diff --git a/.gitignore b/.gitignore
index ccc5bb9604ef9601947060d0f4b11a847e7aada2..a0250ddf67959028b70776c674f463f8b53c4a23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,18 +49,18 @@ sflphone-client-gnome/stamp-h1
 # PJSIP files
 *.depend
 *i686-pc-linux-gnu
-/libs/pjproject-1.0.1/pjlib-util/build/os-auto.mak
-/libs/pjproject-1.0.1/pjlib/build/os-auto.mak
-/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_auto.h
-/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_auto.h
-/libs/pjproject-1.0.1/pjlib/include/pj/config_site.h
-/libs/pjproject-1.0.1/pjmedia/build/os-auto.mak
-/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/config_auto.h
-/libs/pjproject-1.0.1/pjmedia/include/pjmedia/config_auto.h
-/libs/pjproject-1.0.1/pjsip/build/os-auto.mak
-/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_autoconf.h
-/libs/pjproject-1.0.1/third_party/build/os-auto.mak
-/libs/pjproject-1.0.1/third_party/build/portaudio/os-auto.mak
+/libs/pjproject-1.0.3/pjlib-util/build/os-auto.mak
+/libs/pjproject-1.0.3/pjlib/build/os-auto.mak
+/libs/pjproject-1.0.3/pjlib/include/pj/compat/m_auto.h
+/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_auto.h
+/libs/pjproject-1.0.3/pjlib/include/pj/config_site.h
+/libs/pjproject-1.0.3/pjmedia/build/os-auto.mak
+/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/config_auto.h
+/libs/pjproject-1.0.3/pjmedia/include/pjmedia/config_auto.h
+/libs/pjproject-1.0.3/pjsip/build/os-auto.mak
+/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_autoconf.h
+/libs/pjproject-1.0.3/third_party/build/os-auto.mak
+/libs/pjproject-1.0.3/third_party/build/portaudio/os-auto.mak
 
 # Makefile
 sflphone-common/src/Makefile
diff --git a/lang/README b/lang/README
new file mode 100644
index 0000000000000000000000000000000000000000..6ffb51cd1a4564ad643310f0a4d886f4d65c13a7
--- /dev/null
+++ b/lang/README
@@ -0,0 +1,22 @@
+If you need to update the translations files :
+
+First, compile the KDE client in order to update generated c++ files (from ui files, etc).
+For more details about how to compile KDE client, see the README file in sflphone-client-kde folder.
+Then just execute:
+
+	./update.sh
+	
+in the current directory.
+
+
+Now that the global po files are updated, you can copy them in both Gnome and KDE clients using :
+
+	./copy-in-gnome.sh
+
+and
+
+	./copy-in-kde.sh
+
+This will replace the po files in clients with those in lang folder.
+
+ALL CHANGES MADE DIRECTLY IN PO FILES IN THE CLIENTS FOLDERS WILL BE LOST!
diff --git a/lang/copy-in-gnome.sh b/lang/copy-in-gnome.sh
new file mode 100755
index 0000000000000000000000000000000000000000..f5e961f6ad4fb554a3694cf84de76dea04822929
--- /dev/null
+++ b/lang/copy-in-gnome.sh
@@ -0,0 +1,6 @@
+for fichier in `find  .  -name sflphone.po `
+do
+locale=`echo $fichier | cut -d / -f2`
+cp $fichier ../sflphone-client-gnome/po/$locale/sflphone-client-gnome.po
+echo "$fichier	copied to	../sflphone-client-gnome/po/$locale/sflphone-client-gnome.po"
+done
diff --git a/lang/copy-in-kde.sh b/lang/copy-in-kde.sh
new file mode 100755
index 0000000000000000000000000000000000000000..eeaf020136b56d76f4367b41db5368ad6e7714c6
--- /dev/null
+++ b/lang/copy-in-kde.sh
@@ -0,0 +1,6 @@
+for fichier in `find  .  -name sflphone.po `
+do
+locale=`echo $fichier | cut -d / -f2`
+cp $fichier ../sflphone-client-kde/po/$locale/sflphone-client-kde.po
+echo "$fichier	copied to	../sflphone-client-kde/po/$locale/sflphone-client-kde.po"
+done
diff --git a/lang/de/sflphone.po b/lang/de/sflphone.po
new file mode 100644
index 0000000000000000000000000000000000000000..9513fd6b0668446b77fa0db7a249045e7eecd938
--- /dev/null
+++ b/lang/de/sflphone.po
@@ -0,0 +1,1282 @@
+# German translation of SFLphone.
+# Copyright (C) 2008 The Free Software Foundation, Inc.
+# This file is distributed under the GNU General Public License Version 3.
+#
+# Sven Werlen <sven.werlen@savoirfairelinux.com>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: sflphone\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-07-17 16:14-0400\n"
+"PO-Revision-Date: 2009-01-08 10:46-0500\n"
+"Last-Translator: Sven Werlen <sven.werlen@savoirfairelinux.com>\n"
+"Language-Team: SavoirFaire Linux Inc <sflphoneteam@savoirfairelinux.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 0.2\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../sflphone-client-kde/src/Account.cpp:34
+#: ../sflphone-client-gnome/src/accountlist.c:175
+msgctxt "account state"
+msgid "Registered"
+msgstr "Registriert"
+
+#: ../sflphone-client-kde/src/Account.cpp:36
+#: ../sflphone-client-gnome/src/accountlist.c:178
+msgctxt "account state"
+msgid "Not Registered"
+msgstr "Nicht registriert"
+
+#: ../sflphone-client-kde/src/Account.cpp:38
+#: ../sflphone-client-gnome/src/accountlist.c:181
+msgctxt "account state"
+msgid "Trying..."
+msgstr "Am versuchen..."
+
+#: ../sflphone-client-kde/src/Account.cpp:40
+#: ../sflphone-client-gnome/src/accountlist.c:184
+msgctxt "account state"
+msgid "Error"
+msgstr "Fehler"
+
+#: ../sflphone-client-kde/src/Account.cpp:42
+#: ../sflphone-client-gnome/src/accountlist.c:187
+msgctxt "account state"
+msgid "Authentication Failed"
+msgstr "Falsche Authentifizierung"
+
+#: ../sflphone-client-kde/src/Account.cpp:44
+#: ../sflphone-client-gnome/src/accountlist.c:190
+msgctxt "account state"
+msgid "Network unreachable"
+msgstr "Kein netzwerk"
+
+#: ../sflphone-client-kde/src/Account.cpp:46
+#: ../sflphone-client-gnome/src/accountlist.c:193
+msgctxt "account state"
+msgid "Host unreachable"
+msgstr "Host unerreichbar"
+
+#: ../sflphone-client-kde/src/Account.cpp:48
+#: ../sflphone-client-gnome/src/accountlist.c:196
+msgctxt "account state"
+msgid "Stun configuration error"
+msgstr "Stun: Konfigurationsfehler"
+
+#: ../sflphone-client-kde/src/Account.cpp:50
+#: ../sflphone-client-gnome/src/accountlist.c:199
+msgctxt "account state"
+msgid "Stun server invalid"
+msgstr "Ungültiger Stun server"
+
+#: ../sflphone-client-kde/src/Account.cpp:51
+#: ../sflphone-client-gnome/src/accountlist.c:202
+msgctxt "account state"
+msgid "Invalid"
+msgstr "Ungültig"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:163
+#: ../sflphone-client-kde/src/AccountWizard.cpp:278
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:393
+msgid "Account creation wizard"
+msgstr "SFLphone Konto (Konfigurationsassistent)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:199
+#: ../sflphone-client-kde/src/AccountWizard.cpp:217
+#: ../sflphone-client-kde/src/AccountWizard.cpp:561
+#: ../sflphone-client-gnome/src/assistant.c:68
+#, c-format
+msgid "This assistant is now finished."
+msgstr "Assistent beendet."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:211
+msgid "Creation of account has failed for the reason"
+msgstr "Konfigurationsassistent mit Fehler beendet"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:255
+#: ../sflphone-client-kde/src/AccountWizard.cpp:440
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:363
+#: ../sflphone-client-gnome/src/assistant.c:72
+msgid "Alias"
+msgstr "Alias"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:256
+#: ../sflphone-client-kde/src/AccountWizard.cpp:441
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:370
+#: ../sflphone-client-gnome/src/assistant.c:75
+msgid "Server"
+msgstr "Server"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:257
+#: ../sflphone-client-kde/src/AccountWizard.cpp:442
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:371
+#: ../sflphone-client-gnome/src/assistant.c:78
+msgid "Username"
+msgstr "Benutzername"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:258
+#: ../sflphone-client-kde/src/AccountWizard.cpp:443
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:372
+msgid "Password"
+msgstr "Passwort"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:259
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:364
+#: ../sflphone-client-gnome/src/config/configwindow.c:418
+msgid "Protocol"
+msgstr "Protokoll"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:260
+#: ../sflphone-client-kde/src/AccountWizard.cpp:444
+msgid "Voicemail number"
+msgstr "Voicemail Nummer"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:279
+#: ../sflphone-client-gnome/src/assistant.c:216
+msgid "Welcome to the Account creation wizard of SFLphone!"
+msgstr "Wilkommen zu SFLphone!"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:281
+#: ../sflphone-client-gnome/src/assistant.c:217
+msgid "This installation wizard will help you configure an account."
+msgstr ""
+"The Installationsassistent wird Ihnen helfen, ein Konto zu konfigurieren."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:309
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Account"
+msgstr "Konto"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:310
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Please select one of the following options"
+msgstr "Bitte eine Option auswählen"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:312
+#: ../sflphone-client-gnome/src/assistant.c:251
+msgid "Create a free SIP/IAX2 account on sflphone.org"
+msgstr "SIP/IAX2 Konto bei sflphone.org erstellen lassen"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:313
+#: ../sflphone-client-gnome/src/assistant.c:253
+msgid "Register an existing SIP or IAX2 account"
+msgstr "Existierendes SIP/IAX2 Konto registrieren"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:352
+#: ../sflphone-client-gnome/src/assistant.c:231
+msgid "VoIP Protocols"
+msgstr "VoIP Protokoll"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:353
+#: ../sflphone-client-gnome/src/assistant.c:231
+msgid "Select an account type"
+msgstr "Kontotyp auswählen"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:355
+#: ../sflphone-client-gnome/src/assistant.c:233
+msgid "SIP (Session Initiation Protocol)"
+msgstr "SIP (Session Initiation Protocol)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:356
+#: ../sflphone-client-gnome/src/assistant.c:235
+msgid "IAX2 (InterAsterix Exchange)"
+msgstr "IAX2 (InterAsterisk Exchange)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:395
+#: ../sflphone-client-gnome/src/assistant.c:339
+msgid "Optional email address"
+msgstr "Fakultative E-mail-Adresse"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:396
+#: ../sflphone-client-gnome/src/assistant.c:339
+msgid "This email address will be used to send your voicemail messages."
+msgstr ""
+"Diese E-mail-Adresse wird benutzt, um Ihnen voicemail Meldungen zu schicken."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:398
+msgid "Email address"
+msgstr "E-mail-Adresse"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:432
+#: ../sflphone-client-gnome/src/assistant.c:266
+msgid "SIP account settings"
+msgstr "Konfiguration des SIP Konto"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:436
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "IAX2 account settings"
+msgstr "Konfiguration des IAX2 Konto"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:438
+#: ../sflphone-client-gnome/src/assistant.c:266
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "Please fill the following information"
+msgstr "Folgende Informationen bitte ausfühlen"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:523
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:856
+msgid "Network Address Translation (NAT)"
+msgstr "Network Address Translation (NAT)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:524
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:536
+msgid "You should probably enable this if you are behind a firewall."
+msgstr "Sie sollten dieses einschalten, falls Sie hinter einer Firewall sind."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:526
+msgid "Enable STUN"
+msgstr "STUN einschalten"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:527
+msgid "Stun Server"
+msgstr "Stun Server"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:562
+msgid ""
+"After checking the settings you chose, click \"Finish\" to create the "
+"account."
+msgstr "Einstellungen prüfen, dann \"Finish\" drücken."
+
+#: ../sflphone-client-kde/src/ActionSetAccountFirst.cpp:26
+msgid "Default account"
+msgstr "Default Konto"
+
+#: ../sflphone-client-kde/src/Call.cpp:116
+#: ../sflphone-client-gnome/src/contacts/calltree.c:322
+msgid "Transfer to : "
+msgstr "Weiterleiten zu : "
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:89
+#: ../sflphone-client-gnome/src/actions.c:816
+msgid "Codec"
+msgstr "Codec"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:93
+#: ../sflphone-client-gnome/src/config/audioconf.c:581
+msgid "Frequency"
+msgstr "Frequenz"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:97
+#: ../sflphone-client-gnome/src/config/audioconf.c:586
+msgid "Bitrate"
+msgstr "Bitrate"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:101
+#: ../sflphone-client-gnome/src/config/audioconf.c:591
+msgid "Bandwidth"
+msgstr "Bandbreite"
+
+#: ../sflphone-client-kde/src/main.cpp:38
+msgid "SFLphone KDE Client"
+msgstr "SFLphone KDE Client"
+
+#: ../sflphone-client-kde/src/main.cpp:42
+msgid "(C) 2009 Savoir-faire Linux"
+msgstr "(C) 2009 Savoir-faire Linux"
+
+#: ../sflphone-client-kde/src/main.cpp:46
+msgid "Jérémy Quentin"
+msgstr "Jérémy Quentin"
+
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Ihre Namen"
+
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "Ihre E-Mail-Adressen"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:62
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-gnome/src/statusicon.c:126
+msgid "SFLphone"
+msgstr "SFLphone"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:209
+msgid "Incoming call"
+msgstr "Eingehende Anrufe"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
+msgid "You have an incoming call from"
+msgstr "Sie haben einen Anruf aus"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
+msgid "Click to accept or refuse it."
+msgstr "Klicken, um zu akzeptieren oder abzulehnen."
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:716
+msgid "Address book loading..."
+msgstr "Adressbuch Laden..."
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:901
+#: ../sflphone-client-gnome/src/actions.c:89
+msgid "No registered accounts"
+msgstr "Kein registriertes Konto"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:905
+#: ../sflphone-client-gnome/src/actions.c:83
+#: ../sflphone-client-gnome/src/actions.c:813
+msgid "Using account"
+msgstr "Mit Konto"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
+msgid "Main screen"
+msgstr "Hauptbildschirm"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:165
+msgid "Call history"
+msgstr "Liste der vorherigen Anrufen"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:394
+#: ../sflphone-client-gnome/src/toolbar.c:243
+#: ../sflphone-client-gnome/src/toolbar.c:245
+msgid "Address book"
+msgstr "Adressbuch"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1108
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1173
+msgid "Edit before call"
+msgstr "Vor Aufruf bearbeiten"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:41
+#: ../sflphone-client-gnome/src/toolbar.c:167
+#: ../sflphone-client-gnome/src/toolbar.c:169
+msgid "New call"
+msgstr "Neuer Anruf"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:42
+#: ../sflphone-client-kde/src/sflphone_const.h:47
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:381
+#: ../sflphone-client-gnome/src/toolbar.c:186
+#: ../sflphone-client-gnome/src/toolbar.c:188
+msgid "Hang up"
+msgstr "Auflegen"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:43
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:382
+#: ../sflphone-client-gnome/src/toolbar.c:207
+#: ../sflphone-client-gnome/src/toolbar.c:209
+msgid "Hold on"
+msgstr "In Warteschleife"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:44
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:383
+#: ../sflphone-client-gnome/src/toolbar.c:220
+#: ../sflphone-client-gnome/src/toolbar.c:222
+msgid "Transfer"
+msgstr "Weiterleiten"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:45
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:392
+#: ../sflphone-client-gnome/src/toolbar.c:263
+msgid "Record"
+msgstr "Gespräch aufzeichnen"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:46
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:380
+#: ../sflphone-client-gnome/src/toolbar.c:176
+#: ../sflphone-client-gnome/src/toolbar.c:178
+msgid "Pick up"
+msgstr "Abnehmen"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:48
+#: ../sflphone-client-gnome/src/toolbar.c:196
+#: ../sflphone-client-gnome/src/toolbar.c:198
+msgid "Hold off"
+msgstr "Aus Warteschleife"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:49
+msgid "Give up transfer"
+msgstr "Transfer aufgeben"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:50
+msgid "Call back"
+msgstr "Zurückrufen"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:48
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:91
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
+#: ../sflphone-client-gnome/src/config/configwindow.c:722
+#: ../sflphone-client-gnome/src/config/configwindow.c:791
+msgctxt "Config section"
+msgid "General"
+msgstr "Allgemein"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:49
+msgctxt "Config section"
+msgid "Display"
+msgstr "Display"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:50
+#: ../sflphone-client-gnome/src/config/configwindow.c:833
+msgctxt "Config section"
+msgid "Accounts"
+msgstr "Konten"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:51
+#: ../sflphone-client-gnome/src/config/configwindow.c:786
+msgctxt "Config section"
+msgid "Audio"
+msgstr "Audio"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:52
+#: ../sflphone-client-gnome/src/config/configwindow.c:801
+msgctxt "Config section"
+msgid "Address Book"
+msgstr "Adressbuch"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:53
+#: ../sflphone-client-gnome/src/config/configwindow.c:796
+msgctxt "Config section"
+msgid "Recordings"
+msgstr "Tonaufnahmen"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:54
+#: ../sflphone-client-gnome/src/config/configwindow.c:806
+msgctxt "Config section"
+msgid "Hooks"
+msgstr "Hooks"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:328
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows. Enable/disable them by checking/unchecking "
+"them on the left of the item. Add or remove some with \"Plus\" and \"Sub\" "
+"buttons. Edit the selected account with the form on the right."
+msgstr ""
+"Sflphone verwendet das erste \"registrierte\" Konto in der Liste, wenn Sie "
+"anrufen. Benutzen Sie die Pfeile, um die Anordnung der Kontos zu ändern. Mit "
+"\"Plus\" und \"Minus\" können Sie ein Konto anlegen bzgl. entfernen. Mit "
+"\"Editieren\" können Sie ein Konto bearbeiten. "
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:332
+msgid "Remove the selected account"
+msgstr "Entfernen Sie das ausgewählte Konto"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:335
+msgid ""
+"This button will remove the selected account in the list below. Be sure you "
+"really don't need it anymore. If you think you might use it again later, "
+"just uncheck it."
+msgstr ""
+"Diese Aktion entfernt das ausgewählte Konto aus der Liste. Stellen Sie "
+"sicher, dass Sie es wirklich nicht mehr brauchen."
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:340
+msgid "Remove"
+msgstr "Entfernen"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:342
+msgid "Add a new account"
+msgstr "Neues Konto anlegen"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:345
+msgid ""
+"This button enables you to initialize a new account. You will then be able "
+"to edit it using the form on the right."
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:347
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:349
+msgid "Get this account down"
+msgstr "Konto nach unten"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:352
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:359
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows."
+msgstr ""
+"Sflphone verwendet das erste \"registrierte\" Konto in der Liste, wenn Sie "
+"anrufen. Benutzen Sie die Pfeile, um die Anordnung der Kontos zu ändern."
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:354
+msgid "Down"
+msgstr "Unten"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:356
+msgid "Get this account up"
+msgstr "Nach oben"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:361
+msgid "Up"
+msgstr "Oben"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:362
+msgid "Apply"
+msgstr "übernehmen"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:367
+msgid "SIP"
+msgstr "SIP"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:368
+msgid "IAX"
+msgstr "IAX"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:373
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:385
+#: ../sflphone-client-gnome/src/toolbar.c:52
+#: ../sflphone-client-gnome/src/toolbar.c:251
+#: ../sflphone-client-gnome/src/toolbar.c:255
+msgid "Voicemail"
+msgstr "Voicemail"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:374
+#: ../sflphone-client-gnome/src/config/configwindow.c:425
+msgid "Status"
+msgstr "Status"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:377
+#: ../sflphone-client-gnome/src/config/configwindow.c:528
+msgid "Stun parameters will be applied on each SIP account created."
+msgstr "Alle SIP Kontos werden mit Stun Einstellungen angepasst."
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:378
+msgid "Enable Stun"
+msgstr "Stun aktivieren"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:380
+#: ../sflphone-client-gnome/src/config/configwindow.c:544
+msgid "Format : name.server:port"
+msgstr "Format: Name.Server:Port"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:382
+msgid "choose Stun server (example : stunserver.org)"
+msgstr "Stun Server auswählen (Bsp: stunserver.org)"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:154
+msgid "Enable address book"
+msgstr "Aktivieren Adressbuch"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:155
+#, fuzzy
+msgid "Maximum results"
+msgstr "Maximale Anzahl Resultaten"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:156
+#, fuzzy
+msgid "Display photo if available"
+msgstr "Foto anzeigen"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:157
+#, fuzzy
+msgid "Display phone numbers of these types :"
+msgstr "Nummer anzeigen für Typen :"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:158
+#, fuzzy
+msgid "Work"
+msgstr "Arbeit"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:159
+#, fuzzy
+msgid "Mobile"
+msgstr "Handy"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:160
+#, fuzzy
+msgid "Home"
+msgstr "Heim"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:225
+msgid "Sound manager"
+msgstr "Sound Manager"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:228
+msgid "ALSA"
+msgstr "ALSA"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:229
+msgid "PulseAudio"
+msgstr "Pulseaudio"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:231
+msgid "Enable ringtones"
+msgstr "Klingeltöne aktivieren"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:232
+#: ../sflphone-client-gnome/src/config/audioconf.c:812
+msgid "Codecs"
+msgstr "Codecs"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:233
+#: ../sflphone-client-gnome/src/config/audioconf.c:795
+msgid "ALSA settings"
+msgstr "ALSA Konfiguration"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:234
+#: ../sflphone-client-gnome/src/config/audioconf.c:662
+msgid "ALSA plugin"
+msgstr "ALSA Plugin"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:235
+#: ../sflphone-client-gnome/src/config/audioconf.c:706
+msgid "Input"
+msgstr "Eingabe"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:236
+#: ../sflphone-client-gnome/src/config/audioconf.c:684
+msgid "Output"
+msgstr "Ausgabe"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:237
+msgid "PulseAudio settings"
+msgstr "Pulseaudio Einstellungen "
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:238
+msgid "Mute other applications during a call"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:121
+msgid "Enable notifications"
+msgstr "Aktivieren Benachrichtungungen"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:122
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:126
+#, fuzzy
+msgid "On incoming calls"
+msgstr "Auf eingehende Anrufe "
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:123
+#, fuzzy
+msgid "On messages"
+msgstr "Auf Nachrichten"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:124
+msgid "Show main window"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:125
+#, fuzzy
+msgid "On start"
+msgstr "Am Start"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:166
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "Keep my history for at least"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:167
+#: ../sflphone-client-gnome/src/config/configwindow.c:643
+msgctxt "End of 'Keep my history for at least n days.'"
+msgid "days"
+msgstr "Tag"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:168
+msgid "Clear history"
+msgstr "Vorherigen Anrufen leeren"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:169
+msgid "Connection"
+msgstr "Connection"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:170
+#: ../sflphone-client-gnome/src/config/configwindow.c:664
+msgid "SIP Port"
+msgstr "SIP Port"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:180
+#: ../sflphone-client-gnome/src/config/hooks-config.c:130
+msgid "URL Argument"
+msgstr "URL Argumen"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:181
+#: ../sflphone-client-gnome/src/config/hooks-config.c:135
+msgid "Custom commands on incoming calls with URL"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:182
+msgid "Trigger on specific SIP header"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:183
+msgid "Trigger on IAX2 URL"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:184
+msgid "Command to run"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:185
+#: ../sflphone-client-gnome/src/config/hooks-config.c:138
+#, c-format
+msgid "%s will be replaced with the passed URL."
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:186
+#: ../sflphone-client-gnome/src/config/hooks-config.c:165
+msgid "Phone number rewriting"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:187
+msgid "Prefix dialed numbers with"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:92
+#: ../sflphone-client-gnome/src/config/configwindow.c:726
+msgid "Destination folder"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:384
+#: ../sflphone-client-gnome/src/toolbar.c:232
+#: ../sflphone-client-gnome/src/toolbar.c:234
+msgid "History"
+msgstr "Vorherige Anrufe"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:386
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:388
+msgid "Configure SFLphone"
+msgstr "Konfigurieren SFLphone"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:390
+#, fuzzy
+msgid "Display volume controls"
+msgstr "Lautstärke Kontrollen"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:391
+msgid "Display dialpad"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:396
+msgid "Attention:number of results exceeds max displayed."
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:398
+#: ../sflphone-client-gnome/src/sliders.c:163
+msgid "Mic volume"
+msgstr "Mikro Lautstärke"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:402
+#: ../sflphone-client-gnome/src/sliders.c:161
+msgid "Speakers volume"
+msgstr "Lautsprecher Lautstärke"
+
+#: ../sflphone-client-gnome/src/actions.c:54
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+#, c-format
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] "%d Voice Nachricht"
+msgstr[1] "%d Voice Nachricht"
+
+#: ../sflphone-client-gnome/src/actions.c:234
+msgid ""
+"Unable to connect to the SFLphone server.\n"
+"Make sure the daemon is running."
+msgstr ""
+"SFLphone Server kann nicht verbunden werden. Stellen Sie sicher, dass der "
+"Dämon läuft."
+
+#: ../sflphone-client-gnome/src/actions.c:809
+#, c-format
+msgid "IP call - %s"
+msgstr "IP Anruf - %s"
+
+#: ../sflphone-client-gnome/src/actions.c:908
+#, 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>Fehler: Kein Audio-Codec gefunden.\n"
+"\n"
+"</b> SFL Audio-Codecs müssen in <i>%s</i> oder <b>.sflphone</b> Ihres HOME-"
+"Verzeichniss ( <i>%s</i> ) gespeichert werden."
+
+#: ../sflphone-client-gnome/src/assistant.c:70
+msgid ""
+"You can at any time check your registration state or modify your accounts "
+"parameters in the Options/Accounts window."
+msgstr ""
+"Sie können jederzeit Ihres Registrierungsstatus überprüfen oder "
+"IhreKontoparameter ändern (Optionen/Konten)."
+
+#: ../sflphone-client-gnome/src/assistant.c:190
+msgid "SFLphone account creation wizard"
+msgstr "SFLphone Konto (Konfigurationsassistent)"
+
+#: ../sflphone-client-gnome/src/assistant.c:274
+#: ../sflphone-client-gnome/src/assistant.c:370
+#: ../sflphone-client-gnome/src/config/accountwindow.c:153
+msgid "_Alias"
+msgstr "_Alias"
+
+#: ../sflphone-client-gnome/src/assistant.c:282
+#: ../sflphone-client-gnome/src/assistant.c:378
+#: ../sflphone-client-gnome/src/config/accountwindow.c:189
+msgid "_Host name"
+msgstr "_Hostname"
+
+#: ../sflphone-client-gnome/src/assistant.c:290
+#: ../sflphone-client-gnome/src/assistant.c:386
+#: ../sflphone-client-gnome/src/config/accountwindow.c:197
+msgid "_User name"
+msgstr "_Benutzername"
+
+#: ../sflphone-client-gnome/src/assistant.c:306
+#: ../sflphone-client-gnome/src/assistant.c:401
+#: ../sflphone-client-gnome/src/config/accountwindow.c:212
+msgid "_Password"
+msgstr "_Passwort"
+
+#: ../sflphone-client-gnome/src/assistant.c:324
+#: ../sflphone-client-gnome/src/assistant.c:417
+#: ../sflphone-client-gnome/src/config/accountwindow.c:228
+msgid "_Voicemail number"
+msgstr "_Voicemail Nummer"
+
+#: ../sflphone-client-gnome/src/assistant.c:347
+msgid "_Email address"
+msgstr "_Email"
+
+#: ../sflphone-client-gnome/src/assistant.c:444
+#: ../sflphone-client-gnome/src/config/configwindow.c:532
+msgid "E_nable STUN"
+msgstr "STUN Ei_nschalten"
+
+#: ../sflphone-client-gnome/src/assistant.c:451
+msgid "_STUN server"
+msgstr "_STUN Server"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Account Registration"
+msgstr "Konto Registrierung"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Congratulations!"
+msgstr "Gratulation!"
+
+#: ../sflphone-client-gnome/src/errors.c:29
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening playback device"
+msgstr ""
+"ALSA Benachrichtigung\n"
+"\n"
+"Fehler während Öffnen des \"playback device\""
+
+#: ../sflphone-client-gnome/src/errors.c:32
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening capture device"
+msgstr ""
+"ALSA Benachrichtigung\n"
+"\n"
+"Fehler während Öffnen des \"capture device\""
+
+#: ../sflphone-client-gnome/src/errors.c:35
+msgid ""
+"Pulseaudio notification\n"
+"\n"
+"Pulseaudio is not running"
+msgstr ""
+"Pulseaudio Benachrichtigung\n"
+"\n"
+"Pulseaudio nicht gestartet"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:70
+msgid "There is one call in progress."
+msgstr "Laufender Anruf."
+
+#: ../sflphone-client-gnome/src/mainwindow.c:74
+msgid "There are calls in progress."
+msgstr "Laufende Anrufe."
+
+#: ../sflphone-client-gnome/src/mainwindow.c:83
+msgid "Do you still want to quit?"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/mainwindow.c:284
+msgid "SFLphone Error"
+msgstr "SFLphone Fehler"
+
+#: ../sflphone-client-gnome/src/menus.c:134
+msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr "SFLphone ist ein VoIP Client (kompatibel mit SIP und IAX2 Protokolle)"
+
+#: ../sflphone-client-gnome/src/menus.c:137
+msgid "About SFLphone"
+msgstr "Über SFLphone"
+
+#: ../sflphone-client-gnome/src/menus.c:161
+msgid "_Help"
+msgstr "_Hilfe"
+
+#: ../sflphone-client-gnome/src/menus.c:296
+#: ../sflphone-client-gnome/src/menus.c:953
+msgid "_New call"
+msgstr "_Neuer Anruf"
+
+#: ../sflphone-client-gnome/src/menus.c:308
+#: ../sflphone-client-gnome/src/menus.c:785
+msgid "_Pick up"
+msgstr "_Abnehmen"
+
+#: ../sflphone-client-gnome/src/menus.c:318
+#: ../sflphone-client-gnome/src/menus.c:797
+msgid "_Hang up"
+msgstr "A_uflegen"
+
+#: ../sflphone-client-gnome/src/menus.c:328
+#: ../sflphone-client-gnome/src/menus.c:809
+msgid "On _Hold"
+msgstr "in _Warteschleife"
+
+#: ../sflphone-client-gnome/src/menus.c:340
+#: ../sflphone-client-gnome/src/menus.c:821
+msgid "_Record"
+msgstr "_Gespräch aufzeichnen"
+
+#: ../sflphone-client-gnome/src/menus.c:354
+msgid "_Account creation wizard"
+msgstr "SFLphone _Konto (Konfigurationsassistent)"
+
+#: ../sflphone-client-gnome/src/menus.c:384
+msgid "_Call"
+msgstr "_Anruf"
+
+#: ../sflphone-client-gnome/src/menus.c:552
+msgid "Clear _history"
+msgstr "Liste der vorherigen Anrufen _leeren"
+
+#: ../sflphone-client-gnome/src/menus.c:564
+msgid "_Accounts"
+msgstr "_Konten"
+
+#: ../sflphone-client-gnome/src/menus.c:579
+msgid "_Edit"
+msgstr "_Editieren"
+
+#: ../sflphone-client-gnome/src/menus.c:631
+msgid "_Dialpad"
+msgstr "_Wählscheibe"
+
+#: ../sflphone-client-gnome/src/menus.c:643
+msgid "_Volume controls"
+msgstr "Lautstärke Kontrollen"
+
+#: ../sflphone-client-gnome/src/menus.c:661
+msgid "_View"
+msgstr "_Anzeigen"
+
+#: ../sflphone-client-gnome/src/menus.c:881
+msgid "_Call back"
+msgstr "_zurückrufen"
+
+#: ../sflphone-client-gnome/src/menus.c:1061
+msgid "Edit phone number"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/menus.c:1072
+msgid "Edit the phone number before making a call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/sflnotify.c:71
+#: ../sflphone-client-gnome/src/sflnotify.c:91
+#, c-format
+msgid "%s account : %s"
+msgstr "Konto %s : %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:75
+#, c-format
+msgid "<i>From</i> %s"
+msgstr "<i>Von</i> %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:111
+#, c-format
+msgid "Calling with %s account <i>%s</i>"
+msgstr "Mit %s Konto <i>%s</i> anrufen"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:115
+msgid "Current account"
+msgstr "Aktuelles Konto"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:130
+msgid "You have no accounts set up"
+msgstr "Sie haben noch kein Konto eingestellt"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:131
+#: ../sflphone-client-gnome/src/sflnotify.c:148
+msgid "Error"
+msgstr "Fehler"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:147
+msgid "You have no registered accounts"
+msgstr "Sie haben noch kein registriertes Konto"
+
+#: ../sflphone-client-gnome/src/statusicon.c:91
+msgid "_Show main window"
+msgstr "_Hauptfenster anzeigen"
+
+#: ../sflphone-client-gnome/src/statusicon.c:127
+#, c-format
+msgid "%i account configured"
+msgid_plural "%i accounts configured"
+msgstr[0] "%i Konto konfiguriert"
+msgstr[1] "%i Konten konfiguriert"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:113
+msgid "Account settings"
+msgstr "Kontoeinstellungen"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:147
+msgid "_Enable this account"
+msgstr "_Einschalten"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:161
+msgid "_Protocol"
+msgstr "_Protokoll"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:179
+msgid "Unknown"
+msgstr "unbekannt"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:312
+msgid "_Use Evolution address books"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:319
+msgid "Download limit :"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:327
+msgid "cards"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:333
+msgid "_Display contact photo if available"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:341
+msgid "Fields from Evolution's address books"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:345
+msgid "_Work"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:351
+msgid "_Home"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:357
+msgid "_Mobile"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:364
+msgid "Address Books"
+msgstr "Adressbücher"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:368
+msgid "Select which Evolution address books to use"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:404
+#: ../sflphone-client-gnome/src/config/audioconf.c:576
+msgid "Name"
+msgstr "Name"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:741
+msgid "_Voice Activity Detection"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:751
+msgid "_Noise Reduction (Narrow-Band Companding)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:780
+msgid "Sound Manager"
+msgstr "Sound Manager"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:783
+msgid "_Pulseaudio"
+msgstr "Pulseaudio"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:788
+msgid "_ALSA"
+msgstr "ALSA"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:835
+msgid "Ringtones"
+msgstr "Klingeltöne"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:841
+msgid "_Enable ringtones"
+msgstr "Klingeltöne _einschalten"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:847
+msgid "Choose a ringtone"
+msgstr "Klingelton auswählen"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
+msgid "Audio Files"
+msgstr "Audio Dateien"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:589
+msgid "Desktop Notifications"
+msgstr "Desktopbenachrichtigungen"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:593
+msgid "_Enable notifications"
+msgstr "Benachrichtigungen _einschalten"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:599
+msgid "Enable voicemail _notifications"
+msgstr "_Benachrichtigung für Voice Nachrichten"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:611
+msgid "System Tray Icon"
+msgstr "Benachrichtigungsfeld (\"System Tray\") Icon"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:614
+msgid "_Popup main window on incoming call"
+msgstr "Hauptfenster anzeigen wenn eingehendes Gespräch"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:619
+msgid "Ne_ver popup main window"
+msgstr "_Hauptfenster nie anzeigen"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:623
+msgid "Hide SFLphone window on _startup"
+msgstr "_Unsichtbar beim Start"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:629
+msgid "Calls History"
+msgstr "Liste der vorherigen Anrufen"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:632
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "_Keep my history for at least"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:647
+msgid "PulseAudio sound server"
+msgstr "PulseAudio Sound Server"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:650
+msgid "_Mute other applications during a call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:677
+msgid "Port"
+msgstr "Port"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:732
+msgid "Select a folder"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:766
+msgid "Preferences"
+msgstr "Einstellungen"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:845
+msgid "Configured Accounts"
+msgstr "Konfigurierten Konten"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:141
+msgid "Trigger on specific _SIP header"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:150
+msgid "Trigger on _IAX2 URL"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:155
+msgid "Command to _run"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:169
+msgid "_Prefix dialed numbers with"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+msgid "Search all"
+msgstr "Suche in allen"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:57
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:70
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:82
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:94
+msgid "Click here to change the search type"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+msgid "Search by missed call"
+msgstr "Suche nach Anruf in Abwesenheit "
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+msgid "Search by incoming call"
+msgstr "Suche nach eingehenden Anruf "
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+msgid "Search by outgoing call"
+msgstr "Suche nach ausgehenden Anru"
+
+#~ msgid "User"
+#~ msgstr "Benutzername"
+
+#~ msgid "Mailbox"
+#~ msgstr "Mailbox"
+
+#~ msgid "State"
+#~ msgstr "Status"
+
+#~ msgid "Stun settings will be applied on each account"
+#~ msgstr "Alle SIP Kontos werden mit Stun Einstellungen angepasst."
+
+#~ msgid "Audio device"
+#~ msgstr "Audio Dateien"
+
+#~ msgid "&Codecs"
+#~ msgstr "Codecs"
+
+#~ msgid "Out"
+#~ msgstr "Ausgabe"
+
+#~ msgid "On &incoming calls"
+#~ msgstr "Auf eingehende Anrufe "
+
+#~ msgid "days"
+#~ msgstr "Tag"
+
+#~ msgid "General"
+#~ msgstr "Allgemein"
+
+#~ msgid "Hold"
+#~ msgstr "In Warteschleife"
+
+#~ msgid "Configure accounts"
+#~ msgstr "Konfigurierten Konten"
+
+#~ msgid "Configure audio"
+#~ msgstr "Konfigurieren SFLphone"
+
+#~ msgctxt "Action record a call"
+#~ msgid "Record"
+#~ msgstr "Gespräch aufzeichnen"
+
+#~ msgid "accounr state"
+#~ msgstr "Kontoeinstellungen"
+
+#~ msgid "%s - %s"
+#~ msgstr "%s - %s"
diff --git a/lang/es/sflphone.po b/lang/es/sflphone.po
new file mode 100644
index 0000000000000000000000000000000000000000..178c397bbfcf2e4f1f8fb72a36ad500e4cf63eef
--- /dev/null
+++ b/lang/es/sflphone.po
@@ -0,0 +1,1478 @@
+# Spanish translation of SFLphone.
+# Copyright (C) 2008 2009 The Free Software Foundation, Inc.
+# This file is distributed under the GNU General Public License Version 3.
+# 
+# Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>, 2008.
+# 
+# POT-Creation-Date: 2007-01-13 01:39+0100\n
+msgid ""
+msgstr ""
+"Project-Id-Version: SFLphone 0.9.4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-07-17 16:14-0400\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"
+
+#: ../sflphone-client-kde/src/Account.cpp:34
+#: ../sflphone-client-gnome/src/accountlist.c:175
+msgctxt "account state"
+msgid "Registered"
+msgstr "Registrado"
+
+#: ../sflphone-client-kde/src/Account.cpp:36
+#: ../sflphone-client-gnome/src/accountlist.c:178
+msgctxt "account state"
+msgid "Not Registered"
+msgstr "No registrado"
+
+#: ../sflphone-client-kde/src/Account.cpp:38
+#: ../sflphone-client-gnome/src/accountlist.c:181
+msgctxt "account state"
+msgid "Trying..."
+msgstr "Intentando..."
+
+#: ../sflphone-client-kde/src/Account.cpp:40
+#: ../sflphone-client-gnome/src/accountlist.c:184
+msgctxt "account state"
+msgid "Error"
+msgstr "Error"
+
+#: ../sflphone-client-kde/src/Account.cpp:42
+#: ../sflphone-client-gnome/src/accountlist.c:187
+msgctxt "account state"
+msgid "Authentication Failed"
+msgstr "Autenticación erronea"
+
+#: ../sflphone-client-kde/src/Account.cpp:44
+#: ../sflphone-client-gnome/src/accountlist.c:190
+msgctxt "account state"
+msgid "Network unreachable"
+msgstr "Red Inaccesible"
+
+#: ../sflphone-client-kde/src/Account.cpp:46
+#: ../sflphone-client-gnome/src/accountlist.c:193
+msgctxt "account state"
+msgid "Host unreachable"
+msgstr "Parte del servidor"
+
+#: ../sflphone-client-kde/src/Account.cpp:48
+#: ../sflphone-client-gnome/src/accountlist.c:196
+msgctxt "account state"
+msgid "Stun configuration error"
+msgstr "Error de configuración Stun"
+
+#: ../sflphone-client-kde/src/Account.cpp:50
+#: ../sflphone-client-gnome/src/accountlist.c:199
+msgctxt "account state"
+msgid "Stun server invalid"
+msgstr "Servidor stun inválido"
+
+#: ../sflphone-client-kde/src/Account.cpp:51
+#: ../sflphone-client-gnome/src/accountlist.c:202
+msgctxt "account state"
+msgid "Invalid"
+msgstr "Inválido"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:163
+#: ../sflphone-client-kde/src/AccountWizard.cpp:278
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:393
+msgid "Account creation wizard"
+msgstr "Asistente de configuración de cuentas"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:199
+#: ../sflphone-client-kde/src/AccountWizard.cpp:217
+#: ../sflphone-client-kde/src/AccountWizard.cpp:561
+#: ../sflphone-client-gnome/src/assistant.c:68
+#, c-format
+msgid "This assistant is now finished."
+msgstr "Ese asistante ha finalizado."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:211
+msgid "Creation of account has failed for the reason"
+msgstr "Creación de cuenta ha fallado por la razón"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:255
+#: ../sflphone-client-kde/src/AccountWizard.cpp:440
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:363
+#: ../sflphone-client-gnome/src/assistant.c:72
+msgid "Alias"
+msgstr "Alias"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:256
+#: ../sflphone-client-kde/src/AccountWizard.cpp:441
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:370
+#: ../sflphone-client-gnome/src/assistant.c:75
+msgid "Server"
+msgstr "Servidor"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:257
+#: ../sflphone-client-kde/src/AccountWizard.cpp:442
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:371
+#: ../sflphone-client-gnome/src/assistant.c:78
+msgid "Username"
+msgstr "Usuario"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:258
+#: ../sflphone-client-kde/src/AccountWizard.cpp:443
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:372
+msgid "Password"
+msgstr "Contraseña"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:259
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:364
+#: ../sflphone-client-gnome/src/config/configwindow.c:418
+msgid "Protocol"
+msgstr "Protocolo"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:260
+#: ../sflphone-client-kde/src/AccountWizard.cpp:444
+msgid "Voicemail number"
+msgstr "Número de buzón de voz"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:279
+#: ../sflphone-client-gnome/src/assistant.c:216
+msgid "Welcome to the Account creation wizard of SFLphone!"
+msgstr "¡Bienvenido al asistente de configuración de cuentas de SFLphone"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:281
+#: ../sflphone-client-gnome/src/assistant.c:217
+msgid "This installation wizard will help you configure an account."
+msgstr "Este asistente de instalación le ayudará a configurar una cuenta."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:309
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Account"
+msgstr "Cuenta"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:310
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Please select one of the following options"
+msgstr "Por favor, elija una de las siguientes opciones"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:312
+#: ../sflphone-client-gnome/src/assistant.c:251
+msgid "Create a free SIP/IAX2 account on sflphone.org"
+msgstr "Crear una cuenta SIP/IAX2 gratis en sflphone.org"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:313
+#: ../sflphone-client-gnome/src/assistant.c:253
+msgid "Register an existing SIP or IAX2 account"
+msgstr "Registrar una cuenta SIP o IAX2 existente"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:352
+#: ../sflphone-client-gnome/src/assistant.c:231
+msgid "VoIP Protocols"
+msgstr "Protocolos VoIP"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:353
+#: ../sflphone-client-gnome/src/assistant.c:231
+msgid "Select an account type"
+msgstr "Escoja un tipo de cuenta"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:355
+#: ../sflphone-client-gnome/src/assistant.c:233
+msgid "SIP (Session Initiation Protocol)"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:356
+#: ../sflphone-client-gnome/src/assistant.c:235
+msgid "IAX2 (InterAsterix Exchange)"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:395
+#: ../sflphone-client-gnome/src/assistant.c:339
+msgid "Optional email address"
+msgstr "Dirección de correo opcional"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:396
+#: ../sflphone-client-gnome/src/assistant.c:339
+msgid "This email address will be used to send your voicemail messages."
+msgstr "Esta dirección de correo se usará para mandar sus mensajes de voz"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:398
+msgid "Email address"
+msgstr "Dirección de correo"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:432
+#: ../sflphone-client-gnome/src/assistant.c:266
+msgid "SIP account settings"
+msgstr "Configuración de cuenta SIP"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:436
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "IAX2 account settings"
+msgstr "Configuración de cuenta IAX2"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:438
+#: ../sflphone-client-gnome/src/assistant.c:266
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "Please fill the following information"
+msgstr "Por favor, rellene la siguiente información"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:523
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:856
+msgid "Network Address Translation (NAT)"
+msgstr "Conversión de Dirección de Red (NAT)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:524
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:536
+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."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:526
+msgid "Enable STUN"
+msgstr "Activar STUN"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:527
+msgid "Stun Server"
+msgstr "Servidor STUN"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:562
+msgid ""
+"After checking the settings you chose, click \"Finish\" to create the "
+"account."
+msgstr ""
+"Después de comprobar los ajustes usted eligió, haz clic \"Terminar\"para "
+"crear la cuenta."
+
+#: ../sflphone-client-kde/src/ActionSetAccountFirst.cpp:26
+msgid "Default account"
+msgstr "Cuenta por defecto"
+
+#: ../sflphone-client-kde/src/Call.cpp:116
+#: ../sflphone-client-gnome/src/contacts/calltree.c:322
+msgid "Transfer to : "
+msgstr "Transferir a : "
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:89
+#: ../sflphone-client-gnome/src/actions.c:816
+msgid "Codec"
+msgstr "Códec"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:93
+#: ../sflphone-client-gnome/src/config/audioconf.c:581
+msgid "Frequency"
+msgstr "Frecuencia"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:97
+#: ../sflphone-client-gnome/src/config/audioconf.c:586
+msgid "Bitrate"
+msgstr "Tasa de transferencia"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:101
+#: ../sflphone-client-gnome/src/config/audioconf.c:591
+msgid "Bandwidth"
+msgstr "Ancho de banda"
+
+#: ../sflphone-client-kde/src/main.cpp:38
+msgid "SFLphone KDE Client"
+msgstr "Cliente KDE de SFLphone"
+
+#: ../sflphone-client-kde/src/main.cpp:42
+msgid "(C) 2009 Savoir-faire Linux"
+msgstr ""
+
+#: ../sflphone-client-kde/src/main.cpp:46
+msgid "Jérémy Quentin"
+msgstr ""
+
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Maxime Chambreuil"
+
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "maxime.chambreuil@savoirfairelinux.com"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:62
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-gnome/src/statusicon.c:126
+msgid "SFLphone"
+msgstr "SFLphone"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:209
+msgid "Incoming call"
+msgstr "Llamada entrante"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
+msgid "You have an incoming call from"
+msgstr "Tienes una llamada de"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
+msgid "Click to accept or refuse it."
+msgstr "Haz clic para aceptar o rechazarlo"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:716
+msgid "Address book loading..."
+msgstr "Cargando el directorio..."
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:901
+#: ../sflphone-client-gnome/src/actions.c:89
+msgid "No registered accounts"
+msgstr "Ninguna cuenta registrada"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:905
+#: ../sflphone-client-gnome/src/actions.c:83
+#: ../sflphone-client-gnome/src/actions.c:813
+msgid "Using account"
+msgstr "Usando la cuenta"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
+msgid "Main screen"
+msgstr "Pantalla principal"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:165
+msgid "Call history"
+msgstr "Historia de Llamada"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:394
+#: ../sflphone-client-gnome/src/toolbar.c:243
+#: ../sflphone-client-gnome/src/toolbar.c:245
+msgid "Address book"
+msgstr "Libreta de contactos"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1108
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1173
+msgid "Edit before call"
+msgstr "Editar antes de llamar"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:41
+#: ../sflphone-client-gnome/src/toolbar.c:167
+#: ../sflphone-client-gnome/src/toolbar.c:169
+msgid "New call"
+msgstr "Nueva llamada"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:42
+#: ../sflphone-client-kde/src/sflphone_const.h:47
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:381
+#: ../sflphone-client-gnome/src/toolbar.c:186
+#: ../sflphone-client-gnome/src/toolbar.c:188
+msgid "Hang up"
+msgstr "Colgar"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:43
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:382
+#: ../sflphone-client-gnome/src/toolbar.c:207
+#: ../sflphone-client-gnome/src/toolbar.c:209
+msgid "Hold on"
+msgstr "Retener"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:44
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:383
+#: ../sflphone-client-gnome/src/toolbar.c:220
+#: ../sflphone-client-gnome/src/toolbar.c:222
+msgid "Transfer"
+msgstr "Transferir"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:45
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:392
+#: ../sflphone-client-gnome/src/toolbar.c:263
+msgid "Record"
+msgstr "Recordar"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:46
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:380
+#: ../sflphone-client-gnome/src/toolbar.c:176
+#: ../sflphone-client-gnome/src/toolbar.c:178
+msgid "Pick up"
+msgstr "Descolgar"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:48
+#: ../sflphone-client-gnome/src/toolbar.c:196
+#: ../sflphone-client-gnome/src/toolbar.c:198
+msgid "Hold off"
+msgstr "Seguir"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:49
+msgid "Give up transfer"
+msgstr "Abandonar transferencia"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:50
+msgid "Call back"
+msgstr "Llamar"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:48
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:91
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
+#: ../sflphone-client-gnome/src/config/configwindow.c:722
+#: ../sflphone-client-gnome/src/config/configwindow.c:791
+msgctxt "Config section"
+msgid "General"
+msgstr ""
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:49
+msgctxt "Config section"
+msgid "Display"
+msgstr "Mostrar"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:50
+#: ../sflphone-client-gnome/src/config/configwindow.c:833
+msgctxt "Config section"
+msgid "Accounts"
+msgstr "Cuentas"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:51
+#: ../sflphone-client-gnome/src/config/configwindow.c:786
+msgctxt "Config section"
+msgid "Audio"
+msgstr "Audio"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:52
+#: ../sflphone-client-gnome/src/config/configwindow.c:801
+msgctxt "Config section"
+msgid "Address Book"
+msgstr "Libreta de direcciones"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:53
+#: ../sflphone-client-gnome/src/config/configwindow.c:796
+msgctxt "Config section"
+msgid "Recordings"
+msgstr "Grabaciones"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:54
+#: ../sflphone-client-gnome/src/config/configwindow.c:806
+msgctxt "Config section"
+msgid "Hooks"
+msgstr "Disparadores"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:328
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows. Enable/disable them by checking/unchecking "
+"them on the left of the item. Add or remove some with \"Plus\" and \"Sub\" "
+"buttons. Edit the selected account with the form on the right."
+msgstr ""
+"Por defecto, sflphone usa la primera cuenta registrada en esa listapara "
+"llamar. Cambiar el orden de las cuentas con las flechas \"Arriba\" y \"Abajo"
+"\". Activar/Desactivar las si las selecciona/deselecciona a la izquierda. "
+"Añadir ò Eliminar algunas con los botones \"Mas\" y \"Menos\" Editar la "
+"cuenta seleccionada con el formulario a la derecha."
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:332
+msgid "Remove the selected account"
+msgstr "Eliminar la cuenta seleccionada"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:335
+msgid ""
+"This button will remove the selected account in the list below. Be sure you "
+"really don't need it anymore. If you think you might use it again later, "
+"just uncheck it."
+msgstr ""
+"Este botòn elimina la cuenta seleccionada en la siguiente lista. Esté "
+"seguroque usted no la necesita mas. Si usted piensa que, tal vez, lo va a "
+"necesitardespues, solo lo deselecciona."
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:340
+msgid "Remove"
+msgstr "Eliminar"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:342
+msgid "Add a new account"
+msgstr "Añadir una nueva cuenta"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:345
+msgid ""
+"This button enables you to initialize a new account. You will then be able "
+"to edit it using the form on the right."
+msgstr ""
+"Este botón le permite inicializar una nueva cuenta. Usted podrá "
+"corregirlocon el formulario a la derecha."
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:347
+msgid "Add"
+msgstr "Añadir"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:349
+msgid "Get this account down"
+msgstr "Bajar esta cuenta"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:352
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:359
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows."
+msgstr ""
+"Por defecto, sflphone usa la primera cuenta registrada en esa listapara "
+"llamar. Cambiar el orden de las cuentas con las flechas \"Arriba\" y \"Abajo"
+"\"."
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:354
+msgid "Down"
+msgstr "Abajo"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:356
+msgid "Get this account up"
+msgstr "Subir esta cuenta"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:361
+msgid "Up"
+msgstr "Arriba"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:362
+msgid "Apply"
+msgstr "Aplicar"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:367
+msgid "SIP"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:368
+msgid "IAX"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:373
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:385
+#: ../sflphone-client-gnome/src/toolbar.c:52
+#: ../sflphone-client-gnome/src/toolbar.c:251
+#: ../sflphone-client-gnome/src/toolbar.c:255
+msgid "Voicemail"
+msgstr "Mensaje de voz"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:374
+#: ../sflphone-client-gnome/src/config/configwindow.c:425
+msgid "Status"
+msgstr "Estado"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:377
+#: ../sflphone-client-gnome/src/config/configwindow.c:528
+msgid "Stun parameters will be applied on each SIP account created."
+msgstr "Parámetros de stun se aplicarán a cada cuenta SIP creada."
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:378
+msgid "Enable Stun"
+msgstr "Activar STUN"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:380
+#: ../sflphone-client-gnome/src/config/configwindow.c:544
+msgid "Format : name.server:port"
+msgstr "Formato : nombre.servidor:puerto"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:382
+msgid "choose Stun server (example : stunserver.org)"
+msgstr "Elija un servidor Stun (ejemplo : stunserver.org)"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:154
+msgid "Enable address book"
+msgstr "Activar la libreta de contactos"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:155
+msgid "Maximum results"
+msgstr "Resultados maximo"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:156
+msgid "Display photo if available"
+msgstr "Mostrar fotos de contactos, si está disponible"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:157
+msgid "Display phone numbers of these types :"
+msgstr "Mostrar números de este typo:"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:158
+msgid "Work"
+msgstr "Profesional"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:159
+msgid "Mobile"
+msgstr "Movil"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:160
+msgid "Home"
+msgstr "Personal"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:225
+msgid "Sound manager"
+msgstr "Gestor de audio"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:228
+msgid "ALSA"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:229
+msgid "PulseAudio"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:231
+msgid "Enable ringtones"
+msgstr "Habilitar tonos de llamada"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:232
+#: ../sflphone-client-gnome/src/config/audioconf.c:812
+msgid "Codecs"
+msgstr "Códecs"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:233
+#: ../sflphone-client-gnome/src/config/audioconf.c:795
+msgid "ALSA settings"
+msgstr "Configuración de ALSA"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:234
+#: ../sflphone-client-gnome/src/config/audioconf.c:662
+msgid "ALSA plugin"
+msgstr "Plugin ALSA"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:235
+#: ../sflphone-client-gnome/src/config/audioconf.c:706
+msgid "Input"
+msgstr "Entrada"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:236
+#: ../sflphone-client-gnome/src/config/audioconf.c:684
+msgid "Output"
+msgstr "Salida"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:237
+msgid "PulseAudio settings"
+msgstr "Configuración de PulseAudio"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:238
+msgid "Mute other applications during a call"
+msgstr "Silenciar el resto de aplicaciones durante una llamada"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:121
+msgid "Enable notifications"
+msgstr "Habilitar notificaciones"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:122
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:126
+msgid "On incoming calls"
+msgstr "Al recibir llamadas"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:123
+msgid "On messages"
+msgstr "Al recibir mensajes"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:124
+msgid "Show main window"
+msgstr "Mostrar ventana principal"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:125
+msgid "On start"
+msgstr "En el arranque"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:166
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "Keep my history for at least"
+msgstr "Guardar mi historia por lo menos"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:167
+#: ../sflphone-client-gnome/src/config/configwindow.c:643
+msgctxt "End of 'Keep my history for at least n days.'"
+msgid "days"
+msgstr "días"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:168
+msgid "Clear history"
+msgstr "Limpiar historia"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:169
+msgid "Connection"
+msgstr "Connexión"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:170
+#: ../sflphone-client-gnome/src/config/configwindow.c:664
+msgid "SIP Port"
+msgstr "Puerto SIP"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:180
+#: ../sflphone-client-gnome/src/config/hooks-config.c:130
+msgid "URL Argument"
+msgstr "Argumento de URL"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:181
+#: ../sflphone-client-gnome/src/config/hooks-config.c:135
+msgid "Custom commands on incoming calls with URL"
+msgstr "Comandos personalizados en llamada entrante con URL"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:182
+msgid "Trigger on specific SIP header"
+msgstr "Disparador en una cabecera SIP específica"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:183
+msgid "Trigger on IAX2 URL"
+msgstr "Disparador en una URL IAX2"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:184
+msgid "Command to run"
+msgstr "Comando de ejecutar"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:185
+#: ../sflphone-client-gnome/src/config/hooks-config.c:138
+#, c-format
+msgid "%s will be replaced with the passed URL."
+msgstr "%s se remplazará por la URL."
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:186
+#: ../sflphone-client-gnome/src/config/hooks-config.c:165
+msgid "Phone number rewriting"
+msgstr "Reescritura de número de teléfono"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:187
+msgid "Prefix dialed numbers with"
+msgstr "Prefijar los números marcados con"
+
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:92
+#: ../sflphone-client-gnome/src/config/configwindow.c:726
+msgid "Destination folder"
+msgstr "Carpeta de destino"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:384
+#: ../sflphone-client-gnome/src/toolbar.c:232
+#: ../sflphone-client-gnome/src/toolbar.c:234
+msgid "History"
+msgstr "Historia de Llamada"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:386
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:388
+msgid "Configure SFLphone"
+msgstr "Configurar SFLphone"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:390
+msgid "Display volume controls"
+msgstr "Mostrar controles de volumen"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:391
+msgid "Display dialpad"
+msgstr "Mostrar dialpad"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:396
+msgid "Attention:number of results exceeds max displayed."
+msgstr "Cuidado:número de resultatos excede el maximo a mostrar."
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:398
+#: ../sflphone-client-gnome/src/sliders.c:163
+msgid "Mic volume"
+msgstr "Volumen del micrófono"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:402
+#: ../sflphone-client-gnome/src/sliders.c:161
+msgid "Speakers volume"
+msgstr "Volumen de altavoces"
+
+#: ../sflphone-client-gnome/src/actions.c:54
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+#, c-format
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] "%d mensaje de voz"
+msgstr[1] "%d mensajes de voz"
+
+#: ../sflphone-client-gnome/src/actions.c:234
+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 que el demonio esté funcionando."
+
+#: ../sflphone-client-gnome/src/actions.c:809
+#, c-format
+msgid "IP call - %s"
+msgstr "Llamada IP - %s"
+
+#: ../sflphone-client-gnome/src/actions.c:908
+#, 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> )"
+
+#: ../sflphone-client-gnome/src/assistant.c:70
+msgid ""
+"You can at any time check your registration state or modify your accounts "
+"parameters in the Options/Accounts window."
+msgstr ""
+"Puede comprobar en cualquier momento su estado de registro o modificar la "
+"configuración de sus cuentas en la ventana de Opciones/Cuentas."
+
+#: ../sflphone-client-gnome/src/assistant.c:190
+msgid "SFLphone account creation wizard"
+msgstr "Asistente de creación de cuentas"
+
+#: ../sflphone-client-gnome/src/assistant.c:274
+#: ../sflphone-client-gnome/src/assistant.c:370
+#: ../sflphone-client-gnome/src/config/accountwindow.c:153
+msgid "_Alias"
+msgstr "_Alias"
+
+#: ../sflphone-client-gnome/src/assistant.c:282
+#: ../sflphone-client-gnome/src/assistant.c:378
+#: ../sflphone-client-gnome/src/config/accountwindow.c:189
+msgid "_Host name"
+msgstr "_Nombre de equipo"
+
+#: ../sflphone-client-gnome/src/assistant.c:290
+#: ../sflphone-client-gnome/src/assistant.c:386
+#: ../sflphone-client-gnome/src/config/accountwindow.c:197
+msgid "_User name"
+msgstr "_Usuario"
+
+#: ../sflphone-client-gnome/src/assistant.c:306
+#: ../sflphone-client-gnome/src/assistant.c:401
+#: ../sflphone-client-gnome/src/config/accountwindow.c:212
+msgid "_Password"
+msgstr "_Contraseña"
+
+#: ../sflphone-client-gnome/src/assistant.c:324
+#: ../sflphone-client-gnome/src/assistant.c:417
+#: ../sflphone-client-gnome/src/config/accountwindow.c:228
+msgid "_Voicemail number"
+msgstr "_Número de buzón de voz"
+
+#: ../sflphone-client-gnome/src/assistant.c:347
+msgid "_Email address"
+msgstr "_Correo"
+
+#: ../sflphone-client-gnome/src/assistant.c:444
+#: ../sflphone-client-gnome/src/config/configwindow.c:532
+msgid "E_nable STUN"
+msgstr "A_ctivar STUN"
+
+#: ../sflphone-client-gnome/src/assistant.c:451
+msgid "_STUN server"
+msgstr "_Servidor STUN"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Account Registration"
+msgstr "Registro de cuenta"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Congratulations!"
+msgstr "¡Enhorabuena!"
+
+#: ../sflphone-client-gnome/src/errors.c:29
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening playback device"
+msgstr ""
+"<b>Notificación ALSA</b>\n"
+"\n"
+"Error al abrir el dispositivo de reproducción"
+
+#: ../sflphone-client-gnome/src/errors.c:32
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening capture device"
+msgstr ""
+"<b>Notificación ALSA</b>\n"
+"\n"
+"Error al abrir el dispositivo de captura"
+
+#: ../sflphone-client-gnome/src/errors.c:35
+msgid ""
+"Pulseaudio notification\n"
+"\n"
+"Pulseaudio is not running"
+msgstr ""
+"<b>Notificación de Pulseaudio</b>\n"
+"\n"
+"Pulseaudio no está funcionando"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:70
+msgid "There is one call in progress."
+msgstr "No hay llamada en curso"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:74
+msgid "There are calls in progress."
+msgstr "Hay llamadas en curso."
+
+#: ../sflphone-client-gnome/src/mainwindow.c:83
+msgid "Do you still want to quit?"
+msgstr "Sin embargo quiere parar ?"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:284
+msgid "SFLphone Error"
+msgstr "SFLphone Error"
+
+#: ../sflphone-client-gnome/src/menus.c:134
+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-client-gnome/src/menus.c:137
+msgid "About SFLphone"
+msgstr "Sobre SFLphone"
+
+#: ../sflphone-client-gnome/src/menus.c:161
+msgid "_Help"
+msgstr "_Ayuda"
+
+#: ../sflphone-client-gnome/src/menus.c:296
+#: ../sflphone-client-gnome/src/menus.c:953
+msgid "_New call"
+msgstr "_Nueva llamada"
+
+#: ../sflphone-client-gnome/src/menus.c:308
+#: ../sflphone-client-gnome/src/menus.c:785
+msgid "_Pick up"
+msgstr "_Descolgar"
+
+#: ../sflphone-client-gnome/src/menus.c:318
+#: ../sflphone-client-gnome/src/menus.c:797
+msgid "_Hang up"
+msgstr "_Colgar"
+
+#: ../sflphone-client-gnome/src/menus.c:328
+#: ../sflphone-client-gnome/src/menus.c:809
+msgid "On _Hold"
+msgstr "En _Espera"
+
+#: ../sflphone-client-gnome/src/menus.c:340
+#: ../sflphone-client-gnome/src/menus.c:821
+msgid "_Record"
+msgstr "_Recordar"
+
+#: ../sflphone-client-gnome/src/menus.c:354
+msgid "_Account creation wizard"
+msgstr "Asistente de configuración de cuentas"
+
+#: ../sflphone-client-gnome/src/menus.c:384
+msgid "_Call"
+msgstr "_Llamar"
+
+#: ../sflphone-client-gnome/src/menus.c:552
+msgid "Clear _history"
+msgstr "_Limpiar historia"
+
+#: ../sflphone-client-gnome/src/menus.c:564
+msgid "_Accounts"
+msgstr "_Cuentas"
+
+#: ../sflphone-client-gnome/src/menus.c:579
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../sflphone-client-gnome/src/menus.c:631
+msgid "_Dialpad"
+msgstr "_Teclado numérico"
+
+#: ../sflphone-client-gnome/src/menus.c:643
+msgid "_Volume controls"
+msgstr "_Controles de volumen"
+
+#: ../sflphone-client-gnome/src/menus.c:661
+msgid "_View"
+msgstr "_Ver"
+
+#: ../sflphone-client-gnome/src/menus.c:881
+msgid "_Call back"
+msgstr "_Llamar"
+
+#: ../sflphone-client-gnome/src/menus.c:1061
+msgid "Edit phone number"
+msgstr "Editar número de teléfono"
+
+#: ../sflphone-client-gnome/src/menus.c:1072
+msgid "Edit the phone number before making a call"
+msgstr "Editar el número de teléfono antes de llamar"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:71
+#: ../sflphone-client-gnome/src/sflnotify.c:91
+#, c-format
+msgid "%s account : %s"
+msgstr "%s cuenta : %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:75
+#, c-format
+msgid "<i>From</i> %s"
+msgstr "<i>De</i> %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:111
+#, c-format
+msgid "Calling with %s account <i>%s</i>"
+msgstr "Llamando con la cuenta %s <i>%s</i>"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:115
+msgid "Current account"
+msgstr "Cuenta actual"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:130
+msgid "You have no accounts set up"
+msgstr "Ninguna cuenta configurada"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:131
+#: ../sflphone-client-gnome/src/sflnotify.c:148
+msgid "Error"
+msgstr "Error"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:147
+msgid "You have no registered accounts"
+msgstr "No tiene ninguna cuenta registrada"
+
+#: ../sflphone-client-gnome/src/statusicon.c:91
+msgid "_Show main window"
+msgstr "Mostrar ventana principal"
+
+#: ../sflphone-client-gnome/src/statusicon.c:127
+#, c-format
+msgid "%i account configured"
+msgid_plural "%i accounts configured"
+msgstr[0] "%i cuenta configurada"
+msgstr[1] "%i cuentas configuradas"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:113
+msgid "Account settings"
+msgstr "Configuración de cuentas"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:147
+msgid "_Enable this account"
+msgstr "_Habilitar esta cuenta"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:161
+msgid "_Protocol"
+msgstr "_Protocolo"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:179
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:312
+msgid "_Use Evolution address books"
+msgstr "_Usar libreta de contactos de Evolution"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:319
+msgid "Download limit :"
+msgstr "Limite de descargo :"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:327
+msgid "cards"
+msgstr "tarjetas"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:333
+msgid "_Display contact photo if available"
+msgstr "_Mostrar fotos de contactos, si está disponible"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:341
+msgid "Fields from Evolution's address books"
+msgstr "Usar los siguientes campos de la libreta de direcciones de Evolution:"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:345
+msgid "_Work"
+msgstr "P_rofesional"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:351
+msgid "_Home"
+msgstr "_Personal"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:357
+msgid "_Mobile"
+msgstr "_Movil"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:364
+msgid "Address Books"
+msgstr "Directorios"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:368
+msgid "Select which Evolution address books to use"
+msgstr "Seleccione el directorio de Evolution a usar"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:404
+#: ../sflphone-client-gnome/src/config/audioconf.c:576
+msgid "Name"
+msgstr "Nombre"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:741
+msgid "_Voice Activity Detection"
+msgstr "_Detección de actividad de voz"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:751
+msgid "_Noise Reduction (Narrow-Band Companding)"
+msgstr "_Reducción de ruido"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:780
+msgid "Sound Manager"
+msgstr "Gestor de audio"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:783
+msgid "_Pulseaudio"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:788
+msgid "_ALSA"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:835
+msgid "Ringtones"
+msgstr "Tonos de llamada"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:841
+msgid "_Enable ringtones"
+msgstr "_Habilitar tonos de llamada"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:847
+msgid "Choose a ringtone"
+msgstr "Elija un tono de llmada"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
+msgid "Audio Files"
+msgstr "Archivos de Audio"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:589
+msgid "Desktop Notifications"
+msgstr "Notificación de escritorio"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:593
+msgid "_Enable notifications"
+msgstr "_Activar notificaciones"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:599
+msgid "Enable voicemail _notifications"
+msgstr "Activar _notificaciones de mensajes de voz"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:611
+msgid "System Tray Icon"
+msgstr "Icono de bandeja del sistema"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:614
+msgid "_Popup main window on incoming call"
+msgstr "_Popup ventana principal al recibir llamadas"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:619
+msgid "Ne_ver popup main window"
+msgstr "_Nunca mostrar ventana principal"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:623
+msgid "Hide SFLphone window on _startup"
+msgstr "Esconder SFLphone al principio"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:629
+msgid "Calls History"
+msgstr "Historia de llamadas"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:632
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "_Keep my history for at least"
+msgstr "_Guardar mi historia por lo menos"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:647
+msgid "PulseAudio sound server"
+msgstr "Servidor de sonido Pulseaudio"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:650
+msgid "_Mute other applications during a call"
+msgstr "Silenciar otras aplicaciones durante una llamada"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:677
+msgid "Port"
+msgstr "Puerto"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:732
+msgid "Select a folder"
+msgstr "Seleccione una carpeta"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:766
+msgid "Preferences"
+msgstr "Preferencias"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:845
+msgid "Configured Accounts"
+msgstr "Cuentas Configuradas"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:141
+msgid "Trigger on specific _SIP header"
+msgstr "Disparador en una cabecera _SIP específica"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:150
+msgid "Trigger on _IAX2 URL"
+msgstr "Disparador con una URL _IAX2"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:155
+msgid "Command to _run"
+msgstr "_Comando a ejecutar"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:169
+msgid "_Prefix dialed numbers with"
+msgstr "_Prefijar los números marcados con"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+msgid "Search all"
+msgstr "Buscar todos"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:57
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:70
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:82
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:94
+msgid "Click here to change the search type"
+msgstr "Haz clic aqui para cambiar el type de busqueda"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+msgid "Search by missed call"
+msgstr "Buscar en llamadas faltadas"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+msgid "Search by incoming call"
+msgstr "Buscar en llamadas entrantes"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+msgid "Search by outgoing call"
+msgstr "Buscar en llamadas saliente"
+
+#~ msgid "User"
+#~ msgstr "Usuario"
+
+#~ msgid "Mailbox"
+#~ msgstr "Mensaje de voz"
+
+#~ msgid "State"
+#~ msgstr "Estado"
+
+#~ msgid "Stun settings will be applied on each account"
+#~ msgstr "Parámetros de stun se aplicarán a cada cuenta SIP creada."
+
+#~ msgid "Audio device"
+#~ msgstr "Archivos de Audio"
+
+#~ msgid "&Codecs"
+#~ msgstr "Códecs"
+
+#~ msgid "Out"
+#~ msgstr "Salida"
+
+#~ msgid "On &incoming calls"
+#~ msgstr "Al recibir llamadas"
+
+#~ msgid "Custom commands with URL %s will be replaced with the passed URL."
+#~ msgstr "%s se remplazará por la URL."
+
+#~ msgid "Phone number formatting"
+#~ msgstr "Reescritura de número de teléfono"
+
+#~ msgid "Add phone number prefix"
+#~ msgstr "Reescritura de número de teléfono"
+
+#~ msgid "General"
+#~ msgstr "General"
+
+#~ msgid "Hold"
+#~ msgstr "Retener"
+
+#~ msgid "Configure accounts"
+#~ msgstr "Cuentas Configuradas"
+
+#~ msgid "Configure audio"
+#~ msgstr "Cuentas Configuradas"
+
+#~ msgid "accounr state"
+#~ msgstr "Configuración de cuentas"
+
+#~ msgid "%s - %s"
+#~ msgstr "%s - %s"
+
+#~ msgid "Registered"
+#~ msgstr "Registrado"
+
+#~ msgid "Not Registered"
+#~ msgstr "No registrado"
+
+#~ msgid "Trying..."
+#~ msgstr "Intentando..."
+
+#~ msgid "Bad authentification"
+#~ msgstr "Autenticación erronea"
+
+#~ msgid "Network unreachable"
+#~ msgstr "Red Inaccesible"
+
+#~ msgid "Host unreachable"
+#~ msgstr "_Parte del servidor"
+
+#~ msgid "Stun configuration error"
+#~ msgstr "Error de configuración Stun"
+
+#~ msgid "Stun server invalid"
+#~ msgstr "Servidor stun inválido"
+
+#~ msgid "Invalid"
+#~ msgstr "Inválido"
+
+#~ msgid "%d voice mails"
+#~ msgstr "%d mensajes de voz"
+
+#~ msgid "No registered account"
+#~ msgstr "No tiene ninguna cuenta registrada"
+
+#~ msgid ""
+#~ "This assistant is now finished.\n"
+#~ "You can at any time check your registration state or modify your accounts "
+#~ "parameters in the Options/Accounts window.\n"
+#~ "\n"
+#~ "Alias :    %s\n"
+#~ "Server :   %s\n"
+#~ "Username : %s\n"
+#~ msgstr ""
+#~ "Ese asistante ha finalizado.\n"
+#~ "Puede comprobar en cualquier momento su estado de registro o modificar la "
+#~ "configuración de sus cuentas en la ventana de Opciones/Cuentas.\n"
+#~ "\n"
+#~ "Alias :    %s\n"
+#~ "Server :   %s\n"
+#~ "Username : %s\n"
+
+#~ msgid "SFLphone account configuration wizard"
+#~ msgstr "Asistente de configuración de cuentas de SFLphone"
+
+#~ msgid "Welcome to SFLphone!"
+#~ msgstr "¡Bienvenido a SFLphone!"
+
+#~ msgid "Select an account type:"
+#~ msgstr "Escoja un tipo de cuenta:"
+
+#~ msgid "Please select one of the following option:"
+#~ msgstr "Por favor, elija una de las siguientes opciones:"
+
+#~ msgid "SIP account configuration"
+#~ msgstr "Configuración de cuenta SIP"
+
+#~ msgid "Please fill the following information:"
+#~ msgstr "Por favor, rellene la siguiente información:"
+
+#~ msgid "Optional Email Address "
+#~ msgstr "Dirección de correo opcional "
+
+#~ msgid "This email address will be use to send your voicemail messages"
+#~ msgstr "Esta dirección de correo se usará para mandar sus mensajes de voz"
+
+#~ msgid "_Email"
+#~ msgstr "_Correo"
+
+#~ msgid "IAX2 account configuration"
+#~ msgstr "Configuración de cuenta IAX2"
+
+#~ msgid "Network Address Translation"
+#~ msgstr "Conversión de Dirección de Red (NAT)"
+
+#~ msgid "Edit phone"
+#~ msgstr "Editar teléfono"
+
+#~ msgid "%s account: %s"
+#~ msgstr "%s cuenta: %s"
+
+#~ msgid "<i>From:</i> %s"
+#~ msgstr "<i>De:</i> %s"
+
+#~ msgid "You haven't setup any accounts"
+#~ msgstr "No ha configurado cuentas"
+
+#~ msgid "SFLphone - %i accounts configured"
+#~ msgstr "SFLphone - %i cuentas configuradas"
+
+#~ msgid "\"Voicemail\" <%s>"
+#~ msgstr "\"Mensaje\" <%s>"
+
+#~ msgid "Place a call"
+#~ msgstr "Llamar"
+
+#~ msgid "Off Hold"
+#~ msgstr "Seguir"
+
+#~ msgid "Record a call"
+#~ msgstr "Grabar una llamada"
+
+#~ msgid "Account Parameters"
+#~ msgstr "Parámetros de cuenta"
+
+#~ msgid "Download limit:"
+#~ msgstr "Límite de descarga"
+
+#~ msgid "_Business phone"
+#~ msgstr "_Numero de teléfono profesional"
+
+#~ msgid "_Home phone"
+#~ msgstr "_Numero de teléfono personal"
+
+#~ msgid "_Mobile phone"
+#~ msgstr "_Número de movil"
+
+#~ msgid "Select which Evolution address books to use:"
+#~ msgstr "Seleccione las libretas de direcciones de Evolution a usar:"
+
+#~ msgid "audio device index for output = %d"
+#~ msgstr "índice del dispositivo de salida de audio = %d"
+
+#~ msgid "ALSA configuration"
+#~ msgstr "Configuración de ALSA"
+
+#~ msgid "Stun parameters will apply to each SIP account created."
+#~ msgstr "Parámetros de stun se aplicarán a cada cuenta SIP creada."
+
+#~ msgid "Enable it if you are behind a firewall"
+#~ msgstr "Actívelo si está detrás de un cortafuegos"
+
+#~ msgid "Format: name.server:port"
+#~ msgstr "Formato: nombre.servidor:puerto"
+
+#~ msgid "Port:"
+#~ msgstr "Puerto:"
+
+#~ msgid "Command to _run: "
+#~ msgstr "_Orden a ejecutar: "
+
+#~ msgid "Phone Number Rewriting"
+#~ msgstr "Reescritura de número de teléfono"
+
+#~ msgid "_Prefix dialed numbers with:"
+#~ msgstr "_prefijar los números marcados con:"
+
+#~ msgid "Accept"
+#~ msgstr "Aceptar"
+
+#~ msgid "Refuse"
+#~ msgstr "Rechazar"
+
+#~ msgid "Ignore"
+#~ msgstr "Ignorar"
+
+#~ msgid "<small>Missed call</small>"
+#~ msgstr "<small>Llamada fallida</small>"
+
+#~ msgid "<small>Duration:</small> %s"
+#~ msgstr "<small>Duración:</small> %s"
+
+#~ msgid "Fields"
+#~ msgstr "Campos"
+
+#~ msgid "_History size limit"
+#~ msgstr "Límite de tamaño de _historial"
+
+#~ msgid ""
+#~ "SFLphone can run custom commands if incoming calls come with an URL "
+#~ "attached.\n"
+#~ "In this case, %s will be replaced with the passed URL."
+#~ msgstr ""
+#~ "SFLphone puede ejecutar órdenes personalizadas si las llamadas entrantes "
+#~ "incluyen una URL.\n"
+#~ "En este caso, %s se remplazará por la URL."
+
+#~ msgid "Search history"
+#~ msgstr "Historial de búsquedas"
+
+#~ msgid "Search contact"
+#~ msgstr "_Buscar contacto"
+
+#~ msgid "Registered to %s (%s)"
+#~ msgstr "Registrado en %s (%s)"
+
+#~ msgid "%s account- %s             %s"
+#~ msgstr "%s cuenta- %s             %s"
diff --git a/lang/fr/sflphone.po b/lang/fr/sflphone.po
new file mode 100644
index 0000000000000000000000000000000000000000..88626ad880061fb24f15e926d24083606f752ace
--- /dev/null
+++ b/lang/fr/sflphone.po
@@ -0,0 +1,1554 @@
+# French translation of SFLphone.
+# Copyright (C) 2008 2009 The Free Software Foundation, Inc.
+# This file is distributed under the GNU General Public License Version 3.
+#
+# Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>, 2008.
+#
+# POT-Creation-Date: 2008-01-13 01:39+0100\n
+msgid ""
+msgstr ""
+"Project-Id-Version: SFLphone 0.9.4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-07-17 16:14-0400\n"
+"PO-Revision-Date: 2008-03-31 14:15\n"
+"Last-Translator: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>\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"
+
+#: ../sflphone-client-kde/src/Account.cpp:34
+#: ../sflphone-client-gnome/src/accountlist.c:175
+msgctxt "account state"
+msgid "Registered"
+msgstr "Enregistré"
+
+#: ../sflphone-client-kde/src/Account.cpp:36
+#: ../sflphone-client-gnome/src/accountlist.c:178
+msgctxt "account state"
+msgid "Not Registered"
+msgstr "Non Enregistré"
+
+#: ../sflphone-client-kde/src/Account.cpp:38
+#: ../sflphone-client-gnome/src/accountlist.c:181
+msgctxt "account state"
+msgid "Trying..."
+msgstr "En cours..."
+
+#: ../sflphone-client-kde/src/Account.cpp:40
+#: ../sflphone-client-gnome/src/accountlist.c:184
+msgctxt "account state"
+msgid "Error"
+msgstr "Erreur"
+
+#: ../sflphone-client-kde/src/Account.cpp:42
+#: ../sflphone-client-gnome/src/accountlist.c:187
+msgctxt "account state"
+msgid "Authentication Failed"
+msgstr "Erreur d'authentification"
+
+#: ../sflphone-client-kde/src/Account.cpp:44
+#: ../sflphone-client-gnome/src/accountlist.c:190
+msgctxt "account state"
+msgid "Network unreachable"
+msgstr "Réseau introuvable"
+
+#: ../sflphone-client-kde/src/Account.cpp:46
+#: ../sflphone-client-gnome/src/accountlist.c:193
+msgctxt "account state"
+msgid "Host unreachable"
+msgstr "Serveur introuvable"
+
+#: ../sflphone-client-kde/src/Account.cpp:48
+#: ../sflphone-client-gnome/src/accountlist.c:196
+msgctxt "account state"
+msgid "Stun configuration error"
+msgstr "Erreur de configuration STUN"
+
+#: ../sflphone-client-kde/src/Account.cpp:50
+#: ../sflphone-client-gnome/src/accountlist.c:199
+msgctxt "account state"
+msgid "Stun server invalid"
+msgstr "Serveur STUN invalide"
+
+#: ../sflphone-client-kde/src/Account.cpp:51
+#: ../sflphone-client-gnome/src/accountlist.c:202
+msgctxt "account state"
+msgid "Invalid"
+msgstr "Non valide"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:163
+#: ../sflphone-client-kde/src/AccountWizard.cpp:278
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:393
+msgid "Account creation wizard"
+msgstr "Assistant de création de compte"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:199
+#: ../sflphone-client-kde/src/AccountWizard.cpp:217
+#: ../sflphone-client-kde/src/AccountWizard.cpp:561
+#: ../sflphone-client-gnome/src/assistant.c:68
+#, c-format
+msgid "This assistant is now finished."
+msgstr "Cet assistant est maintenant terminé."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:211
+msgid "Creation of account has failed for the reason"
+msgstr "Échec de la création du compte pour les raisons suivantes"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:255
+#: ../sflphone-client-kde/src/AccountWizard.cpp:440
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:363
+#: ../sflphone-client-gnome/src/assistant.c:72
+msgid "Alias"
+msgstr "Alias"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:256
+#: ../sflphone-client-kde/src/AccountWizard.cpp:441
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:370
+#: ../sflphone-client-gnome/src/assistant.c:75
+msgid "Server"
+msgstr "Serveur"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:257
+#: ../sflphone-client-kde/src/AccountWizard.cpp:442
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:371
+#: ../sflphone-client-gnome/src/assistant.c:78
+msgid "Username"
+msgstr "Nom d'utilisateur"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:258
+#: ../sflphone-client-kde/src/AccountWizard.cpp:443
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:372
+msgid "Password"
+msgstr "Mot de passe"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:259
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:364
+#: ../sflphone-client-gnome/src/config/configwindow.c:418
+msgid "Protocol"
+msgstr "Protocole"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:260
+#: ../sflphone-client-kde/src/AccountWizard.cpp:444
+msgid "Voicemail number"
+msgstr "Numéro de boîte vocale"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:279
+#: ../sflphone-client-gnome/src/assistant.c:216
+msgid "Welcome to the Account creation wizard of SFLphone!"
+msgstr "Bienvenue dans l'assistant de création de compte de SFLphone !"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:281
+#: ../sflphone-client-gnome/src/assistant.c:217
+msgid "This installation wizard will help you configure an account."
+msgstr "Cet assistant vous guidera dans la configuration d'un compte."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:309
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Account"
+msgstr "Compte"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:310
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Please select one of the following options"
+msgstr "Veuillez sélectionner une des options suivantes"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:312
+#: ../sflphone-client-gnome/src/assistant.c:251
+msgid "Create a free SIP/IAX2 account on sflphone.org"
+msgstr "Créer un compte SIP/IAX2 gratuit sur sflphone.org"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:313
+#: ../sflphone-client-gnome/src/assistant.c:253
+msgid "Register an existing SIP or IAX2 account"
+msgstr "Enregistrer un compte SIP ou IAX2 existant"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:352
+#: ../sflphone-client-gnome/src/assistant.c:231
+msgid "VoIP Protocols"
+msgstr "Protocoles VoIP"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:353
+#: ../sflphone-client-gnome/src/assistant.c:231
+msgid "Select an account type"
+msgstr "Sélectionnez un type de compte"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:355
+#: ../sflphone-client-gnome/src/assistant.c:233
+msgid "SIP (Session Initiation Protocol)"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:356
+#: ../sflphone-client-gnome/src/assistant.c:235
+msgid "IAX2 (InterAsterix Exchange)"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:395
+#: ../sflphone-client-gnome/src/assistant.c:339
+msgid "Optional email address"
+msgstr "Adresse courriel optionnelle"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:396
+#: ../sflphone-client-gnome/src/assistant.c:339
+msgid "This email address will be used to send your voicemail messages."
+msgstr "Vos messages vocaux seront envoyés par courriel à cette adresse."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:398
+msgid "Email address"
+msgstr "Adresse courriel"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:432
+#: ../sflphone-client-gnome/src/assistant.c:266
+msgid "SIP account settings"
+msgstr "Paramètres de compte SIP"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:436
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "IAX2 account settings"
+msgstr "Paramètres de compte IAX2"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:438
+#: ../sflphone-client-gnome/src/assistant.c:266
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "Please fill the following information"
+msgstr "Veuillez remplir les champs suivants"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:523
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:856
+msgid "Network Address Translation (NAT)"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:524
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:536
+msgid "You should probably enable this if you are behind a firewall."
+msgstr ""
+"Vous devriez probablement activer cette option si vous vous trouvez derrière "
+"un pare-feu."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:526
+msgid "Enable STUN"
+msgstr "Activer STUN"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:527
+msgid "Stun Server"
+msgstr "Serveur STUN"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:562
+msgid ""
+"After checking the settings you chose, click \"Finish\" to create the "
+"account."
+msgstr ""
+"Après avoir vérifié les paramètres choisis, cliquez sur \"Terminer\" pour "
+"créer le compte."
+
+#: ../sflphone-client-kde/src/ActionSetAccountFirst.cpp:26
+msgid "Default account"
+msgstr "Compte par défaut"
+
+#: ../sflphone-client-kde/src/Call.cpp:116
+#: ../sflphone-client-gnome/src/contacts/calltree.c:322
+msgid "Transfer to : "
+msgstr "Transférer à : "
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:89
+#: ../sflphone-client-gnome/src/actions.c:816
+msgid "Codec"
+msgstr "Codec"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:93
+#: ../sflphone-client-gnome/src/config/audioconf.c:581
+msgid "Frequency"
+msgstr "Fréquence"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:97
+#: ../sflphone-client-gnome/src/config/audioconf.c:586
+msgid "Bitrate"
+msgstr "Bitrate"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:101
+#: ../sflphone-client-gnome/src/config/audioconf.c:591
+msgid "Bandwidth"
+msgstr "Bande passante"
+
+#: ../sflphone-client-kde/src/main.cpp:38
+msgid "SFLphone KDE Client"
+msgstr "SFLphone Client KDE"
+
+#: ../sflphone-client-kde/src/main.cpp:42
+msgid "(C) 2009 Savoir-faire Linux"
+msgstr ""
+
+#: ../sflphone-client-kde/src/main.cpp:46
+msgid "Jérémy Quentin"
+msgstr ""
+
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Jérémy Quentin"
+
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "jeremy.quentin@savoirfairelinux.com"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:62
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-gnome/src/statusicon.c:126
+msgid "SFLphone"
+msgstr "SFLphone"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:209
+msgid "Incoming call"
+msgstr "Appel entrant"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
+msgid "You have an incoming call from"
+msgstr "Vous avez un appel entrant de"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
+msgid "Click to accept or refuse it."
+msgstr "Cliquez ici pour accepter ou refuser."
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:716
+msgid "Address book loading..."
+msgstr "Carnet d'adresse en cours de chargement..."
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:901
+#: ../sflphone-client-gnome/src/actions.c:89
+msgid "No registered accounts"
+msgstr "Pas de compte enregistré"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:905
+#: ../sflphone-client-gnome/src/actions.c:83
+#: ../sflphone-client-gnome/src/actions.c:813
+msgid "Using account"
+msgstr "Utilise le compte"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
+msgid "Main screen"
+msgstr "Écran principal"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:165
+msgid "Call history"
+msgstr "Historique d'appels"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:394
+#: ../sflphone-client-gnome/src/toolbar.c:243
+#: ../sflphone-client-gnome/src/toolbar.c:245
+msgid "Address book"
+msgstr "Carnet d'adresses"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1108
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1173
+msgid "Edit before call"
+msgstr "Éditer avant d'appeler"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:41
+#: ../sflphone-client-gnome/src/toolbar.c:167
+#: ../sflphone-client-gnome/src/toolbar.c:169
+msgid "New call"
+msgstr "Nouvel appel"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:42
+#: ../sflphone-client-kde/src/sflphone_const.h:47
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:381
+#: ../sflphone-client-gnome/src/toolbar.c:186
+#: ../sflphone-client-gnome/src/toolbar.c:188
+msgid "Hang up"
+msgstr "Raccrocher"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:43
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:382
+#: ../sflphone-client-gnome/src/toolbar.c:207
+#: ../sflphone-client-gnome/src/toolbar.c:209
+msgid "Hold on"
+msgstr "Mettre en attente"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:44
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:383
+#: ../sflphone-client-gnome/src/toolbar.c:220
+#: ../sflphone-client-gnome/src/toolbar.c:222
+msgid "Transfer"
+msgstr "Transférer"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:45
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:392
+#: ../sflphone-client-gnome/src/toolbar.c:263
+msgid "Record"
+msgstr "Enregistrer"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:46
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:380
+#: ../sflphone-client-gnome/src/toolbar.c:176
+#: ../sflphone-client-gnome/src/toolbar.c:178
+msgid "Pick up"
+msgstr "Décrocher"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:48
+#: ../sflphone-client-gnome/src/toolbar.c:196
+#: ../sflphone-client-gnome/src/toolbar.c:198
+msgid "Hold off"
+msgstr "Reprendre"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:49
+msgid "Give up transfer"
+msgstr "Abandonner le transfert"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:50
+msgid "Call back"
+msgstr "Rappeler"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:48
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:91
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
+#: ../sflphone-client-gnome/src/config/configwindow.c:722
+#: ../sflphone-client-gnome/src/config/configwindow.c:791
+msgctxt "Config section"
+msgid "General"
+msgstr "General"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:49
+msgctxt "Config section"
+msgid "Display"
+msgstr "Affichage"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:50
+#: ../sflphone-client-gnome/src/config/configwindow.c:833
+msgctxt "Config section"
+msgid "Accounts"
+msgstr "Comptes"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:51
+#: ../sflphone-client-gnome/src/config/configwindow.c:786
+msgctxt "Config section"
+msgid "Audio"
+msgstr "Audio"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:52
+#: ../sflphone-client-gnome/src/config/configwindow.c:801
+msgctxt "Config section"
+msgid "Address Book"
+msgstr "Carnet d'adresses"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:53
+#: ../sflphone-client-gnome/src/config/configwindow.c:796
+msgctxt "Config section"
+msgid "Recordings"
+msgstr "Enregistrements"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:54
+#: ../sflphone-client-gnome/src/config/configwindow.c:806
+msgctxt "Config section"
+msgid "Hooks"
+msgstr "Ancrage"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:328
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows. Enable/disable them by checking/unchecking "
+"them on the left of the item. Add or remove some with \"Plus\" and \"Sub\" "
+"buttons. Edit the selected account with the form on the right."
+msgstr ""
+"Par défaut, quand vous effectuez un appel, SFLphone utilise le premier "
+"compte dans cette liste en état \"Enregistré\". Utilisez les flèches vers le "
+"haut et vers le bas pour changer l'ordre des comptes. Activez/désactivez-les "
+"en les cochant/décochant. Ajoutez et supprimez-les avec les boutons \"+\" et "
+"\"-\". Éditez le compte sélectionné avec le formulaire de droite."
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:332
+msgid "Remove the selected account"
+msgstr "Supprimer le compte sélectionné"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:335
+msgid ""
+"This button will remove the selected account in the list below. Be sure you "
+"really don't need it anymore. If you think you might use it again later, "
+"just uncheck it."
+msgstr ""
+"Ce bouton supprime le compte actuellement sélectionné dans la liste ci-"
+"dessus. Si vous comptez réutiliser ce compte plus tard, choisissez plutôt de "
+"le décocher."
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:340
+msgid "Remove"
+msgstr "Supprimer"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:342
+msgid "Add a new account"
+msgstr "Ajouter un nouveau compte"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:345
+msgid ""
+"This button enables you to initialize a new account. You will then be able "
+"to edit it using the form on the right."
+msgstr ""
+"Ce bouton ajoute un nouveau compte à la liste. Vous pouvez ensuite l'éditer "
+"à partir du formulaire à droite de la liste."
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:347
+msgid "Add"
+msgstr "Ajouter"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:349
+msgid "Get this account down"
+msgstr "Descendre ce compte dans la liste"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:352
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:359
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows."
+msgstr ""
+"Par défaut, quand vous effectuez un appel, SFLphone utilise le premier "
+"compte dans cette liste en état \"Enregistré\". Utilisez les flèches vers le "
+"haut et vers le bas pour changer l'ordre des comptes."
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:354
+msgid "Down"
+msgstr "Descendre"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:356
+msgid "Get this account up"
+msgstr "Monter ce compte dans la liste"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:361
+msgid "Up"
+msgstr "Monter"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:362
+msgid "Apply"
+msgstr "Appliquer"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:367
+msgid "SIP"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:368
+msgid "IAX"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:373
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:385
+#: ../sflphone-client-gnome/src/toolbar.c:52
+#: ../sflphone-client-gnome/src/toolbar.c:251
+#: ../sflphone-client-gnome/src/toolbar.c:255
+msgid "Voicemail"
+msgstr "Boite vocale"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:374
+#: ../sflphone-client-gnome/src/config/configwindow.c:425
+msgid "Status"
+msgstr "Statut"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:377
+#: ../sflphone-client-gnome/src/config/configwindow.c:528
+msgid "Stun parameters will be applied on each SIP account created."
+msgstr "Les paramètres de STUN seront appliqués à tous les comptes"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:378
+msgid "Enable Stun"
+msgstr "Activer STUN"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:380
+#: ../sflphone-client-gnome/src/config/configwindow.c:544
+msgid "Format : name.server:port"
+msgstr "Format : nom.serveur:port"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:382
+msgid "choose Stun server (example : stunserver.org)"
+msgstr "Choisissez un serveur STUN (exemple : stunserver.org)"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:154
+msgid "Enable address book"
+msgstr "Activer le carnet d'adresses"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:155
+msgid "Maximum results"
+msgstr "Nombre de résultats maximum"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:156
+msgid "Display photo if available"
+msgstr "Afficher la photo si disponible"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:157
+msgid "Display phone numbers of these types :"
+msgstr "Afficher les numéros de téléphone"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:158
+msgid "Work"
+msgstr "Professionnels"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:159
+msgid "Mobile"
+msgstr "Mobiles"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:160
+msgid "Home"
+msgstr "Personnels"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:225
+msgid "Sound manager"
+msgstr "Interface audio"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:228
+msgid "ALSA"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:229
+msgid "PulseAudio"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:231
+msgid "Enable ringtones"
+msgstr "Activer les sonneries"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:232
+#: ../sflphone-client-gnome/src/config/audioconf.c:812
+msgid "Codecs"
+msgstr "Codecs"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:233
+#: ../sflphone-client-gnome/src/config/audioconf.c:795
+msgid "ALSA settings"
+msgstr "Paramètres ALSA"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:234
+#: ../sflphone-client-gnome/src/config/audioconf.c:662
+msgid "ALSA plugin"
+msgstr "Greffon ALSA"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:235
+#: ../sflphone-client-gnome/src/config/audioconf.c:706
+msgid "Input"
+msgstr "Entrée"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:236
+#: ../sflphone-client-gnome/src/config/audioconf.c:684
+msgid "Output"
+msgstr "Sortie"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:237
+msgid "PulseAudio settings"
+msgstr "Paramètres PulseAudio"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:238
+msgid "Mute other applications during a call"
+msgstr "Couper le son des autres applications pendant un appel"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:121
+msgid "Enable notifications"
+msgstr "Activer les notifications"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:122
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:126
+msgid "On incoming calls"
+msgstr "Lors d'appels entrants"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:123
+msgid "On messages"
+msgstr "Lors de réception de messages"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:124
+msgid "Show main window"
+msgstr "Mettre la fenêtre principale au premier plan"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:125
+msgid "On start"
+msgstr "Au démarrage"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:166
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "Keep my history for at least"
+msgstr "Garder mon historique au moins"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:167
+#: ../sflphone-client-gnome/src/config/configwindow.c:643
+msgctxt "End of 'Keep my history for at least n days.'"
+msgid "days"
+msgstr "jours"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:168
+msgid "Clear history"
+msgstr "Effacer l'historique"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:169
+msgid "Connection"
+msgstr "Connexion"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:170
+#: ../sflphone-client-gnome/src/config/configwindow.c:664
+msgid "SIP Port"
+msgstr "Port SIP"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:180
+#: ../sflphone-client-gnome/src/config/hooks-config.c:130
+msgid "URL Argument"
+msgstr "Argument URL"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:181
+#: ../sflphone-client-gnome/src/config/hooks-config.c:135
+msgid "Custom commands on incoming calls with URL"
+msgstr "Commandes personnalisées lors d'appels entrants avec une URL"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:182
+msgid "Trigger on specific SIP header"
+msgstr "Déclencher sur un entête SIP spécifique"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:183
+msgid "Trigger on IAX2 URL"
+msgstr "Déclencher en IAX2"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:184
+msgid "Command to run"
+msgstr "Commande à exécuter"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:185
+#: ../sflphone-client-gnome/src/config/hooks-config.c:138
+#, c-format
+msgid "%s will be replaced with the passed URL."
+msgstr "%s sera remplacé par l'URL passé en argument."
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:186
+#: ../sflphone-client-gnome/src/config/hooks-config.c:165
+msgid "Phone number rewriting"
+msgstr "Réécriture des numéros appelés"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:187
+msgid "Prefix dialed numbers with"
+msgstr "Ajouter le préfixe"
+
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:92
+#: ../sflphone-client-gnome/src/config/configwindow.c:726
+msgid "Destination folder"
+msgstr "Dossier de destination"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:384
+#: ../sflphone-client-gnome/src/toolbar.c:232
+#: ../sflphone-client-gnome/src/toolbar.c:234
+msgid "History"
+msgstr "Historique"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:386
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:388
+msgid "Configure SFLphone"
+msgstr "Configurer SFLphone"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:390
+msgid "Display volume controls"
+msgstr "Afficher les controles du volume"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:391
+msgid "Display dialpad"
+msgstr "Afficher le clavier"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:396
+msgid "Attention:number of results exceeds max displayed."
+msgstr "Attention:tous les résultats ne sont pas affichés."
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:398
+#: ../sflphone-client-gnome/src/sliders.c:163
+msgid "Mic volume"
+msgstr "Volume du micro"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:402
+#: ../sflphone-client-gnome/src/sliders.c:161
+msgid "Speakers volume"
+msgstr "Volume des hauts-parleurs"
+
+#: ../sflphone-client-gnome/src/actions.c:54
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+#, c-format
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] "%d message vocal"
+msgstr[1] "%d messages vocaux"
+
+#: ../sflphone-client-gnome/src/actions.c:234
+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-client-gnome/src/actions.c:809
+#, c-format
+msgid "IP call - %s"
+msgstr "Appel IP - %s"
+
+#: ../sflphone-client-gnome/src/actions.c:908
+#, 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-client-gnome/src/assistant.c:70
+msgid ""
+"You can at any time check your registration state or modify your accounts "
+"parameters in the Options/Accounts window."
+msgstr ""
+"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-client-gnome/src/assistant.c:190
+msgid "SFLphone account creation wizard"
+msgstr "Assistant de création de compte de SFLphone"
+
+#: ../sflphone-client-gnome/src/assistant.c:274
+#: ../sflphone-client-gnome/src/assistant.c:370
+#: ../sflphone-client-gnome/src/config/accountwindow.c:153
+msgid "_Alias"
+msgstr "A_lias"
+
+#: ../sflphone-client-gnome/src/assistant.c:282
+#: ../sflphone-client-gnome/src/assistant.c:378
+#: ../sflphone-client-gnome/src/config/accountwindow.c:189
+msgid "_Host name"
+msgstr "_Serveur"
+
+#: ../sflphone-client-gnome/src/assistant.c:290
+#: ../sflphone-client-gnome/src/assistant.c:386
+#: ../sflphone-client-gnome/src/config/accountwindow.c:197
+msgid "_User name"
+msgstr "Usa_ger"
+
+#: ../sflphone-client-gnome/src/assistant.c:306
+#: ../sflphone-client-gnome/src/assistant.c:401
+#: ../sflphone-client-gnome/src/config/accountwindow.c:212
+msgid "_Password"
+msgstr "_Mot de passe"
+
+#: ../sflphone-client-gnome/src/assistant.c:324
+#: ../sflphone-client-gnome/src/assistant.c:417
+#: ../sflphone-client-gnome/src/config/accountwindow.c:228
+msgid "_Voicemail number"
+msgstr "_Boite vocale #"
+
+#: ../sflphone-client-gnome/src/assistant.c:347
+msgid "_Email address"
+msgstr "A_dresse courriel"
+
+#: ../sflphone-client-gnome/src/assistant.c:444
+#: ../sflphone-client-gnome/src/config/configwindow.c:532
+msgid "E_nable STUN"
+msgstr "A_ctiver STUN"
+
+#: ../sflphone-client-gnome/src/assistant.c:451
+msgid "_STUN server"
+msgstr "S_erveur STUN"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Account Registration"
+msgstr "Enregistrement du compte"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Congratulations!"
+msgstr "Félicitations!"
+
+#: ../sflphone-client-gnome/src/errors.c:29
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening playback device"
+msgstr ""
+"Notification ALSA\n"
+"\n"
+"Erreur lors de l'ouverture du périphérique de sortie"
+
+#: ../sflphone-client-gnome/src/errors.c:32
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening capture device"
+msgstr ""
+"Notification ALSA\n"
+"\n"
+"Erreur lors de l'ouverture du périphérique d'entrée"
+
+#: ../sflphone-client-gnome/src/errors.c:35
+msgid ""
+"Pulseaudio notification\n"
+"\n"
+"Pulseaudio is not running"
+msgstr ""
+"Notification Pulseaudio\n"
+"\n"
+"Pulseaudio n'est pas lancé"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:70
+msgid "There is one call in progress."
+msgstr "Vous avez un appel en cours."
+
+#: ../sflphone-client-gnome/src/mainwindow.c:74
+msgid "There are calls in progress."
+msgstr "Vous avez des appels en cours."
+
+#: ../sflphone-client-gnome/src/mainwindow.c:83
+msgid "Do you still want to quit?"
+msgstr "Voulez-vous quitter?"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:284
+msgid "SFLphone Error"
+msgstr "Erreur SFLphone"
+
+#: ../sflphone-client-gnome/src/menus.c:134
+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-client-gnome/src/menus.c:137
+msgid "About SFLphone"
+msgstr "A propos de SFLphone"
+
+#: ../sflphone-client-gnome/src/menus.c:161
+msgid "_Help"
+msgstr "A_ide"
+
+#: ../sflphone-client-gnome/src/menus.c:296
+#: ../sflphone-client-gnome/src/menus.c:953
+msgid "_New call"
+msgstr "_Nouvel appel"
+
+#: ../sflphone-client-gnome/src/menus.c:308
+#: ../sflphone-client-gnome/src/menus.c:785
+msgid "_Pick up"
+msgstr "_Décrocher"
+
+#: ../sflphone-client-gnome/src/menus.c:318
+#: ../sflphone-client-gnome/src/menus.c:797
+msgid "_Hang up"
+msgstr "_Raccrocher"
+
+#: ../sflphone-client-gnome/src/menus.c:328
+#: ../sflphone-client-gnome/src/menus.c:809
+msgid "On _Hold"
+msgstr "_Mettre en attente"
+
+#: ../sflphone-client-gnome/src/menus.c:340
+#: ../sflphone-client-gnome/src/menus.c:821
+msgid "_Record"
+msgstr "Enregistrer"
+
+#: ../sflphone-client-gnome/src/menus.c:354
+msgid "_Account creation wizard"
+msgstr "_Assistant de création de compte"
+
+#: ../sflphone-client-gnome/src/menus.c:384
+msgid "_Call"
+msgstr "_Actions"
+
+#: ../sflphone-client-gnome/src/menus.c:552
+msgid "Clear _history"
+msgstr "Effacer l'_historique"
+
+#: ../sflphone-client-gnome/src/menus.c:564
+msgid "_Accounts"
+msgstr "Co_mptes"
+
+#: ../sflphone-client-gnome/src/menus.c:579
+msgid "_Edit"
+msgstr "_Editer"
+
+#: ../sflphone-client-gnome/src/menus.c:631
+msgid "_Dialpad"
+msgstr "_Clavier"
+
+#: ../sflphone-client-gnome/src/menus.c:643
+msgid "_Volume controls"
+msgstr "Contrôle du _volume"
+
+#: ../sflphone-client-gnome/src/menus.c:661
+msgid "_View"
+msgstr "A_ffichage"
+
+#: ../sflphone-client-gnome/src/menus.c:881
+msgid "_Call back"
+msgstr "_Rappeler"
+
+#: ../sflphone-client-gnome/src/menus.c:1061
+msgid "Edit phone number"
+msgstr "Éditer le numéro"
+
+#: ../sflphone-client-gnome/src/menus.c:1072
+msgid "Edit the phone number before making a call"
+msgstr "Éditer le numéro de téléphone avant d'appeler"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:71
+#: ../sflphone-client-gnome/src/sflnotify.c:91
+#, c-format
+msgid "%s account : %s"
+msgstr "%s account : %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:75
+#, c-format
+msgid "<i>From</i> %s"
+msgstr "<i>De</i> %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:111
+#, c-format
+msgid "Calling with %s account <i>%s</i>"
+msgstr "Appel avec le compte %s <i>%s</i>"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:115
+msgid "Current account"
+msgstr "Compte courant"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:130
+msgid "You have no accounts set up"
+msgstr "Vous n'avez pas configuré de compte"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:131
+#: ../sflphone-client-gnome/src/sflnotify.c:148
+msgid "Error"
+msgstr "Erreur"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:147
+msgid "You have no registered accounts"
+msgstr "Vous n'avez aucun compte enregistré"
+
+#: ../sflphone-client-gnome/src/statusicon.c:91
+msgid "_Show main window"
+msgstr "_Afficher la fenêtre principale"
+
+#: ../sflphone-client-gnome/src/statusicon.c:127
+#, c-format
+msgid "%i account configured"
+msgid_plural "%i accounts configured"
+msgstr[0] "%i compte configuré"
+msgstr[1] "%i comptes configurés"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:113
+msgid "Account settings"
+msgstr "Paramètre des comptes"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:147
+msgid "_Enable this account"
+msgstr "Activer ce compte"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:161
+msgid "_Protocol"
+msgstr "P_rotocole"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:179
+msgid "Unknown"
+msgstr "Inconnu"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:312
+msgid "_Use Evolution address books"
+msgstr "_Utiliser les carnets d'adresse d'Évolution"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:319
+msgid "Download limit :"
+msgstr "Limite de téléchargement :"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:327
+msgid "cards"
+msgstr "entrées"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:333
+msgid "_Display contact photo if available"
+msgstr "_Afficher la photo si disponible"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:341
+msgid "Fields from Evolution's address books"
+msgstr "Utiliser les champs suivants des carnets d'adresse d'Évolution"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:345
+msgid "_Work"
+msgstr "_Professionnels"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:351
+msgid "_Home"
+msgstr "P_ersonnels"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:357
+msgid "_Mobile"
+msgstr "_Mobiles"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:364
+msgid "Address Books"
+msgstr "Carnets d'adresses"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:368
+msgid "Select which Evolution address books to use"
+msgstr "Sélectionnez les carnets d'adresses d'Evolution à utiliser"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:404
+#: ../sflphone-client-gnome/src/config/audioconf.c:576
+msgid "Name"
+msgstr "Nom"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:741
+msgid "_Voice Activity Detection"
+msgstr "Détection de l'activité de la voix"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:751
+msgid "_Noise Reduction (Narrow-Band Companding)"
+msgstr "Réduction du bruit (Compresseur extenseur LBR)"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:780
+msgid "Sound Manager"
+msgstr "Interface Audio"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:783
+msgid "_Pulseaudio"
+msgstr "_Pulseaudio"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:788
+msgid "_ALSA"
+msgstr "_ALSA"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:835
+msgid "Ringtones"
+msgstr "Sonneries"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:841
+msgid "_Enable ringtones"
+msgstr "_Activer les sonneries"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:847
+msgid "Choose a ringtone"
+msgstr "Sélectionner une sonnerie"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
+msgid "Audio Files"
+msgstr "Fichier Audio"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:589
+msgid "Desktop Notifications"
+msgstr "Notifications de Bureau"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:593
+msgid "_Enable notifications"
+msgstr "_Activer les notifications"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:599
+msgid "Enable voicemail _notifications"
+msgstr "Activer les notifications de boîte _vocale"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:611
+msgid "System Tray Icon"
+msgstr "Icône dans la barre des tâches"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:614
+msgid "_Popup main window on incoming call"
+msgstr "Faire apparaître la fenêtre _principale lors d'appel entrant"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:619
+msgid "Ne_ver popup main window"
+msgstr "Ne _jamais afficher la fenêtre principale"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:623
+msgid "Hide SFLphone window on _startup"
+msgstr "_Cacher la fenêtre de SFLphone au démarrage"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:629
+msgid "Calls History"
+msgstr "Historique des appels"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:632
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "_Keep my history for at least"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:647
+msgid "PulseAudio sound server"
+msgstr "Serveur de son PulseAudio"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:650
+msgid "_Mute other applications during a call"
+msgstr "Éteindre le _son des autres applications lors d'un appel"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:677
+msgid "Port"
+msgstr "Port"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:732
+msgid "Select a folder"
+msgstr "Choisissez un dossier"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:766
+msgid "Preferences"
+msgstr "Préférences"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:845
+msgid "Configured Accounts"
+msgstr "Comptes Configurés"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:141
+msgid "Trigger on specific _SIP header"
+msgstr "Déclencher sur un entête _SIP spécifique"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:150
+msgid "Trigger on _IAX2 URL"
+msgstr "Déclencher en _IAX2"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:155
+msgid "Command to _run"
+msgstr "Commande à e_xécuter"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:169
+msgid "_Prefix dialed numbers with"
+msgstr "_Préfixer les numéros composés par"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+msgid "Search all"
+msgstr "Rechercher dans tous"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:57
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:70
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:82
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:94
+msgid "Click here to change the search type"
+msgstr "Cliquez ici pour changer le type de recherche"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+msgid "Search by missed call"
+msgstr "Rechercher dans les appels manqués"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+msgid "Search by incoming call"
+msgstr "Rechercher dans les appels entrants"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+msgid "Search by outgoing call"
+msgstr "Rechercher dans les appels sortants"
+
+#~ msgid "User"
+#~ msgstr "Nom d'utilisateur"
+
+#~ msgid "Mailbox"
+#~ msgstr "Boîte vocale"
+
+#~ msgid "State"
+#~ msgstr "Statut"
+
+#~ msgid "Stun settings will be applied on each account"
+#~ msgstr "Les paramètres de STUN seront appliqués à tous les comptes"
+
+#~ msgid "Audio device"
+#~ msgstr "Fichier Audio"
+
+#~ msgid "&Codecs"
+#~ msgstr "Codecs"
+
+#~ msgid "Out"
+#~ msgstr "Sortie"
+
+#~ msgid "On &incoming calls"
+#~ msgstr "Lors d'appels entrants"
+
+#~ msgid "days"
+#~ msgstr "jours"
+
+#~ msgid "Custom commands with URL %s will be replaced with the passed URL."
+#~ msgstr "%s sera remplacé par l'URL passé en argument."
+
+#~ msgid "Phone number formatting"
+#~ msgstr "Réécriture des numéros appelés"
+
+#~ msgid "Add phone number prefix"
+#~ msgstr "Ajouter un préfixe au numéro"
+
+#~ msgid "General"
+#~ msgstr "Général"
+
+#~ msgid "Hold"
+#~ msgstr "Mettre en attente"
+
+#~ msgid "Configure accounts"
+#~ msgstr "Comptes Configurés"
+
+#~ msgid "Configure audio"
+#~ msgstr "Configurer l'audio"
+
+#~ msgctxt "Action record a call"
+#~ msgid "Record"
+#~ msgstr "Enregistrer"
+
+#~ msgid "accounr state"
+#~ msgstr "Paramètre des comptes"
+
+#~ msgid "%s - %s"
+#~ msgstr "%s - %s"
+
+#~ msgid "Registered"
+#~ msgstr "Enregistré"
+
+#~ msgid "Not Registered"
+#~ msgstr "Non Enregistré"
+
+#~ msgid "Trying..."
+#~ msgstr "En cours..."
+
+#~ msgid "Bad authentification"
+#~ msgstr "Erreur d'authentification"
+
+#~ msgid "Network unreachable"
+#~ msgstr "Réseau non trouvé"
+
+#~ msgid "Host unreachable"
+#~ msgstr "Serveur introuvable"
+
+#~ msgid "Stun configuration error"
+#~ msgstr "Erreur de configuration Stun"
+
+#~ msgid "Stun server invalid"
+#~ msgstr "Serveur Stun invalide"
+
+#~ msgid "Invalid"
+#~ msgstr "Non valide"
+
+#~ msgid "%d voice mails"
+#~ msgstr "%d messages vocaux"
+
+#~ msgid "Using %s (%s)"
+#~ msgstr "Utilise %s (%s)"
+
+#~ msgid "No registered account"
+#~ msgstr "Aucun compte enregistré"
+
+#~ msgid "Using %s (%s) - Codec: %s"
+#~ msgstr "Utilise %s (%s) - Codec: %s"
+
+#~ msgid ""
+#~ "This assistant is now finished.\n"
+#~ "You can at any time check your registration state or modify your accounts "
+#~ "parameters in the Options/Accounts window.\n"
+#~ "\n"
+#~ "Alias :    %s\n"
+#~ "Server :   %s\n"
+#~ "Username : %s\n"
+#~ msgstr ""
+#~ "Cet assistant est maintenant terminé.\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.\n"
+#~ "\n"
+#~ "Alias :    %s\n"
+#~ "Serveur :   %s\n"
+#~ "Nom d'usager : %s\n"
+
+#~ msgid "SFLphone account configuration wizard"
+#~ msgstr "Assistant de configuration de compte"
+
+#~ msgid "Welcome to SFLphone!"
+#~ msgstr "Bienvenue dans SFLphone"
+
+#~ msgid "Select an account type:"
+#~ msgstr "Choisissez un type de compte:"
+
+#~ msgid "Please select one of the following option:"
+#~ msgstr "Veuillez remplir les champs suivants:"
+
+#~ msgid "SIP account configuration"
+#~ msgstr "Configuration d'un compte SIP"
+
+#~ msgid "Please fill the following information:"
+#~ msgstr "Veuillez remplir les champs suivants:"
+
+#~ msgid "Optional Email Address "
+#~ msgstr "Courriel optionnel"
+
+#~ msgid "This email address will be use to send your voicemail messages"
+#~ msgstr "Vos messages vocaux seront envoyés par courriel à cette adresse "
+
+#~ msgid "_Email"
+#~ msgstr "_Email"
+
+#~ msgid "IAX2 account configuration"
+#~ msgstr "Configuration d'un compte IAX2"
+
+#~ msgid "Network Address Translation"
+#~ msgstr "Traduction d'adresse réseau (NAT)"
+
+#~ msgid "Edit phone"
+#~ msgstr "Éditer numéro"
+
+#~ msgid "%s account: %s"
+#~ msgstr "Compte %s: %s"
+
+#~ msgid "<i>From:</i> %s"
+#~ msgstr "<i>De:</i> %s"
+
+#~ msgid "You haven't setup any accounts"
+#~ msgstr "Vous n'avez aucun compte configuré"
+
+#~ msgid "SFLphone - %i accounts configured"
+#~ msgstr "SFLphone - %i comptes configurés"
+
+#~ msgid "\"Voicemail\" <%s>"
+#~ msgstr "\"Boite vocale\" <%s>"
+
+#~ msgid "Place a call"
+#~ msgstr "Appeler"
+
+#~ msgid "Off Hold"
+#~ msgstr "Reprendre"
+
+#~ msgid "On Hold"
+#~ msgstr "Mettre en attente"
+
+#~ msgid "Record a call"
+#~ msgstr "_Enregistrer un appel"
+
+#~ msgid "Account Parameters"
+#~ msgstr "Paramètres du Compte"
+
+#~ msgid "Download limit:"
+#~ msgstr "Limite de _téléchargement:"
+
+#~ msgid "_Business phone"
+#~ msgstr "Tél du _bureau"
+
+#~ msgid "_Home phone"
+#~ msgstr "Tél du _domicile"
+
+#~ msgid "_Mobile phone"
+#~ msgstr "Tél _portable"
+
+#~ msgid "Select which Evolution address books to use:"
+#~ msgstr "Sélectionner quels carnets d'adresse d'Évolution utiliser:"
+
+#~ msgid "audio device index for output = %d"
+#~ msgstr "index du device audio de sortie = %d"
+
+#~ msgid "ALSA configuration"
+#~ msgstr "Configuration ALSA"
+
+#~ msgid "Stun parameters will apply to each SIP account created."
+#~ msgstr "Les paramètres STUN sont appliqués à tous les comptes SIP créés"
+
+#~ msgid "Enable it if you are behind a firewall"
+#~ msgstr ""
+#~ "À activer si vous êtes derrière un pare-feu, puis redémarrez SFLphone"
+
+#~ msgid "Format: name.server:port"
+#~ msgstr "Format: nom.serveur:port"
+
+#~ msgid "Recordings folder"
+#~ msgstr "Dossier pour les enregistrements"
+
+#~ msgid "General Settings"
+#~ msgstr "Préférences"
+
+#~ msgid "Audio Settings"
+#~ msgstr "Paramètres Audio"
+
+#~ msgid "Recordings"
+#~ msgstr "Enregistrements"
+
+#~ msgid "Address Book"
+#~ msgstr "Carnet d'adresse"
+
+#~ msgid "Hooks"
+#~ msgstr "Ancrage"
+
+#~ msgid "Accounts"
+#~ msgstr "Comptes"
+
+#~ msgid "URL Passing"
+#~ msgstr "Passage d'URL"
+
+#~ msgid "Command to _run: "
+#~ msgstr "Commande à _exécuter: "
+
+#~ msgid "Phone Number Rewriting"
+#~ msgstr "Rééecriture du numéro"
+
+#~ msgid "_Prefix dialed numbers with:"
+#~ msgstr "_Préfixer les numéros composés par:"
+
+#~ msgid "Accept"
+#~ msgstr "Accepter"
+
+#~ msgid "Refuse"
+#~ msgstr "Refuser"
+
+#~ msgid "Ignore"
+#~ msgstr "Ignorer"
+
+#~ msgid "<small>Missed call</small>"
+#~ msgstr "<small>Appel manqué</small>"
+
+#~ msgid "<small>Duration:</small> %s"
+#~ msgstr "<small>Durée:</small> %s"
+
+#~ msgid "Fields"
+#~ msgstr "Champs"
+
+#~ msgid "_History size limit"
+#~ msgstr "_Taille limite de l'historique"
+
+#~ msgid ""
+#~ "SFLphone can run custom commands if incoming calls come with an URL "
+#~ "attached.\n"
+#~ "In this case, %s will be replaced with the passed URL."
+#~ msgstr ""
+#~ "SFLphone peut exécuter des commandes lors d'appels entrants qui ont un "
+#~ "URL associé.\n"
+#~ "Dans ce cas, %s sera remplacé par l'URL en question."
+
+#~ msgid "Search history"
+#~ msgstr "Rechercher"
+
+#~ msgid "Search contact"
+#~ msgstr "Rechercher un contact"
+
+#~ msgid "Registered to %s (%s)"
+#~ msgstr "Connecté avec %s (%s)"
+
+#~ msgid "%s account- %s             %s"
+#~ msgstr "compte %s- %s             %s"
+
+#~ msgid "Books"
+#~ msgstr "Carnets d'adresse"
+
+#~ msgid "_Enable"
+#~ msgstr "_Activer"
+
+#~ msgid "_Notify voice mails"
+#~ msgstr "_Notifier les messages vocaux"
+
+#~ msgid "_Start hidden"
+#~ msgstr "_Démarrer caché"
+
+#~ msgid "_Maximum number of calls"
+#~ msgstr "N_ombre maximum d'appels"
+
+#~ msgid "_Control running applications volume"
+#~ msgstr "_Autoriser à modifier le volume des autres applications"
+
+#~ msgid "Account previously setup"
+#~ msgstr "Liste des comptes existants"
+
+#~ msgid "URL argument"
+#~ msgstr "Argument URL"
+
+#~ msgid "_SIP protocol"
+#~ msgstr "_Protocole SIP"
+
+#~ msgid "_SIP Header: "
+#~ msgstr "En-tête SIP: "
+
+#~ msgid "_IAX2 protocol"
+#~ msgstr "_Protocole IAX2"
+
+#~ msgid "_Prepend: "
+#~ msgstr "Préfixe: "
diff --git a/lang/ru/sflphone.po b/lang/ru/sflphone.po
new file mode 100644
index 0000000000000000000000000000000000000000..a8b2eaea36ae7a02279f3c6aa95d17a1ad393b72
--- /dev/null
+++ b/lang/ru/sflphone.po
@@ -0,0 +1,1257 @@
+# Russian Translation.
+# Copyright (C) 2009 Savoir-Faire Linux Inc.
+# This file is distributed under the same license as the sflphone package.
+# Hussein Abdallah <hussein.abdallah@savoirfairelinux.com>.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: SFLphone 0.9.6\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-07-17 16:14-0400\n"
+"PO-Revision-Date: 2009-06-08 10:19 GMT-5\n"
+"Last-Translator: HUSSEIN ABDALLAH <hussein.abdallah@savoirfairelinux.com>\n"
+"Language-Team:  Savoir-Faire Linux Inc <sflphoneteam@savoirfairelinux.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../sflphone-client-kde/src/Account.cpp:34
+#: ../sflphone-client-gnome/src/accountlist.c:175
+msgctxt "account state"
+msgid "Registered"
+msgstr "Зарегистрирован"
+
+#: ../sflphone-client-kde/src/Account.cpp:36
+#: ../sflphone-client-gnome/src/accountlist.c:178
+msgctxt "account state"
+msgid "Not Registered"
+msgstr "Не зарегистрирован"
+
+#: ../sflphone-client-kde/src/Account.cpp:38
+#: ../sflphone-client-gnome/src/accountlist.c:181
+msgctxt "account state"
+msgid "Trying..."
+msgstr "Пробует подключиться..."
+
+#: ../sflphone-client-kde/src/Account.cpp:40
+#: ../sflphone-client-gnome/src/accountlist.c:184
+msgctxt "account state"
+msgid "Error"
+msgstr "Ошибка"
+
+#: ../sflphone-client-kde/src/Account.cpp:42
+#: ../sflphone-client-gnome/src/accountlist.c:187
+msgctxt "account state"
+msgid "Authentication Failed"
+msgstr "Неправильная идентификация"
+
+#: ../sflphone-client-kde/src/Account.cpp:44
+#: ../sflphone-client-gnome/src/accountlist.c:190
+msgctxt "account state"
+msgid "Network unreachable"
+msgstr "Сеть недоступна"
+
+#: ../sflphone-client-kde/src/Account.cpp:46
+#: ../sflphone-client-gnome/src/accountlist.c:193
+msgctxt "account state"
+msgid "Host unreachable"
+msgstr "Хост недоступен"
+
+#: ../sflphone-client-kde/src/Account.cpp:48
+#: ../sflphone-client-gnome/src/accountlist.c:196
+msgctxt "account state"
+msgid "Stun configuration error"
+msgstr "Ошибка настройки Stun"
+
+#: ../sflphone-client-kde/src/Account.cpp:50
+#: ../sflphone-client-gnome/src/accountlist.c:199
+msgctxt "account state"
+msgid "Stun server invalid"
+msgstr "Недействительный Stun-сервер"
+
+#: ../sflphone-client-kde/src/Account.cpp:51
+#: ../sflphone-client-gnome/src/accountlist.c:202
+msgctxt "account state"
+msgid "Invalid"
+msgstr "Недействительный"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:163
+#: ../sflphone-client-kde/src/AccountWizard.cpp:278
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:393
+msgid "Account creation wizard"
+msgstr "Мастер настройки SFLphone"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:199
+#: ../sflphone-client-kde/src/AccountWizard.cpp:217
+#: ../sflphone-client-kde/src/AccountWizard.cpp:561
+#: ../sflphone-client-gnome/src/assistant.c:68
+#, c-format
+msgid "This assistant is now finished."
+msgstr "Мастер закончил настройку."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:211
+msgid "Creation of account has failed for the reason"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:255
+#: ../sflphone-client-kde/src/AccountWizard.cpp:440
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:363
+#: ../sflphone-client-gnome/src/assistant.c:72
+msgid "Alias"
+msgstr "Псевдоним"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:256
+#: ../sflphone-client-kde/src/AccountWizard.cpp:441
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:370
+#: ../sflphone-client-gnome/src/assistant.c:75
+msgid "Server"
+msgstr "Сервер"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:257
+#: ../sflphone-client-kde/src/AccountWizard.cpp:442
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:371
+#: ../sflphone-client-gnome/src/assistant.c:78
+msgid "Username"
+msgstr "Пользователь"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:258
+#: ../sflphone-client-kde/src/AccountWizard.cpp:443
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:372
+msgid "Password"
+msgstr "Пароль"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:259
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:364
+#: ../sflphone-client-gnome/src/config/configwindow.c:418
+msgid "Protocol"
+msgstr "Протокол"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:260
+#: ../sflphone-client-kde/src/AccountWizard.cpp:444
+msgid "Voicemail number"
+msgstr "Номер автоответчика #"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:279
+#: ../sflphone-client-gnome/src/assistant.c:216
+msgid "Welcome to the Account creation wizard of SFLphone!"
+msgstr "Добро пожаловать в SFLphone!"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:281
+#: ../sflphone-client-gnome/src/assistant.c:217
+msgid "This installation wizard will help you configure an account."
+msgstr "Этот мастер установки поможет вам настроить ваш аккаунт."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:309
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Account"
+msgstr "Аккаунты"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:310
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Please select one of the following options"
+msgstr "Введите пожалуйста следующие данные"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:312
+#: ../sflphone-client-gnome/src/assistant.c:251
+msgid "Create a free SIP/IAX2 account on sflphone.org"
+msgstr "Создать бесплатный SIP/IAX2-аккаунт на sflphone.org"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:313
+#: ../sflphone-client-gnome/src/assistant.c:253
+msgid "Register an existing SIP or IAX2 account"
+msgstr "Зарегистрировать существующий SIP или IAX2 аккаунт"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:352
+#: ../sflphone-client-gnome/src/assistant.c:231
+msgid "VoIP Protocols"
+msgstr "VoIP-протоколы"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:353
+#: ../sflphone-client-gnome/src/assistant.c:231
+msgid "Select an account type"
+msgstr "Выберите тип аккаунта"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:355
+#: ../sflphone-client-gnome/src/assistant.c:233
+msgid "SIP (Session Initiation Protocol)"
+msgstr "SIP (Session Initiation Protocol)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:356
+#: ../sflphone-client-gnome/src/assistant.c:235
+msgid "IAX2 (InterAsterix Exchange)"
+msgstr "IAX2 (InterAsterix Exchange)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:395
+#: ../sflphone-client-gnome/src/assistant.c:339
+msgid "Optional email address"
+msgstr "Электронный адрес (необязательный)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:396
+#: ../sflphone-client-gnome/src/assistant.c:339
+msgid "This email address will be used to send your voicemail messages."
+msgstr "Этот электронный адрес будет использоваться для речевых сообщений"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:398
+msgid "Email address"
+msgstr "Адрес эл. почты"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:432
+#: ../sflphone-client-gnome/src/assistant.c:266
+msgid "SIP account settings"
+msgstr "Настройка SIP-аккаунта"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:436
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "IAX2 account settings"
+msgstr "Настройка IAX2-аккаунта"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:438
+#: ../sflphone-client-gnome/src/assistant.c:266
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "Please fill the following information"
+msgstr "Введите пожалуйста следующие данные"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:523
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:856
+msgid "Network Address Translation (NAT)"
+msgstr "Network Address Translation (NAT)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:524
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:536
+msgid "You should probably enable this if you are behind a firewall."
+msgstr "Вы наверное должны это включить если вы находитесь за сетевым экраном."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:526
+msgid "Enable STUN"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:527
+msgid "Stun Server"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:562
+msgid ""
+"After checking the settings you chose, click \"Finish\" to create the "
+"account."
+msgstr ""
+
+#: ../sflphone-client-kde/src/ActionSetAccountFirst.cpp:26
+msgid "Default account"
+msgstr ""
+
+#: ../sflphone-client-kde/src/Call.cpp:116
+#: ../sflphone-client-gnome/src/contacts/calltree.c:322
+msgid "Transfer to : "
+msgstr ""
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:89
+#: ../sflphone-client-gnome/src/actions.c:816
+msgid "Codec"
+msgstr "Codec"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:93
+#: ../sflphone-client-gnome/src/config/audioconf.c:581
+msgid "Frequency"
+msgstr "Частота"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:97
+#: ../sflphone-client-gnome/src/config/audioconf.c:586
+msgid "Bitrate"
+msgstr "Битрейт"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:101
+#: ../sflphone-client-gnome/src/config/audioconf.c:591
+msgid "Bandwidth"
+msgstr "Пропускная способность"
+
+#: ../sflphone-client-kde/src/main.cpp:38
+msgid "SFLphone KDE Client"
+msgstr ""
+
+#: ../sflphone-client-kde/src/main.cpp:42
+msgid "(C) 2009 Savoir-faire Linux"
+msgstr ""
+
+#: ../sflphone-client-kde/src/main.cpp:46
+msgid "Jérémy Quentin"
+msgstr ""
+
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr ""
+
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr ""
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:62
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-gnome/src/statusicon.c:126
+msgid "SFLphone"
+msgstr ""
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:209
+msgid "Incoming call"
+msgstr ""
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
+msgid "You have an incoming call from"
+msgstr ""
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
+msgid "Click to accept or refuse it."
+msgstr ""
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:716
+msgid "Address book loading..."
+msgstr ""
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:901
+#: ../sflphone-client-gnome/src/actions.c:89
+msgid "No registered accounts"
+msgstr "У вас нет зарегистрированных аккаунтов"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:905
+#: ../sflphone-client-gnome/src/actions.c:83
+#: ../sflphone-client-gnome/src/actions.c:813
+msgid "Using account"
+msgstr ""
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
+msgid "Main screen"
+msgstr ""
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:165
+msgid "Call history"
+msgstr ""
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:394
+#: ../sflphone-client-gnome/src/toolbar.c:243
+#: ../sflphone-client-gnome/src/toolbar.c:245
+msgid "Address book"
+msgstr "Адресная книга"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1108
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1173
+msgid "Edit before call"
+msgstr ""
+
+#: ../sflphone-client-kde/src/sflphone_const.h:41
+#: ../sflphone-client-gnome/src/toolbar.c:167
+#: ../sflphone-client-gnome/src/toolbar.c:169
+msgid "New call"
+msgstr "Новый звонок"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:42
+#: ../sflphone-client-kde/src/sflphone_const.h:47
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:381
+#: ../sflphone-client-gnome/src/toolbar.c:186
+#: ../sflphone-client-gnome/src/toolbar.c:188
+msgid "Hang up"
+msgstr "Положить трубку"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:43
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:382
+#: ../sflphone-client-gnome/src/toolbar.c:207
+#: ../sflphone-client-gnome/src/toolbar.c:209
+msgid "Hold on"
+msgstr "Удержать звонок"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:44
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:383
+#: ../sflphone-client-gnome/src/toolbar.c:220
+#: ../sflphone-client-gnome/src/toolbar.c:222
+msgid "Transfer"
+msgstr "Переслать звонок на другой номер"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:45
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:392
+#: ../sflphone-client-gnome/src/toolbar.c:263
+msgid "Record"
+msgstr "Записать переговор"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:46
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:380
+#: ../sflphone-client-gnome/src/toolbar.c:176
+#: ../sflphone-client-gnome/src/toolbar.c:178
+msgid "Pick up"
+msgstr "Взять трубку"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:48
+#: ../sflphone-client-gnome/src/toolbar.c:196
+#: ../sflphone-client-gnome/src/toolbar.c:198
+msgid "Hold off"
+msgstr "Снова взять"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:49
+msgid "Give up transfer"
+msgstr ""
+
+#: ../sflphone-client-kde/src/sflphone_const.h:50
+msgid "Call back"
+msgstr ""
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:48
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:91
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
+#: ../sflphone-client-gnome/src/config/configwindow.c:722
+#: ../sflphone-client-gnome/src/config/configwindow.c:791
+msgctxt "Config section"
+msgid "General"
+msgstr "Общие настройки"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:49
+msgctxt "Config section"
+msgid "Display"
+msgstr ""
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:50
+#: ../sflphone-client-gnome/src/config/configwindow.c:833
+msgctxt "Config section"
+msgid "Accounts"
+msgstr ""
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:51
+#: ../sflphone-client-gnome/src/config/configwindow.c:786
+msgctxt "Config section"
+msgid "Audio"
+msgstr "звука"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:52
+#: ../sflphone-client-gnome/src/config/configwindow.c:801
+msgctxt "Config section"
+msgid "Address Book"
+msgstr "Адресная книга"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:53
+#: ../sflphone-client-gnome/src/config/configwindow.c:796
+msgctxt "Config section"
+msgid "Recordings"
+msgstr "Запись"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:54
+#: ../sflphone-client-gnome/src/config/configwindow.c:806
+msgctxt "Config section"
+msgid "Hooks"
+msgstr "перехватчики (hooks)"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:328
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows. Enable/disable them by checking/unchecking "
+"them on the left of the item. Add or remove some with \"Plus\" and \"Sub\" "
+"buttons. Edit the selected account with the form on the right."
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:332
+msgid "Remove the selected account"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:335
+msgid ""
+"This button will remove the selected account in the list below. Be sure you "
+"really don't need it anymore. If you think you might use it again later, "
+"just uncheck it."
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:340
+msgid "Remove"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:342
+msgid "Add a new account"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:345
+msgid ""
+"This button enables you to initialize a new account. You will then be able "
+"to edit it using the form on the right."
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:347
+msgid "Add"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:349
+msgid "Get this account down"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:352
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:359
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows."
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:354
+msgid "Down"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:356
+msgid "Get this account up"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:361
+msgid "Up"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:362
+msgid "Apply"
+msgstr "Применить"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:367
+msgid "SIP"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:368
+msgid "IAX"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:373
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:385
+#: ../sflphone-client-gnome/src/toolbar.c:52
+#: ../sflphone-client-gnome/src/toolbar.c:251
+#: ../sflphone-client-gnome/src/toolbar.c:255
+msgid "Voicemail"
+msgstr "Автоответчик"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:374
+#: ../sflphone-client-gnome/src/config/configwindow.c:425
+msgid "Status"
+msgstr "Статус"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:377
+#: ../sflphone-client-gnome/src/config/configwindow.c:528
+msgid "Stun parameters will be applied on each SIP account created."
+msgstr "STUN-параметры будут эффективны для каждого созданного SIP-аккаунта"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:378
+msgid "Enable Stun"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:380
+#: ../sflphone-client-gnome/src/config/configwindow.c:544
+msgid "Format : name.server:port"
+msgstr "Формат: имя.сервер:порт"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:382
+msgid "choose Stun server (example : stunserver.org)"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:154
+msgid "Enable address book"
+msgstr "Адресная книга"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:155
+msgid "Maximum results"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:156
+msgid "Display photo if available"
+msgstr "_Показать фотографию контакта (если имеется):"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:157
+msgid "Display phone numbers of these types :"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:158
+msgid "Work"
+msgstr "Рабочий"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:159
+msgid "Mobile"
+msgstr "Мобильный"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:160
+msgid "Home"
+msgstr "Домашний"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:225
+msgid "Sound manager"
+msgstr "Менеджер звука"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:228
+msgid "ALSA"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:229
+msgid "PulseAudio"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:231
+msgid "Enable ringtones"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:232
+#: ../sflphone-client-gnome/src/config/audioconf.c:812
+msgid "Codecs"
+msgstr "Кодеки"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:233
+#: ../sflphone-client-gnome/src/config/audioconf.c:795
+msgid "ALSA settings"
+msgstr "Настройка ALSA"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:234
+#: ../sflphone-client-gnome/src/config/audioconf.c:662
+msgid "ALSA plugin"
+msgstr "ALSA-плагин"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:235
+#: ../sflphone-client-gnome/src/config/audioconf.c:706
+msgid "Input"
+msgstr "Вход"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:236
+#: ../sflphone-client-gnome/src/config/audioconf.c:684
+msgid "Output"
+msgstr "Выход"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:237
+msgid "PulseAudio settings"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:238
+msgid "Mute other applications during a call"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:121
+msgid "Enable notifications"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:122
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:126
+msgid "On incoming calls"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:123
+msgid "On messages"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:124
+msgid "Show main window"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:125
+msgid "On start"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:166
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "Keep my history for at least"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:167
+#: ../sflphone-client-gnome/src/config/configwindow.c:643
+msgctxt "End of 'Keep my history for at least n days.'"
+msgid "days"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:168
+msgid "Clear history"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:169
+msgid "Connection"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:170
+#: ../sflphone-client-gnome/src/config/configwindow.c:664
+msgid "SIP Port"
+msgstr "SIP-порт"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:180
+#: ../sflphone-client-gnome/src/config/hooks-config.c:130
+msgid "URL Argument"
+msgstr "Передача URL"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:181
+#: ../sflphone-client-gnome/src/config/hooks-config.c:135
+msgid "Custom commands on incoming calls with URL"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:182
+msgid "Trigger on specific SIP header"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:183
+msgid "Trigger on IAX2 URL"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:184
+msgid "Command to run"
+msgstr "Выполнить команду:"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:185
+#: ../sflphone-client-gnome/src/config/hooks-config.c:138
+#, c-format
+msgid "%s will be replaced with the passed URL."
+msgstr "%s будет заменена на переданную URL"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:186
+#: ../sflphone-client-gnome/src/config/hooks-config.c:165
+msgid "Phone number rewriting"
+msgstr "Переписка номера телефона"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:187
+msgid "Prefix dialed numbers with"
+msgstr "Добавить перед на набранными номерами"
+
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:92
+#: ../sflphone-client-gnome/src/config/configwindow.c:726
+msgid "Destination folder"
+msgstr "Папка назначения"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:384
+#: ../sflphone-client-gnome/src/toolbar.c:232
+#: ../sflphone-client-gnome/src/toolbar.c:234
+msgid "History"
+msgstr "Журнал"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:386
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:388
+msgid "Configure SFLphone"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:390
+msgid "Display volume controls"
+msgstr "_Настройки громкости"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:391
+msgid "Display dialpad"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:396
+msgid "Attention:number of results exceeds max displayed."
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:398
+#: ../sflphone-client-gnome/src/sliders.c:163
+msgid "Mic volume"
+msgstr "Громкость микрофона"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:402
+#: ../sflphone-client-gnome/src/sliders.c:161
+msgid "Speakers volume"
+msgstr "Громкость"
+
+#: ../sflphone-client-gnome/src/actions.c:54
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+#, c-format
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] "%d речевое сообщение"
+msgstr[1] "%d речевое сообщение"
+
+#: ../sflphone-client-gnome/src/actions.c:234
+msgid ""
+"Unable to connect to the SFLphone server.\n"
+"Make sure the daemon is running."
+msgstr ""
+"Невозможно подключиться к SFLphone-серверу.\n"
+"Проверьте если демон работает."
+
+#: ../sflphone-client-gnome/src/actions.c:809
+#, c-format
+msgid "IP call - %s"
+msgstr "IP звонок  - %s"
+
+#: ../sflphone-client-gnome/src/actions.c:908
+#, 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>Ошибка: звуковые кодеки не найдены.\n"
+"\n"
+"</b> Звуковые кодеки SFL должны находиться в <i>%s</i> или в <b>.sflphone</"
+"b> каталоге в вашем домашнем каталоге( <i>%s</i> )"
+
+#: ../sflphone-client-gnome/src/assistant.c:70
+msgid ""
+"You can at any time check your registration state or modify your accounts "
+"parameters in the Options/Accounts window."
+msgstr ""
+"Вы можете в любое время проверить статус регистрации или изменитьпараметры  "
+"ваших аккаунтов в меню Правка / Аккаунты."
+
+#: ../sflphone-client-gnome/src/assistant.c:190
+msgid "SFLphone account creation wizard"
+msgstr "Мастер настройки SFLphone"
+
+#: ../sflphone-client-gnome/src/assistant.c:274
+#: ../sflphone-client-gnome/src/assistant.c:370
+#: ../sflphone-client-gnome/src/config/accountwindow.c:153
+msgid "_Alias"
+msgstr "_Псевдоним"
+
+#: ../sflphone-client-gnome/src/assistant.c:282
+#: ../sflphone-client-gnome/src/assistant.c:378
+#: ../sflphone-client-gnome/src/config/accountwindow.c:189
+msgid "_Host name"
+msgstr "Имя или IP-адрес _сервера"
+
+#: ../sflphone-client-gnome/src/assistant.c:290
+#: ../sflphone-client-gnome/src/assistant.c:386
+#: ../sflphone-client-gnome/src/config/accountwindow.c:197
+msgid "_User name"
+msgstr "Имя или _номер пользователя"
+
+#: ../sflphone-client-gnome/src/assistant.c:306
+#: ../sflphone-client-gnome/src/assistant.c:401
+#: ../sflphone-client-gnome/src/config/accountwindow.c:212
+msgid "_Password"
+msgstr "Па_роль"
+
+#: ../sflphone-client-gnome/src/assistant.c:324
+#: ../sflphone-client-gnome/src/assistant.c:417
+#: ../sflphone-client-gnome/src/config/accountwindow.c:228
+msgid "_Voicemail number"
+msgstr "Номер _автоответчика #"
+
+#: ../sflphone-client-gnome/src/assistant.c:347
+msgid "_Email address"
+msgstr "_Адрес эл. почты"
+
+#: ../sflphone-client-gnome/src/assistant.c:444
+#: ../sflphone-client-gnome/src/config/configwindow.c:532
+msgid "E_nable STUN"
+msgstr "Включить STUN"
+
+#: ../sflphone-client-gnome/src/assistant.c:451
+msgid "_STUN server"
+msgstr "_STUN-сервер"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Account Registration"
+msgstr "Регистрация аккаунта"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Congratulations!"
+msgstr "Поздравляем!"
+
+#: ../sflphone-client-gnome/src/errors.c:29
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening playback device"
+msgstr ""
+"<b>ALSA-nпредупреждение</b>\n"
+"\n"
+"Ошибка во время активирования устройства проигрывания"
+
+#: ../sflphone-client-gnome/src/errors.c:32
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening capture device"
+msgstr ""
+"<b>ALSA-nпредупреждение</b>\n"
+"\n"
+"Ошибка во время активирования устройства входа"
+
+#: ../sflphone-client-gnome/src/errors.c:35
+msgid ""
+"Pulseaudio notification\n"
+"\n"
+"Pulseaudio is not running"
+msgstr ""
+"<b>Предупреждение Pulseaudio</b>\n"
+"\n"
+"Pulseaudio не работает"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:70
+msgid "There is one call in progress."
+msgstr "Звонок ещё не окончен."
+
+#: ../sflphone-client-gnome/src/mainwindow.c:74
+msgid "There are calls in progress."
+msgstr "Несколько звонков ещё не окончены."
+
+#: ../sflphone-client-gnome/src/mainwindow.c:83
+msgid "Do you still want to quit?"
+msgstr "Вы уверенны что хотите выйти?"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:284
+msgid "SFLphone Error"
+msgstr "Ошибка SFLphone."
+
+#: ../sflphone-client-gnome/src/menus.c:134
+msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr "SFLphone - SIP и IAX2-совместимый VoIP-клиент "
+
+#: ../sflphone-client-gnome/src/menus.c:137
+msgid "About SFLphone"
+msgstr "О SFLphone"
+
+#: ../sflphone-client-gnome/src/menus.c:161
+msgid "_Help"
+msgstr "_Помощь"
+
+#: ../sflphone-client-gnome/src/menus.c:296
+#: ../sflphone-client-gnome/src/menus.c:953
+msgid "_New call"
+msgstr "_Новый звонок"
+
+#: ../sflphone-client-gnome/src/menus.c:308
+#: ../sflphone-client-gnome/src/menus.c:785
+msgid "_Pick up"
+msgstr "_Взять трубку"
+
+#: ../sflphone-client-gnome/src/menus.c:318
+#: ../sflphone-client-gnome/src/menus.c:797
+msgid "_Hang up"
+msgstr "_Положить трубку"
+
+#: ../sflphone-client-gnome/src/menus.c:328
+#: ../sflphone-client-gnome/src/menus.c:809
+msgid "On _Hold"
+msgstr "_Удержать звонок"
+
+#: ../sflphone-client-gnome/src/menus.c:340
+#: ../sflphone-client-gnome/src/menus.c:821
+msgid "_Record"
+msgstr "Записать"
+
+#: ../sflphone-client-gnome/src/menus.c:354
+msgid "_Account creation wizard"
+msgstr "Мастер настройки SFLphone"
+
+#: ../sflphone-client-gnome/src/menus.c:384
+msgid "_Call"
+msgstr "_Звонок"
+
+#: ../sflphone-client-gnome/src/menus.c:552
+msgid "Clear _history"
+msgstr "_Стереть журнал"
+
+#: ../sflphone-client-gnome/src/menus.c:564
+msgid "_Accounts"
+msgstr "_Аккаунты"
+
+#: ../sflphone-client-gnome/src/menus.c:579
+msgid "_Edit"
+msgstr "_Правка"
+
+#: ../sflphone-client-gnome/src/menus.c:631
+msgid "_Dialpad"
+msgstr "_Клавиатура"
+
+#: ../sflphone-client-gnome/src/menus.c:643
+msgid "_Volume controls"
+msgstr "_Настройки громкости"
+
+#: ../sflphone-client-gnome/src/menus.c:661
+msgid "_View"
+msgstr "_Вид"
+
+#: ../sflphone-client-gnome/src/menus.c:881
+msgid "_Call back"
+msgstr "_Перезвонить"
+
+#: ../sflphone-client-gnome/src/menus.c:1061
+msgid "Edit phone number"
+msgstr "Мобильный телефон"
+
+#: ../sflphone-client-gnome/src/menus.c:1072
+msgid "Edit the phone number before making a call"
+msgstr "Изменить номер телефона перед звонком"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:71
+#: ../sflphone-client-gnome/src/sflnotify.c:91
+#, c-format
+msgid "%s account : %s"
+msgstr "%s аккаунт: %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:75
+#, c-format
+msgid "<i>From</i> %s"
+msgstr "<i>От:</i> %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:111
+#, c-format
+msgid "Calling with %s account <i>%s</i>"
+msgstr "Звонок с аккаунтом %s <i>%s</i>"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:115
+msgid "Current account"
+msgstr "Нынешний аккаунт"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:130
+msgid "You have no accounts set up"
+msgstr "Вы не настроили ни одного аккаунта"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:131
+#: ../sflphone-client-gnome/src/sflnotify.c:148
+msgid "Error"
+msgstr "Ошибка"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:147
+msgid "You have no registered accounts"
+msgstr "У вас нет зарегистрированных аккаунтов"
+
+#: ../sflphone-client-gnome/src/statusicon.c:91
+msgid "_Show main window"
+msgstr "_Показать главное окно"
+
+#: ../sflphone-client-gnome/src/statusicon.c:127
+#, c-format
+msgid "%i account configured"
+msgid_plural "%i accounts configured"
+msgstr[0] ""
+msgstr[1] "SFLphone - Зарегистрировано %i аккаунтов"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:113
+msgid "Account settings"
+msgstr "Настройки аккаунта"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:147
+msgid "_Enable this account"
+msgstr "_Включить"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:161
+msgid "_Protocol"
+msgstr "Пр_отокол"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:179
+msgid "Unknown"
+msgstr "Неизвестный"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:312
+msgid "_Use Evolution address books"
+msgstr "_Использовать адресную книгу Evolution"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:319
+msgid "Download limit :"
+msgstr "Ограничение скорости скачивания:"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:327
+msgid "cards"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:333
+msgid "_Display contact photo if available"
+msgstr "_Показать фотографию контакта (если имеется):"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:341
+msgid "Fields from Evolution's address books"
+msgstr "Исполоьзовать следующие поля из адресной книги Evolution:"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:345
+msgid "_Work"
+msgstr "_Рабочий"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:351
+msgid "_Home"
+msgstr "_Домашний"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:357
+msgid "_Mobile"
+msgstr "_Мобильный"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:364
+msgid "Address Books"
+msgstr "Адресная книга"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:368
+msgid "Select which Evolution address books to use"
+msgstr "Выбрать адресную книгу Evolution:"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:404
+#: ../sflphone-client-gnome/src/config/audioconf.c:576
+msgid "Name"
+msgstr "Имя"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:741
+msgid "_Voice Activity Detection"
+msgstr "Включить детектор тишины"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:751
+msgid "_Noise Reduction (Narrow-Band Companding)"
+msgstr "Шумоподавление"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:780
+msgid "Sound Manager"
+msgstr "Менеджер звука"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:783
+msgid "_Pulseaudio"
+msgstr "_Pulseaudio"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:788
+msgid "_ALSA"
+msgstr "_ALSA"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:835
+msgid "Ringtones"
+msgstr "Звонки"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:841
+msgid "_Enable ringtones"
+msgstr "Включить звонок"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:847
+msgid "Choose a ringtone"
+msgstr "Выберите звонок"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
+msgid "Audio Files"
+msgstr "Звуковые файлы"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:589
+msgid "Desktop Notifications"
+msgstr "Извещения на рабочем столе"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:593
+msgid "_Enable notifications"
+msgstr "Включить звонок"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:599
+msgid "Enable voicemail _notifications"
+msgstr "Включить предупреждения о речевых сообщениях"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:611
+msgid "System Tray Icon"
+msgstr "System Tray Icon"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:614
+msgid "_Popup main window on incoming call"
+msgstr "_Показать главное окно при входящем звонке"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:619
+msgid "Ne_ver popup main window"
+msgstr "Никогда не показывать главное окно"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:623
+msgid "Hide SFLphone window on _startup"
+msgstr "Спрятать окно SFLphone при пуске"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:629
+msgid "Calls History"
+msgstr "Журнал звонков"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:632
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "_Keep my history for at least"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:647
+msgid "PulseAudio sound server"
+msgstr "Сервер звука PulseAudio"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:650
+msgid "_Mute other applications during a call"
+msgstr "Приглушать звук других програм во время звонка"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:677
+msgid "Port"
+msgstr "Порт"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:732
+msgid "Select a folder"
+msgstr "Выберите папку"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:766
+msgid "Preferences"
+msgstr "Предпочтения"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:845
+msgid "Configured Accounts"
+msgstr "Нынешний аккаунт"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:141
+msgid "Trigger on specific _SIP header"
+msgstr "Запустить при определëнном SIP-заголовке"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:150
+msgid "Trigger on _IAX2 URL"
+msgstr "Запустить при наличии URL _IAX2"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:155
+msgid "Command to _run"
+msgstr "_Выполнить команду:"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:169
+msgid "_Prefix dialed numbers with"
+msgstr "Добавить перед на набранными номерами"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+msgid "Search all"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:57
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:70
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:82
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:94
+msgid "Click here to change the search type"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+msgid "Search by missed call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+msgid "Search by incoming call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+msgid "Search by outgoing call"
+msgstr ""
+
+#~ msgid "User"
+#~ msgstr "Пользователь"
+
+#~ msgid "State"
+#~ msgstr "Статус"
+
+#~ msgid "Stun settings will be applied on each account"
+#~ msgstr "STUN-параметры будут эффективны для каждого созданного SIP-аккаунта"
+
+#~ msgid "Audio device"
+#~ msgstr "Звуковые файлы"
+
+#~ msgid "&Codecs"
+#~ msgstr "Кодеки"
+
+#~ msgid "Out"
+#~ msgstr "Выход"
+
+#~ msgid "Custom commands with URL %s will be replaced with the passed URL."
+#~ msgstr "%s будет заменена на переданную URL"
+
+#~ msgid "Phone number formatting"
+#~ msgstr "Переписка номера телефона"
+
+#~ msgid "Add phone number prefix"
+#~ msgstr "Мобильный телефон"
+
+#~ msgid "General"
+#~ msgstr "Общие настройки"
+
+#~ msgid "Hold"
+#~ msgstr "Удержать звонок"
+
+#~ msgid "Configure accounts"
+#~ msgstr "Нынешний аккаунт"
+
+#~ msgid "Configure audio"
+#~ msgstr "Нынешний аккаунт"
+
+#~ msgctxt "Action record a call"
+#~ msgid "Record"
+#~ msgstr "Записать переговор"
+
+#~ msgid "accounr state"
+#~ msgstr "Настройки аккаунта"
diff --git a/lang/sflphone.pot b/lang/sflphone.pot
new file mode 100644
index 0000000000000000000000000000000000000000..bf10b600ffe85594d1d73459a56a67c414427ba9
--- /dev/null
+++ b/lang/sflphone.pot
@@ -0,0 +1,1196 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-07-17 16:14-0400\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: ../sflphone-client-kde/src/Account.cpp:34
+#: ../sflphone-client-gnome/src/accountlist.c:175
+msgctxt "account state"
+msgid "Registered"
+msgstr ""
+
+#: ../sflphone-client-kde/src/Account.cpp:36
+#: ../sflphone-client-gnome/src/accountlist.c:178
+msgctxt "account state"
+msgid "Not Registered"
+msgstr ""
+
+#: ../sflphone-client-kde/src/Account.cpp:38
+#: ../sflphone-client-gnome/src/accountlist.c:181
+msgctxt "account state"
+msgid "Trying..."
+msgstr ""
+
+#: ../sflphone-client-kde/src/Account.cpp:40
+#: ../sflphone-client-gnome/src/accountlist.c:184
+msgctxt "account state"
+msgid "Error"
+msgstr ""
+
+#: ../sflphone-client-kde/src/Account.cpp:42
+#: ../sflphone-client-gnome/src/accountlist.c:187
+msgctxt "account state"
+msgid "Authentication Failed"
+msgstr ""
+
+#: ../sflphone-client-kde/src/Account.cpp:44
+#: ../sflphone-client-gnome/src/accountlist.c:190
+msgctxt "account state"
+msgid "Network unreachable"
+msgstr ""
+
+#: ../sflphone-client-kde/src/Account.cpp:46
+#: ../sflphone-client-gnome/src/accountlist.c:193
+msgctxt "account state"
+msgid "Host unreachable"
+msgstr ""
+
+#: ../sflphone-client-kde/src/Account.cpp:48
+#: ../sflphone-client-gnome/src/accountlist.c:196
+msgctxt "account state"
+msgid "Stun configuration error"
+msgstr ""
+
+#: ../sflphone-client-kde/src/Account.cpp:50
+#: ../sflphone-client-gnome/src/accountlist.c:199
+msgctxt "account state"
+msgid "Stun server invalid"
+msgstr ""
+
+#: ../sflphone-client-kde/src/Account.cpp:51
+#: ../sflphone-client-gnome/src/accountlist.c:202
+msgctxt "account state"
+msgid "Invalid"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:163
+#: ../sflphone-client-kde/src/AccountWizard.cpp:278
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:393
+msgid "Account creation wizard"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:199
+#: ../sflphone-client-kde/src/AccountWizard.cpp:217
+#: ../sflphone-client-kde/src/AccountWizard.cpp:561
+#: ../sflphone-client-gnome/src/assistant.c:68
+#, c-format
+msgid "This assistant is now finished."
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:211
+msgid "Creation of account has failed for the reason"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:255
+#: ../sflphone-client-kde/src/AccountWizard.cpp:440
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:363
+#: ../sflphone-client-gnome/src/assistant.c:72
+msgid "Alias"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:256
+#: ../sflphone-client-kde/src/AccountWizard.cpp:441
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:370
+#: ../sflphone-client-gnome/src/assistant.c:75
+msgid "Server"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:257
+#: ../sflphone-client-kde/src/AccountWizard.cpp:442
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:371
+#: ../sflphone-client-gnome/src/assistant.c:78
+msgid "Username"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:258
+#: ../sflphone-client-kde/src/AccountWizard.cpp:443
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:372
+msgid "Password"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:259
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:364
+#: ../sflphone-client-gnome/src/config/configwindow.c:418
+msgid "Protocol"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:260
+#: ../sflphone-client-kde/src/AccountWizard.cpp:444
+msgid "Voicemail number"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:279
+#: ../sflphone-client-gnome/src/assistant.c:216
+msgid "Welcome to the Account creation wizard of SFLphone!"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:281
+#: ../sflphone-client-gnome/src/assistant.c:217
+msgid "This installation wizard will help you configure an account."
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:309
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Account"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:310
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Please select one of the following options"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:312
+#: ../sflphone-client-gnome/src/assistant.c:251
+msgid "Create a free SIP/IAX2 account on sflphone.org"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:313
+#: ../sflphone-client-gnome/src/assistant.c:253
+msgid "Register an existing SIP or IAX2 account"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:352
+#: ../sflphone-client-gnome/src/assistant.c:231
+msgid "VoIP Protocols"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:353
+#: ../sflphone-client-gnome/src/assistant.c:231
+msgid "Select an account type"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:355
+#: ../sflphone-client-gnome/src/assistant.c:233
+msgid "SIP (Session Initiation Protocol)"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:356
+#: ../sflphone-client-gnome/src/assistant.c:235
+msgid "IAX2 (InterAsterix Exchange)"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:395
+#: ../sflphone-client-gnome/src/assistant.c:339
+msgid "Optional email address"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:396
+#: ../sflphone-client-gnome/src/assistant.c:339
+msgid "This email address will be used to send your voicemail messages."
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:398
+msgid "Email address"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:432
+#: ../sflphone-client-gnome/src/assistant.c:266
+msgid "SIP account settings"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:436
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "IAX2 account settings"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:438
+#: ../sflphone-client-gnome/src/assistant.c:266
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "Please fill the following information"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:523
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:856
+msgid "Network Address Translation (NAT)"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:524
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:536
+msgid "You should probably enable this if you are behind a firewall."
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:526
+msgid "Enable STUN"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:527
+msgid "Stun Server"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:562
+msgid ""
+"After checking the settings you chose, click \"Finish\" to create the "
+"account."
+msgstr ""
+
+#: ../sflphone-client-kde/src/ActionSetAccountFirst.cpp:26
+msgid "Default account"
+msgstr ""
+
+#: ../sflphone-client-kde/src/Call.cpp:116
+#: ../sflphone-client-gnome/src/contacts/calltree.c:322
+msgid "Transfer to : "
+msgstr ""
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:89
+#: ../sflphone-client-gnome/src/actions.c:816
+msgid "Codec"
+msgstr ""
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:93
+#: ../sflphone-client-gnome/src/config/audioconf.c:581
+msgid "Frequency"
+msgstr ""
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:97
+#: ../sflphone-client-gnome/src/config/audioconf.c:586
+msgid "Bitrate"
+msgstr ""
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:101
+#: ../sflphone-client-gnome/src/config/audioconf.c:591
+msgid "Bandwidth"
+msgstr ""
+
+#: ../sflphone-client-kde/src/main.cpp:38
+msgid "SFLphone KDE Client"
+msgstr ""
+
+#: ../sflphone-client-kde/src/main.cpp:42
+msgid "(C) 2009 Savoir-faire Linux"
+msgstr ""
+
+#: ../sflphone-client-kde/src/main.cpp:46
+msgid "Jérémy Quentin"
+msgstr ""
+
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr ""
+
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr ""
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:62
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-gnome/src/statusicon.c:126
+msgid "SFLphone"
+msgstr ""
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:209
+msgid "Incoming call"
+msgstr ""
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
+msgid "You have an incoming call from"
+msgstr ""
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
+msgid "Click to accept or refuse it."
+msgstr ""
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:716
+msgid "Address book loading..."
+msgstr ""
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:901
+#: ../sflphone-client-gnome/src/actions.c:89
+msgid "No registered accounts"
+msgstr ""
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:905
+#: ../sflphone-client-gnome/src/actions.c:83
+#: ../sflphone-client-gnome/src/actions.c:813
+msgid "Using account"
+msgstr ""
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
+msgid "Main screen"
+msgstr ""
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:165
+msgid "Call history"
+msgstr ""
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:394
+#: ../sflphone-client-gnome/src/toolbar.c:243
+#: ../sflphone-client-gnome/src/toolbar.c:245
+msgid "Address book"
+msgstr ""
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1108
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1173
+msgid "Edit before call"
+msgstr ""
+
+#: ../sflphone-client-kde/src/sflphone_const.h:41
+#: ../sflphone-client-gnome/src/toolbar.c:167
+#: ../sflphone-client-gnome/src/toolbar.c:169
+msgid "New call"
+msgstr ""
+
+#: ../sflphone-client-kde/src/sflphone_const.h:42
+#: ../sflphone-client-kde/src/sflphone_const.h:47
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:381
+#: ../sflphone-client-gnome/src/toolbar.c:186
+#: ../sflphone-client-gnome/src/toolbar.c:188
+msgid "Hang up"
+msgstr ""
+
+#: ../sflphone-client-kde/src/sflphone_const.h:43
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:382
+#: ../sflphone-client-gnome/src/toolbar.c:207
+#: ../sflphone-client-gnome/src/toolbar.c:209
+msgid "Hold on"
+msgstr ""
+
+#: ../sflphone-client-kde/src/sflphone_const.h:44
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:383
+#: ../sflphone-client-gnome/src/toolbar.c:220
+#: ../sflphone-client-gnome/src/toolbar.c:222
+msgid "Transfer"
+msgstr ""
+
+#: ../sflphone-client-kde/src/sflphone_const.h:45
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:392
+#: ../sflphone-client-gnome/src/toolbar.c:263
+msgid "Record"
+msgstr ""
+
+#: ../sflphone-client-kde/src/sflphone_const.h:46
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:380
+#: ../sflphone-client-gnome/src/toolbar.c:176
+#: ../sflphone-client-gnome/src/toolbar.c:178
+msgid "Pick up"
+msgstr ""
+
+#: ../sflphone-client-kde/src/sflphone_const.h:48
+#: ../sflphone-client-gnome/src/toolbar.c:196
+#: ../sflphone-client-gnome/src/toolbar.c:198
+msgid "Hold off"
+msgstr ""
+
+#: ../sflphone-client-kde/src/sflphone_const.h:49
+msgid "Give up transfer"
+msgstr ""
+
+#: ../sflphone-client-kde/src/sflphone_const.h:50
+msgid "Call back"
+msgstr ""
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:48
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:91
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
+#: ../sflphone-client-gnome/src/config/configwindow.c:722
+#: ../sflphone-client-gnome/src/config/configwindow.c:791
+msgctxt "Config section"
+msgid "General"
+msgstr ""
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:49
+msgctxt "Config section"
+msgid "Display"
+msgstr ""
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:50
+#: ../sflphone-client-gnome/src/config/configwindow.c:833
+msgctxt "Config section"
+msgid "Accounts"
+msgstr ""
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:51
+#: ../sflphone-client-gnome/src/config/configwindow.c:786
+msgctxt "Config section"
+msgid "Audio"
+msgstr ""
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:52
+#: ../sflphone-client-gnome/src/config/configwindow.c:801
+msgctxt "Config section"
+msgid "Address Book"
+msgstr ""
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:53
+#: ../sflphone-client-gnome/src/config/configwindow.c:796
+msgctxt "Config section"
+msgid "Recordings"
+msgstr ""
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:54
+#: ../sflphone-client-gnome/src/config/configwindow.c:806
+msgctxt "Config section"
+msgid "Hooks"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:328
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows. Enable/disable them by checking/unchecking "
+"them on the left of the item. Add or remove some with \"Plus\" and \"Sub\" "
+"buttons. Edit the selected account with the form on the right."
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:332
+msgid "Remove the selected account"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:335
+msgid ""
+"This button will remove the selected account in the list below. Be sure you "
+"really don't need it anymore. If you think you might use it again later, "
+"just uncheck it."
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:340
+msgid "Remove"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:342
+msgid "Add a new account"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:345
+msgid ""
+"This button enables you to initialize a new account. You will then be able "
+"to edit it using the form on the right."
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:347
+msgid "Add"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:349
+msgid "Get this account down"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:352
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:359
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows."
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:354
+msgid "Down"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:356
+msgid "Get this account up"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:361
+msgid "Up"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:362
+msgid "Apply"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:367
+msgid "SIP"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:368
+msgid "IAX"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:373
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:385
+#: ../sflphone-client-gnome/src/toolbar.c:52
+#: ../sflphone-client-gnome/src/toolbar.c:251
+#: ../sflphone-client-gnome/src/toolbar.c:255
+msgid "Voicemail"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:374
+#: ../sflphone-client-gnome/src/config/configwindow.c:425
+msgid "Status"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:377
+#: ../sflphone-client-gnome/src/config/configwindow.c:528
+msgid "Stun parameters will be applied on each SIP account created."
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:378
+msgid "Enable Stun"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:380
+#: ../sflphone-client-gnome/src/config/configwindow.c:544
+msgid "Format : name.server:port"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:382
+msgid "choose Stun server (example : stunserver.org)"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:154
+msgid "Enable address book"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:155
+msgid "Maximum results"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:156
+msgid "Display photo if available"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:157
+msgid "Display phone numbers of these types :"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:158
+msgid "Work"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:159
+msgid "Mobile"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:160
+msgid "Home"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:225
+msgid "Sound manager"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:228
+msgid "ALSA"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:229
+msgid "PulseAudio"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:231
+msgid "Enable ringtones"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:232
+#: ../sflphone-client-gnome/src/config/audioconf.c:812
+msgid "Codecs"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:233
+#: ../sflphone-client-gnome/src/config/audioconf.c:795
+msgid "ALSA settings"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:234
+#: ../sflphone-client-gnome/src/config/audioconf.c:662
+msgid "ALSA plugin"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:235
+#: ../sflphone-client-gnome/src/config/audioconf.c:706
+msgid "Input"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:236
+#: ../sflphone-client-gnome/src/config/audioconf.c:684
+msgid "Output"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:237
+msgid "PulseAudio settings"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:238
+msgid "Mute other applications during a call"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:121
+msgid "Enable notifications"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:122
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:126
+msgid "On incoming calls"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:123
+msgid "On messages"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:124
+msgid "Show main window"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:125
+msgid "On start"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:166
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "Keep my history for at least"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:167
+#: ../sflphone-client-gnome/src/config/configwindow.c:643
+msgctxt "End of 'Keep my history for at least n days.'"
+msgid "days"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:168
+msgid "Clear history"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:169
+msgid "Connection"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:170
+#: ../sflphone-client-gnome/src/config/configwindow.c:664
+msgid "SIP Port"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:180
+#: ../sflphone-client-gnome/src/config/hooks-config.c:130
+msgid "URL Argument"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:181
+#: ../sflphone-client-gnome/src/config/hooks-config.c:135
+msgid "Custom commands on incoming calls with URL"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:182
+msgid "Trigger on specific SIP header"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:183
+msgid "Trigger on IAX2 URL"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:184
+msgid "Command to run"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:185
+#: ../sflphone-client-gnome/src/config/hooks-config.c:138
+#, c-format
+msgid "%s will be replaced with the passed URL."
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:186
+#: ../sflphone-client-gnome/src/config/hooks-config.c:165
+msgid "Phone number rewriting"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:187
+msgid "Prefix dialed numbers with"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:92
+#: ../sflphone-client-gnome/src/config/configwindow.c:726
+msgid "Destination folder"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:384
+#: ../sflphone-client-gnome/src/toolbar.c:232
+#: ../sflphone-client-gnome/src/toolbar.c:234
+msgid "History"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:386
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:388
+msgid "Configure SFLphone"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:390
+msgid "Display volume controls"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:391
+msgid "Display dialpad"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:396
+msgid "Attention:number of results exceeds max displayed."
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:398
+#: ../sflphone-client-gnome/src/sliders.c:163
+msgid "Mic volume"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:402
+#: ../sflphone-client-gnome/src/sliders.c:161
+msgid "Speakers volume"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/actions.c:54
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+#, c-format
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../sflphone-client-gnome/src/actions.c:234
+msgid ""
+"Unable to connect to the SFLphone server.\n"
+"Make sure the daemon is running."
+msgstr ""
+
+#: ../sflphone-client-gnome/src/actions.c:809
+#, c-format
+msgid "IP call - %s"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/actions.c:908
+#, 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-client-gnome/src/assistant.c:70
+msgid ""
+"You can at any time check your registration state or modify your accounts "
+"parameters in the Options/Accounts window."
+msgstr ""
+
+#: ../sflphone-client-gnome/src/assistant.c:190
+msgid "SFLphone account creation wizard"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/assistant.c:274
+#: ../sflphone-client-gnome/src/assistant.c:370
+#: ../sflphone-client-gnome/src/config/accountwindow.c:153
+msgid "_Alias"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/assistant.c:282
+#: ../sflphone-client-gnome/src/assistant.c:378
+#: ../sflphone-client-gnome/src/config/accountwindow.c:189
+msgid "_Host name"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/assistant.c:290
+#: ../sflphone-client-gnome/src/assistant.c:386
+#: ../sflphone-client-gnome/src/config/accountwindow.c:197
+msgid "_User name"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/assistant.c:306
+#: ../sflphone-client-gnome/src/assistant.c:401
+#: ../sflphone-client-gnome/src/config/accountwindow.c:212
+msgid "_Password"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/assistant.c:324
+#: ../sflphone-client-gnome/src/assistant.c:417
+#: ../sflphone-client-gnome/src/config/accountwindow.c:228
+msgid "_Voicemail number"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/assistant.c:347
+msgid "_Email address"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/assistant.c:444
+#: ../sflphone-client-gnome/src/config/configwindow.c:532
+msgid "E_nable STUN"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/assistant.c:451
+msgid "_STUN server"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Account Registration"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Congratulations!"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/errors.c:29
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening playback device"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/errors.c:32
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening capture device"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/errors.c:35
+msgid ""
+"Pulseaudio notification\n"
+"\n"
+"Pulseaudio is not running"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/mainwindow.c:70
+msgid "There is one call in progress."
+msgstr ""
+
+#: ../sflphone-client-gnome/src/mainwindow.c:74
+msgid "There are calls in progress."
+msgstr ""
+
+#: ../sflphone-client-gnome/src/mainwindow.c:83
+msgid "Do you still want to quit?"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/mainwindow.c:284
+msgid "SFLphone Error"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/menus.c:134
+msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr ""
+
+#: ../sflphone-client-gnome/src/menus.c:137
+msgid "About SFLphone"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/menus.c:161
+msgid "_Help"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/menus.c:296
+#: ../sflphone-client-gnome/src/menus.c:953
+msgid "_New call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/menus.c:308
+#: ../sflphone-client-gnome/src/menus.c:785
+msgid "_Pick up"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/menus.c:318
+#: ../sflphone-client-gnome/src/menus.c:797
+msgid "_Hang up"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/menus.c:328
+#: ../sflphone-client-gnome/src/menus.c:809
+msgid "On _Hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/menus.c:340
+#: ../sflphone-client-gnome/src/menus.c:821
+msgid "_Record"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/menus.c:354
+msgid "_Account creation wizard"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/menus.c:384
+msgid "_Call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/menus.c:552
+msgid "Clear _history"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/menus.c:564
+msgid "_Accounts"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/menus.c:579
+msgid "_Edit"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/menus.c:631
+msgid "_Dialpad"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/menus.c:643
+msgid "_Volume controls"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/menus.c:661
+msgid "_View"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/menus.c:881
+msgid "_Call back"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/menus.c:1061
+msgid "Edit phone number"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/menus.c:1072
+msgid "Edit the phone number before making a call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/sflnotify.c:71
+#: ../sflphone-client-gnome/src/sflnotify.c:91
+#, c-format
+msgid "%s account : %s"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/sflnotify.c:75
+#, c-format
+msgid "<i>From</i> %s"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/sflnotify.c:111
+#, c-format
+msgid "Calling with %s account <i>%s</i>"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/sflnotify.c:115
+msgid "Current account"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/sflnotify.c:130
+msgid "You have no accounts set up"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/sflnotify.c:131
+#: ../sflphone-client-gnome/src/sflnotify.c:148
+msgid "Error"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/sflnotify.c:147
+msgid "You have no registered accounts"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/statusicon.c:91
+msgid "_Show main window"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/statusicon.c:127
+#, c-format
+msgid "%i account configured"
+msgid_plural "%i accounts configured"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:113
+msgid "Account settings"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:147
+msgid "_Enable this account"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:161
+msgid "_Protocol"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:179
+msgid "Unknown"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:312
+msgid "_Use Evolution address books"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:319
+msgid "Download limit :"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:327
+msgid "cards"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:333
+msgid "_Display contact photo if available"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:341
+msgid "Fields from Evolution's address books"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:345
+msgid "_Work"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:351
+msgid "_Home"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:357
+msgid "_Mobile"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:364
+msgid "Address Books"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:368
+msgid "Select which Evolution address books to use"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:404
+#: ../sflphone-client-gnome/src/config/audioconf.c:576
+msgid "Name"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:741
+msgid "_Voice Activity Detection"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:751
+msgid "_Noise Reduction (Narrow-Band Companding)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:780
+msgid "Sound Manager"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:783
+msgid "_Pulseaudio"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:788
+msgid "_ALSA"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:835
+msgid "Ringtones"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:841
+msgid "_Enable ringtones"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:847
+msgid "Choose a ringtone"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
+msgid "Audio Files"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:589
+msgid "Desktop Notifications"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:593
+msgid "_Enable notifications"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:599
+msgid "Enable voicemail _notifications"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:611
+msgid "System Tray Icon"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:614
+msgid "_Popup main window on incoming call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:619
+msgid "Ne_ver popup main window"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:623
+msgid "Hide SFLphone window on _startup"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:629
+msgid "Calls History"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:632
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "_Keep my history for at least"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:647
+msgid "PulseAudio sound server"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:650
+msgid "_Mute other applications during a call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:677
+msgid "Port"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:732
+msgid "Select a folder"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:766
+msgid "Preferences"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:845
+msgid "Configured Accounts"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:141
+msgid "Trigger on specific _SIP header"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:150
+msgid "Trigger on _IAX2 URL"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:155
+msgid "Command to _run"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:169
+msgid "_Prefix dialed numbers with"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+msgid "Search all"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:57
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:70
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:82
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:94
+msgid "Click here to change the search type"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+msgid "Search by missed call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+msgid "Search by incoming call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+msgid "Search by outgoing call"
+msgstr ""
diff --git a/lang/update.sh b/lang/update.sh
new file mode 100755
index 0000000000000000000000000000000000000000..2903b9fba1763acb871aa95da9b96763f111dd4d
--- /dev/null
+++ b/lang/update.sh
@@ -0,0 +1,13 @@
+xgettext --from-code=utf-8 --language=C --language=C++ --kde \
+     -k_  -kc_:1c,2  -kn_:1,2    -ktr2i18n -ktr2i18n:2c,1 -kki18nc:1c,2 -kki18n -ki18n -ki18nc:1c,2 \
+     -o sflphone.pot \
+     ../sflphone-client-kde/src/*.cpp        ../sflphone-client-kde/src/*.h \
+     ../sflphone-client-kde/src/conf/*.h     ../sflphone-client-kde/src/conf/*.cpp \
+     ../sflphone-client-kde/build/src/*.h    ../sflphone-client-kde/build/src/*.cpp \
+     ../sflphone-client-gnome/src/*.c        ../sflphone-client-gnome/src/config/*.c \
+     ../sflphone-client-gnome/src/dbus/*.c   ../sflphone-client-gnome/src/contacts/*.c
+
+for fichier in `find  .  -name *.po `
+do
+msgmerge --update $fichier sflphone.pot
+done
\ No newline at end of file
diff --git a/lang/zh_CN/sflphone.po b/lang/zh_CN/sflphone.po
new file mode 100644
index 0000000000000000000000000000000000000000..08c96f7a7251ef4bc815abeaecd578cde3645edc
--- /dev/null
+++ b/lang/zh_CN/sflphone.po
@@ -0,0 +1,1522 @@
+# Chinese translation of SFLphone.
+# Copyright (C) 2008 The Free Software Foundation, Inc.
+# This file is distributed under the GNU General Public License Version 3.
+# 
+# Yun Liu <yun.liu@savoirfairelinux.com>, 2008.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: SFLphone 0.9.2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-07-17 16:14-0400\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"
+"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"
+
+#: ../sflphone-client-kde/src/Account.cpp:34
+#: ../sflphone-client-gnome/src/accountlist.c:175
+msgctxt "account state"
+msgid "Registered"
+msgstr "已注册"
+
+#: ../sflphone-client-kde/src/Account.cpp:36
+#: ../sflphone-client-gnome/src/accountlist.c:178
+msgctxt "account state"
+msgid "Not Registered"
+msgstr "未注册"
+
+#: ../sflphone-client-kde/src/Account.cpp:38
+#: ../sflphone-client-gnome/src/accountlist.c:181
+msgctxt "account state"
+msgid "Trying..."
+msgstr "正在连接..."
+
+#: ../sflphone-client-kde/src/Account.cpp:40
+#: ../sflphone-client-gnome/src/accountlist.c:184
+msgctxt "account state"
+msgid "Error"
+msgstr "注册失败"
+
+#: ../sflphone-client-kde/src/Account.cpp:42
+#: ../sflphone-client-gnome/src/accountlist.c:187
+msgctxt "account state"
+msgid "Authentication Failed"
+msgstr "认证错误"
+
+#: ../sflphone-client-kde/src/Account.cpp:44
+#: ../sflphone-client-gnome/src/accountlist.c:190
+msgctxt "account state"
+msgid "Network unreachable"
+msgstr "网络连接失败"
+
+#: ../sflphone-client-kde/src/Account.cpp:46
+#: ../sflphone-client-gnome/src/accountlist.c:193
+msgctxt "account state"
+msgid "Host unreachable"
+msgstr "服务器连接失败"
+
+#: ../sflphone-client-kde/src/Account.cpp:48
+#: ../sflphone-client-gnome/src/accountlist.c:196
+msgctxt "account state"
+msgid "Stun configuration error"
+msgstr "STUN配置有误"
+
+#: ../sflphone-client-kde/src/Account.cpp:50
+#: ../sflphone-client-gnome/src/accountlist.c:199
+msgctxt "account state"
+msgid "Stun server invalid"
+msgstr "STUN服务器无效"
+
+#: ../sflphone-client-kde/src/Account.cpp:51
+#: ../sflphone-client-gnome/src/accountlist.c:202
+msgctxt "account state"
+msgid "Invalid"
+msgstr "无效"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:163
+#: ../sflphone-client-kde/src/AccountWizard.cpp:278
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:393
+msgid "Account creation wizard"
+msgstr "帐户创建向导"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:199
+#: ../sflphone-client-kde/src/AccountWizard.cpp:217
+#: ../sflphone-client-kde/src/AccountWizard.cpp:561
+#: ../sflphone-client-gnome/src/assistant.c:68
+#, c-format
+msgid "This assistant is now finished."
+msgstr "配置完成."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:211
+msgid "Creation of account has failed for the reason"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:255
+#: ../sflphone-client-kde/src/AccountWizard.cpp:440
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:363
+#: ../sflphone-client-gnome/src/assistant.c:72
+msgid "Alias"
+msgstr "别名"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:256
+#: ../sflphone-client-kde/src/AccountWizard.cpp:441
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:370
+#: ../sflphone-client-gnome/src/assistant.c:75
+msgid "Server"
+msgstr "服务器"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:257
+#: ../sflphone-client-kde/src/AccountWizard.cpp:442
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:371
+#: ../sflphone-client-gnome/src/assistant.c:78
+msgid "Username"
+msgstr "用户名"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:258
+#: ../sflphone-client-kde/src/AccountWizard.cpp:443
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:372
+msgid "Password"
+msgstr "密码"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:259
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:364
+#: ../sflphone-client-gnome/src/config/configwindow.c:418
+msgid "Protocol"
+msgstr "协议"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:260
+#: ../sflphone-client-kde/src/AccountWizard.cpp:444
+msgid "Voicemail number"
+msgstr "语音信箱号码"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:279
+#: ../sflphone-client-gnome/src/assistant.c:216
+msgid "Welcome to the Account creation wizard of SFLphone!"
+msgstr "欢迎使用SFLphone帐户创建向导!"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:281
+#: ../sflphone-client-gnome/src/assistant.c:217
+msgid "This installation wizard will help you configure an account."
+msgstr "安装向导将帮助您配置帐户"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:309
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Account"
+msgstr "帐户"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:310
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Please select one of the following options"
+msgstr "请选择以下选项中的一个"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:312
+#: ../sflphone-client-gnome/src/assistant.c:251
+msgid "Create a free SIP/IAX2 account on sflphone.org"
+msgstr "在sflphone.org上创建免费的SIP/IAX2帐户"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:313
+#: ../sflphone-client-gnome/src/assistant.c:253
+msgid "Register an existing SIP or IAX2 account"
+msgstr "注册已存在的SIP或IAX2帐户"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:352
+#: ../sflphone-client-gnome/src/assistant.c:231
+msgid "VoIP Protocols"
+msgstr "VoIP协议"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:353
+#: ../sflphone-client-gnome/src/assistant.c:231
+msgid "Select an account type"
+msgstr "选择帐户类型"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:355
+#: ../sflphone-client-gnome/src/assistant.c:233
+msgid "SIP (Session Initiation Protocol)"
+msgstr "SIP(会话初始化协议)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:356
+#: ../sflphone-client-gnome/src/assistant.c:235
+msgid "IAX2 (InterAsterix Exchange)"
+msgstr "IAX2(Asterisk内部交换协议)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:395
+#: ../sflphone-client-gnome/src/assistant.c:339
+msgid "Optional email address"
+msgstr "可选邮件地址"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:396
+#: ../sflphone-client-gnome/src/assistant.c:339
+msgid "This email address will be used to send your voicemail messages."
+msgstr "这个邮件地址将被用来发送您的语音邮箱消息"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:398
+msgid "Email address"
+msgstr "邮件地址"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:432
+#: ../sflphone-client-gnome/src/assistant.c:266
+msgid "SIP account settings"
+msgstr "SIP帐户设置"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:436
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "IAX2 account settings"
+msgstr "IAX2帐户设置"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:438
+#: ../sflphone-client-gnome/src/assistant.c:266
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "Please fill the following information"
+msgstr "请填写以下信息"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:523
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:856
+msgid "Network Address Translation (NAT)"
+msgstr "网络地址解析(NAT)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:524
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:536
+msgid "You should probably enable this if you are behind a firewall."
+msgstr "如果你使用网络使用防火墙，你很有可能需要设定此项."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:526
+msgid "Enable STUN"
+msgstr "使用STUN"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:527
+msgid "Stun Server"
+msgstr "STUN服务器"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:562
+msgid ""
+"After checking the settings you chose, click \"Finish\" to create the "
+"account."
+msgstr "当您检查完选定的设置, 请点击\"结束\"来创建帐户"
+
+#: ../sflphone-client-kde/src/ActionSetAccountFirst.cpp:26
+msgid "Default account"
+msgstr "默认帐户"
+
+#: ../sflphone-client-kde/src/Call.cpp:116
+#: ../sflphone-client-gnome/src/contacts/calltree.c:322
+msgid "Transfer to : "
+msgstr "转给:"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:89
+#: ../sflphone-client-gnome/src/actions.c:816
+msgid "Codec"
+msgstr "编码"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:93
+#: ../sflphone-client-gnome/src/config/audioconf.c:581
+msgid "Frequency"
+msgstr "频率"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:97
+#: ../sflphone-client-gnome/src/config/audioconf.c:586
+msgid "Bitrate"
+msgstr "比率"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:101
+#: ../sflphone-client-gnome/src/config/audioconf.c:591
+msgid "Bandwidth"
+msgstr "带宽"
+
+#: ../sflphone-client-kde/src/main.cpp:38
+msgid "SFLphone KDE Client"
+msgstr "SFLphone KDE客户端"
+
+#: ../sflphone-client-kde/src/main.cpp:42
+msgid "(C) 2009 Savoir-faire Linux"
+msgstr "(C) 2009 Savoir-faire Linux"
+
+#: ../sflphone-client-kde/src/main.cpp:46
+msgid "Jérémy Quentin"
+msgstr "Jérémy Quentin"
+
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Yun Liu"
+
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "yunliu2000@gmail.com"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:62
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-gnome/src/statusicon.c:126
+msgid "SFLphone"
+msgstr "SFLphone"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:209
+msgid "Incoming call"
+msgstr "来电"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
+msgid "You have an incoming call from"
+msgstr "您有一个电话,来自于"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
+msgid "Click to accept or refuse it."
+msgstr "请点击接听或拒绝"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:716
+msgid "Address book loading..."
+msgstr "载入地址簿......"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:901
+#: ../sflphone-client-gnome/src/actions.c:89
+msgid "No registered accounts"
+msgstr "没有已注册帐户"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:905
+#: ../sflphone-client-gnome/src/actions.c:83
+#: ../sflphone-client-gnome/src/actions.c:813
+msgid "Using account"
+msgstr "使用账户"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
+msgid "Main screen"
+msgstr "主屏幕"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:165
+msgid "Call history"
+msgstr "呼叫记录"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:394
+#: ../sflphone-client-gnome/src/toolbar.c:243
+#: ../sflphone-client-gnome/src/toolbar.c:245
+msgid "Address book"
+msgstr "地址簿"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1108
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1173
+msgid "Edit before call"
+msgstr "呼叫前进行编辑"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:41
+#: ../sflphone-client-gnome/src/toolbar.c:167
+#: ../sflphone-client-gnome/src/toolbar.c:169
+msgid "New call"
+msgstr "新电话"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:42
+#: ../sflphone-client-kde/src/sflphone_const.h:47
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:381
+#: ../sflphone-client-gnome/src/toolbar.c:186
+#: ../sflphone-client-gnome/src/toolbar.c:188
+msgid "Hang up"
+msgstr "放电话"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:43
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:382
+#: ../sflphone-client-gnome/src/toolbar.c:207
+#: ../sflphone-client-gnome/src/toolbar.c:209
+msgid "Hold on"
+msgstr "呼叫保持"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:44
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:383
+#: ../sflphone-client-gnome/src/toolbar.c:220
+#: ../sflphone-client-gnome/src/toolbar.c:222
+msgid "Transfer"
+msgstr "转接"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:45
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:392
+#: ../sflphone-client-gnome/src/toolbar.c:263
+msgid "Record"
+msgstr "记录"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:46
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:380
+#: ../sflphone-client-gnome/src/toolbar.c:176
+#: ../sflphone-client-gnome/src/toolbar.c:178
+msgid "Pick up"
+msgstr "接电话"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:48
+#: ../sflphone-client-gnome/src/toolbar.c:196
+#: ../sflphone-client-gnome/src/toolbar.c:198
+msgid "Hold off"
+msgstr "恢复通话"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:49
+msgid "Give up transfer"
+msgstr "取消转接"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:50
+msgid "Call back"
+msgstr "回叫"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:48
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:91
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
+#: ../sflphone-client-gnome/src/config/configwindow.c:722
+#: ../sflphone-client-gnome/src/config/configwindow.c:791
+msgctxt "Config section"
+msgid "General"
+msgstr "常用配置"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:49
+msgctxt "Config section"
+msgid "Display"
+msgstr "显示"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:50
+#: ../sflphone-client-gnome/src/config/configwindow.c:833
+msgctxt "Config section"
+msgid "Accounts"
+msgstr "帐户"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:51
+#: ../sflphone-client-gnome/src/config/configwindow.c:786
+msgctxt "Config section"
+msgid "Audio"
+msgstr "音频"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:52
+#: ../sflphone-client-gnome/src/config/configwindow.c:801
+msgctxt "Config section"
+msgid "Address Book"
+msgstr "地址簿"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:53
+#: ../sflphone-client-gnome/src/config/configwindow.c:796
+msgctxt "Config section"
+msgid "Recordings"
+msgstr "记录"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:54
+#: ../sflphone-client-gnome/src/config/configwindow.c:806
+msgctxt "Config section"
+msgid "Hooks"
+msgstr "钩键"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:328
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows. Enable/disable them by checking/unchecking "
+"them on the left of the item. Add or remove some with \"Plus\" and \"Sub\" "
+"buttons. Edit the selected account with the form on the right."
+msgstr ""
+"在默认情况下，当你打电话时，sflphone会使用列表当中第一个已注册的帐户。使用箭"
+"头\"上\"和\"下\"可以改变账户的顺序。选择账户名称左边的方框可以启用帐户，取消"
+"选择则会禁用该账户。通过\"加\"\"减\"按钮可以添加或删除账户。点击\"编辑\"按钮"
+"可以改变账户的设置。"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:332
+msgid "Remove the selected account"
+msgstr "删除所选账户"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:335
+msgid ""
+"This button will remove the selected account in the list below. Be sure you "
+"really don't need it anymore. If you think you might use it again later, "
+"just uncheck it."
+msgstr ""
+"该按钮会删除列表中被选定的账户。请确认你的操作。如果你希望继续使用某个账户，"
+"请取消对该账户的选择"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:340
+msgid "Remove"
+msgstr "删除"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:342
+msgid "Add a new account"
+msgstr "增加新帐户"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:345
+msgid ""
+"This button enables you to initialize a new account. You will then be able "
+"to edit it using the form on the right."
+msgstr ""
+"通过该按钮可以创建一个新账户。添加该账户之后你还可以通过编辑按钮来修改设置。"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:347
+msgid "Add"
+msgstr "添加"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:349
+msgid "Get this account down"
+msgstr "将该账户向下移动"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:352
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:359
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows."
+msgstr ""
+"在默认情况下，当你打电话时，sflphone会使用列表当中第一个已注册的帐户。使用箭"
+"头\"上\"和\"下\"可以改变账户的顺序。选择账户名称左边的方框可以启用帐户，取消"
+"选择则会禁用该账户。通过\"加\"\"减\"按钮可以添加或删除账户。"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:354
+msgid "Down"
+msgstr "下"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:356
+msgid "Get this account up"
+msgstr "把该账户向上移动"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:361
+msgid "Up"
+msgstr "上"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:362
+msgid "Apply"
+msgstr "应用"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:367
+msgid "SIP"
+msgstr "SIP"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:368
+msgid "IAX"
+msgstr "IAX"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:373
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:385
+#: ../sflphone-client-gnome/src/toolbar.c:52
+#: ../sflphone-client-gnome/src/toolbar.c:251
+#: ../sflphone-client-gnome/src/toolbar.c:255
+msgid "Voicemail"
+msgstr "语音信箱"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:374
+#: ../sflphone-client-gnome/src/config/configwindow.c:425
+msgid "Status"
+msgstr "状态"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:377
+#: ../sflphone-client-gnome/src/config/configwindow.c:528
+msgid "Stun parameters will be applied on each SIP account created."
+msgstr "STUN参数将应用于每一个注册的SIP帐户"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:378
+msgid "Enable Stun"
+msgstr "使用STUN"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:380
+#: ../sflphone-client-gnome/src/config/configwindow.c:544
+msgid "Format : name.server:port"
+msgstr "格式：名称.服务器:端口"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:382
+msgid "choose Stun server (example : stunserver.org)"
+msgstr "选择STUN服务器(例如:stunserver.org)"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:154
+msgid "Enable address book"
+msgstr "启用地址簿"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:155
+msgid "Maximum results"
+msgstr "结果最大值"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:156
+msgid "Display photo if available"
+msgstr "如果可行则显示联系人照片"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:157
+msgid "Display phone numbers of these types :"
+msgstr "显示这些格式的电话号码"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:158
+msgid "Work"
+msgstr "单位电话"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:159
+msgid "Mobile"
+msgstr "移动电话"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:160
+msgid "Home"
+msgstr "家庭电话"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:225
+msgid "Sound manager"
+msgstr "声音管理器"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:228
+msgid "ALSA"
+msgstr "ALSA"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:229
+msgid "PulseAudio"
+msgstr "PulseAudio"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:231
+msgid "Enable ringtones"
+msgstr "启用铃声"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:232
+#: ../sflphone-client-gnome/src/config/audioconf.c:812
+msgid "Codecs"
+msgstr "Codecs编码"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:233
+#: ../sflphone-client-gnome/src/config/audioconf.c:795
+msgid "ALSA settings"
+msgstr "ALSA设置"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:234
+#: ../sflphone-client-gnome/src/config/audioconf.c:662
+msgid "ALSA plugin"
+msgstr "ALSA插件"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:235
+#: ../sflphone-client-gnome/src/config/audioconf.c:706
+msgid "Input"
+msgstr "输入"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:236
+#: ../sflphone-client-gnome/src/config/audioconf.c:684
+msgid "Output"
+msgstr "输出"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:237
+msgid "PulseAudio settings"
+msgstr "PulseAudio设置"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:238
+msgid "Mute other applications during a call"
+msgstr "当有来电时静音其它应用程序"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:121
+msgid "Enable notifications"
+msgstr "启用提示"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:122
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:126
+msgid "On incoming calls"
+msgstr "有新来电"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:123
+msgid "On messages"
+msgstr "有新消息"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:124
+msgid "Show main window"
+msgstr "显示主窗口"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:125
+msgid "On start"
+msgstr "正在启动"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:166
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "Keep my history for at least"
+msgstr "保存呼叫记录至少"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:167
+#: ../sflphone-client-gnome/src/config/configwindow.c:643
+msgctxt "End of 'Keep my history for at least n days.'"
+msgid "days"
+msgstr "天"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:168
+msgid "Clear history"
+msgstr "清空历史记录"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:169
+msgid "Connection"
+msgstr "连接"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:170
+#: ../sflphone-client-gnome/src/config/configwindow.c:664
+msgid "SIP Port"
+msgstr "SIP端口号"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:180
+#: ../sflphone-client-gnome/src/config/hooks-config.c:130
+msgid "URL Argument"
+msgstr "URL参数"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:181
+#: ../sflphone-client-gnome/src/config/hooks-config.c:135
+msgid "Custom commands on incoming calls with URL"
+msgstr "定制对带有URL的来电的处理"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:182
+msgid "Trigger on specific SIP header"
+msgstr "激活指定的SIP头"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:183
+msgid "Trigger on IAX2 URL"
+msgstr "激活IAX2 URL"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:184
+msgid "Command to run"
+msgstr "要运行的命令"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:185
+#: ../sflphone-client-gnome/src/config/hooks-config.c:138
+#, c-format
+msgid "%s will be replaced with the passed URL."
+msgstr "传输的URL会被替换成%s."
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:186
+#: ../sflphone-client-gnome/src/config/hooks-config.c:165
+msgid "Phone number rewriting"
+msgstr "重设电话号码"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:187
+msgid "Prefix dialed numbers with"
+msgstr "号码前缀"
+
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:92
+#: ../sflphone-client-gnome/src/config/configwindow.c:726
+msgid "Destination folder"
+msgstr "目标文件夹"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:384
+#: ../sflphone-client-gnome/src/toolbar.c:232
+#: ../sflphone-client-gnome/src/toolbar.c:234
+msgid "History"
+msgstr "历史"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:386
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:388
+msgid "Configure SFLphone"
+msgstr "配置SFLphone"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:390
+msgid "Display volume controls"
+msgstr "显示音量控制"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:391
+msgid "Display dialpad"
+msgstr "显示拨号键盘"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:396
+msgid "Attention:number of results exceeds max displayed."
+msgstr "注意:结果超过可显示的最大值"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:398
+#: ../sflphone-client-gnome/src/sliders.c:163
+msgid "Mic volume"
+msgstr "话筒音量"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:402
+#: ../sflphone-client-gnome/src/sliders.c:161
+msgid "Speakers volume"
+msgstr "扬声器音量"
+
+#: ../sflphone-client-gnome/src/actions.c:54
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] "%d 个语音信息"
+msgstr[1] "%d 个语音信息"
+
+#: ../sflphone-client-gnome/src/actions.c:234
+msgid ""
+"Unable to connect to the SFLphone server.\n"
+"Make sure the daemon is running."
+msgstr ""
+"连接SFLphone服务器失败.\n"
+"请检查daemon是否还在运行."
+
+#: ../sflphone-client-gnome/src/actions.c:809
+#, c-format
+msgid "IP call - %s"
+msgstr "IP 电话 - %s"
+
+#: ../sflphone-client-gnome/src/actions.c:908
+#, 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>错误：无法找到codecs编码文件.\n"
+"\n"
+"</b> SFL声音codecs文件应位于<i>%s</i> 或 位于主目录( <i>%s</i> )的<b>."
+"sflphone</b>目录下"
+
+#: ../sflphone-client-gnome/src/assistant.c:70
+msgid ""
+"You can at any time check your registration state or modify your accounts "
+"parameters in the Options/Accounts window."
+msgstr "你可以随时在 选项/帐户 窗口中查看注册状态或者修改帐户参数."
+
+#: ../sflphone-client-gnome/src/assistant.c:190
+msgid "SFLphone account creation wizard"
+msgstr "SFLphone账户创建向导"
+
+#: ../sflphone-client-gnome/src/assistant.c:274
+#: ../sflphone-client-gnome/src/assistant.c:370
+#: ../sflphone-client-gnome/src/config/accountwindow.c:153
+msgid "_Alias"
+msgstr "别名(A)"
+
+#: ../sflphone-client-gnome/src/assistant.c:282
+#: ../sflphone-client-gnome/src/assistant.c:378
+#: ../sflphone-client-gnome/src/config/accountwindow.c:189
+msgid "_Host name"
+msgstr "主机名(H)"
+
+#: ../sflphone-client-gnome/src/assistant.c:290
+#: ../sflphone-client-gnome/src/assistant.c:386
+#: ../sflphone-client-gnome/src/config/accountwindow.c:197
+msgid "_User name"
+msgstr "用户名(U)"
+
+#: ../sflphone-client-gnome/src/assistant.c:306
+#: ../sflphone-client-gnome/src/assistant.c:401
+#: ../sflphone-client-gnome/src/config/accountwindow.c:212
+msgid "_Password"
+msgstr "密码(P)"
+
+#: ../sflphone-client-gnome/src/assistant.c:324
+#: ../sflphone-client-gnome/src/assistant.c:417
+#: ../sflphone-client-gnome/src/config/accountwindow.c:228
+msgid "_Voicemail number"
+msgstr "语音信箱号码(V)"
+
+#: ../sflphone-client-gnome/src/assistant.c:347
+msgid "_Email address"
+msgstr "邮件地址(E)"
+
+#: ../sflphone-client-gnome/src/assistant.c:444
+#: ../sflphone-client-gnome/src/config/configwindow.c:532
+msgid "E_nable STUN"
+msgstr "使用STUN(n)"
+
+#: ../sflphone-client-gnome/src/assistant.c:451
+msgid "_STUN server"
+msgstr "STUN服务器(S)"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Account Registration"
+msgstr "帐户注册"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Congratulations!"
+msgstr "恭喜！"
+
+#: ../sflphone-client-gnome/src/errors.c:29
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening playback device"
+msgstr ""
+"ALSA提示\n"
+"\n"
+"打开回放设备时出错"
+
+#: ../sflphone-client-gnome/src/errors.c:32
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening capture device"
+msgstr ""
+"ALSA提示\n"
+"\n"
+"打开采集设备时出错"
+
+#: ../sflphone-client-gnome/src/errors.c:35
+msgid ""
+"Pulseaudio notification\n"
+"\n"
+"Pulseaudio is not running"
+msgstr ""
+"Pulseaudio提示\n"
+"\n"
+"Pulseaudio未运行"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:70
+msgid "There is one call in progress."
+msgstr "有一个电话正在处理"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:74
+msgid "There are calls in progress."
+msgstr "有电话正在处理中"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:83
+msgid "Do you still want to quit?"
+msgstr "确认要退出?"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:284
+msgid "SFLphone Error"
+msgstr "SFLphone出错"
+
+#: ../sflphone-client-gnome/src/menus.c:134
+msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr "SFLphone是一个VoIP客户端，它兼容SIP和IAX2协议."
+
+#: ../sflphone-client-gnome/src/menus.c:137
+msgid "About SFLphone"
+msgstr "关于SFLphone"
+
+#: ../sflphone-client-gnome/src/menus.c:161
+msgid "_Help"
+msgstr "帮助(H)"
+
+#: ../sflphone-client-gnome/src/menus.c:296
+#: ../sflphone-client-gnome/src/menus.c:953
+msgid "_New call"
+msgstr "新电话(N)"
+
+#: ../sflphone-client-gnome/src/menus.c:308
+#: ../sflphone-client-gnome/src/menus.c:785
+msgid "_Pick up"
+msgstr "拨出(P)"
+
+#: ../sflphone-client-gnome/src/menus.c:318
+#: ../sflphone-client-gnome/src/menus.c:797
+msgid "_Hang up"
+msgstr "放下(H)"
+
+#: ../sflphone-client-gnome/src/menus.c:328
+#: ../sflphone-client-gnome/src/menus.c:809
+msgid "On _Hold"
+msgstr "保持(H)"
+
+#: ../sflphone-client-gnome/src/menus.c:340
+#: ../sflphone-client-gnome/src/menus.c:821
+msgid "_Record"
+msgstr "记录(R)"
+
+#: ../sflphone-client-gnome/src/menus.c:354
+msgid "_Account creation wizard"
+msgstr "帐户创建向导"
+
+#: ../sflphone-client-gnome/src/menus.c:384
+msgid "_Call"
+msgstr "电话"
+
+#: ../sflphone-client-gnome/src/menus.c:552
+msgid "Clear _history"
+msgstr "清空历史记录(C)"
+
+#: ../sflphone-client-gnome/src/menus.c:564
+msgid "_Accounts"
+msgstr "帐户(A)"
+
+#: ../sflphone-client-gnome/src/menus.c:579
+msgid "_Edit"
+msgstr "编辑(E)"
+
+#: ../sflphone-client-gnome/src/menus.c:631
+msgid "_Dialpad"
+msgstr "拨号面板"
+
+#: ../sflphone-client-gnome/src/menus.c:643
+msgid "_Volume controls"
+msgstr "音量控制(V)"
+
+#: ../sflphone-client-gnome/src/menus.c:661
+msgid "_View"
+msgstr "查看(V)"
+
+#: ../sflphone-client-gnome/src/menus.c:881
+msgid "_Call back"
+msgstr "回叫(C)"
+
+#: ../sflphone-client-gnome/src/menus.c:1061
+msgid "Edit phone number"
+msgstr "编辑电话号码"
+
+#: ../sflphone-client-gnome/src/menus.c:1072
+msgid "Edit the phone number before making a call"
+msgstr "拨出电话前编辑电话号码"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:71
+#: ../sflphone-client-gnome/src/sflnotify.c:91
+#, c-format
+msgid "%s account : %s"
+msgstr "%s 帐户: %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:75
+#, c-format
+msgid "<i>From</i> %s"
+msgstr "<i>拨入方</i> %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:111
+#, c-format
+msgid "Calling with %s account <i>%s</i>"
+msgstr "使用%s帐户<i>%s</i>呼叫"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:115
+msgid "Current account"
+msgstr "当前帐户"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:130
+msgid "You have no accounts set up"
+msgstr "你没有设置任何账户"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:131
+#: ../sflphone-client-gnome/src/sflnotify.c:148
+msgid "Error"
+msgstr "注册失败"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:147
+msgid "You have no registered accounts"
+msgstr "未发现已注册帐户"
+
+#: ../sflphone-client-gnome/src/statusicon.c:91
+msgid "_Show main window"
+msgstr "显示主窗口(S)"
+
+#: ../sflphone-client-gnome/src/statusicon.c:127
+#, c-format
+msgid "%i account configured"
+msgid_plural "%i accounts configured"
+msgstr[0] "已配置了%i个账户"
+msgstr[1] "已配置了%i个账户"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:113
+msgid "Account settings"
+msgstr "帐户设置"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:147
+msgid "_Enable this account"
+msgstr "启用该账户(E)"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:161
+msgid "_Protocol"
+msgstr "协议(P)"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:179
+msgid "Unknown"
+msgstr "未知"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:312
+msgid "_Use Evolution address books"
+msgstr "使用Evolution地址薄(U)"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:319
+msgid "Download limit :"
+msgstr "下载上限:"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:327
+msgid "cards"
+msgstr "卡"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:333
+msgid "_Display contact photo if available"
+msgstr "如果可行则显示联系人照片(D)"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:341
+msgid "Fields from Evolution's address books"
+msgstr "使用Evolution地址薄中的如下字段:"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:345
+msgid "_Work"
+msgstr "单位电话(W)"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:351
+msgid "_Home"
+msgstr "家庭电话(H)"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:357
+msgid "_Mobile"
+msgstr "移动电话(M)"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:364
+msgid "Address Books"
+msgstr "地址簿"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:368
+msgid "Select which Evolution address books to use"
+msgstr "选择使用如下Evolution地址薄"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:404
+#: ../sflphone-client-gnome/src/config/audioconf.c:576
+msgid "Name"
+msgstr "名称"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:741
+msgid "_Voice Activity Detection"
+msgstr "声音状态检测(V)"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:751
+msgid "_Noise Reduction (Narrow-Band Companding)"
+msgstr "降噪处理-窄频压缩(N)"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:780
+msgid "Sound Manager"
+msgstr "音频管理器"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:783
+msgid "_Pulseaudio"
+msgstr "Pulseaudio"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:788
+msgid "_ALSA"
+msgstr "ALSA"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:835
+msgid "Ringtones"
+msgstr "铃声"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:841
+msgid "_Enable ringtones"
+msgstr "启用铃声(E)"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:847
+msgid "Choose a ringtone"
+msgstr "选择铃声"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
+msgid "Audio Files"
+msgstr "音频文件"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:589
+msgid "Desktop Notifications"
+msgstr "桌面提示"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:593
+msgid "_Enable notifications"
+msgstr "启用提示(E)"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:599
+msgid "Enable voicemail _notifications"
+msgstr "启用语音邮箱提示(n)"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:611
+msgid "System Tray Icon"
+msgstr "系统托盘图标"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:614
+msgid "_Popup main window on incoming call"
+msgstr "来电时弹出主窗口(P)"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:619
+msgid "Ne_ver popup main window"
+msgstr "从不弹出主窗口(v)"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:623
+msgid "Hide SFLphone window on _startup"
+msgstr "在启动时隐藏SFLphone主窗口"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:629
+msgid "Calls History"
+msgstr "拨号历史"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:632
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "_Keep my history for at least"
+msgstr "保留历史记录至少(K)"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:647
+msgid "PulseAudio sound server"
+msgstr "PulseAudio服务器"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:650
+msgid "_Mute other applications during a call"
+msgstr "当有来电时静音其它应用程序(c)"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:677
+msgid "Port"
+msgstr "端口"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:732
+msgid "Select a folder"
+msgstr "选择文件夹"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:766
+msgid "Preferences"
+msgstr "属性"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:845
+msgid "Configured Accounts"
+msgstr "已配置帐户"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:141
+msgid "Trigger on specific _SIP header"
+msgstr "激活指定的SIP头(S)"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:150
+msgid "Trigger on _IAX2 URL"
+msgstr "激活IAX2 URL(I)"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:155
+msgid "Command to _run"
+msgstr "运行命令(r)"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:169
+msgid "_Prefix dialed numbers with"
+msgstr "号码前缀(P)"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+msgid "Search all"
+msgstr "查询所有"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:57
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:70
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:82
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:94
+msgid "Click here to change the search type"
+msgstr "请点击此处改变查询方式"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+msgid "Search by missed call"
+msgstr "从未接电话中查询"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+msgid "Search by incoming call"
+msgstr "从来电中查询"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+msgid "Search by outgoing call"
+msgstr "从拨出电话中查询"
+
+#~ msgid "User"
+#~ msgstr "用户名"
+
+#~ msgid "Mailbox"
+#~ msgstr "语音邮件"
+
+#~ msgctxt "Action record a call"
+#~ msgid "Record"
+#~ msgstr "记录"
+
+#~ msgid "%s - %s"
+#~ msgstr "%s - %s"
+
+#~ msgid "Registered"
+#~ msgstr "已注册"
+
+#~ msgid "Not Registered"
+#~ msgstr "未注册"
+
+#~ msgid "Trying..."
+#~ msgstr "正在连接..."
+
+#~ msgid "Bad authentification"
+#~ msgstr "认证错误"
+
+#~ msgid "Network unreachable"
+#~ msgstr "网络连接失败"
+
+#~ msgid "Host unreachable"
+#~ msgstr "服务器连接失败"
+
+#~ msgid "Stun configuration error"
+#~ msgstr "Stun配置有误"
+
+#~ msgid "Stun server invalid"
+#~ msgstr "Stun服务器无效"
+
+#~ msgid "Invalid"
+#~ msgstr "无效"
+
+#~ msgid "%d voice mails"
+#~ msgstr "%d 个语音信息"
+
+#~ msgid "No registered account"
+#~ msgstr "未发现已注册帐户"
+
+#~ msgid ""
+#~ "This assistant is now finished.\n"
+#~ "You can at any time check your registration state or modify your accounts "
+#~ "parameters in the Options/Accounts window.\n"
+#~ "\n"
+#~ "Alias :    %s\n"
+#~ "Server :   %s\n"
+#~ "Username : %s\n"
+#~ msgstr ""
+#~ "配置完成.\n"
+#~ "你可以随时在 选项/帐户 窗口中查看注册状态或者修改帐户参数.\n"
+#~ "\n"
+#~ "别名:     %s\n"
+#~ "服务器:   %s\n"
+#~ "用户名:   %s\n"
+
+#~ msgid "SFLphone account configuration wizard"
+#~ msgstr "SFLphone 帐户设置向导"
+
+#~ msgid "Welcome to SFLphone!"
+#~ msgstr "欢迎使用SFLphone!"
+
+#~ msgid "Select an account type:"
+#~ msgstr "选择帐户类型:"
+
+#~ msgid "Please select one of the following option:"
+#~ msgstr "请选择以下选项中的一个:"
+
+#~ msgid "SIP account configuration"
+#~ msgstr "SIP帐户配置"
+
+#~ msgid "Please fill the following information:"
+#~ msgstr "请填写以下信息:"
+
+#~ msgid "Optional Email Address "
+#~ msgstr "可选邮件地址 "
+
+#~ msgid "This email address will be use to send your voicemail messages"
+#~ msgstr "这个邮件地址将被用来发送您的语音邮箱消息"
+
+#~ msgid "_Email"
+#~ msgstr " 邮件(E)"
+
+#~ msgid "IAX2 account configuration"
+#~ msgstr "IAX2帐户配置"
+
+#~ msgid "Network Address Translation"
+#~ msgstr "网络地址解析"
+
+#~ msgid "Edit phone"
+#~ msgstr "编辑电话"
+
+#~ msgid "%s account: %s"
+#~ msgstr "%s 帐户: %s"
+
+#~ msgid "<i>From:</i> %s"
+#~ msgstr "<i>拨入方：</i> %s"
+
+#~ msgid "You haven't setup any accounts"
+#~ msgstr "你没有设置任何帐户"
+
+#~ msgid "SFLphone - %i accounts configured"
+#~ msgstr "SFLphone - %i 个帐户已配置"
+
+#~ msgid "\"Voicemail\" <%s>"
+#~ msgstr "\"语音邮件\" <%s>"
+
+#~ msgid "Place a call"
+#~ msgstr "拨号"
+
+#~ msgid "Off Hold"
+#~ msgstr "恢复通话"
+
+#~ msgid "On Hold"
+#~ msgstr "待机"
+
+#~ msgid "Record a call"
+#~ msgstr "记录通话"
+
+#~ msgid "Account Parameters"
+#~ msgstr "帐户相关参数"
+
+#~ msgid "General"
+#~ msgstr "常用配置"
+
+#~ msgid "Download limit:"
+#~ msgstr "下载上限:"
+
+#~ msgid "_Business phone"
+#~ msgstr "商务电话(B)"
+
+#~ msgid "_Home phone"
+#~ msgstr "家庭电话(H)"
+
+#~ msgid "_Mobile phone"
+#~ msgstr "移动电话(M)"
+
+#~ msgid "Select which Evolution address books to use:"
+#~ msgstr "选择使用如下Evolution地址薄:"
+
+#~ msgid "audio device index for output = %d"
+#~ msgstr "音频设备输出索引 ＝ %d"
+
+#~ msgid "ALSA configuration"
+#~ msgstr "ALSA 配置"
+
+#~ msgid "Stun parameters will apply to each SIP account created."
+#~ msgstr "Stun参数将应用于每一个注册的SIP帐户"
+
+#~ msgid "Enable it if you are behind a firewall"
+#~ msgstr "当使用防火墙时,启用该项"
+
+#~ msgid "Format: name.server:port"
+#~ msgstr "格式：name.server:port"
+
+#~ msgid "Port:"
+#~ msgstr "端口:"
+
+#~ msgid "Recordings folder"
+#~ msgstr "记录文件夹(R)"
+
+#~ msgid "General Settings"
+#~ msgstr "常用配置"
+
+#~ msgid "Audio Settings"
+#~ msgstr "音频配置"
+
+#~ msgid "Recordings"
+#~ msgstr "记录"
+
+#~ msgid "Address Book"
+#~ msgstr "地址簿"
+
+#~ msgid "Hooks"
+#~ msgstr "钩键"
+
+#~ msgid "Accounts"
+#~ msgstr "帐户"
+
+#~ msgid "URL Passing"
+#~ msgstr "传输URL"
+
+
+#~ msgid "Phone Number Rewriting"
+#~ msgstr "重设电话号码"
+
+#~ msgid "_Prefix dialed numbers with:"
+#~ msgstr "号码前缀:"
+
+#~ msgid "Accept"
+#~ msgstr "接受"
+
+#~ msgid "Refuse"
+#~ msgstr "拒绝"
+
+#~ msgid "Ignore"
+#~ msgstr "忽略"
+
+#~ msgid "<small>Missed call</small>"
+#~ msgstr "<small>未接电话</small>"
+
+#~ msgid "<small>Duration:</small> %s"
+#~ msgstr "<small>时长:</small> %s"
+
+#~ msgid "Fields"
+#~ msgstr "字段"
+
+#~ msgid "_History size limit"
+#~ msgstr "历史记录上限(H)"
+
+#~ msgid ""
+#~ "SFLphone can run custom commands if incoming calls come with an URL "
+#~ "attached.\n"
+#~ "In this case, %s will be replaced with the passed URL."
+#~ msgstr ""
+#~ "当来电有附加的URL时,SFLphone可运行客户命令.\n"
+#~ "在此情况下,传输的URL会被替换成%s."
+
+#~ msgid "Search history"
+#~ msgstr "查找历史记录"
+
+#~ msgid "Search contact"
+#~ msgstr "查找联系人(S)"
+
+#~ msgid "Registered to %s (%s)"
+#~ msgstr "注册到 %s (%s)"
+
+#~ msgid "%s account- %s             %s"
+#~ msgstr "%s 帐户- %s             %s"
+
+#~ msgid "Books"
+#~ msgstr "钩键"
+
+#~ msgid "_Enable"
+#~ msgstr "启用(E)"
+
+#~ msgid "_Notify voice mails"
+#~ msgstr "通知语音邮件(N)"
+
+#~ msgid "_Start hidden"
+#~ msgstr "启动时隐藏(S)"
+
+#~ msgid "_Maximum number of calls"
+#~ msgstr "最大拨号数(M)"
+
+#~ msgid "_Control running applications volume"
+#~ msgstr "控制正在运行的应用程序的音量(C)"
+
+#~ msgid "Account previously setup"
+#~ msgstr "帐户以前设置"
+
+#~ msgid "URL argument"
+#~ msgstr "URL参数"
+
+#~ msgid "_SIP protocol"
+#~ msgstr "SIP 协议(S)"
+
+#~ msgid "_SIP Header: "
+#~ msgstr "SIP消息头(S):"
+
+#~ msgid "_IAX2 protocol"
+#~ msgstr "IAX2 协议(I)"
+
+#~ msgid "Search"
+#~ msgstr "查找"
+
+#~ msgid "_Enabled"
+#~ msgstr "启用(E)"
+
+#~ msgid "%s account- %s"
+#~ msgstr "%s 帐户- %s"
+
+#~ msgid "Noise reduction"
+#~ msgstr "降噪"
+
+#~ msgid "_Destination folder"
+#~ msgstr "目标文件夹(D)"
+
+#~ msgid "_Account Assistant"
+#~ msgstr "帐户向导(A)"
+
+#~ msgid "Setup Accounts"
+#~ msgstr "设定帐户"
+
+#~ msgid "Search Parameters"
+#~ msgstr "查找相关参数"
+
+#~ msgid "Maximum result number for a request: "
+#~ msgstr "最大拨号数"
+
+#~ msgid "Search for and display: "
+#~ msgstr "查找并显示:"
+
+#~ msgid "_STUN Server"
+#~ msgstr "STUN服务器(S)"
diff --git a/lang/zh_HK/sflphone.po b/lang/zh_HK/sflphone.po
new file mode 100644
index 0000000000000000000000000000000000000000..ac82aea3bff5b3811789dbe507048c11a521c20e
--- /dev/null
+++ b/lang/zh_HK/sflphone.po
@@ -0,0 +1,1523 @@
+# Chinese translation of SFLphone.
+# Copyright (C) 2008 The Free Software Foundation, Inc.
+# This file is distributed under the GNU General Public License Version 3.
+# 
+# Yun Liu <yun.liu@savoirfairelinux.com>, 2008.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: SFLphone 0.9.2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-07-17 16:14-0400\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"
+"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"
+
+#: ../sflphone-client-kde/src/Account.cpp:34
+#: ../sflphone-client-gnome/src/accountlist.c:175
+msgctxt "account state"
+msgid "Registered"
+msgstr "已註冊"
+
+#: ../sflphone-client-kde/src/Account.cpp:36
+#: ../sflphone-client-gnome/src/accountlist.c:178
+msgctxt "account state"
+msgid "Not Registered"
+msgstr "未註冊"
+
+#: ../sflphone-client-kde/src/Account.cpp:38
+#: ../sflphone-client-gnome/src/accountlist.c:181
+msgctxt "account state"
+msgid "Trying..."
+msgstr "正在連接..."
+
+#: ../sflphone-client-kde/src/Account.cpp:40
+#: ../sflphone-client-gnome/src/accountlist.c:184
+msgctxt "account state"
+msgid "Error"
+msgstr "註冊失敗"
+
+#: ../sflphone-client-kde/src/Account.cpp:42
+#: ../sflphone-client-gnome/src/accountlist.c:187
+msgctxt "account state"
+msgid "Authentication Failed"
+msgstr "認證錯誤"
+
+#: ../sflphone-client-kde/src/Account.cpp:44
+#: ../sflphone-client-gnome/src/accountlist.c:190
+msgctxt "account state"
+msgid "Network unreachable"
+msgstr "網路連線失敗"
+
+#: ../sflphone-client-kde/src/Account.cpp:46
+#: ../sflphone-client-gnome/src/accountlist.c:193
+msgctxt "account state"
+msgid "Host unreachable"
+msgstr "伺服器連線失敗"
+
+#: ../sflphone-client-kde/src/Account.cpp:48
+#: ../sflphone-client-gnome/src/accountlist.c:196
+msgctxt "account state"
+msgid "Stun configuration error"
+msgstr "STUN配置有誤"
+
+#: ../sflphone-client-kde/src/Account.cpp:50
+#: ../sflphone-client-gnome/src/accountlist.c:199
+msgctxt "account state"
+msgid "Stun server invalid"
+msgstr "STUN伺服器無效"
+
+#: ../sflphone-client-kde/src/Account.cpp:51
+#: ../sflphone-client-gnome/src/accountlist.c:202
+msgctxt "account state"
+msgid "Invalid"
+msgstr "無效"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:163
+#: ../sflphone-client-kde/src/AccountWizard.cpp:278
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:393
+msgid "Account creation wizard"
+msgstr "帳戶創建向導"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:199
+#: ../sflphone-client-kde/src/AccountWizard.cpp:217
+#: ../sflphone-client-kde/src/AccountWizard.cpp:561
+#: ../sflphone-client-gnome/src/assistant.c:68
+#, c-format
+msgid "This assistant is now finished."
+msgstr "配置完成."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:211
+msgid "Creation of account has failed for the reason"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:255
+#: ../sflphone-client-kde/src/AccountWizard.cpp:440
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:363
+#: ../sflphone-client-gnome/src/assistant.c:72
+msgid "Alias"
+msgstr "別稱"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:256
+#: ../sflphone-client-kde/src/AccountWizard.cpp:441
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:370
+#: ../sflphone-client-gnome/src/assistant.c:75
+msgid "Server"
+msgstr "伺服器"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:257
+#: ../sflphone-client-kde/src/AccountWizard.cpp:442
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:371
+#: ../sflphone-client-gnome/src/assistant.c:78
+msgid "Username"
+msgstr "使用者名稱"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:258
+#: ../sflphone-client-kde/src/AccountWizard.cpp:443
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:372
+msgid "Password"
+msgstr "密碼"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:259
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:364
+#: ../sflphone-client-gnome/src/config/configwindow.c:418
+msgid "Protocol"
+msgstr "協議"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:260
+#: ../sflphone-client-kde/src/AccountWizard.cpp:444
+msgid "Voicemail number"
+msgstr "語音郵箱"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:279
+#: ../sflphone-client-gnome/src/assistant.c:216
+msgid "Welcome to the Account creation wizard of SFLphone!"
+msgstr "歡迎使用SFLphone帳戶創建嚮導!"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:281
+#: ../sflphone-client-gnome/src/assistant.c:217
+msgid "This installation wizard will help you configure an account."
+msgstr "安裝向導將幫助您配置帳戶"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:309
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Account"
+msgstr "帳戶"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:310
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Please select one of the following options"
+msgstr "請選擇以下選項中的一個"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:312
+#: ../sflphone-client-gnome/src/assistant.c:251
+msgid "Create a free SIP/IAX2 account on sflphone.org"
+msgstr "在sflphone.org上創建免費的SIP/IAX2帳戶"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:313
+#: ../sflphone-client-gnome/src/assistant.c:253
+msgid "Register an existing SIP or IAX2 account"
+msgstr "註冊已存在的SIP或IAX2帳戶"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:352
+#: ../sflphone-client-gnome/src/assistant.c:231
+msgid "VoIP Protocols"
+msgstr "VoIP協議"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:353
+#: ../sflphone-client-gnome/src/assistant.c:231
+msgid "Select an account type"
+msgstr "選擇帳戶類型"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:355
+#: ../sflphone-client-gnome/src/assistant.c:233
+msgid "SIP (Session Initiation Protocol)"
+msgstr "SIP(會話初始化協議)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:356
+#: ../sflphone-client-gnome/src/assistant.c:235
+msgid "IAX2 (InterAsterix Exchange)"
+msgstr "IAX2(Asterisk內部交換協議)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:395
+#: ../sflphone-client-gnome/src/assistant.c:339
+msgid "Optional email address"
+msgstr "可選郵件地址"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:396
+#: ../sflphone-client-gnome/src/assistant.c:339
+msgid "This email address will be used to send your voicemail messages."
+msgstr "這個郵件地址將被用來發送您的語音"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:398
+msgid "Email address"
+msgstr "郵件地址"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:432
+#: ../sflphone-client-gnome/src/assistant.c:266
+msgid "SIP account settings"
+msgstr "SIP帳戶配置"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:436
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "IAX2 account settings"
+msgstr "IAX2帳戶配置"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:438
+#: ../sflphone-client-gnome/src/assistant.c:266
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "Please fill the following information"
+msgstr "請填寫如下信息"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:523
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:856
+msgid "Network Address Translation (NAT)"
+msgstr "网络地址解析(NAT)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:524
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:536
+msgid "You should probably enable this if you are behind a firewall."
+msgstr "如果你使用網路防火牆，你很有可能需要設定該項."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:526
+msgid "Enable STUN"
+msgstr "啟用STUN"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:527
+msgid "Stun Server"
+msgstr "STUN伺服器"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:562
+msgid ""
+"After checking the settings you chose, click \"Finish\" to create the "
+"account."
+msgstr "當您檢查完選定的設置,請點擊\"結束\"來創建帳戶"
+
+#: ../sflphone-client-kde/src/ActionSetAccountFirst.cpp:26
+msgid "Default account"
+msgstr "默認帳戶"
+
+#: ../sflphone-client-kde/src/Call.cpp:116
+#: ../sflphone-client-gnome/src/contacts/calltree.c:322
+msgid "Transfer to : "
+msgstr "轉給:"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:89
+#: ../sflphone-client-gnome/src/actions.c:816
+msgid "Codec"
+msgstr "編碼"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:93
+#: ../sflphone-client-gnome/src/config/audioconf.c:581
+msgid "Frequency"
+msgstr "顰律"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:97
+#: ../sflphone-client-gnome/src/config/audioconf.c:586
+msgid "Bitrate"
+msgstr "比率"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:101
+#: ../sflphone-client-gnome/src/config/audioconf.c:591
+msgid "Bandwidth"
+msgstr "顰寬"
+
+#: ../sflphone-client-kde/src/main.cpp:38
+msgid "SFLphone KDE Client"
+msgstr "SFLphone KDE客戶端"
+
+#: ../sflphone-client-kde/src/main.cpp:42
+msgid "(C) 2009 Savoir-faire Linux"
+msgstr "(C) 2009 Savoir-faire Linux"
+
+#: ../sflphone-client-kde/src/main.cpp:46
+msgid "Jérémy Quentin"
+msgstr "Jérémy Quentin"
+
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Yun Liu"
+
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "yunliu2000@gmail.com"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:62
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-gnome/src/statusicon.c:126
+msgid "SFLphone"
+msgstr "SFLphone"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:209
+msgid "Incoming call"
+msgstr "來電"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
+msgid "You have an incoming call from"
+msgstr "您有一個電話,來自於"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
+msgid "Click to accept or refuse it."
+msgstr "請點擊接聽或拒絕"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:716
+msgid "Address book loading..."
+msgstr "載入地址簿......"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:901
+#: ../sflphone-client-gnome/src/actions.c:89
+msgid "No registered accounts"
+msgstr "沒有已註冊帳戶"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:905
+#: ../sflphone-client-gnome/src/actions.c:83
+#: ../sflphone-client-gnome/src/actions.c:813
+msgid "Using account"
+msgstr "使用賬戶"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
+msgid "Main screen"
+msgstr "主屏幕"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:165
+msgid "Call history"
+msgstr "呼叫記錄"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:394
+#: ../sflphone-client-gnome/src/toolbar.c:243
+#: ../sflphone-client-gnome/src/toolbar.c:245
+msgid "Address book"
+msgstr "地址簿"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1108
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1173
+msgid "Edit before call"
+msgstr "呼叫前進行編輯"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:41
+#: ../sflphone-client-gnome/src/toolbar.c:167
+#: ../sflphone-client-gnome/src/toolbar.c:169
+msgid "New call"
+msgstr "新電話"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:42
+#: ../sflphone-client-kde/src/sflphone_const.h:47
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:381
+#: ../sflphone-client-gnome/src/toolbar.c:186
+#: ../sflphone-client-gnome/src/toolbar.c:188
+msgid "Hang up"
+msgstr "放電話"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:43
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:382
+#: ../sflphone-client-gnome/src/toolbar.c:207
+#: ../sflphone-client-gnome/src/toolbar.c:209
+msgid "Hold on"
+msgstr "呼叫保持"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:44
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:383
+#: ../sflphone-client-gnome/src/toolbar.c:220
+#: ../sflphone-client-gnome/src/toolbar.c:222
+msgid "Transfer"
+msgstr "轉接"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:45
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:392
+#: ../sflphone-client-gnome/src/toolbar.c:263
+msgid "Record"
+msgstr "記錄"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:46
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:380
+#: ../sflphone-client-gnome/src/toolbar.c:176
+#: ../sflphone-client-gnome/src/toolbar.c:178
+msgid "Pick up"
+msgstr "接電話"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:48
+#: ../sflphone-client-gnome/src/toolbar.c:196
+#: ../sflphone-client-gnome/src/toolbar.c:198
+msgid "Hold off"
+msgstr "恢復通話"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:49
+msgid "Give up transfer"
+msgstr "取消轉接"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:50
+msgid "Call back"
+msgstr "回叫"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:48
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:91
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
+#: ../sflphone-client-gnome/src/config/configwindow.c:722
+#: ../sflphone-client-gnome/src/config/configwindow.c:791
+msgctxt "Config section"
+msgid "General"
+msgstr "常用配置"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:49
+msgctxt "Config section"
+msgid "Display"
+msgstr "顯示"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:50
+#: ../sflphone-client-gnome/src/config/configwindow.c:833
+msgctxt "Config section"
+msgid "Accounts"
+msgstr "帳戶"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:51
+#: ../sflphone-client-gnome/src/config/configwindow.c:786
+msgctxt "Config section"
+msgid "Audio"
+msgstr "音頻"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:52
+#: ../sflphone-client-gnome/src/config/configwindow.c:801
+msgctxt "Config section"
+msgid "Address Book"
+msgstr "地址簿"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:53
+#: ../sflphone-client-gnome/src/config/configwindow.c:796
+msgctxt "Config section"
+msgid "Recordings"
+msgstr "記錄"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:54
+#: ../sflphone-client-gnome/src/config/configwindow.c:806
+msgctxt "Config section"
+msgid "Hooks"
+msgstr "鉤鍵"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:328
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows. Enable/disable them by checking/unchecking "
+"them on the left of the item. Add or remove some with \"Plus\" and \"Sub\" "
+"buttons. Edit the selected account with the form on the right."
+msgstr ""
+"在默認情況下，當你打電話時，sflphone會使用列表當中第一個已註冊的帳戶。使用箭"
+"頭\"上\"和\"下\"可以改變賬戶的順序。選擇賬戶名稱左邊的方框可以啟用帳戶，取消"
+"選擇則會禁用該賬戶。通過\"加\"\"減\"按鈕可以添加或刪除賬戶。點擊\"編輯\"按鈕"
+"可以改變賬戶的設置。"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:332
+msgid "Remove the selected account"
+msgstr "刪除所選賬戶"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:335
+msgid ""
+"This button will remove the selected account in the list below. Be sure you "
+"really don't need it anymore. If you think you might use it again later, "
+"just uncheck it."
+msgstr ""
+"該按鈕會刪除列表中被選定的賬戶。請確認你的操作。如果你希望繼續使用某個賬戶，"
+"請取消對該賬戶的選擇"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:340
+msgid "Remove"
+msgstr "刪除"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:342
+msgid "Add a new account"
+msgstr "增加新帳戶"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:345
+msgid ""
+"This button enables you to initialize a new account. You will then be able "
+"to edit it using the form on the right."
+msgstr ""
+"通過該按鈕可以創建一個新賬戶。添加該賬戶之後你還可以通過編輯按鈕來修改設置。"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:347
+msgid "Add"
+msgstr "添加"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:349
+msgid "Get this account down"
+msgstr "將該賬戶向下移動"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:352
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:359
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows."
+msgstr ""
+"在默認情況下，當你打電話時，sflphone會使用列表當中第一個已註冊的帳戶。使用箭"
+"頭\"上\"和\"下\"可以改變賬戶的順序。選擇賬戶名稱左邊的方框可以啟用帳戶，取消"
+"選擇則會禁用該賬戶。通過\"加\"\"減\"按鈕可以添加或刪除賬戶。"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:354
+msgid "Down"
+msgstr "下"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:356
+msgid "Get this account up"
+msgstr "把該賬戶向上移動"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:361
+msgid "Up"
+msgstr "上"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:362
+msgid "Apply"
+msgstr "套用"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:367
+msgid "SIP"
+msgstr "SIP"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:368
+msgid "IAX"
+msgstr "IAX"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:373
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:385
+#: ../sflphone-client-gnome/src/toolbar.c:52
+#: ../sflphone-client-gnome/src/toolbar.c:251
+#: ../sflphone-client-gnome/src/toolbar.c:255
+msgid "Voicemail"
+msgstr "語音郵件"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:374
+#: ../sflphone-client-gnome/src/config/configwindow.c:425
+msgid "Status"
+msgstr "狀態"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:377
+#: ../sflphone-client-gnome/src/config/configwindow.c:528
+msgid "Stun parameters will be applied on each SIP account created."
+msgstr "STUN參數將應用於每一個註冊的SIP帳戶"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:378
+msgid "Enable Stun"
+msgstr "啟用STUN"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:380
+#: ../sflphone-client-gnome/src/config/configwindow.c:544
+msgid "Format : name.server:port"
+msgstr "格式 : 名稱.服務器:端口"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:382
+msgid "choose Stun server (example : stunserver.org)"
+msgstr "選擇STUN服務器(例如:stunserver.org)"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:154
+msgid "Enable address book"
+msgstr "啟用地址簿"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:155
+msgid "Maximum results"
+msgstr "結果最大值"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:156
+msgid "Display photo if available"
+msgstr "如果可以則顯示聯繫人照片"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:157
+msgid "Display phone numbers of these types :"
+msgstr "顯示這些格式的電話號碼"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:158
+msgid "Work"
+msgstr "單位電話"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:159
+msgid "Mobile"
+msgstr "移動電話"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:160
+msgid "Home"
+msgstr "家庭電話"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:225
+msgid "Sound manager"
+msgstr "聲音管理器"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:228
+msgid "ALSA"
+msgstr "ALSA"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:229
+msgid "PulseAudio"
+msgstr "PulseAudio"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:231
+msgid "Enable ringtones"
+msgstr "啟動鈴聲"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:232
+#: ../sflphone-client-gnome/src/config/audioconf.c:812
+msgid "Codecs"
+msgstr "編碼"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:233
+#: ../sflphone-client-gnome/src/config/audioconf.c:795
+msgid "ALSA settings"
+msgstr "ALSA 配置"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:234
+#: ../sflphone-client-gnome/src/config/audioconf.c:662
+msgid "ALSA plugin"
+msgstr "ALSA插件"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:235
+#: ../sflphone-client-gnome/src/config/audioconf.c:706
+msgid "Input"
+msgstr "輸入"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:236
+#: ../sflphone-client-gnome/src/config/audioconf.c:684
+msgid "Output"
+msgstr "輸出"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:237
+msgid "PulseAudio settings"
+msgstr "PulseAudio 配置"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:238
+msgid "Mute other applications during a call"
+msgstr "當有來電時靜音其它應用程序"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:121
+msgid "Enable notifications"
+msgstr "啟動提示"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:122
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:126
+msgid "On incoming calls"
+msgstr "有新來電"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:123
+msgid "On messages"
+msgstr "有新消息"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:124
+msgid "Show main window"
+msgstr "顯示主窗口"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:125
+msgid "On start"
+msgstr "正在啟動"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:166
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "Keep my history for at least"
+msgstr "保存呼叫記錄數至少"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:167
+#: ../sflphone-client-gnome/src/config/configwindow.c:643
+msgctxt "End of 'Keep my history for at least n days.'"
+msgid "days"
+msgstr "天"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:168
+msgid "Clear history"
+msgstr "清空曆史記錄"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:169
+msgid "Connection"
+msgstr "連接"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:170
+#: ../sflphone-client-gnome/src/config/configwindow.c:664
+msgid "SIP Port"
+msgstr "SIP端口"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:180
+#: ../sflphone-client-gnome/src/config/hooks-config.c:130
+msgid "URL Argument"
+msgstr "URL參數"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:181
+#: ../sflphone-client-gnome/src/config/hooks-config.c:135
+msgid "Custom commands on incoming calls with URL"
+msgstr "定制對帶有URL的來電的處理"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:182
+msgid "Trigger on specific SIP header"
+msgstr "激活指定的SIP頭"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:183
+msgid "Trigger on IAX2 URL"
+msgstr "激活IAX2 URL"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:184
+msgid "Command to run"
+msgstr "要運行的命令"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:185
+#: ../sflphone-client-gnome/src/config/hooks-config.c:138
+#, c-format
+msgid "%s will be replaced with the passed URL."
+msgstr "傳輸的URL會被替換成%s."
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:186
+#: ../sflphone-client-gnome/src/config/hooks-config.c:165
+msgid "Phone number rewriting"
+msgstr "重設電話號碼"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:187
+msgid "Prefix dialed numbers with"
+msgstr "號碼前綴"
+
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:92
+#: ../sflphone-client-gnome/src/config/configwindow.c:726
+msgid "Destination folder"
+msgstr "目標文件夾"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:384
+#: ../sflphone-client-gnome/src/toolbar.c:232
+#: ../sflphone-client-gnome/src/toolbar.c:234
+msgid "History"
+msgstr "歷史"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:386
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:388
+msgid "Configure SFLphone"
+msgstr "配置SFLphone"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:390
+msgid "Display volume controls"
+msgstr "顯示音量控制"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:391
+msgid "Display dialpad"
+msgstr "顯示撥號鍵盤"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:396
+msgid "Attention:number of results exceeds max displayed."
+msgstr "注意:結果超過可顯示的最大值"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:398
+#: ../sflphone-client-gnome/src/sliders.c:163
+msgid "Mic volume"
+msgstr "話筒音量"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:402
+#: ../sflphone-client-gnome/src/sliders.c:161
+msgid "Speakers volume"
+msgstr "揚聲器音量"
+
+#: ../sflphone-client-gnome/src/actions.c:54
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] "%d 個語音郵件"
+msgstr[1] "%d 個語音郵件"
+
+#: ../sflphone-client-gnome/src/actions.c:234
+msgid ""
+"Unable to connect to the SFLphone server.\n"
+"Make sure the daemon is running."
+msgstr ""
+"連接SFLphone伺服器失敗.\n"
+"請核查daemon是否正在運行."
+
+#: ../sflphone-client-gnome/src/actions.c:809
+#, c-format
+msgid "IP call - %s"
+msgstr "IP電話- %s"
+
+#: ../sflphone-client-gnome/src/actions.c:908
+#, 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>錯誤：無法找到音訊編碼檔案.\n"
+"\n"
+"</b> SFL聲音編碼檔案應該位于<i>%s</i> 或者位于主目錄( <i>%s</i> )的<b>."
+"sflphone</b>目錄下"
+
+#: ../sflphone-client-gnome/src/assistant.c:70
+msgid ""
+"You can at any time check your registration state or modify your accounts "
+"parameters in the Options/Accounts window."
+msgstr "你可以隨時在 選項/帳戶 中查看註冊狀態或者修改帳戶信息."
+
+#: ../sflphone-client-gnome/src/assistant.c:190
+msgid "SFLphone account creation wizard"
+msgstr "SFLphone賬戶創建嚮導"
+
+#: ../sflphone-client-gnome/src/assistant.c:274
+#: ../sflphone-client-gnome/src/assistant.c:370
+#: ../sflphone-client-gnome/src/config/accountwindow.c:153
+msgid "_Alias"
+msgstr "別稱(A)"
+
+#: ../sflphone-client-gnome/src/assistant.c:282
+#: ../sflphone-client-gnome/src/assistant.c:378
+#: ../sflphone-client-gnome/src/config/accountwindow.c:189
+msgid "_Host name"
+msgstr "主机名稱(H)"
+
+#: ../sflphone-client-gnome/src/assistant.c:290
+#: ../sflphone-client-gnome/src/assistant.c:386
+#: ../sflphone-client-gnome/src/config/accountwindow.c:197
+msgid "_User name"
+msgstr "使用者名稱(U)"
+
+#: ../sflphone-client-gnome/src/assistant.c:306
+#: ../sflphone-client-gnome/src/assistant.c:401
+#: ../sflphone-client-gnome/src/config/accountwindow.c:212
+msgid "_Password"
+msgstr "密碼(P)"
+
+#: ../sflphone-client-gnome/src/assistant.c:324
+#: ../sflphone-client-gnome/src/assistant.c:417
+#: ../sflphone-client-gnome/src/config/accountwindow.c:228
+msgid "_Voicemail number"
+msgstr "語音郵箱(V)"
+
+#: ../sflphone-client-gnome/src/assistant.c:347
+msgid "_Email address"
+msgstr "郵件地址(E)"
+
+#: ../sflphone-client-gnome/src/assistant.c:444
+#: ../sflphone-client-gnome/src/config/configwindow.c:532
+msgid "E_nable STUN"
+msgstr "啟用STUN(n)"
+
+#: ../sflphone-client-gnome/src/assistant.c:451
+msgid "_STUN server"
+msgstr "STUN伺服器(S)"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Account Registration"
+msgstr "帳戶註冊"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Congratulations!"
+msgstr "恭喜！"
+
+#: ../sflphone-client-gnome/src/errors.c:29
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening playback device"
+msgstr ""
+"ALSA提示\n"
+"\n"
+"打開回放設備時出錯"
+
+#: ../sflphone-client-gnome/src/errors.c:32
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening capture device"
+msgstr ""
+"ALSA提示\n"
+"\n"
+"打開采集設備時出錯"
+
+#: ../sflphone-client-gnome/src/errors.c:35
+msgid ""
+"Pulseaudio notification\n"
+"\n"
+"Pulseaudio is not running"
+msgstr ""
+"Pulseaudio提示\n"
+"\n"
+"Pulseaudio未運行"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:70
+msgid "There is one call in progress."
+msgstr "有一個電話正在處理中."
+
+#: ../sflphone-client-gnome/src/mainwindow.c:74
+msgid "There are calls in progress."
+msgstr "有電話正在處理中."
+
+#: ../sflphone-client-gnome/src/mainwindow.c:83
+msgid "Do you still want to quit?"
+msgstr "確認要退出?"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:284
+msgid "SFLphone Error"
+msgstr "SFLphone 出錯"
+
+#: ../sflphone-client-gnome/src/menus.c:134
+msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr "SFLphone是一個VoIP客戶端，它兼容SIP和IAX2协议."
+
+#: ../sflphone-client-gnome/src/menus.c:137
+msgid "About SFLphone"
+msgstr "有關SFLphone"
+
+#: ../sflphone-client-gnome/src/menus.c:161
+msgid "_Help"
+msgstr "幫助(H)"
+
+#: ../sflphone-client-gnome/src/menus.c:296
+#: ../sflphone-client-gnome/src/menus.c:953
+msgid "_New call"
+msgstr "新電話(N)"
+
+#: ../sflphone-client-gnome/src/menus.c:308
+#: ../sflphone-client-gnome/src/menus.c:785
+msgid "_Pick up"
+msgstr "撥出(P)"
+
+#: ../sflphone-client-gnome/src/menus.c:318
+#: ../sflphone-client-gnome/src/menus.c:797
+msgid "_Hang up"
+msgstr "放下(H)"
+
+#: ../sflphone-client-gnome/src/menus.c:328
+#: ../sflphone-client-gnome/src/menus.c:809
+msgid "On _Hold"
+msgstr "待机"
+
+#: ../sflphone-client-gnome/src/menus.c:340
+#: ../sflphone-client-gnome/src/menus.c:821
+msgid "_Record"
+msgstr "記錄(R)"
+
+#: ../sflphone-client-gnome/src/menus.c:354
+msgid "_Account creation wizard"
+msgstr "帳戶創建向導(A)"
+
+#: ../sflphone-client-gnome/src/menus.c:384
+msgid "_Call"
+msgstr "電話"
+
+#: ../sflphone-client-gnome/src/menus.c:552
+msgid "Clear _history"
+msgstr "清空曆史記錄(C)"
+
+#: ../sflphone-client-gnome/src/menus.c:564
+msgid "_Accounts"
+msgstr "帳戶(A)"
+
+#: ../sflphone-client-gnome/src/menus.c:579
+msgid "_Edit"
+msgstr "編輯(E)"
+
+#: ../sflphone-client-gnome/src/menus.c:631
+msgid "_Dialpad"
+msgstr "撥號面板"
+
+#: ../sflphone-client-gnome/src/menus.c:643
+msgid "_Volume controls"
+msgstr "音量控制(V)"
+
+#: ../sflphone-client-gnome/src/menus.c:661
+msgid "_View"
+msgstr "查看(V)"
+
+#: ../sflphone-client-gnome/src/menus.c:881
+msgid "_Call back"
+msgstr "回叫(C)"
+
+#: ../sflphone-client-gnome/src/menus.c:1061
+msgid "Edit phone number"
+msgstr "編輯電話號碼"
+
+#: ../sflphone-client-gnome/src/menus.c:1072
+msgid "Edit the phone number before making a call"
+msgstr "撥出電話前編輯電話號碼"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:71
+#: ../sflphone-client-gnome/src/sflnotify.c:91
+#, c-format
+msgid "%s account : %s"
+msgstr "%s 帳戶 : %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:75
+#, c-format
+msgid "<i>From</i> %s"
+msgstr "<i>撥入方</i> %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:111
+#, c-format
+msgid "Calling with %s account <i>%s</i>"
+msgstr "使用%s帳戶<i>%s</i>呼叫"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:115
+msgid "Current account"
+msgstr "當前帳戶"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:130
+msgid "You have no accounts set up"
+msgstr "你沒有設置任何賬戶"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:131
+#: ../sflphone-client-gnome/src/sflnotify.c:148
+msgid "Error"
+msgstr "註冊失敗"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:147
+msgid "You have no registered accounts"
+msgstr "未發現已註冊帳戶"
+
+#: ../sflphone-client-gnome/src/statusicon.c:91
+msgid "_Show main window"
+msgstr "顯示主窗口(S)"
+
+#: ../sflphone-client-gnome/src/statusicon.c:127
+#, c-format
+msgid "%i account configured"
+msgid_plural "%i accounts configured"
+msgstr[0] "已配置了%i個賬戶"
+msgstr[1] "已配置了%i個賬戶"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:113
+msgid "Account settings"
+msgstr "帳戶設置"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:147
+msgid "_Enable this account"
+msgstr "啟用該賬戶(E)"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:161
+msgid "_Protocol"
+msgstr "協議(P)"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:179
+msgid "Unknown"
+msgstr "未知"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:312
+msgid "_Use Evolution address books"
+msgstr "使用Evolution地址薄(U)"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:319
+msgid "Download limit :"
+msgstr "下載上限:"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:327
+msgid "cards"
+msgstr "卡"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:333
+msgid "_Display contact photo if available"
+msgstr "如果可以則顯示聯繫人照片(D)"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:341
+msgid "Fields from Evolution's address books"
+msgstr "使用Evolution地址薄中的如下字段:"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:345
+msgid "_Work"
+msgstr "單位電話(W)"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:351
+msgid "_Home"
+msgstr "家庭電話(H)"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:357
+msgid "_Mobile"
+msgstr "移動電話(M)"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:364
+msgid "Address Books"
+msgstr "地址簿"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:368
+msgid "Select which Evolution address books to use"
+msgstr "選擇使用如下Evolution地址薄"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:404
+#: ../sflphone-client-gnome/src/config/audioconf.c:576
+msgid "Name"
+msgstr "名稱"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:741
+msgid "_Voice Activity Detection"
+msgstr "聲音狀態檢測(V)"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:751
+msgid "_Noise Reduction (Narrow-Band Companding)"
+msgstr "降噪處理-窄頻壓縮(N)"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:780
+msgid "Sound Manager"
+msgstr "聲音管理器"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:783
+msgid "_Pulseaudio"
+msgstr "Pulseaudio"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:788
+msgid "_ALSA"
+msgstr "ALSA"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:835
+msgid "Ringtones"
+msgstr "鈴聲"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:841
+msgid "_Enable ringtones"
+msgstr "啟動鈴聲(E)"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:847
+msgid "Choose a ringtone"
+msgstr "鈴聲選擇"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
+msgid "Audio Files"
+msgstr "音訊檔案"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:589
+msgid "Desktop Notifications"
+msgstr "桌面提示"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:593
+msgid "_Enable notifications"
+msgstr "啟動提示(E)"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:599
+msgid "Enable voicemail _notifications"
+msgstr "啟用語音郵箱提示(n)"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:611
+msgid "System Tray Icon"
+msgstr "系統托盤圖標"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:614
+msgid "_Popup main window on incoming call"
+msgstr "來電話時彈出主視窗(P)"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:619
+msgid "Ne_ver popup main window"
+msgstr "從不彈出主視窗(v)"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:623
+msgid "Hide SFLphone window on _startup"
+msgstr "在啟動時隱藏SFLphone主窗口"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:629
+msgid "Calls History"
+msgstr "打電話歷史"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:632
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "_Keep my history for at least"
+msgstr "保留歷史記錄至少(K)"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:647
+msgid "PulseAudio sound server"
+msgstr "PulseAudio聲音伺服器"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:650
+msgid "_Mute other applications during a call"
+msgstr "當有來電時靜音其它應用程序(c)"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:677
+msgid "Port"
+msgstr "端口"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:732
+msgid "Select a folder"
+msgstr "選擇文件夾"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:766
+msgid "Preferences"
+msgstr "屬性"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:845
+msgid "Configured Accounts"
+msgstr "已配置帳戶"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:141
+msgid "Trigger on specific _SIP header"
+msgstr "激活指定的SIP頭(S)"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:150
+msgid "Trigger on _IAX2 URL"
+msgstr "激活IAX2 URL(I)"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:155
+msgid "Command to _run"
+msgstr "運行命令(r)"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:169
+msgid "_Prefix dialed numbers with"
+msgstr "號碼前綴(P)"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+msgid "Search all"
+msgstr "查詢所有"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:57
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:70
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:82
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:94
+msgid "Click here to change the search type"
+msgstr "請點擊此處改變查詢方式"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+msgid "Search by missed call"
+msgstr "從未接電話中查詢"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+msgid "Search by incoming call"
+msgstr "從來電中查詢"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+msgid "Search by outgoing call"
+msgstr "從撥出電話中查詢"
+
+#~ msgid "User"
+#~ msgstr "使用者名稱"
+
+#~ msgid "Mailbox"
+#~ msgstr "語音郵件"
+
+#~ msgctxt "Action record a call"
+#~ msgid "Record"
+#~ msgstr "記錄"
+
+#~ msgid "%s - %s"
+#~ msgstr "%s - %s"
+
+#~ msgid "Registered"
+#~ msgstr "已註冊"
+
+#~ msgid "Not Registered"
+#~ msgstr "未註冊"
+
+#~ msgid "Trying..."
+#~ msgstr "正在連接..."
+
+#~ msgid "Bad authentification"
+#~ msgstr "認證錯誤"
+
+#~ msgid "Network unreachable"
+#~ msgstr "網路連線失敗"
+
+#~ msgid "Host unreachable"
+#~ msgstr "伺服器連線失敗"
+
+#~ msgid "Stun configuration error"
+#~ msgstr "Stun配置有誤"
+
+#~ msgid "Stun server invalid"
+#~ msgstr "Stun伺服器無效"
+
+#~ msgid "Invalid"
+#~ msgstr "無效"
+
+#~ msgid "%d voice mails"
+#~ msgstr "%d 個語音郵件"
+
+#~ msgid "No registered account"
+#~ msgstr "未發現已註冊帳戶"
+
+#~ msgid ""
+#~ "This assistant is now finished.\n"
+#~ "You can at any time check your registration state or modify your accounts "
+#~ "parameters in the Options/Accounts window.\n"
+#~ "\n"
+#~ "Alias :    %s\n"
+#~ "Server :   %s\n"
+#~ "Username : %s\n"
+#~ msgstr ""
+#~ "配置完成.\n"
+#~ "你可以隨時在 選項/帳戶 中查看註冊狀態或者修改帳戶信息\n"
+#~ "別稱:         %s\n"
+#~ "伺服器:       %s\n"
+#~ "使用者名稱:   %s\n"
+
+#~ msgid "SFLphone account configuration wizard"
+#~ msgstr "SFLphone 帳戶設置向導"
+
+#~ msgid "Welcome to SFLphone!"
+#~ msgstr "歡迎使用SFLphone!"
+
+#~ msgid "Select an account type:"
+#~ msgstr "選擇帳戶類型:"
+
+#~ msgid "Please select one of the following option:"
+#~ msgstr "請選擇以下選項中的一個:"
+
+#~ msgid "SIP account configuration"
+#~ msgstr "SIP帳戶配置"
+
+#~ msgid "Please fill the following information:"
+#~ msgstr "請填寫如下信息:"
+
+#~ msgid "Optional Email Address "
+#~ msgstr "可選郵件地址 "
+
+#~ msgid "This email address will be use to send your voicemail messages"
+#~ msgstr "這個郵件地址將被用來發送您的語音郵箱消息"
+
+#~ msgid "_Email"
+#~ msgstr "郵件(E)"
+
+#~ msgid "IAX2 account configuration"
+#~ msgstr "IAX2帳戶配置"
+
+#~ msgid "Network Address Translation"
+#~ msgstr "網路地址分析"
+
+#~ msgid "Edit phone"
+#~ msgstr "編輯電話"
+
+#~ msgid "%s account: %s"
+#~ msgstr "%s 帳戶: %s"
+
+#~ msgid "<i>From:</i> %s"
+#~ msgstr "<i>撥入方：</i> %s"
+
+#~ msgid "You haven't setup any accounts"
+#~ msgstr "你沒有設置任何帳戶"
+
+#~ msgid "SFLphone - %i accounts configured"
+#~ msgstr "SFLphone - %i 個帳戶已配置"
+
+#~ msgid "\"Voicemail\" <%s>"
+#~ msgstr "\"語音郵件\" <%s>"
+
+#~ msgid "Place a call"
+#~ msgstr "打電話"
+
+#~ msgid "Off Hold"
+#~ msgstr "恢复通話"
+
+#~ msgid "On Hold"
+#~ msgstr "待机"
+
+#~ msgid "Record a call"
+#~ msgstr "記錄通話"
+
+#~ msgid "Account Parameters"
+#~ msgstr "帳戶相關參數"
+
+#~ msgid "General"
+#~ msgstr "常用配置"
+
+#~ msgid "Download limit:"
+#~ msgstr "下載上限:"
+
+#~ msgid "_Business phone"
+#~ msgstr "商務電話(B)"
+
+#~ msgid "_Home phone"
+#~ msgstr "家庭電話(H)"
+
+#~ msgid "_Mobile phone"
+#~ msgstr "移動電話(M)"
+
+#~ msgid "Select which Evolution address books to use:"
+#~ msgstr "選擇使用如下Evolution地址薄:"
+
+#~ msgid "audio device index for output = %d"
+#~ msgstr "音訊設備輸出索引 ＝ %d"
+
+#~ msgid "ALSA configuration"
+#~ msgstr "ALSA 配置"
+
+#~ msgid "Stun parameters will apply to each SIP account created."
+#~ msgstr "Stun參數將應用於每一個註冊的SIP帳戶"
+
+#~ msgid "Enable it if you are behind a firewall"
+#~ msgstr "當使用防火牆時，需要設定此項"
+
+#~ msgid "Format: name.server:port"
+#~ msgstr "格式：name.server:port"
+
+#~ msgid "Port:"
+#~ msgstr "端口:"
+
+#~ msgid "Recordings folder"
+#~ msgstr "記錄文件夾(R)"
+
+#~ msgid "General Settings"
+#~ msgstr "常用配置"
+
+#~ msgid "Audio Settings"
+#~ msgstr "音訊配置"
+
+#~ msgid "Recordings"
+#~ msgstr "記錄"
+
+#~ msgid "Address Book"
+#~ msgstr "地址簿"
+
+#~ msgid "Hooks"
+#~ msgstr "鉤鍵"
+
+#~ msgid "Accounts"
+#~ msgstr "帳戶"
+
+#~ msgid "URL Passing"
+#~ msgstr "傳輸URL"
+
+#~ msgid "Command to _run: "
+#~ msgstr "運行命令(C):"
+
+#~ msgid "Phone Number Rewriting"
+#~ msgstr "重設電話號碼"
+
+#~ msgid "_Prefix dialed numbers with:"
+#~ msgstr "號碼前綴:"
+
+#~ msgid "Accept"
+#~ msgstr "接受"
+
+#~ msgid "Refuse"
+#~ msgstr "拒絕"
+
+#~ msgid "Ignore"
+#~ msgstr "忽略"
+
+#~ msgid "<small>Missed call</small>"
+#~ msgstr "<small>未接電話</small>"
+
+#~ msgid "<small>Duration:</small> %s"
+#~ msgstr "<small>時長:</small> %s"
+
+#~ msgid "Fields"
+#~ msgstr "字段"
+
+#~ msgid "_History size limit"
+#~ msgstr "歷史記錄上限(H)"
+
+#~ msgid ""
+#~ "SFLphone can run custom commands if incoming calls come with an URL "
+#~ "attached.\n"
+#~ "In this case, %s will be replaced with the passed URL."
+#~ msgstr ""
+#~ "當來電有附加的URL時,SFLphone可運行客戶命令.\n"
+#~ "在此情況下,傳輸的URL會被替換成%s."
+
+#~ msgid "Search history"
+#~ msgstr "搜尋歷史記錄"
+
+#~ msgid "Search contact"
+#~ msgstr "搜尋聯繫人(S)"
+
+#~ msgid "Registered to %s (%s)"
+#~ msgstr "註冊到 %s (%s)"
+
+#~ msgid "%s account- %s             %s"
+#~ msgstr "%s 帳戶- %s\t\t%s"
+
+#~ msgid "Books"
+#~ msgstr "鉤鍵"
+
+#~ msgid "_Enable"
+#~ msgstr "啟用(E)"
+
+#~ msgid "_Notify voice mails"
+#~ msgstr "語音郵件通知(N)"
+
+#~ msgid "_Start hidden"
+#~ msgstr "啟動時隱藏(S)"
+
+#~ msgid "_Maximum number of calls"
+#~ msgstr "最大打出電話數目(M)"
+
+#~ msgid "_Control running applications volume"
+#~ msgstr "控制正在運行中的應用程式的音量(C)"
+
+#~ msgid "Account previously setup"
+#~ msgstr "帳戶以前設定"
+
+#~ msgid "URL argument"
+#~ msgstr "URL參數"
+
+#~ msgid "_SIP protocol"
+#~ msgstr "SIP 協議(S)"
+
+#~ msgid "_SIP Header: "
+#~ msgstr "SIP消息頭(S):"
+
+#~ msgid "_IAX2 protocol"
+#~ msgstr "IAX2 協議(I)"
+
+#~ msgid "Search"
+#~ msgstr "搜尋"
+
+#~ msgid "_Enabled"
+#~ msgstr "啟用(E)"
+
+#~ msgid "%s account- %s"
+#~ msgstr "%s 帳戶- %s"
+
+#~ msgid "Noise reduction"
+#~ msgstr "降噪"
+
+#~ msgid "_Destination folder"
+#~ msgstr "目標文件夾(D)"
+
+#~ msgid "_Account Assistant"
+#~ msgstr "帳戶向導(A)"
+
+#~ msgid "Setup Accounts"
+#~ msgstr "設定帳戶"
+
+#~ msgid "Search Parameters"
+#~ msgstr "搜尋相關參數"
+
+#~ msgid "Maximum result number for a request: "
+#~ msgstr "最大打出電話數目"
+
+#~ msgid "Search for and display: "
+#~ msgstr "搜尋並顯示:"
+
+#~ msgid "_STUN Server"
+#~ msgstr "STUN伺服器(S)"
diff --git a/sflphone-client-gnome/INSTALL b/sflphone-client-gnome/INSTALL
index 23e5f25d0e5f85798dcfb368ecb2f04f59777f61..8b82ade08e87bbfb02fbf4c3b45b181ab6dda8cb 100644
--- a/sflphone-client-gnome/INSTALL
+++ b/sflphone-client-gnome/INSTALL
@@ -1,16 +1,19 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008 Free Software Foundation, Inc.
 
-This file is free documentation; the Free Software Foundation gives
+   This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
 
 Basic Installation
 ==================
 
-These are generic installation instructions.
+   Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -23,9 +26,9 @@ debugging `configure').
 
    It can also use an optional file (typically called `config.cache'
 and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
+the results of its tests to speed up reconfiguring.  Caching is
 disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
 
    If you need to do unusual things to compile the package, please try
 to figure out how `configure' could check whether to do them, and mail
@@ -35,20 +38,17 @@ some point `config.cache' contains results you don't want to keep, you
 may remove or edit it.
 
    The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
 
 The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
+     `./configure' to configure the package for your system.
 
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
 
   2. Type `make' to compile the package.
 
@@ -67,42 +67,57 @@ The simplest way to compile this package is:
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
+  6. Often, you can also type `make uninstall' to remove the installed
+     files again.
+
 Compilers and Options
 =====================
 
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
 
    You can give `configure' initial values for configuration parameters
 by setting variables in the command line or in the environment.  Here
 is an example:
 
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
 
    *Note Defining Variables::, for more details.
 
 Compiling For Multiple Architectures
 ====================================
 
-You can compile the package for more than one kind of computer at the
+   You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
 source code in the directory that `configure' is in and in `..'.
 
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory.  After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
 
 Installation Names
 ==================
 
-By default, `make install' installs the package's commands under
+   By default, `make install' installs the package's commands under
 `/usr/local/bin', include files under `/usr/local/include', etc.  You
 can specify an installation prefix other than `/usr/local' by giving
 `configure' the option `--prefix=PREFIX'.
@@ -125,7 +140,7 @@ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 Optional Features
 =================
 
-Some packages pay attention to `--enable-FEATURE' options to
+   Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
 is something like `gnu-as' or `x' (for the X Window System).  The
@@ -137,14 +152,36 @@ find the X include and library files automatically, but if it doesn't,
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 
+Particular systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+     ./configure CC="cc -Ae"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
+a workaround.  If GNU CC is not installed, it is therefore recommended
+to try
+
+     ./configure CC="cc"
+
+and if that doesn't work, try
+
+     ./configure CC="cc -nodtk"
+
 Specifying the System Type
 ==========================
 
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
 `--build=TYPE' option.  TYPE can either be a short name for the system
 type, such as `sun4', or a canonical name which has the form:
 
@@ -170,9 +207,9 @@ eventually be run) with `--host=TYPE'.
 Sharing Defaults
 ================
 
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
 `configure' looks for `PREFIX/share/config.site' if it exists, then
 `PREFIX/etc/config.site' if it exists.  Or, you can set the
 `CONFIG_SITE' environment variable to the location of the site script.
@@ -181,7 +218,7 @@ A warning: not all `configure' scripts look for a site script.
 Defining Variables
 ==================
 
-Variables not defined in a site shell script can be set in the
+   Variables not defined in a site shell script can be set in the
 environment passed to `configure'.  However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost.  In order to avoid this problem, you should set
@@ -190,21 +227,29 @@ them in the `configure' command line, using `VAR=value'.  For example:
      ./configure CC=/usr/local2/bin/gcc
 
 causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).  Here is a another example:
+overridden in the site shell script).
 
-     /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
 
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
 
-`configure' recognizes the following options to control how it operates.
+   `configure' recognizes the following options to control how it
+operates.
 
 `--help'
 `-h'
-     Print a summary of the options to `configure', and exit.
+     Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+     Print a summary of the options unique to this package's
+     `configure', and exit.  The `short' variant lists options used
+     only in the top level, while the `recursive' variant lists options
+     also present in any nested packages.
 
 `--version'
 `-V'
@@ -231,6 +276,16 @@ configuration-related scripts to be executed by `/bin/bash'.
      Look for the package's source code in directory DIR.  Usually
      `configure' can determine that directory automatically.
 
+`--prefix=DIR'
+     Use DIR as the installation prefix.  *Note Installation Names::
+     for more details, including other options available for fine-tuning
+     the installation locations.
+
+`--no-create'
+`-n'
+     Run the configure checks, but stop before creating any output
+     files.
+
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
 
diff --git a/sflphone-client-gnome/Makefile.am b/sflphone-client-gnome/Makefile.am
index 2b5fd37e02c6d72619f32054e94c76cf66da75e3..a0a1e82ed9d3024b6767bc93b2c8544f2f988dc2 100644
--- a/sflphone-client-gnome/Makefile.am
+++ b/sflphone-client-gnome/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src pixmaps tests man
+SUBDIRS = src pixmaps tests man po
 
 ACLOCAL_AMFLAGS = -I m4
 
diff --git a/sflphone-client-gnome/VERSION b/sflphone-client-gnome/VERSION
index 517317e95fb23bda5f1c305dfaa84bfa8021a824..bc440692c3b559a2d3fe749ce99f8993b879252f 100644
--- a/sflphone-client-gnome/VERSION
+++ b/sflphone-client-gnome/VERSION
@@ -1 +1 @@
-0.9.6~beta
+0.9.6~rc1
diff --git a/sflphone-client-gnome/configure.ac b/sflphone-client-gnome/configure.ac
index 1faa55dc8f89b6dc5660e7b3acc663f6ae1f359b..0eca32f442601234ea49ff9abf20683d00089a71 100644
--- a/sflphone-client-gnome/configure.ac
+++ b/sflphone-client-gnome/configure.ac
@@ -18,9 +18,9 @@ AC_ARG_WITH(debug,
 		[with_debug=no]
 	)
 if test "x$with_debug" = "xfull" -o "x$with_debug" = "xyes"; then
-	CFLAGS="$CFLAGS -g -O2 -DDEBUG -Wall -Wextra"
+	CFLAGS="-g -O0 -DDEBUG -Wall -Wextra"
 else
-	CFLAGS="$CFLAGS -g -Wall -O2"
+	CFLAGS="$CFLAGS"
 fi
 
 AC_PROG_CC
@@ -46,6 +46,8 @@ fi
 AC_SUBST(LIBSEXY_CFLAGS)
 AC_SUBST(LIBSEXY_LIBS)
 
+PKG_CHECK_MODULES(DBUSGLIB, dbus-glib-1 >= 0.75, HAVE_DBUS_G_PROXY_SET_DEFAULT_TIMEOUT=true, HAVE_DBUS_G_PROXY_SET_DEFAULT_TIMEOUT=false);
+
 PKG_CHECK_MODULES(DEPS,     \
     dbus-glib-1 >= 0.35     \
     libnotify >= 0.4        \
@@ -76,6 +78,7 @@ pixmaps/Makefile
 sflphone.desktop
 tests/Makefile
 man/Makefile
+po/Makefile
 ])
 
 
diff --git a/sflphone-common/po/Makefile.am b/sflphone-client-gnome/po/Makefile.am
similarity index 63%
rename from sflphone-common/po/Makefile.am
rename to sflphone-client-gnome/po/Makefile.am
index 696a63db8212f32f017cc965e0a457d01401b209..b0459040b62901326e1dcc0e06fe9bf2f1bd3765 100644
--- a/sflphone-common/po/Makefile.am
+++ b/sflphone-client-gnome/po/Makefile.am
@@ -1,27 +1,25 @@
 # location of installation directories
-locale_installdir=$(datadir)/locale
-DOMAIN=sflphone
+locale_installdir=$(DESTDIR)$(datadir)/locale
+DOMAIN=sflphone-client-gnome
 
-POTFILE=sflphone.pot
 
 POFILES=\
-	 fr.po \
-	 es.po \
-	 de.po \
-     zh_CN.po \
-     zh_HK.po \
-	 ru.po
+	 fr/sflphone-client-gnome.po \
+	 es/sflphone-client-gnome.po \
+	 de/sflphone-client-gnome.po \
+     zh_CN/sflphone-client-gnome.po \
+     zh_HK/sflphone-client-gnome.po \
+	 ru/sflphone-client-gnome.po
 
 MOFILES=\
-	 fr.mo \
-	 es.mo \
-	 de.mo \
-     zh_CN.mo \
-     zh_HK.mo \
-	 ru.mo
+	 fr/sflphone-client-gnome.mo \
+	 es/sflphone-client-gnome.mo \
+	 de/sflphone-client-gnome.mo \
+     zh_CN/sflphone-client-gnome.mo \
+     zh_HK/sflphone-client-gnome.mo \
+	 ru/sflphone-client-gnome.mo
 
 MSGFMT=msgfmt
-MSGMERGE=msgmerge
 
 # necessary files
 EXTRA_DIST= $(POFILES)
@@ -32,14 +30,13 @@ all:	$(MOFILES)
 SUFFIXES=.po .mo
 
 .po.mo:
-	$(MSGMERGE) --update $< $(POTFILE) 
 	$(MSGFMT) -o $@ $<
 
 install-data-local:
 	@catalogs='$(MOFILES)'; \
 	for i in $$catalogs; do \
 		destdir=$(locale_installdir); \
-		lang=`echo $$i | sed 's/\.mo//'`; \
+		lang=`echo $$i | cut -d / -f1`; \
 		$(mkinstalldirs) $(locale_installdir)/$$lang/LC_MESSAGES; \
 		$(INSTALL_DATA) $$i $(locale_installdir)/$$lang/LC_MESSAGES/$(DOMAIN).mo; \
 		echo "installing $$i as $(locale_installdir)/$$lang/LC_MESSAGES/$(DOMAIN).mo"; \
diff --git a/sflphone-client-gnome/po/README b/sflphone-client-gnome/po/README
new file mode 100644
index 0000000000000000000000000000000000000000..163854cefa2388102ad20d7fdf8952f58cd45932
--- /dev/null
+++ b/sflphone-client-gnome/po/README
@@ -0,0 +1,5 @@
+These are translation files for both Gnome and KDE clients.
+
+If you want to update the translations, refere to the lang folder at the root directory of git repository, where the po files to edit are gathered.
+
+DO NOT EDIT THESE PO FILES since they are to be replaced by the new ones from lang folder. All changes might be lost.
diff --git a/sflphone-client-gnome/po/de/sflphone-client-gnome.po b/sflphone-client-gnome/po/de/sflphone-client-gnome.po
new file mode 100644
index 0000000000000000000000000000000000000000..9513fd6b0668446b77fa0db7a249045e7eecd938
--- /dev/null
+++ b/sflphone-client-gnome/po/de/sflphone-client-gnome.po
@@ -0,0 +1,1282 @@
+# German translation of SFLphone.
+# Copyright (C) 2008 The Free Software Foundation, Inc.
+# This file is distributed under the GNU General Public License Version 3.
+#
+# Sven Werlen <sven.werlen@savoirfairelinux.com>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: sflphone\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-07-17 16:14-0400\n"
+"PO-Revision-Date: 2009-01-08 10:46-0500\n"
+"Last-Translator: Sven Werlen <sven.werlen@savoirfairelinux.com>\n"
+"Language-Team: SavoirFaire Linux Inc <sflphoneteam@savoirfairelinux.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 0.2\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../sflphone-client-kde/src/Account.cpp:34
+#: ../sflphone-client-gnome/src/accountlist.c:175
+msgctxt "account state"
+msgid "Registered"
+msgstr "Registriert"
+
+#: ../sflphone-client-kde/src/Account.cpp:36
+#: ../sflphone-client-gnome/src/accountlist.c:178
+msgctxt "account state"
+msgid "Not Registered"
+msgstr "Nicht registriert"
+
+#: ../sflphone-client-kde/src/Account.cpp:38
+#: ../sflphone-client-gnome/src/accountlist.c:181
+msgctxt "account state"
+msgid "Trying..."
+msgstr "Am versuchen..."
+
+#: ../sflphone-client-kde/src/Account.cpp:40
+#: ../sflphone-client-gnome/src/accountlist.c:184
+msgctxt "account state"
+msgid "Error"
+msgstr "Fehler"
+
+#: ../sflphone-client-kde/src/Account.cpp:42
+#: ../sflphone-client-gnome/src/accountlist.c:187
+msgctxt "account state"
+msgid "Authentication Failed"
+msgstr "Falsche Authentifizierung"
+
+#: ../sflphone-client-kde/src/Account.cpp:44
+#: ../sflphone-client-gnome/src/accountlist.c:190
+msgctxt "account state"
+msgid "Network unreachable"
+msgstr "Kein netzwerk"
+
+#: ../sflphone-client-kde/src/Account.cpp:46
+#: ../sflphone-client-gnome/src/accountlist.c:193
+msgctxt "account state"
+msgid "Host unreachable"
+msgstr "Host unerreichbar"
+
+#: ../sflphone-client-kde/src/Account.cpp:48
+#: ../sflphone-client-gnome/src/accountlist.c:196
+msgctxt "account state"
+msgid "Stun configuration error"
+msgstr "Stun: Konfigurationsfehler"
+
+#: ../sflphone-client-kde/src/Account.cpp:50
+#: ../sflphone-client-gnome/src/accountlist.c:199
+msgctxt "account state"
+msgid "Stun server invalid"
+msgstr "Ungültiger Stun server"
+
+#: ../sflphone-client-kde/src/Account.cpp:51
+#: ../sflphone-client-gnome/src/accountlist.c:202
+msgctxt "account state"
+msgid "Invalid"
+msgstr "Ungültig"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:163
+#: ../sflphone-client-kde/src/AccountWizard.cpp:278
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:393
+msgid "Account creation wizard"
+msgstr "SFLphone Konto (Konfigurationsassistent)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:199
+#: ../sflphone-client-kde/src/AccountWizard.cpp:217
+#: ../sflphone-client-kde/src/AccountWizard.cpp:561
+#: ../sflphone-client-gnome/src/assistant.c:68
+#, c-format
+msgid "This assistant is now finished."
+msgstr "Assistent beendet."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:211
+msgid "Creation of account has failed for the reason"
+msgstr "Konfigurationsassistent mit Fehler beendet"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:255
+#: ../sflphone-client-kde/src/AccountWizard.cpp:440
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:363
+#: ../sflphone-client-gnome/src/assistant.c:72
+msgid "Alias"
+msgstr "Alias"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:256
+#: ../sflphone-client-kde/src/AccountWizard.cpp:441
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:370
+#: ../sflphone-client-gnome/src/assistant.c:75
+msgid "Server"
+msgstr "Server"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:257
+#: ../sflphone-client-kde/src/AccountWizard.cpp:442
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:371
+#: ../sflphone-client-gnome/src/assistant.c:78
+msgid "Username"
+msgstr "Benutzername"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:258
+#: ../sflphone-client-kde/src/AccountWizard.cpp:443
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:372
+msgid "Password"
+msgstr "Passwort"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:259
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:364
+#: ../sflphone-client-gnome/src/config/configwindow.c:418
+msgid "Protocol"
+msgstr "Protokoll"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:260
+#: ../sflphone-client-kde/src/AccountWizard.cpp:444
+msgid "Voicemail number"
+msgstr "Voicemail Nummer"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:279
+#: ../sflphone-client-gnome/src/assistant.c:216
+msgid "Welcome to the Account creation wizard of SFLphone!"
+msgstr "Wilkommen zu SFLphone!"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:281
+#: ../sflphone-client-gnome/src/assistant.c:217
+msgid "This installation wizard will help you configure an account."
+msgstr ""
+"The Installationsassistent wird Ihnen helfen, ein Konto zu konfigurieren."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:309
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Account"
+msgstr "Konto"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:310
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Please select one of the following options"
+msgstr "Bitte eine Option auswählen"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:312
+#: ../sflphone-client-gnome/src/assistant.c:251
+msgid "Create a free SIP/IAX2 account on sflphone.org"
+msgstr "SIP/IAX2 Konto bei sflphone.org erstellen lassen"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:313
+#: ../sflphone-client-gnome/src/assistant.c:253
+msgid "Register an existing SIP or IAX2 account"
+msgstr "Existierendes SIP/IAX2 Konto registrieren"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:352
+#: ../sflphone-client-gnome/src/assistant.c:231
+msgid "VoIP Protocols"
+msgstr "VoIP Protokoll"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:353
+#: ../sflphone-client-gnome/src/assistant.c:231
+msgid "Select an account type"
+msgstr "Kontotyp auswählen"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:355
+#: ../sflphone-client-gnome/src/assistant.c:233
+msgid "SIP (Session Initiation Protocol)"
+msgstr "SIP (Session Initiation Protocol)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:356
+#: ../sflphone-client-gnome/src/assistant.c:235
+msgid "IAX2 (InterAsterix Exchange)"
+msgstr "IAX2 (InterAsterisk Exchange)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:395
+#: ../sflphone-client-gnome/src/assistant.c:339
+msgid "Optional email address"
+msgstr "Fakultative E-mail-Adresse"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:396
+#: ../sflphone-client-gnome/src/assistant.c:339
+msgid "This email address will be used to send your voicemail messages."
+msgstr ""
+"Diese E-mail-Adresse wird benutzt, um Ihnen voicemail Meldungen zu schicken."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:398
+msgid "Email address"
+msgstr "E-mail-Adresse"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:432
+#: ../sflphone-client-gnome/src/assistant.c:266
+msgid "SIP account settings"
+msgstr "Konfiguration des SIP Konto"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:436
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "IAX2 account settings"
+msgstr "Konfiguration des IAX2 Konto"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:438
+#: ../sflphone-client-gnome/src/assistant.c:266
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "Please fill the following information"
+msgstr "Folgende Informationen bitte ausfühlen"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:523
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:856
+msgid "Network Address Translation (NAT)"
+msgstr "Network Address Translation (NAT)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:524
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:536
+msgid "You should probably enable this if you are behind a firewall."
+msgstr "Sie sollten dieses einschalten, falls Sie hinter einer Firewall sind."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:526
+msgid "Enable STUN"
+msgstr "STUN einschalten"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:527
+msgid "Stun Server"
+msgstr "Stun Server"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:562
+msgid ""
+"After checking the settings you chose, click \"Finish\" to create the "
+"account."
+msgstr "Einstellungen prüfen, dann \"Finish\" drücken."
+
+#: ../sflphone-client-kde/src/ActionSetAccountFirst.cpp:26
+msgid "Default account"
+msgstr "Default Konto"
+
+#: ../sflphone-client-kde/src/Call.cpp:116
+#: ../sflphone-client-gnome/src/contacts/calltree.c:322
+msgid "Transfer to : "
+msgstr "Weiterleiten zu : "
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:89
+#: ../sflphone-client-gnome/src/actions.c:816
+msgid "Codec"
+msgstr "Codec"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:93
+#: ../sflphone-client-gnome/src/config/audioconf.c:581
+msgid "Frequency"
+msgstr "Frequenz"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:97
+#: ../sflphone-client-gnome/src/config/audioconf.c:586
+msgid "Bitrate"
+msgstr "Bitrate"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:101
+#: ../sflphone-client-gnome/src/config/audioconf.c:591
+msgid "Bandwidth"
+msgstr "Bandbreite"
+
+#: ../sflphone-client-kde/src/main.cpp:38
+msgid "SFLphone KDE Client"
+msgstr "SFLphone KDE Client"
+
+#: ../sflphone-client-kde/src/main.cpp:42
+msgid "(C) 2009 Savoir-faire Linux"
+msgstr "(C) 2009 Savoir-faire Linux"
+
+#: ../sflphone-client-kde/src/main.cpp:46
+msgid "Jérémy Quentin"
+msgstr "Jérémy Quentin"
+
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Ihre Namen"
+
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "Ihre E-Mail-Adressen"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:62
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-gnome/src/statusicon.c:126
+msgid "SFLphone"
+msgstr "SFLphone"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:209
+msgid "Incoming call"
+msgstr "Eingehende Anrufe"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
+msgid "You have an incoming call from"
+msgstr "Sie haben einen Anruf aus"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
+msgid "Click to accept or refuse it."
+msgstr "Klicken, um zu akzeptieren oder abzulehnen."
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:716
+msgid "Address book loading..."
+msgstr "Adressbuch Laden..."
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:901
+#: ../sflphone-client-gnome/src/actions.c:89
+msgid "No registered accounts"
+msgstr "Kein registriertes Konto"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:905
+#: ../sflphone-client-gnome/src/actions.c:83
+#: ../sflphone-client-gnome/src/actions.c:813
+msgid "Using account"
+msgstr "Mit Konto"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
+msgid "Main screen"
+msgstr "Hauptbildschirm"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:165
+msgid "Call history"
+msgstr "Liste der vorherigen Anrufen"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:394
+#: ../sflphone-client-gnome/src/toolbar.c:243
+#: ../sflphone-client-gnome/src/toolbar.c:245
+msgid "Address book"
+msgstr "Adressbuch"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1108
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1173
+msgid "Edit before call"
+msgstr "Vor Aufruf bearbeiten"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:41
+#: ../sflphone-client-gnome/src/toolbar.c:167
+#: ../sflphone-client-gnome/src/toolbar.c:169
+msgid "New call"
+msgstr "Neuer Anruf"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:42
+#: ../sflphone-client-kde/src/sflphone_const.h:47
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:381
+#: ../sflphone-client-gnome/src/toolbar.c:186
+#: ../sflphone-client-gnome/src/toolbar.c:188
+msgid "Hang up"
+msgstr "Auflegen"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:43
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:382
+#: ../sflphone-client-gnome/src/toolbar.c:207
+#: ../sflphone-client-gnome/src/toolbar.c:209
+msgid "Hold on"
+msgstr "In Warteschleife"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:44
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:383
+#: ../sflphone-client-gnome/src/toolbar.c:220
+#: ../sflphone-client-gnome/src/toolbar.c:222
+msgid "Transfer"
+msgstr "Weiterleiten"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:45
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:392
+#: ../sflphone-client-gnome/src/toolbar.c:263
+msgid "Record"
+msgstr "Gespräch aufzeichnen"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:46
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:380
+#: ../sflphone-client-gnome/src/toolbar.c:176
+#: ../sflphone-client-gnome/src/toolbar.c:178
+msgid "Pick up"
+msgstr "Abnehmen"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:48
+#: ../sflphone-client-gnome/src/toolbar.c:196
+#: ../sflphone-client-gnome/src/toolbar.c:198
+msgid "Hold off"
+msgstr "Aus Warteschleife"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:49
+msgid "Give up transfer"
+msgstr "Transfer aufgeben"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:50
+msgid "Call back"
+msgstr "Zurückrufen"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:48
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:91
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
+#: ../sflphone-client-gnome/src/config/configwindow.c:722
+#: ../sflphone-client-gnome/src/config/configwindow.c:791
+msgctxt "Config section"
+msgid "General"
+msgstr "Allgemein"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:49
+msgctxt "Config section"
+msgid "Display"
+msgstr "Display"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:50
+#: ../sflphone-client-gnome/src/config/configwindow.c:833
+msgctxt "Config section"
+msgid "Accounts"
+msgstr "Konten"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:51
+#: ../sflphone-client-gnome/src/config/configwindow.c:786
+msgctxt "Config section"
+msgid "Audio"
+msgstr "Audio"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:52
+#: ../sflphone-client-gnome/src/config/configwindow.c:801
+msgctxt "Config section"
+msgid "Address Book"
+msgstr "Adressbuch"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:53
+#: ../sflphone-client-gnome/src/config/configwindow.c:796
+msgctxt "Config section"
+msgid "Recordings"
+msgstr "Tonaufnahmen"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:54
+#: ../sflphone-client-gnome/src/config/configwindow.c:806
+msgctxt "Config section"
+msgid "Hooks"
+msgstr "Hooks"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:328
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows. Enable/disable them by checking/unchecking "
+"them on the left of the item. Add or remove some with \"Plus\" and \"Sub\" "
+"buttons. Edit the selected account with the form on the right."
+msgstr ""
+"Sflphone verwendet das erste \"registrierte\" Konto in der Liste, wenn Sie "
+"anrufen. Benutzen Sie die Pfeile, um die Anordnung der Kontos zu ändern. Mit "
+"\"Plus\" und \"Minus\" können Sie ein Konto anlegen bzgl. entfernen. Mit "
+"\"Editieren\" können Sie ein Konto bearbeiten. "
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:332
+msgid "Remove the selected account"
+msgstr "Entfernen Sie das ausgewählte Konto"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:335
+msgid ""
+"This button will remove the selected account in the list below. Be sure you "
+"really don't need it anymore. If you think you might use it again later, "
+"just uncheck it."
+msgstr ""
+"Diese Aktion entfernt das ausgewählte Konto aus der Liste. Stellen Sie "
+"sicher, dass Sie es wirklich nicht mehr brauchen."
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:340
+msgid "Remove"
+msgstr "Entfernen"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:342
+msgid "Add a new account"
+msgstr "Neues Konto anlegen"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:345
+msgid ""
+"This button enables you to initialize a new account. You will then be able "
+"to edit it using the form on the right."
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:347
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:349
+msgid "Get this account down"
+msgstr "Konto nach unten"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:352
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:359
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows."
+msgstr ""
+"Sflphone verwendet das erste \"registrierte\" Konto in der Liste, wenn Sie "
+"anrufen. Benutzen Sie die Pfeile, um die Anordnung der Kontos zu ändern."
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:354
+msgid "Down"
+msgstr "Unten"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:356
+msgid "Get this account up"
+msgstr "Nach oben"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:361
+msgid "Up"
+msgstr "Oben"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:362
+msgid "Apply"
+msgstr "übernehmen"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:367
+msgid "SIP"
+msgstr "SIP"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:368
+msgid "IAX"
+msgstr "IAX"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:373
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:385
+#: ../sflphone-client-gnome/src/toolbar.c:52
+#: ../sflphone-client-gnome/src/toolbar.c:251
+#: ../sflphone-client-gnome/src/toolbar.c:255
+msgid "Voicemail"
+msgstr "Voicemail"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:374
+#: ../sflphone-client-gnome/src/config/configwindow.c:425
+msgid "Status"
+msgstr "Status"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:377
+#: ../sflphone-client-gnome/src/config/configwindow.c:528
+msgid "Stun parameters will be applied on each SIP account created."
+msgstr "Alle SIP Kontos werden mit Stun Einstellungen angepasst."
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:378
+msgid "Enable Stun"
+msgstr "Stun aktivieren"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:380
+#: ../sflphone-client-gnome/src/config/configwindow.c:544
+msgid "Format : name.server:port"
+msgstr "Format: Name.Server:Port"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:382
+msgid "choose Stun server (example : stunserver.org)"
+msgstr "Stun Server auswählen (Bsp: stunserver.org)"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:154
+msgid "Enable address book"
+msgstr "Aktivieren Adressbuch"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:155
+#, fuzzy
+msgid "Maximum results"
+msgstr "Maximale Anzahl Resultaten"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:156
+#, fuzzy
+msgid "Display photo if available"
+msgstr "Foto anzeigen"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:157
+#, fuzzy
+msgid "Display phone numbers of these types :"
+msgstr "Nummer anzeigen für Typen :"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:158
+#, fuzzy
+msgid "Work"
+msgstr "Arbeit"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:159
+#, fuzzy
+msgid "Mobile"
+msgstr "Handy"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:160
+#, fuzzy
+msgid "Home"
+msgstr "Heim"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:225
+msgid "Sound manager"
+msgstr "Sound Manager"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:228
+msgid "ALSA"
+msgstr "ALSA"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:229
+msgid "PulseAudio"
+msgstr "Pulseaudio"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:231
+msgid "Enable ringtones"
+msgstr "Klingeltöne aktivieren"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:232
+#: ../sflphone-client-gnome/src/config/audioconf.c:812
+msgid "Codecs"
+msgstr "Codecs"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:233
+#: ../sflphone-client-gnome/src/config/audioconf.c:795
+msgid "ALSA settings"
+msgstr "ALSA Konfiguration"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:234
+#: ../sflphone-client-gnome/src/config/audioconf.c:662
+msgid "ALSA plugin"
+msgstr "ALSA Plugin"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:235
+#: ../sflphone-client-gnome/src/config/audioconf.c:706
+msgid "Input"
+msgstr "Eingabe"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:236
+#: ../sflphone-client-gnome/src/config/audioconf.c:684
+msgid "Output"
+msgstr "Ausgabe"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:237
+msgid "PulseAudio settings"
+msgstr "Pulseaudio Einstellungen "
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:238
+msgid "Mute other applications during a call"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:121
+msgid "Enable notifications"
+msgstr "Aktivieren Benachrichtungungen"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:122
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:126
+#, fuzzy
+msgid "On incoming calls"
+msgstr "Auf eingehende Anrufe "
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:123
+#, fuzzy
+msgid "On messages"
+msgstr "Auf Nachrichten"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:124
+msgid "Show main window"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:125
+#, fuzzy
+msgid "On start"
+msgstr "Am Start"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:166
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "Keep my history for at least"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:167
+#: ../sflphone-client-gnome/src/config/configwindow.c:643
+msgctxt "End of 'Keep my history for at least n days.'"
+msgid "days"
+msgstr "Tag"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:168
+msgid "Clear history"
+msgstr "Vorherigen Anrufen leeren"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:169
+msgid "Connection"
+msgstr "Connection"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:170
+#: ../sflphone-client-gnome/src/config/configwindow.c:664
+msgid "SIP Port"
+msgstr "SIP Port"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:180
+#: ../sflphone-client-gnome/src/config/hooks-config.c:130
+msgid "URL Argument"
+msgstr "URL Argumen"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:181
+#: ../sflphone-client-gnome/src/config/hooks-config.c:135
+msgid "Custom commands on incoming calls with URL"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:182
+msgid "Trigger on specific SIP header"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:183
+msgid "Trigger on IAX2 URL"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:184
+msgid "Command to run"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:185
+#: ../sflphone-client-gnome/src/config/hooks-config.c:138
+#, c-format
+msgid "%s will be replaced with the passed URL."
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:186
+#: ../sflphone-client-gnome/src/config/hooks-config.c:165
+msgid "Phone number rewriting"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:187
+msgid "Prefix dialed numbers with"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:92
+#: ../sflphone-client-gnome/src/config/configwindow.c:726
+msgid "Destination folder"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:384
+#: ../sflphone-client-gnome/src/toolbar.c:232
+#: ../sflphone-client-gnome/src/toolbar.c:234
+msgid "History"
+msgstr "Vorherige Anrufe"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:386
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:388
+msgid "Configure SFLphone"
+msgstr "Konfigurieren SFLphone"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:390
+#, fuzzy
+msgid "Display volume controls"
+msgstr "Lautstärke Kontrollen"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:391
+msgid "Display dialpad"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:396
+msgid "Attention:number of results exceeds max displayed."
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:398
+#: ../sflphone-client-gnome/src/sliders.c:163
+msgid "Mic volume"
+msgstr "Mikro Lautstärke"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:402
+#: ../sflphone-client-gnome/src/sliders.c:161
+msgid "Speakers volume"
+msgstr "Lautsprecher Lautstärke"
+
+#: ../sflphone-client-gnome/src/actions.c:54
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+#, c-format
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] "%d Voice Nachricht"
+msgstr[1] "%d Voice Nachricht"
+
+#: ../sflphone-client-gnome/src/actions.c:234
+msgid ""
+"Unable to connect to the SFLphone server.\n"
+"Make sure the daemon is running."
+msgstr ""
+"SFLphone Server kann nicht verbunden werden. Stellen Sie sicher, dass der "
+"Dämon läuft."
+
+#: ../sflphone-client-gnome/src/actions.c:809
+#, c-format
+msgid "IP call - %s"
+msgstr "IP Anruf - %s"
+
+#: ../sflphone-client-gnome/src/actions.c:908
+#, 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>Fehler: Kein Audio-Codec gefunden.\n"
+"\n"
+"</b> SFL Audio-Codecs müssen in <i>%s</i> oder <b>.sflphone</b> Ihres HOME-"
+"Verzeichniss ( <i>%s</i> ) gespeichert werden."
+
+#: ../sflphone-client-gnome/src/assistant.c:70
+msgid ""
+"You can at any time check your registration state or modify your accounts "
+"parameters in the Options/Accounts window."
+msgstr ""
+"Sie können jederzeit Ihres Registrierungsstatus überprüfen oder "
+"IhreKontoparameter ändern (Optionen/Konten)."
+
+#: ../sflphone-client-gnome/src/assistant.c:190
+msgid "SFLphone account creation wizard"
+msgstr "SFLphone Konto (Konfigurationsassistent)"
+
+#: ../sflphone-client-gnome/src/assistant.c:274
+#: ../sflphone-client-gnome/src/assistant.c:370
+#: ../sflphone-client-gnome/src/config/accountwindow.c:153
+msgid "_Alias"
+msgstr "_Alias"
+
+#: ../sflphone-client-gnome/src/assistant.c:282
+#: ../sflphone-client-gnome/src/assistant.c:378
+#: ../sflphone-client-gnome/src/config/accountwindow.c:189
+msgid "_Host name"
+msgstr "_Hostname"
+
+#: ../sflphone-client-gnome/src/assistant.c:290
+#: ../sflphone-client-gnome/src/assistant.c:386
+#: ../sflphone-client-gnome/src/config/accountwindow.c:197
+msgid "_User name"
+msgstr "_Benutzername"
+
+#: ../sflphone-client-gnome/src/assistant.c:306
+#: ../sflphone-client-gnome/src/assistant.c:401
+#: ../sflphone-client-gnome/src/config/accountwindow.c:212
+msgid "_Password"
+msgstr "_Passwort"
+
+#: ../sflphone-client-gnome/src/assistant.c:324
+#: ../sflphone-client-gnome/src/assistant.c:417
+#: ../sflphone-client-gnome/src/config/accountwindow.c:228
+msgid "_Voicemail number"
+msgstr "_Voicemail Nummer"
+
+#: ../sflphone-client-gnome/src/assistant.c:347
+msgid "_Email address"
+msgstr "_Email"
+
+#: ../sflphone-client-gnome/src/assistant.c:444
+#: ../sflphone-client-gnome/src/config/configwindow.c:532
+msgid "E_nable STUN"
+msgstr "STUN Ei_nschalten"
+
+#: ../sflphone-client-gnome/src/assistant.c:451
+msgid "_STUN server"
+msgstr "_STUN Server"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Account Registration"
+msgstr "Konto Registrierung"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Congratulations!"
+msgstr "Gratulation!"
+
+#: ../sflphone-client-gnome/src/errors.c:29
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening playback device"
+msgstr ""
+"ALSA Benachrichtigung\n"
+"\n"
+"Fehler während Öffnen des \"playback device\""
+
+#: ../sflphone-client-gnome/src/errors.c:32
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening capture device"
+msgstr ""
+"ALSA Benachrichtigung\n"
+"\n"
+"Fehler während Öffnen des \"capture device\""
+
+#: ../sflphone-client-gnome/src/errors.c:35
+msgid ""
+"Pulseaudio notification\n"
+"\n"
+"Pulseaudio is not running"
+msgstr ""
+"Pulseaudio Benachrichtigung\n"
+"\n"
+"Pulseaudio nicht gestartet"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:70
+msgid "There is one call in progress."
+msgstr "Laufender Anruf."
+
+#: ../sflphone-client-gnome/src/mainwindow.c:74
+msgid "There are calls in progress."
+msgstr "Laufende Anrufe."
+
+#: ../sflphone-client-gnome/src/mainwindow.c:83
+msgid "Do you still want to quit?"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/mainwindow.c:284
+msgid "SFLphone Error"
+msgstr "SFLphone Fehler"
+
+#: ../sflphone-client-gnome/src/menus.c:134
+msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr "SFLphone ist ein VoIP Client (kompatibel mit SIP und IAX2 Protokolle)"
+
+#: ../sflphone-client-gnome/src/menus.c:137
+msgid "About SFLphone"
+msgstr "Über SFLphone"
+
+#: ../sflphone-client-gnome/src/menus.c:161
+msgid "_Help"
+msgstr "_Hilfe"
+
+#: ../sflphone-client-gnome/src/menus.c:296
+#: ../sflphone-client-gnome/src/menus.c:953
+msgid "_New call"
+msgstr "_Neuer Anruf"
+
+#: ../sflphone-client-gnome/src/menus.c:308
+#: ../sflphone-client-gnome/src/menus.c:785
+msgid "_Pick up"
+msgstr "_Abnehmen"
+
+#: ../sflphone-client-gnome/src/menus.c:318
+#: ../sflphone-client-gnome/src/menus.c:797
+msgid "_Hang up"
+msgstr "A_uflegen"
+
+#: ../sflphone-client-gnome/src/menus.c:328
+#: ../sflphone-client-gnome/src/menus.c:809
+msgid "On _Hold"
+msgstr "in _Warteschleife"
+
+#: ../sflphone-client-gnome/src/menus.c:340
+#: ../sflphone-client-gnome/src/menus.c:821
+msgid "_Record"
+msgstr "_Gespräch aufzeichnen"
+
+#: ../sflphone-client-gnome/src/menus.c:354
+msgid "_Account creation wizard"
+msgstr "SFLphone _Konto (Konfigurationsassistent)"
+
+#: ../sflphone-client-gnome/src/menus.c:384
+msgid "_Call"
+msgstr "_Anruf"
+
+#: ../sflphone-client-gnome/src/menus.c:552
+msgid "Clear _history"
+msgstr "Liste der vorherigen Anrufen _leeren"
+
+#: ../sflphone-client-gnome/src/menus.c:564
+msgid "_Accounts"
+msgstr "_Konten"
+
+#: ../sflphone-client-gnome/src/menus.c:579
+msgid "_Edit"
+msgstr "_Editieren"
+
+#: ../sflphone-client-gnome/src/menus.c:631
+msgid "_Dialpad"
+msgstr "_Wählscheibe"
+
+#: ../sflphone-client-gnome/src/menus.c:643
+msgid "_Volume controls"
+msgstr "Lautstärke Kontrollen"
+
+#: ../sflphone-client-gnome/src/menus.c:661
+msgid "_View"
+msgstr "_Anzeigen"
+
+#: ../sflphone-client-gnome/src/menus.c:881
+msgid "_Call back"
+msgstr "_zurückrufen"
+
+#: ../sflphone-client-gnome/src/menus.c:1061
+msgid "Edit phone number"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/menus.c:1072
+msgid "Edit the phone number before making a call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/sflnotify.c:71
+#: ../sflphone-client-gnome/src/sflnotify.c:91
+#, c-format
+msgid "%s account : %s"
+msgstr "Konto %s : %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:75
+#, c-format
+msgid "<i>From</i> %s"
+msgstr "<i>Von</i> %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:111
+#, c-format
+msgid "Calling with %s account <i>%s</i>"
+msgstr "Mit %s Konto <i>%s</i> anrufen"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:115
+msgid "Current account"
+msgstr "Aktuelles Konto"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:130
+msgid "You have no accounts set up"
+msgstr "Sie haben noch kein Konto eingestellt"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:131
+#: ../sflphone-client-gnome/src/sflnotify.c:148
+msgid "Error"
+msgstr "Fehler"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:147
+msgid "You have no registered accounts"
+msgstr "Sie haben noch kein registriertes Konto"
+
+#: ../sflphone-client-gnome/src/statusicon.c:91
+msgid "_Show main window"
+msgstr "_Hauptfenster anzeigen"
+
+#: ../sflphone-client-gnome/src/statusicon.c:127
+#, c-format
+msgid "%i account configured"
+msgid_plural "%i accounts configured"
+msgstr[0] "%i Konto konfiguriert"
+msgstr[1] "%i Konten konfiguriert"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:113
+msgid "Account settings"
+msgstr "Kontoeinstellungen"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:147
+msgid "_Enable this account"
+msgstr "_Einschalten"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:161
+msgid "_Protocol"
+msgstr "_Protokoll"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:179
+msgid "Unknown"
+msgstr "unbekannt"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:312
+msgid "_Use Evolution address books"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:319
+msgid "Download limit :"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:327
+msgid "cards"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:333
+msgid "_Display contact photo if available"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:341
+msgid "Fields from Evolution's address books"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:345
+msgid "_Work"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:351
+msgid "_Home"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:357
+msgid "_Mobile"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:364
+msgid "Address Books"
+msgstr "Adressbücher"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:368
+msgid "Select which Evolution address books to use"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:404
+#: ../sflphone-client-gnome/src/config/audioconf.c:576
+msgid "Name"
+msgstr "Name"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:741
+msgid "_Voice Activity Detection"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:751
+msgid "_Noise Reduction (Narrow-Band Companding)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:780
+msgid "Sound Manager"
+msgstr "Sound Manager"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:783
+msgid "_Pulseaudio"
+msgstr "Pulseaudio"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:788
+msgid "_ALSA"
+msgstr "ALSA"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:835
+msgid "Ringtones"
+msgstr "Klingeltöne"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:841
+msgid "_Enable ringtones"
+msgstr "Klingeltöne _einschalten"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:847
+msgid "Choose a ringtone"
+msgstr "Klingelton auswählen"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
+msgid "Audio Files"
+msgstr "Audio Dateien"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:589
+msgid "Desktop Notifications"
+msgstr "Desktopbenachrichtigungen"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:593
+msgid "_Enable notifications"
+msgstr "Benachrichtigungen _einschalten"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:599
+msgid "Enable voicemail _notifications"
+msgstr "_Benachrichtigung für Voice Nachrichten"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:611
+msgid "System Tray Icon"
+msgstr "Benachrichtigungsfeld (\"System Tray\") Icon"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:614
+msgid "_Popup main window on incoming call"
+msgstr "Hauptfenster anzeigen wenn eingehendes Gespräch"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:619
+msgid "Ne_ver popup main window"
+msgstr "_Hauptfenster nie anzeigen"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:623
+msgid "Hide SFLphone window on _startup"
+msgstr "_Unsichtbar beim Start"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:629
+msgid "Calls History"
+msgstr "Liste der vorherigen Anrufen"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:632
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "_Keep my history for at least"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:647
+msgid "PulseAudio sound server"
+msgstr "PulseAudio Sound Server"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:650
+msgid "_Mute other applications during a call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:677
+msgid "Port"
+msgstr "Port"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:732
+msgid "Select a folder"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:766
+msgid "Preferences"
+msgstr "Einstellungen"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:845
+msgid "Configured Accounts"
+msgstr "Konfigurierten Konten"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:141
+msgid "Trigger on specific _SIP header"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:150
+msgid "Trigger on _IAX2 URL"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:155
+msgid "Command to _run"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:169
+msgid "_Prefix dialed numbers with"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+msgid "Search all"
+msgstr "Suche in allen"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:57
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:70
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:82
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:94
+msgid "Click here to change the search type"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+msgid "Search by missed call"
+msgstr "Suche nach Anruf in Abwesenheit "
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+msgid "Search by incoming call"
+msgstr "Suche nach eingehenden Anruf "
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+msgid "Search by outgoing call"
+msgstr "Suche nach ausgehenden Anru"
+
+#~ msgid "User"
+#~ msgstr "Benutzername"
+
+#~ msgid "Mailbox"
+#~ msgstr "Mailbox"
+
+#~ msgid "State"
+#~ msgstr "Status"
+
+#~ msgid "Stun settings will be applied on each account"
+#~ msgstr "Alle SIP Kontos werden mit Stun Einstellungen angepasst."
+
+#~ msgid "Audio device"
+#~ msgstr "Audio Dateien"
+
+#~ msgid "&Codecs"
+#~ msgstr "Codecs"
+
+#~ msgid "Out"
+#~ msgstr "Ausgabe"
+
+#~ msgid "On &incoming calls"
+#~ msgstr "Auf eingehende Anrufe "
+
+#~ msgid "days"
+#~ msgstr "Tag"
+
+#~ msgid "General"
+#~ msgstr "Allgemein"
+
+#~ msgid "Hold"
+#~ msgstr "In Warteschleife"
+
+#~ msgid "Configure accounts"
+#~ msgstr "Konfigurierten Konten"
+
+#~ msgid "Configure audio"
+#~ msgstr "Konfigurieren SFLphone"
+
+#~ msgctxt "Action record a call"
+#~ msgid "Record"
+#~ msgstr "Gespräch aufzeichnen"
+
+#~ msgid "accounr state"
+#~ msgstr "Kontoeinstellungen"
+
+#~ msgid "%s - %s"
+#~ msgstr "%s - %s"
diff --git a/sflphone-client-gnome/po/es/sflphone-client-gnome.po b/sflphone-client-gnome/po/es/sflphone-client-gnome.po
new file mode 100644
index 0000000000000000000000000000000000000000..178c397bbfcf2e4f1f8fb72a36ad500e4cf63eef
--- /dev/null
+++ b/sflphone-client-gnome/po/es/sflphone-client-gnome.po
@@ -0,0 +1,1478 @@
+# Spanish translation of SFLphone.
+# Copyright (C) 2008 2009 The Free Software Foundation, Inc.
+# This file is distributed under the GNU General Public License Version 3.
+# 
+# Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>, 2008.
+# 
+# POT-Creation-Date: 2007-01-13 01:39+0100\n
+msgid ""
+msgstr ""
+"Project-Id-Version: SFLphone 0.9.4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-07-17 16:14-0400\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"
+
+#: ../sflphone-client-kde/src/Account.cpp:34
+#: ../sflphone-client-gnome/src/accountlist.c:175
+msgctxt "account state"
+msgid "Registered"
+msgstr "Registrado"
+
+#: ../sflphone-client-kde/src/Account.cpp:36
+#: ../sflphone-client-gnome/src/accountlist.c:178
+msgctxt "account state"
+msgid "Not Registered"
+msgstr "No registrado"
+
+#: ../sflphone-client-kde/src/Account.cpp:38
+#: ../sflphone-client-gnome/src/accountlist.c:181
+msgctxt "account state"
+msgid "Trying..."
+msgstr "Intentando..."
+
+#: ../sflphone-client-kde/src/Account.cpp:40
+#: ../sflphone-client-gnome/src/accountlist.c:184
+msgctxt "account state"
+msgid "Error"
+msgstr "Error"
+
+#: ../sflphone-client-kde/src/Account.cpp:42
+#: ../sflphone-client-gnome/src/accountlist.c:187
+msgctxt "account state"
+msgid "Authentication Failed"
+msgstr "Autenticación erronea"
+
+#: ../sflphone-client-kde/src/Account.cpp:44
+#: ../sflphone-client-gnome/src/accountlist.c:190
+msgctxt "account state"
+msgid "Network unreachable"
+msgstr "Red Inaccesible"
+
+#: ../sflphone-client-kde/src/Account.cpp:46
+#: ../sflphone-client-gnome/src/accountlist.c:193
+msgctxt "account state"
+msgid "Host unreachable"
+msgstr "Parte del servidor"
+
+#: ../sflphone-client-kde/src/Account.cpp:48
+#: ../sflphone-client-gnome/src/accountlist.c:196
+msgctxt "account state"
+msgid "Stun configuration error"
+msgstr "Error de configuración Stun"
+
+#: ../sflphone-client-kde/src/Account.cpp:50
+#: ../sflphone-client-gnome/src/accountlist.c:199
+msgctxt "account state"
+msgid "Stun server invalid"
+msgstr "Servidor stun inválido"
+
+#: ../sflphone-client-kde/src/Account.cpp:51
+#: ../sflphone-client-gnome/src/accountlist.c:202
+msgctxt "account state"
+msgid "Invalid"
+msgstr "Inválido"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:163
+#: ../sflphone-client-kde/src/AccountWizard.cpp:278
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:393
+msgid "Account creation wizard"
+msgstr "Asistente de configuración de cuentas"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:199
+#: ../sflphone-client-kde/src/AccountWizard.cpp:217
+#: ../sflphone-client-kde/src/AccountWizard.cpp:561
+#: ../sflphone-client-gnome/src/assistant.c:68
+#, c-format
+msgid "This assistant is now finished."
+msgstr "Ese asistante ha finalizado."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:211
+msgid "Creation of account has failed for the reason"
+msgstr "Creación de cuenta ha fallado por la razón"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:255
+#: ../sflphone-client-kde/src/AccountWizard.cpp:440
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:363
+#: ../sflphone-client-gnome/src/assistant.c:72
+msgid "Alias"
+msgstr "Alias"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:256
+#: ../sflphone-client-kde/src/AccountWizard.cpp:441
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:370
+#: ../sflphone-client-gnome/src/assistant.c:75
+msgid "Server"
+msgstr "Servidor"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:257
+#: ../sflphone-client-kde/src/AccountWizard.cpp:442
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:371
+#: ../sflphone-client-gnome/src/assistant.c:78
+msgid "Username"
+msgstr "Usuario"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:258
+#: ../sflphone-client-kde/src/AccountWizard.cpp:443
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:372
+msgid "Password"
+msgstr "Contraseña"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:259
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:364
+#: ../sflphone-client-gnome/src/config/configwindow.c:418
+msgid "Protocol"
+msgstr "Protocolo"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:260
+#: ../sflphone-client-kde/src/AccountWizard.cpp:444
+msgid "Voicemail number"
+msgstr "Número de buzón de voz"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:279
+#: ../sflphone-client-gnome/src/assistant.c:216
+msgid "Welcome to the Account creation wizard of SFLphone!"
+msgstr "¡Bienvenido al asistente de configuración de cuentas de SFLphone"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:281
+#: ../sflphone-client-gnome/src/assistant.c:217
+msgid "This installation wizard will help you configure an account."
+msgstr "Este asistente de instalación le ayudará a configurar una cuenta."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:309
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Account"
+msgstr "Cuenta"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:310
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Please select one of the following options"
+msgstr "Por favor, elija una de las siguientes opciones"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:312
+#: ../sflphone-client-gnome/src/assistant.c:251
+msgid "Create a free SIP/IAX2 account on sflphone.org"
+msgstr "Crear una cuenta SIP/IAX2 gratis en sflphone.org"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:313
+#: ../sflphone-client-gnome/src/assistant.c:253
+msgid "Register an existing SIP or IAX2 account"
+msgstr "Registrar una cuenta SIP o IAX2 existente"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:352
+#: ../sflphone-client-gnome/src/assistant.c:231
+msgid "VoIP Protocols"
+msgstr "Protocolos VoIP"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:353
+#: ../sflphone-client-gnome/src/assistant.c:231
+msgid "Select an account type"
+msgstr "Escoja un tipo de cuenta"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:355
+#: ../sflphone-client-gnome/src/assistant.c:233
+msgid "SIP (Session Initiation Protocol)"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:356
+#: ../sflphone-client-gnome/src/assistant.c:235
+msgid "IAX2 (InterAsterix Exchange)"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:395
+#: ../sflphone-client-gnome/src/assistant.c:339
+msgid "Optional email address"
+msgstr "Dirección de correo opcional"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:396
+#: ../sflphone-client-gnome/src/assistant.c:339
+msgid "This email address will be used to send your voicemail messages."
+msgstr "Esta dirección de correo se usará para mandar sus mensajes de voz"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:398
+msgid "Email address"
+msgstr "Dirección de correo"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:432
+#: ../sflphone-client-gnome/src/assistant.c:266
+msgid "SIP account settings"
+msgstr "Configuración de cuenta SIP"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:436
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "IAX2 account settings"
+msgstr "Configuración de cuenta IAX2"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:438
+#: ../sflphone-client-gnome/src/assistant.c:266
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "Please fill the following information"
+msgstr "Por favor, rellene la siguiente información"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:523
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:856
+msgid "Network Address Translation (NAT)"
+msgstr "Conversión de Dirección de Red (NAT)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:524
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:536
+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."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:526
+msgid "Enable STUN"
+msgstr "Activar STUN"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:527
+msgid "Stun Server"
+msgstr "Servidor STUN"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:562
+msgid ""
+"After checking the settings you chose, click \"Finish\" to create the "
+"account."
+msgstr ""
+"Después de comprobar los ajustes usted eligió, haz clic \"Terminar\"para "
+"crear la cuenta."
+
+#: ../sflphone-client-kde/src/ActionSetAccountFirst.cpp:26
+msgid "Default account"
+msgstr "Cuenta por defecto"
+
+#: ../sflphone-client-kde/src/Call.cpp:116
+#: ../sflphone-client-gnome/src/contacts/calltree.c:322
+msgid "Transfer to : "
+msgstr "Transferir a : "
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:89
+#: ../sflphone-client-gnome/src/actions.c:816
+msgid "Codec"
+msgstr "Códec"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:93
+#: ../sflphone-client-gnome/src/config/audioconf.c:581
+msgid "Frequency"
+msgstr "Frecuencia"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:97
+#: ../sflphone-client-gnome/src/config/audioconf.c:586
+msgid "Bitrate"
+msgstr "Tasa de transferencia"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:101
+#: ../sflphone-client-gnome/src/config/audioconf.c:591
+msgid "Bandwidth"
+msgstr "Ancho de banda"
+
+#: ../sflphone-client-kde/src/main.cpp:38
+msgid "SFLphone KDE Client"
+msgstr "Cliente KDE de SFLphone"
+
+#: ../sflphone-client-kde/src/main.cpp:42
+msgid "(C) 2009 Savoir-faire Linux"
+msgstr ""
+
+#: ../sflphone-client-kde/src/main.cpp:46
+msgid "Jérémy Quentin"
+msgstr ""
+
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Maxime Chambreuil"
+
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "maxime.chambreuil@savoirfairelinux.com"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:62
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-gnome/src/statusicon.c:126
+msgid "SFLphone"
+msgstr "SFLphone"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:209
+msgid "Incoming call"
+msgstr "Llamada entrante"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
+msgid "You have an incoming call from"
+msgstr "Tienes una llamada de"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
+msgid "Click to accept or refuse it."
+msgstr "Haz clic para aceptar o rechazarlo"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:716
+msgid "Address book loading..."
+msgstr "Cargando el directorio..."
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:901
+#: ../sflphone-client-gnome/src/actions.c:89
+msgid "No registered accounts"
+msgstr "Ninguna cuenta registrada"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:905
+#: ../sflphone-client-gnome/src/actions.c:83
+#: ../sflphone-client-gnome/src/actions.c:813
+msgid "Using account"
+msgstr "Usando la cuenta"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
+msgid "Main screen"
+msgstr "Pantalla principal"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:165
+msgid "Call history"
+msgstr "Historia de Llamada"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:394
+#: ../sflphone-client-gnome/src/toolbar.c:243
+#: ../sflphone-client-gnome/src/toolbar.c:245
+msgid "Address book"
+msgstr "Libreta de contactos"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1108
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1173
+msgid "Edit before call"
+msgstr "Editar antes de llamar"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:41
+#: ../sflphone-client-gnome/src/toolbar.c:167
+#: ../sflphone-client-gnome/src/toolbar.c:169
+msgid "New call"
+msgstr "Nueva llamada"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:42
+#: ../sflphone-client-kde/src/sflphone_const.h:47
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:381
+#: ../sflphone-client-gnome/src/toolbar.c:186
+#: ../sflphone-client-gnome/src/toolbar.c:188
+msgid "Hang up"
+msgstr "Colgar"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:43
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:382
+#: ../sflphone-client-gnome/src/toolbar.c:207
+#: ../sflphone-client-gnome/src/toolbar.c:209
+msgid "Hold on"
+msgstr "Retener"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:44
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:383
+#: ../sflphone-client-gnome/src/toolbar.c:220
+#: ../sflphone-client-gnome/src/toolbar.c:222
+msgid "Transfer"
+msgstr "Transferir"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:45
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:392
+#: ../sflphone-client-gnome/src/toolbar.c:263
+msgid "Record"
+msgstr "Recordar"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:46
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:380
+#: ../sflphone-client-gnome/src/toolbar.c:176
+#: ../sflphone-client-gnome/src/toolbar.c:178
+msgid "Pick up"
+msgstr "Descolgar"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:48
+#: ../sflphone-client-gnome/src/toolbar.c:196
+#: ../sflphone-client-gnome/src/toolbar.c:198
+msgid "Hold off"
+msgstr "Seguir"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:49
+msgid "Give up transfer"
+msgstr "Abandonar transferencia"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:50
+msgid "Call back"
+msgstr "Llamar"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:48
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:91
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
+#: ../sflphone-client-gnome/src/config/configwindow.c:722
+#: ../sflphone-client-gnome/src/config/configwindow.c:791
+msgctxt "Config section"
+msgid "General"
+msgstr ""
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:49
+msgctxt "Config section"
+msgid "Display"
+msgstr "Mostrar"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:50
+#: ../sflphone-client-gnome/src/config/configwindow.c:833
+msgctxt "Config section"
+msgid "Accounts"
+msgstr "Cuentas"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:51
+#: ../sflphone-client-gnome/src/config/configwindow.c:786
+msgctxt "Config section"
+msgid "Audio"
+msgstr "Audio"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:52
+#: ../sflphone-client-gnome/src/config/configwindow.c:801
+msgctxt "Config section"
+msgid "Address Book"
+msgstr "Libreta de direcciones"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:53
+#: ../sflphone-client-gnome/src/config/configwindow.c:796
+msgctxt "Config section"
+msgid "Recordings"
+msgstr "Grabaciones"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:54
+#: ../sflphone-client-gnome/src/config/configwindow.c:806
+msgctxt "Config section"
+msgid "Hooks"
+msgstr "Disparadores"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:328
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows. Enable/disable them by checking/unchecking "
+"them on the left of the item. Add or remove some with \"Plus\" and \"Sub\" "
+"buttons. Edit the selected account with the form on the right."
+msgstr ""
+"Por defecto, sflphone usa la primera cuenta registrada en esa listapara "
+"llamar. Cambiar el orden de las cuentas con las flechas \"Arriba\" y \"Abajo"
+"\". Activar/Desactivar las si las selecciona/deselecciona a la izquierda. "
+"Añadir ò Eliminar algunas con los botones \"Mas\" y \"Menos\" Editar la "
+"cuenta seleccionada con el formulario a la derecha."
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:332
+msgid "Remove the selected account"
+msgstr "Eliminar la cuenta seleccionada"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:335
+msgid ""
+"This button will remove the selected account in the list below. Be sure you "
+"really don't need it anymore. If you think you might use it again later, "
+"just uncheck it."
+msgstr ""
+"Este botòn elimina la cuenta seleccionada en la siguiente lista. Esté "
+"seguroque usted no la necesita mas. Si usted piensa que, tal vez, lo va a "
+"necesitardespues, solo lo deselecciona."
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:340
+msgid "Remove"
+msgstr "Eliminar"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:342
+msgid "Add a new account"
+msgstr "Añadir una nueva cuenta"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:345
+msgid ""
+"This button enables you to initialize a new account. You will then be able "
+"to edit it using the form on the right."
+msgstr ""
+"Este botón le permite inicializar una nueva cuenta. Usted podrá "
+"corregirlocon el formulario a la derecha."
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:347
+msgid "Add"
+msgstr "Añadir"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:349
+msgid "Get this account down"
+msgstr "Bajar esta cuenta"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:352
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:359
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows."
+msgstr ""
+"Por defecto, sflphone usa la primera cuenta registrada en esa listapara "
+"llamar. Cambiar el orden de las cuentas con las flechas \"Arriba\" y \"Abajo"
+"\"."
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:354
+msgid "Down"
+msgstr "Abajo"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:356
+msgid "Get this account up"
+msgstr "Subir esta cuenta"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:361
+msgid "Up"
+msgstr "Arriba"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:362
+msgid "Apply"
+msgstr "Aplicar"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:367
+msgid "SIP"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:368
+msgid "IAX"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:373
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:385
+#: ../sflphone-client-gnome/src/toolbar.c:52
+#: ../sflphone-client-gnome/src/toolbar.c:251
+#: ../sflphone-client-gnome/src/toolbar.c:255
+msgid "Voicemail"
+msgstr "Mensaje de voz"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:374
+#: ../sflphone-client-gnome/src/config/configwindow.c:425
+msgid "Status"
+msgstr "Estado"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:377
+#: ../sflphone-client-gnome/src/config/configwindow.c:528
+msgid "Stun parameters will be applied on each SIP account created."
+msgstr "Parámetros de stun se aplicarán a cada cuenta SIP creada."
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:378
+msgid "Enable Stun"
+msgstr "Activar STUN"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:380
+#: ../sflphone-client-gnome/src/config/configwindow.c:544
+msgid "Format : name.server:port"
+msgstr "Formato : nombre.servidor:puerto"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:382
+msgid "choose Stun server (example : stunserver.org)"
+msgstr "Elija un servidor Stun (ejemplo : stunserver.org)"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:154
+msgid "Enable address book"
+msgstr "Activar la libreta de contactos"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:155
+msgid "Maximum results"
+msgstr "Resultados maximo"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:156
+msgid "Display photo if available"
+msgstr "Mostrar fotos de contactos, si está disponible"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:157
+msgid "Display phone numbers of these types :"
+msgstr "Mostrar números de este typo:"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:158
+msgid "Work"
+msgstr "Profesional"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:159
+msgid "Mobile"
+msgstr "Movil"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:160
+msgid "Home"
+msgstr "Personal"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:225
+msgid "Sound manager"
+msgstr "Gestor de audio"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:228
+msgid "ALSA"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:229
+msgid "PulseAudio"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:231
+msgid "Enable ringtones"
+msgstr "Habilitar tonos de llamada"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:232
+#: ../sflphone-client-gnome/src/config/audioconf.c:812
+msgid "Codecs"
+msgstr "Códecs"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:233
+#: ../sflphone-client-gnome/src/config/audioconf.c:795
+msgid "ALSA settings"
+msgstr "Configuración de ALSA"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:234
+#: ../sflphone-client-gnome/src/config/audioconf.c:662
+msgid "ALSA plugin"
+msgstr "Plugin ALSA"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:235
+#: ../sflphone-client-gnome/src/config/audioconf.c:706
+msgid "Input"
+msgstr "Entrada"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:236
+#: ../sflphone-client-gnome/src/config/audioconf.c:684
+msgid "Output"
+msgstr "Salida"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:237
+msgid "PulseAudio settings"
+msgstr "Configuración de PulseAudio"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:238
+msgid "Mute other applications during a call"
+msgstr "Silenciar el resto de aplicaciones durante una llamada"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:121
+msgid "Enable notifications"
+msgstr "Habilitar notificaciones"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:122
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:126
+msgid "On incoming calls"
+msgstr "Al recibir llamadas"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:123
+msgid "On messages"
+msgstr "Al recibir mensajes"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:124
+msgid "Show main window"
+msgstr "Mostrar ventana principal"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:125
+msgid "On start"
+msgstr "En el arranque"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:166
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "Keep my history for at least"
+msgstr "Guardar mi historia por lo menos"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:167
+#: ../sflphone-client-gnome/src/config/configwindow.c:643
+msgctxt "End of 'Keep my history for at least n days.'"
+msgid "days"
+msgstr "días"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:168
+msgid "Clear history"
+msgstr "Limpiar historia"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:169
+msgid "Connection"
+msgstr "Connexión"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:170
+#: ../sflphone-client-gnome/src/config/configwindow.c:664
+msgid "SIP Port"
+msgstr "Puerto SIP"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:180
+#: ../sflphone-client-gnome/src/config/hooks-config.c:130
+msgid "URL Argument"
+msgstr "Argumento de URL"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:181
+#: ../sflphone-client-gnome/src/config/hooks-config.c:135
+msgid "Custom commands on incoming calls with URL"
+msgstr "Comandos personalizados en llamada entrante con URL"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:182
+msgid "Trigger on specific SIP header"
+msgstr "Disparador en una cabecera SIP específica"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:183
+msgid "Trigger on IAX2 URL"
+msgstr "Disparador en una URL IAX2"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:184
+msgid "Command to run"
+msgstr "Comando de ejecutar"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:185
+#: ../sflphone-client-gnome/src/config/hooks-config.c:138
+#, c-format
+msgid "%s will be replaced with the passed URL."
+msgstr "%s se remplazará por la URL."
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:186
+#: ../sflphone-client-gnome/src/config/hooks-config.c:165
+msgid "Phone number rewriting"
+msgstr "Reescritura de número de teléfono"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:187
+msgid "Prefix dialed numbers with"
+msgstr "Prefijar los números marcados con"
+
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:92
+#: ../sflphone-client-gnome/src/config/configwindow.c:726
+msgid "Destination folder"
+msgstr "Carpeta de destino"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:384
+#: ../sflphone-client-gnome/src/toolbar.c:232
+#: ../sflphone-client-gnome/src/toolbar.c:234
+msgid "History"
+msgstr "Historia de Llamada"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:386
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:388
+msgid "Configure SFLphone"
+msgstr "Configurar SFLphone"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:390
+msgid "Display volume controls"
+msgstr "Mostrar controles de volumen"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:391
+msgid "Display dialpad"
+msgstr "Mostrar dialpad"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:396
+msgid "Attention:number of results exceeds max displayed."
+msgstr "Cuidado:número de resultatos excede el maximo a mostrar."
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:398
+#: ../sflphone-client-gnome/src/sliders.c:163
+msgid "Mic volume"
+msgstr "Volumen del micrófono"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:402
+#: ../sflphone-client-gnome/src/sliders.c:161
+msgid "Speakers volume"
+msgstr "Volumen de altavoces"
+
+#: ../sflphone-client-gnome/src/actions.c:54
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+#, c-format
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] "%d mensaje de voz"
+msgstr[1] "%d mensajes de voz"
+
+#: ../sflphone-client-gnome/src/actions.c:234
+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 que el demonio esté funcionando."
+
+#: ../sflphone-client-gnome/src/actions.c:809
+#, c-format
+msgid "IP call - %s"
+msgstr "Llamada IP - %s"
+
+#: ../sflphone-client-gnome/src/actions.c:908
+#, 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> )"
+
+#: ../sflphone-client-gnome/src/assistant.c:70
+msgid ""
+"You can at any time check your registration state or modify your accounts "
+"parameters in the Options/Accounts window."
+msgstr ""
+"Puede comprobar en cualquier momento su estado de registro o modificar la "
+"configuración de sus cuentas en la ventana de Opciones/Cuentas."
+
+#: ../sflphone-client-gnome/src/assistant.c:190
+msgid "SFLphone account creation wizard"
+msgstr "Asistente de creación de cuentas"
+
+#: ../sflphone-client-gnome/src/assistant.c:274
+#: ../sflphone-client-gnome/src/assistant.c:370
+#: ../sflphone-client-gnome/src/config/accountwindow.c:153
+msgid "_Alias"
+msgstr "_Alias"
+
+#: ../sflphone-client-gnome/src/assistant.c:282
+#: ../sflphone-client-gnome/src/assistant.c:378
+#: ../sflphone-client-gnome/src/config/accountwindow.c:189
+msgid "_Host name"
+msgstr "_Nombre de equipo"
+
+#: ../sflphone-client-gnome/src/assistant.c:290
+#: ../sflphone-client-gnome/src/assistant.c:386
+#: ../sflphone-client-gnome/src/config/accountwindow.c:197
+msgid "_User name"
+msgstr "_Usuario"
+
+#: ../sflphone-client-gnome/src/assistant.c:306
+#: ../sflphone-client-gnome/src/assistant.c:401
+#: ../sflphone-client-gnome/src/config/accountwindow.c:212
+msgid "_Password"
+msgstr "_Contraseña"
+
+#: ../sflphone-client-gnome/src/assistant.c:324
+#: ../sflphone-client-gnome/src/assistant.c:417
+#: ../sflphone-client-gnome/src/config/accountwindow.c:228
+msgid "_Voicemail number"
+msgstr "_Número de buzón de voz"
+
+#: ../sflphone-client-gnome/src/assistant.c:347
+msgid "_Email address"
+msgstr "_Correo"
+
+#: ../sflphone-client-gnome/src/assistant.c:444
+#: ../sflphone-client-gnome/src/config/configwindow.c:532
+msgid "E_nable STUN"
+msgstr "A_ctivar STUN"
+
+#: ../sflphone-client-gnome/src/assistant.c:451
+msgid "_STUN server"
+msgstr "_Servidor STUN"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Account Registration"
+msgstr "Registro de cuenta"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Congratulations!"
+msgstr "¡Enhorabuena!"
+
+#: ../sflphone-client-gnome/src/errors.c:29
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening playback device"
+msgstr ""
+"<b>Notificación ALSA</b>\n"
+"\n"
+"Error al abrir el dispositivo de reproducción"
+
+#: ../sflphone-client-gnome/src/errors.c:32
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening capture device"
+msgstr ""
+"<b>Notificación ALSA</b>\n"
+"\n"
+"Error al abrir el dispositivo de captura"
+
+#: ../sflphone-client-gnome/src/errors.c:35
+msgid ""
+"Pulseaudio notification\n"
+"\n"
+"Pulseaudio is not running"
+msgstr ""
+"<b>Notificación de Pulseaudio</b>\n"
+"\n"
+"Pulseaudio no está funcionando"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:70
+msgid "There is one call in progress."
+msgstr "No hay llamada en curso"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:74
+msgid "There are calls in progress."
+msgstr "Hay llamadas en curso."
+
+#: ../sflphone-client-gnome/src/mainwindow.c:83
+msgid "Do you still want to quit?"
+msgstr "Sin embargo quiere parar ?"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:284
+msgid "SFLphone Error"
+msgstr "SFLphone Error"
+
+#: ../sflphone-client-gnome/src/menus.c:134
+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-client-gnome/src/menus.c:137
+msgid "About SFLphone"
+msgstr "Sobre SFLphone"
+
+#: ../sflphone-client-gnome/src/menus.c:161
+msgid "_Help"
+msgstr "_Ayuda"
+
+#: ../sflphone-client-gnome/src/menus.c:296
+#: ../sflphone-client-gnome/src/menus.c:953
+msgid "_New call"
+msgstr "_Nueva llamada"
+
+#: ../sflphone-client-gnome/src/menus.c:308
+#: ../sflphone-client-gnome/src/menus.c:785
+msgid "_Pick up"
+msgstr "_Descolgar"
+
+#: ../sflphone-client-gnome/src/menus.c:318
+#: ../sflphone-client-gnome/src/menus.c:797
+msgid "_Hang up"
+msgstr "_Colgar"
+
+#: ../sflphone-client-gnome/src/menus.c:328
+#: ../sflphone-client-gnome/src/menus.c:809
+msgid "On _Hold"
+msgstr "En _Espera"
+
+#: ../sflphone-client-gnome/src/menus.c:340
+#: ../sflphone-client-gnome/src/menus.c:821
+msgid "_Record"
+msgstr "_Recordar"
+
+#: ../sflphone-client-gnome/src/menus.c:354
+msgid "_Account creation wizard"
+msgstr "Asistente de configuración de cuentas"
+
+#: ../sflphone-client-gnome/src/menus.c:384
+msgid "_Call"
+msgstr "_Llamar"
+
+#: ../sflphone-client-gnome/src/menus.c:552
+msgid "Clear _history"
+msgstr "_Limpiar historia"
+
+#: ../sflphone-client-gnome/src/menus.c:564
+msgid "_Accounts"
+msgstr "_Cuentas"
+
+#: ../sflphone-client-gnome/src/menus.c:579
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../sflphone-client-gnome/src/menus.c:631
+msgid "_Dialpad"
+msgstr "_Teclado numérico"
+
+#: ../sflphone-client-gnome/src/menus.c:643
+msgid "_Volume controls"
+msgstr "_Controles de volumen"
+
+#: ../sflphone-client-gnome/src/menus.c:661
+msgid "_View"
+msgstr "_Ver"
+
+#: ../sflphone-client-gnome/src/menus.c:881
+msgid "_Call back"
+msgstr "_Llamar"
+
+#: ../sflphone-client-gnome/src/menus.c:1061
+msgid "Edit phone number"
+msgstr "Editar número de teléfono"
+
+#: ../sflphone-client-gnome/src/menus.c:1072
+msgid "Edit the phone number before making a call"
+msgstr "Editar el número de teléfono antes de llamar"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:71
+#: ../sflphone-client-gnome/src/sflnotify.c:91
+#, c-format
+msgid "%s account : %s"
+msgstr "%s cuenta : %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:75
+#, c-format
+msgid "<i>From</i> %s"
+msgstr "<i>De</i> %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:111
+#, c-format
+msgid "Calling with %s account <i>%s</i>"
+msgstr "Llamando con la cuenta %s <i>%s</i>"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:115
+msgid "Current account"
+msgstr "Cuenta actual"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:130
+msgid "You have no accounts set up"
+msgstr "Ninguna cuenta configurada"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:131
+#: ../sflphone-client-gnome/src/sflnotify.c:148
+msgid "Error"
+msgstr "Error"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:147
+msgid "You have no registered accounts"
+msgstr "No tiene ninguna cuenta registrada"
+
+#: ../sflphone-client-gnome/src/statusicon.c:91
+msgid "_Show main window"
+msgstr "Mostrar ventana principal"
+
+#: ../sflphone-client-gnome/src/statusicon.c:127
+#, c-format
+msgid "%i account configured"
+msgid_plural "%i accounts configured"
+msgstr[0] "%i cuenta configurada"
+msgstr[1] "%i cuentas configuradas"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:113
+msgid "Account settings"
+msgstr "Configuración de cuentas"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:147
+msgid "_Enable this account"
+msgstr "_Habilitar esta cuenta"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:161
+msgid "_Protocol"
+msgstr "_Protocolo"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:179
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:312
+msgid "_Use Evolution address books"
+msgstr "_Usar libreta de contactos de Evolution"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:319
+msgid "Download limit :"
+msgstr "Limite de descargo :"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:327
+msgid "cards"
+msgstr "tarjetas"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:333
+msgid "_Display contact photo if available"
+msgstr "_Mostrar fotos de contactos, si está disponible"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:341
+msgid "Fields from Evolution's address books"
+msgstr "Usar los siguientes campos de la libreta de direcciones de Evolution:"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:345
+msgid "_Work"
+msgstr "P_rofesional"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:351
+msgid "_Home"
+msgstr "_Personal"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:357
+msgid "_Mobile"
+msgstr "_Movil"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:364
+msgid "Address Books"
+msgstr "Directorios"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:368
+msgid "Select which Evolution address books to use"
+msgstr "Seleccione el directorio de Evolution a usar"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:404
+#: ../sflphone-client-gnome/src/config/audioconf.c:576
+msgid "Name"
+msgstr "Nombre"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:741
+msgid "_Voice Activity Detection"
+msgstr "_Detección de actividad de voz"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:751
+msgid "_Noise Reduction (Narrow-Band Companding)"
+msgstr "_Reducción de ruido"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:780
+msgid "Sound Manager"
+msgstr "Gestor de audio"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:783
+msgid "_Pulseaudio"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:788
+msgid "_ALSA"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:835
+msgid "Ringtones"
+msgstr "Tonos de llamada"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:841
+msgid "_Enable ringtones"
+msgstr "_Habilitar tonos de llamada"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:847
+msgid "Choose a ringtone"
+msgstr "Elija un tono de llmada"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
+msgid "Audio Files"
+msgstr "Archivos de Audio"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:589
+msgid "Desktop Notifications"
+msgstr "Notificación de escritorio"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:593
+msgid "_Enable notifications"
+msgstr "_Activar notificaciones"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:599
+msgid "Enable voicemail _notifications"
+msgstr "Activar _notificaciones de mensajes de voz"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:611
+msgid "System Tray Icon"
+msgstr "Icono de bandeja del sistema"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:614
+msgid "_Popup main window on incoming call"
+msgstr "_Popup ventana principal al recibir llamadas"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:619
+msgid "Ne_ver popup main window"
+msgstr "_Nunca mostrar ventana principal"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:623
+msgid "Hide SFLphone window on _startup"
+msgstr "Esconder SFLphone al principio"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:629
+msgid "Calls History"
+msgstr "Historia de llamadas"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:632
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "_Keep my history for at least"
+msgstr "_Guardar mi historia por lo menos"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:647
+msgid "PulseAudio sound server"
+msgstr "Servidor de sonido Pulseaudio"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:650
+msgid "_Mute other applications during a call"
+msgstr "Silenciar otras aplicaciones durante una llamada"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:677
+msgid "Port"
+msgstr "Puerto"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:732
+msgid "Select a folder"
+msgstr "Seleccione una carpeta"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:766
+msgid "Preferences"
+msgstr "Preferencias"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:845
+msgid "Configured Accounts"
+msgstr "Cuentas Configuradas"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:141
+msgid "Trigger on specific _SIP header"
+msgstr "Disparador en una cabecera _SIP específica"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:150
+msgid "Trigger on _IAX2 URL"
+msgstr "Disparador con una URL _IAX2"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:155
+msgid "Command to _run"
+msgstr "_Comando a ejecutar"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:169
+msgid "_Prefix dialed numbers with"
+msgstr "_Prefijar los números marcados con"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+msgid "Search all"
+msgstr "Buscar todos"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:57
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:70
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:82
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:94
+msgid "Click here to change the search type"
+msgstr "Haz clic aqui para cambiar el type de busqueda"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+msgid "Search by missed call"
+msgstr "Buscar en llamadas faltadas"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+msgid "Search by incoming call"
+msgstr "Buscar en llamadas entrantes"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+msgid "Search by outgoing call"
+msgstr "Buscar en llamadas saliente"
+
+#~ msgid "User"
+#~ msgstr "Usuario"
+
+#~ msgid "Mailbox"
+#~ msgstr "Mensaje de voz"
+
+#~ msgid "State"
+#~ msgstr "Estado"
+
+#~ msgid "Stun settings will be applied on each account"
+#~ msgstr "Parámetros de stun se aplicarán a cada cuenta SIP creada."
+
+#~ msgid "Audio device"
+#~ msgstr "Archivos de Audio"
+
+#~ msgid "&Codecs"
+#~ msgstr "Códecs"
+
+#~ msgid "Out"
+#~ msgstr "Salida"
+
+#~ msgid "On &incoming calls"
+#~ msgstr "Al recibir llamadas"
+
+#~ msgid "Custom commands with URL %s will be replaced with the passed URL."
+#~ msgstr "%s se remplazará por la URL."
+
+#~ msgid "Phone number formatting"
+#~ msgstr "Reescritura de número de teléfono"
+
+#~ msgid "Add phone number prefix"
+#~ msgstr "Reescritura de número de teléfono"
+
+#~ msgid "General"
+#~ msgstr "General"
+
+#~ msgid "Hold"
+#~ msgstr "Retener"
+
+#~ msgid "Configure accounts"
+#~ msgstr "Cuentas Configuradas"
+
+#~ msgid "Configure audio"
+#~ msgstr "Cuentas Configuradas"
+
+#~ msgid "accounr state"
+#~ msgstr "Configuración de cuentas"
+
+#~ msgid "%s - %s"
+#~ msgstr "%s - %s"
+
+#~ msgid "Registered"
+#~ msgstr "Registrado"
+
+#~ msgid "Not Registered"
+#~ msgstr "No registrado"
+
+#~ msgid "Trying..."
+#~ msgstr "Intentando..."
+
+#~ msgid "Bad authentification"
+#~ msgstr "Autenticación erronea"
+
+#~ msgid "Network unreachable"
+#~ msgstr "Red Inaccesible"
+
+#~ msgid "Host unreachable"
+#~ msgstr "_Parte del servidor"
+
+#~ msgid "Stun configuration error"
+#~ msgstr "Error de configuración Stun"
+
+#~ msgid "Stun server invalid"
+#~ msgstr "Servidor stun inválido"
+
+#~ msgid "Invalid"
+#~ msgstr "Inválido"
+
+#~ msgid "%d voice mails"
+#~ msgstr "%d mensajes de voz"
+
+#~ msgid "No registered account"
+#~ msgstr "No tiene ninguna cuenta registrada"
+
+#~ msgid ""
+#~ "This assistant is now finished.\n"
+#~ "You can at any time check your registration state or modify your accounts "
+#~ "parameters in the Options/Accounts window.\n"
+#~ "\n"
+#~ "Alias :    %s\n"
+#~ "Server :   %s\n"
+#~ "Username : %s\n"
+#~ msgstr ""
+#~ "Ese asistante ha finalizado.\n"
+#~ "Puede comprobar en cualquier momento su estado de registro o modificar la "
+#~ "configuración de sus cuentas en la ventana de Opciones/Cuentas.\n"
+#~ "\n"
+#~ "Alias :    %s\n"
+#~ "Server :   %s\n"
+#~ "Username : %s\n"
+
+#~ msgid "SFLphone account configuration wizard"
+#~ msgstr "Asistente de configuración de cuentas de SFLphone"
+
+#~ msgid "Welcome to SFLphone!"
+#~ msgstr "¡Bienvenido a SFLphone!"
+
+#~ msgid "Select an account type:"
+#~ msgstr "Escoja un tipo de cuenta:"
+
+#~ msgid "Please select one of the following option:"
+#~ msgstr "Por favor, elija una de las siguientes opciones:"
+
+#~ msgid "SIP account configuration"
+#~ msgstr "Configuración de cuenta SIP"
+
+#~ msgid "Please fill the following information:"
+#~ msgstr "Por favor, rellene la siguiente información:"
+
+#~ msgid "Optional Email Address "
+#~ msgstr "Dirección de correo opcional "
+
+#~ msgid "This email address will be use to send your voicemail messages"
+#~ msgstr "Esta dirección de correo se usará para mandar sus mensajes de voz"
+
+#~ msgid "_Email"
+#~ msgstr "_Correo"
+
+#~ msgid "IAX2 account configuration"
+#~ msgstr "Configuración de cuenta IAX2"
+
+#~ msgid "Network Address Translation"
+#~ msgstr "Conversión de Dirección de Red (NAT)"
+
+#~ msgid "Edit phone"
+#~ msgstr "Editar teléfono"
+
+#~ msgid "%s account: %s"
+#~ msgstr "%s cuenta: %s"
+
+#~ msgid "<i>From:</i> %s"
+#~ msgstr "<i>De:</i> %s"
+
+#~ msgid "You haven't setup any accounts"
+#~ msgstr "No ha configurado cuentas"
+
+#~ msgid "SFLphone - %i accounts configured"
+#~ msgstr "SFLphone - %i cuentas configuradas"
+
+#~ msgid "\"Voicemail\" <%s>"
+#~ msgstr "\"Mensaje\" <%s>"
+
+#~ msgid "Place a call"
+#~ msgstr "Llamar"
+
+#~ msgid "Off Hold"
+#~ msgstr "Seguir"
+
+#~ msgid "Record a call"
+#~ msgstr "Grabar una llamada"
+
+#~ msgid "Account Parameters"
+#~ msgstr "Parámetros de cuenta"
+
+#~ msgid "Download limit:"
+#~ msgstr "Límite de descarga"
+
+#~ msgid "_Business phone"
+#~ msgstr "_Numero de teléfono profesional"
+
+#~ msgid "_Home phone"
+#~ msgstr "_Numero de teléfono personal"
+
+#~ msgid "_Mobile phone"
+#~ msgstr "_Número de movil"
+
+#~ msgid "Select which Evolution address books to use:"
+#~ msgstr "Seleccione las libretas de direcciones de Evolution a usar:"
+
+#~ msgid "audio device index for output = %d"
+#~ msgstr "índice del dispositivo de salida de audio = %d"
+
+#~ msgid "ALSA configuration"
+#~ msgstr "Configuración de ALSA"
+
+#~ msgid "Stun parameters will apply to each SIP account created."
+#~ msgstr "Parámetros de stun se aplicarán a cada cuenta SIP creada."
+
+#~ msgid "Enable it if you are behind a firewall"
+#~ msgstr "Actívelo si está detrás de un cortafuegos"
+
+#~ msgid "Format: name.server:port"
+#~ msgstr "Formato: nombre.servidor:puerto"
+
+#~ msgid "Port:"
+#~ msgstr "Puerto:"
+
+#~ msgid "Command to _run: "
+#~ msgstr "_Orden a ejecutar: "
+
+#~ msgid "Phone Number Rewriting"
+#~ msgstr "Reescritura de número de teléfono"
+
+#~ msgid "_Prefix dialed numbers with:"
+#~ msgstr "_prefijar los números marcados con:"
+
+#~ msgid "Accept"
+#~ msgstr "Aceptar"
+
+#~ msgid "Refuse"
+#~ msgstr "Rechazar"
+
+#~ msgid "Ignore"
+#~ msgstr "Ignorar"
+
+#~ msgid "<small>Missed call</small>"
+#~ msgstr "<small>Llamada fallida</small>"
+
+#~ msgid "<small>Duration:</small> %s"
+#~ msgstr "<small>Duración:</small> %s"
+
+#~ msgid "Fields"
+#~ msgstr "Campos"
+
+#~ msgid "_History size limit"
+#~ msgstr "Límite de tamaño de _historial"
+
+#~ msgid ""
+#~ "SFLphone can run custom commands if incoming calls come with an URL "
+#~ "attached.\n"
+#~ "In this case, %s will be replaced with the passed URL."
+#~ msgstr ""
+#~ "SFLphone puede ejecutar órdenes personalizadas si las llamadas entrantes "
+#~ "incluyen una URL.\n"
+#~ "En este caso, %s se remplazará por la URL."
+
+#~ msgid "Search history"
+#~ msgstr "Historial de búsquedas"
+
+#~ msgid "Search contact"
+#~ msgstr "_Buscar contacto"
+
+#~ msgid "Registered to %s (%s)"
+#~ msgstr "Registrado en %s (%s)"
+
+#~ msgid "%s account- %s             %s"
+#~ msgstr "%s cuenta- %s             %s"
diff --git a/sflphone-client-gnome/po/fr/sflphone-client-gnome.po b/sflphone-client-gnome/po/fr/sflphone-client-gnome.po
new file mode 100644
index 0000000000000000000000000000000000000000..88626ad880061fb24f15e926d24083606f752ace
--- /dev/null
+++ b/sflphone-client-gnome/po/fr/sflphone-client-gnome.po
@@ -0,0 +1,1554 @@
+# French translation of SFLphone.
+# Copyright (C) 2008 2009 The Free Software Foundation, Inc.
+# This file is distributed under the GNU General Public License Version 3.
+#
+# Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>, 2008.
+#
+# POT-Creation-Date: 2008-01-13 01:39+0100\n
+msgid ""
+msgstr ""
+"Project-Id-Version: SFLphone 0.9.4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-07-17 16:14-0400\n"
+"PO-Revision-Date: 2008-03-31 14:15\n"
+"Last-Translator: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>\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"
+
+#: ../sflphone-client-kde/src/Account.cpp:34
+#: ../sflphone-client-gnome/src/accountlist.c:175
+msgctxt "account state"
+msgid "Registered"
+msgstr "Enregistré"
+
+#: ../sflphone-client-kde/src/Account.cpp:36
+#: ../sflphone-client-gnome/src/accountlist.c:178
+msgctxt "account state"
+msgid "Not Registered"
+msgstr "Non Enregistré"
+
+#: ../sflphone-client-kde/src/Account.cpp:38
+#: ../sflphone-client-gnome/src/accountlist.c:181
+msgctxt "account state"
+msgid "Trying..."
+msgstr "En cours..."
+
+#: ../sflphone-client-kde/src/Account.cpp:40
+#: ../sflphone-client-gnome/src/accountlist.c:184
+msgctxt "account state"
+msgid "Error"
+msgstr "Erreur"
+
+#: ../sflphone-client-kde/src/Account.cpp:42
+#: ../sflphone-client-gnome/src/accountlist.c:187
+msgctxt "account state"
+msgid "Authentication Failed"
+msgstr "Erreur d'authentification"
+
+#: ../sflphone-client-kde/src/Account.cpp:44
+#: ../sflphone-client-gnome/src/accountlist.c:190
+msgctxt "account state"
+msgid "Network unreachable"
+msgstr "Réseau introuvable"
+
+#: ../sflphone-client-kde/src/Account.cpp:46
+#: ../sflphone-client-gnome/src/accountlist.c:193
+msgctxt "account state"
+msgid "Host unreachable"
+msgstr "Serveur introuvable"
+
+#: ../sflphone-client-kde/src/Account.cpp:48
+#: ../sflphone-client-gnome/src/accountlist.c:196
+msgctxt "account state"
+msgid "Stun configuration error"
+msgstr "Erreur de configuration STUN"
+
+#: ../sflphone-client-kde/src/Account.cpp:50
+#: ../sflphone-client-gnome/src/accountlist.c:199
+msgctxt "account state"
+msgid "Stun server invalid"
+msgstr "Serveur STUN invalide"
+
+#: ../sflphone-client-kde/src/Account.cpp:51
+#: ../sflphone-client-gnome/src/accountlist.c:202
+msgctxt "account state"
+msgid "Invalid"
+msgstr "Non valide"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:163
+#: ../sflphone-client-kde/src/AccountWizard.cpp:278
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:393
+msgid "Account creation wizard"
+msgstr "Assistant de création de compte"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:199
+#: ../sflphone-client-kde/src/AccountWizard.cpp:217
+#: ../sflphone-client-kde/src/AccountWizard.cpp:561
+#: ../sflphone-client-gnome/src/assistant.c:68
+#, c-format
+msgid "This assistant is now finished."
+msgstr "Cet assistant est maintenant terminé."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:211
+msgid "Creation of account has failed for the reason"
+msgstr "Échec de la création du compte pour les raisons suivantes"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:255
+#: ../sflphone-client-kde/src/AccountWizard.cpp:440
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:363
+#: ../sflphone-client-gnome/src/assistant.c:72
+msgid "Alias"
+msgstr "Alias"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:256
+#: ../sflphone-client-kde/src/AccountWizard.cpp:441
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:370
+#: ../sflphone-client-gnome/src/assistant.c:75
+msgid "Server"
+msgstr "Serveur"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:257
+#: ../sflphone-client-kde/src/AccountWizard.cpp:442
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:371
+#: ../sflphone-client-gnome/src/assistant.c:78
+msgid "Username"
+msgstr "Nom d'utilisateur"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:258
+#: ../sflphone-client-kde/src/AccountWizard.cpp:443
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:372
+msgid "Password"
+msgstr "Mot de passe"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:259
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:364
+#: ../sflphone-client-gnome/src/config/configwindow.c:418
+msgid "Protocol"
+msgstr "Protocole"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:260
+#: ../sflphone-client-kde/src/AccountWizard.cpp:444
+msgid "Voicemail number"
+msgstr "Numéro de boîte vocale"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:279
+#: ../sflphone-client-gnome/src/assistant.c:216
+msgid "Welcome to the Account creation wizard of SFLphone!"
+msgstr "Bienvenue dans l'assistant de création de compte de SFLphone !"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:281
+#: ../sflphone-client-gnome/src/assistant.c:217
+msgid "This installation wizard will help you configure an account."
+msgstr "Cet assistant vous guidera dans la configuration d'un compte."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:309
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Account"
+msgstr "Compte"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:310
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Please select one of the following options"
+msgstr "Veuillez sélectionner une des options suivantes"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:312
+#: ../sflphone-client-gnome/src/assistant.c:251
+msgid "Create a free SIP/IAX2 account on sflphone.org"
+msgstr "Créer un compte SIP/IAX2 gratuit sur sflphone.org"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:313
+#: ../sflphone-client-gnome/src/assistant.c:253
+msgid "Register an existing SIP or IAX2 account"
+msgstr "Enregistrer un compte SIP ou IAX2 existant"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:352
+#: ../sflphone-client-gnome/src/assistant.c:231
+msgid "VoIP Protocols"
+msgstr "Protocoles VoIP"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:353
+#: ../sflphone-client-gnome/src/assistant.c:231
+msgid "Select an account type"
+msgstr "Sélectionnez un type de compte"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:355
+#: ../sflphone-client-gnome/src/assistant.c:233
+msgid "SIP (Session Initiation Protocol)"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:356
+#: ../sflphone-client-gnome/src/assistant.c:235
+msgid "IAX2 (InterAsterix Exchange)"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:395
+#: ../sflphone-client-gnome/src/assistant.c:339
+msgid "Optional email address"
+msgstr "Adresse courriel optionnelle"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:396
+#: ../sflphone-client-gnome/src/assistant.c:339
+msgid "This email address will be used to send your voicemail messages."
+msgstr "Vos messages vocaux seront envoyés par courriel à cette adresse."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:398
+msgid "Email address"
+msgstr "Adresse courriel"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:432
+#: ../sflphone-client-gnome/src/assistant.c:266
+msgid "SIP account settings"
+msgstr "Paramètres de compte SIP"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:436
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "IAX2 account settings"
+msgstr "Paramètres de compte IAX2"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:438
+#: ../sflphone-client-gnome/src/assistant.c:266
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "Please fill the following information"
+msgstr "Veuillez remplir les champs suivants"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:523
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:856
+msgid "Network Address Translation (NAT)"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:524
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:536
+msgid "You should probably enable this if you are behind a firewall."
+msgstr ""
+"Vous devriez probablement activer cette option si vous vous trouvez derrière "
+"un pare-feu."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:526
+msgid "Enable STUN"
+msgstr "Activer STUN"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:527
+msgid "Stun Server"
+msgstr "Serveur STUN"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:562
+msgid ""
+"After checking the settings you chose, click \"Finish\" to create the "
+"account."
+msgstr ""
+"Après avoir vérifié les paramètres choisis, cliquez sur \"Terminer\" pour "
+"créer le compte."
+
+#: ../sflphone-client-kde/src/ActionSetAccountFirst.cpp:26
+msgid "Default account"
+msgstr "Compte par défaut"
+
+#: ../sflphone-client-kde/src/Call.cpp:116
+#: ../sflphone-client-gnome/src/contacts/calltree.c:322
+msgid "Transfer to : "
+msgstr "Transférer à : "
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:89
+#: ../sflphone-client-gnome/src/actions.c:816
+msgid "Codec"
+msgstr "Codec"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:93
+#: ../sflphone-client-gnome/src/config/audioconf.c:581
+msgid "Frequency"
+msgstr "Fréquence"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:97
+#: ../sflphone-client-gnome/src/config/audioconf.c:586
+msgid "Bitrate"
+msgstr "Bitrate"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:101
+#: ../sflphone-client-gnome/src/config/audioconf.c:591
+msgid "Bandwidth"
+msgstr "Bande passante"
+
+#: ../sflphone-client-kde/src/main.cpp:38
+msgid "SFLphone KDE Client"
+msgstr "SFLphone Client KDE"
+
+#: ../sflphone-client-kde/src/main.cpp:42
+msgid "(C) 2009 Savoir-faire Linux"
+msgstr ""
+
+#: ../sflphone-client-kde/src/main.cpp:46
+msgid "Jérémy Quentin"
+msgstr ""
+
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Jérémy Quentin"
+
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "jeremy.quentin@savoirfairelinux.com"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:62
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-gnome/src/statusicon.c:126
+msgid "SFLphone"
+msgstr "SFLphone"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:209
+msgid "Incoming call"
+msgstr "Appel entrant"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
+msgid "You have an incoming call from"
+msgstr "Vous avez un appel entrant de"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
+msgid "Click to accept or refuse it."
+msgstr "Cliquez ici pour accepter ou refuser."
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:716
+msgid "Address book loading..."
+msgstr "Carnet d'adresse en cours de chargement..."
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:901
+#: ../sflphone-client-gnome/src/actions.c:89
+msgid "No registered accounts"
+msgstr "Pas de compte enregistré"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:905
+#: ../sflphone-client-gnome/src/actions.c:83
+#: ../sflphone-client-gnome/src/actions.c:813
+msgid "Using account"
+msgstr "Utilise le compte"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
+msgid "Main screen"
+msgstr "Écran principal"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:165
+msgid "Call history"
+msgstr "Historique d'appels"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:394
+#: ../sflphone-client-gnome/src/toolbar.c:243
+#: ../sflphone-client-gnome/src/toolbar.c:245
+msgid "Address book"
+msgstr "Carnet d'adresses"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1108
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1173
+msgid "Edit before call"
+msgstr "Éditer avant d'appeler"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:41
+#: ../sflphone-client-gnome/src/toolbar.c:167
+#: ../sflphone-client-gnome/src/toolbar.c:169
+msgid "New call"
+msgstr "Nouvel appel"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:42
+#: ../sflphone-client-kde/src/sflphone_const.h:47
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:381
+#: ../sflphone-client-gnome/src/toolbar.c:186
+#: ../sflphone-client-gnome/src/toolbar.c:188
+msgid "Hang up"
+msgstr "Raccrocher"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:43
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:382
+#: ../sflphone-client-gnome/src/toolbar.c:207
+#: ../sflphone-client-gnome/src/toolbar.c:209
+msgid "Hold on"
+msgstr "Mettre en attente"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:44
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:383
+#: ../sflphone-client-gnome/src/toolbar.c:220
+#: ../sflphone-client-gnome/src/toolbar.c:222
+msgid "Transfer"
+msgstr "Transférer"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:45
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:392
+#: ../sflphone-client-gnome/src/toolbar.c:263
+msgid "Record"
+msgstr "Enregistrer"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:46
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:380
+#: ../sflphone-client-gnome/src/toolbar.c:176
+#: ../sflphone-client-gnome/src/toolbar.c:178
+msgid "Pick up"
+msgstr "Décrocher"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:48
+#: ../sflphone-client-gnome/src/toolbar.c:196
+#: ../sflphone-client-gnome/src/toolbar.c:198
+msgid "Hold off"
+msgstr "Reprendre"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:49
+msgid "Give up transfer"
+msgstr "Abandonner le transfert"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:50
+msgid "Call back"
+msgstr "Rappeler"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:48
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:91
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
+#: ../sflphone-client-gnome/src/config/configwindow.c:722
+#: ../sflphone-client-gnome/src/config/configwindow.c:791
+msgctxt "Config section"
+msgid "General"
+msgstr "General"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:49
+msgctxt "Config section"
+msgid "Display"
+msgstr "Affichage"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:50
+#: ../sflphone-client-gnome/src/config/configwindow.c:833
+msgctxt "Config section"
+msgid "Accounts"
+msgstr "Comptes"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:51
+#: ../sflphone-client-gnome/src/config/configwindow.c:786
+msgctxt "Config section"
+msgid "Audio"
+msgstr "Audio"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:52
+#: ../sflphone-client-gnome/src/config/configwindow.c:801
+msgctxt "Config section"
+msgid "Address Book"
+msgstr "Carnet d'adresses"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:53
+#: ../sflphone-client-gnome/src/config/configwindow.c:796
+msgctxt "Config section"
+msgid "Recordings"
+msgstr "Enregistrements"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:54
+#: ../sflphone-client-gnome/src/config/configwindow.c:806
+msgctxt "Config section"
+msgid "Hooks"
+msgstr "Ancrage"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:328
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows. Enable/disable them by checking/unchecking "
+"them on the left of the item. Add or remove some with \"Plus\" and \"Sub\" "
+"buttons. Edit the selected account with the form on the right."
+msgstr ""
+"Par défaut, quand vous effectuez un appel, SFLphone utilise le premier "
+"compte dans cette liste en état \"Enregistré\". Utilisez les flèches vers le "
+"haut et vers le bas pour changer l'ordre des comptes. Activez/désactivez-les "
+"en les cochant/décochant. Ajoutez et supprimez-les avec les boutons \"+\" et "
+"\"-\". Éditez le compte sélectionné avec le formulaire de droite."
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:332
+msgid "Remove the selected account"
+msgstr "Supprimer le compte sélectionné"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:335
+msgid ""
+"This button will remove the selected account in the list below. Be sure you "
+"really don't need it anymore. If you think you might use it again later, "
+"just uncheck it."
+msgstr ""
+"Ce bouton supprime le compte actuellement sélectionné dans la liste ci-"
+"dessus. Si vous comptez réutiliser ce compte plus tard, choisissez plutôt de "
+"le décocher."
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:340
+msgid "Remove"
+msgstr "Supprimer"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:342
+msgid "Add a new account"
+msgstr "Ajouter un nouveau compte"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:345
+msgid ""
+"This button enables you to initialize a new account. You will then be able "
+"to edit it using the form on the right."
+msgstr ""
+"Ce bouton ajoute un nouveau compte à la liste. Vous pouvez ensuite l'éditer "
+"à partir du formulaire à droite de la liste."
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:347
+msgid "Add"
+msgstr "Ajouter"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:349
+msgid "Get this account down"
+msgstr "Descendre ce compte dans la liste"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:352
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:359
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows."
+msgstr ""
+"Par défaut, quand vous effectuez un appel, SFLphone utilise le premier "
+"compte dans cette liste en état \"Enregistré\". Utilisez les flèches vers le "
+"haut et vers le bas pour changer l'ordre des comptes."
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:354
+msgid "Down"
+msgstr "Descendre"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:356
+msgid "Get this account up"
+msgstr "Monter ce compte dans la liste"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:361
+msgid "Up"
+msgstr "Monter"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:362
+msgid "Apply"
+msgstr "Appliquer"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:367
+msgid "SIP"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:368
+msgid "IAX"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:373
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:385
+#: ../sflphone-client-gnome/src/toolbar.c:52
+#: ../sflphone-client-gnome/src/toolbar.c:251
+#: ../sflphone-client-gnome/src/toolbar.c:255
+msgid "Voicemail"
+msgstr "Boite vocale"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:374
+#: ../sflphone-client-gnome/src/config/configwindow.c:425
+msgid "Status"
+msgstr "Statut"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:377
+#: ../sflphone-client-gnome/src/config/configwindow.c:528
+msgid "Stun parameters will be applied on each SIP account created."
+msgstr "Les paramètres de STUN seront appliqués à tous les comptes"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:378
+msgid "Enable Stun"
+msgstr "Activer STUN"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:380
+#: ../sflphone-client-gnome/src/config/configwindow.c:544
+msgid "Format : name.server:port"
+msgstr "Format : nom.serveur:port"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:382
+msgid "choose Stun server (example : stunserver.org)"
+msgstr "Choisissez un serveur STUN (exemple : stunserver.org)"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:154
+msgid "Enable address book"
+msgstr "Activer le carnet d'adresses"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:155
+msgid "Maximum results"
+msgstr "Nombre de résultats maximum"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:156
+msgid "Display photo if available"
+msgstr "Afficher la photo si disponible"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:157
+msgid "Display phone numbers of these types :"
+msgstr "Afficher les numéros de téléphone"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:158
+msgid "Work"
+msgstr "Professionnels"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:159
+msgid "Mobile"
+msgstr "Mobiles"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:160
+msgid "Home"
+msgstr "Personnels"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:225
+msgid "Sound manager"
+msgstr "Interface audio"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:228
+msgid "ALSA"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:229
+msgid "PulseAudio"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:231
+msgid "Enable ringtones"
+msgstr "Activer les sonneries"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:232
+#: ../sflphone-client-gnome/src/config/audioconf.c:812
+msgid "Codecs"
+msgstr "Codecs"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:233
+#: ../sflphone-client-gnome/src/config/audioconf.c:795
+msgid "ALSA settings"
+msgstr "Paramètres ALSA"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:234
+#: ../sflphone-client-gnome/src/config/audioconf.c:662
+msgid "ALSA plugin"
+msgstr "Greffon ALSA"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:235
+#: ../sflphone-client-gnome/src/config/audioconf.c:706
+msgid "Input"
+msgstr "Entrée"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:236
+#: ../sflphone-client-gnome/src/config/audioconf.c:684
+msgid "Output"
+msgstr "Sortie"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:237
+msgid "PulseAudio settings"
+msgstr "Paramètres PulseAudio"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:238
+msgid "Mute other applications during a call"
+msgstr "Couper le son des autres applications pendant un appel"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:121
+msgid "Enable notifications"
+msgstr "Activer les notifications"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:122
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:126
+msgid "On incoming calls"
+msgstr "Lors d'appels entrants"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:123
+msgid "On messages"
+msgstr "Lors de réception de messages"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:124
+msgid "Show main window"
+msgstr "Mettre la fenêtre principale au premier plan"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:125
+msgid "On start"
+msgstr "Au démarrage"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:166
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "Keep my history for at least"
+msgstr "Garder mon historique au moins"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:167
+#: ../sflphone-client-gnome/src/config/configwindow.c:643
+msgctxt "End of 'Keep my history for at least n days.'"
+msgid "days"
+msgstr "jours"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:168
+msgid "Clear history"
+msgstr "Effacer l'historique"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:169
+msgid "Connection"
+msgstr "Connexion"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:170
+#: ../sflphone-client-gnome/src/config/configwindow.c:664
+msgid "SIP Port"
+msgstr "Port SIP"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:180
+#: ../sflphone-client-gnome/src/config/hooks-config.c:130
+msgid "URL Argument"
+msgstr "Argument URL"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:181
+#: ../sflphone-client-gnome/src/config/hooks-config.c:135
+msgid "Custom commands on incoming calls with URL"
+msgstr "Commandes personnalisées lors d'appels entrants avec une URL"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:182
+msgid "Trigger on specific SIP header"
+msgstr "Déclencher sur un entête SIP spécifique"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:183
+msgid "Trigger on IAX2 URL"
+msgstr "Déclencher en IAX2"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:184
+msgid "Command to run"
+msgstr "Commande à exécuter"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:185
+#: ../sflphone-client-gnome/src/config/hooks-config.c:138
+#, c-format
+msgid "%s will be replaced with the passed URL."
+msgstr "%s sera remplacé par l'URL passé en argument."
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:186
+#: ../sflphone-client-gnome/src/config/hooks-config.c:165
+msgid "Phone number rewriting"
+msgstr "Réécriture des numéros appelés"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:187
+msgid "Prefix dialed numbers with"
+msgstr "Ajouter le préfixe"
+
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:92
+#: ../sflphone-client-gnome/src/config/configwindow.c:726
+msgid "Destination folder"
+msgstr "Dossier de destination"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:384
+#: ../sflphone-client-gnome/src/toolbar.c:232
+#: ../sflphone-client-gnome/src/toolbar.c:234
+msgid "History"
+msgstr "Historique"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:386
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:388
+msgid "Configure SFLphone"
+msgstr "Configurer SFLphone"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:390
+msgid "Display volume controls"
+msgstr "Afficher les controles du volume"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:391
+msgid "Display dialpad"
+msgstr "Afficher le clavier"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:396
+msgid "Attention:number of results exceeds max displayed."
+msgstr "Attention:tous les résultats ne sont pas affichés."
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:398
+#: ../sflphone-client-gnome/src/sliders.c:163
+msgid "Mic volume"
+msgstr "Volume du micro"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:402
+#: ../sflphone-client-gnome/src/sliders.c:161
+msgid "Speakers volume"
+msgstr "Volume des hauts-parleurs"
+
+#: ../sflphone-client-gnome/src/actions.c:54
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+#, c-format
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] "%d message vocal"
+msgstr[1] "%d messages vocaux"
+
+#: ../sflphone-client-gnome/src/actions.c:234
+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-client-gnome/src/actions.c:809
+#, c-format
+msgid "IP call - %s"
+msgstr "Appel IP - %s"
+
+#: ../sflphone-client-gnome/src/actions.c:908
+#, 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-client-gnome/src/assistant.c:70
+msgid ""
+"You can at any time check your registration state or modify your accounts "
+"parameters in the Options/Accounts window."
+msgstr ""
+"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-client-gnome/src/assistant.c:190
+msgid "SFLphone account creation wizard"
+msgstr "Assistant de création de compte de SFLphone"
+
+#: ../sflphone-client-gnome/src/assistant.c:274
+#: ../sflphone-client-gnome/src/assistant.c:370
+#: ../sflphone-client-gnome/src/config/accountwindow.c:153
+msgid "_Alias"
+msgstr "A_lias"
+
+#: ../sflphone-client-gnome/src/assistant.c:282
+#: ../sflphone-client-gnome/src/assistant.c:378
+#: ../sflphone-client-gnome/src/config/accountwindow.c:189
+msgid "_Host name"
+msgstr "_Serveur"
+
+#: ../sflphone-client-gnome/src/assistant.c:290
+#: ../sflphone-client-gnome/src/assistant.c:386
+#: ../sflphone-client-gnome/src/config/accountwindow.c:197
+msgid "_User name"
+msgstr "Usa_ger"
+
+#: ../sflphone-client-gnome/src/assistant.c:306
+#: ../sflphone-client-gnome/src/assistant.c:401
+#: ../sflphone-client-gnome/src/config/accountwindow.c:212
+msgid "_Password"
+msgstr "_Mot de passe"
+
+#: ../sflphone-client-gnome/src/assistant.c:324
+#: ../sflphone-client-gnome/src/assistant.c:417
+#: ../sflphone-client-gnome/src/config/accountwindow.c:228
+msgid "_Voicemail number"
+msgstr "_Boite vocale #"
+
+#: ../sflphone-client-gnome/src/assistant.c:347
+msgid "_Email address"
+msgstr "A_dresse courriel"
+
+#: ../sflphone-client-gnome/src/assistant.c:444
+#: ../sflphone-client-gnome/src/config/configwindow.c:532
+msgid "E_nable STUN"
+msgstr "A_ctiver STUN"
+
+#: ../sflphone-client-gnome/src/assistant.c:451
+msgid "_STUN server"
+msgstr "S_erveur STUN"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Account Registration"
+msgstr "Enregistrement du compte"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Congratulations!"
+msgstr "Félicitations!"
+
+#: ../sflphone-client-gnome/src/errors.c:29
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening playback device"
+msgstr ""
+"Notification ALSA\n"
+"\n"
+"Erreur lors de l'ouverture du périphérique de sortie"
+
+#: ../sflphone-client-gnome/src/errors.c:32
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening capture device"
+msgstr ""
+"Notification ALSA\n"
+"\n"
+"Erreur lors de l'ouverture du périphérique d'entrée"
+
+#: ../sflphone-client-gnome/src/errors.c:35
+msgid ""
+"Pulseaudio notification\n"
+"\n"
+"Pulseaudio is not running"
+msgstr ""
+"Notification Pulseaudio\n"
+"\n"
+"Pulseaudio n'est pas lancé"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:70
+msgid "There is one call in progress."
+msgstr "Vous avez un appel en cours."
+
+#: ../sflphone-client-gnome/src/mainwindow.c:74
+msgid "There are calls in progress."
+msgstr "Vous avez des appels en cours."
+
+#: ../sflphone-client-gnome/src/mainwindow.c:83
+msgid "Do you still want to quit?"
+msgstr "Voulez-vous quitter?"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:284
+msgid "SFLphone Error"
+msgstr "Erreur SFLphone"
+
+#: ../sflphone-client-gnome/src/menus.c:134
+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-client-gnome/src/menus.c:137
+msgid "About SFLphone"
+msgstr "A propos de SFLphone"
+
+#: ../sflphone-client-gnome/src/menus.c:161
+msgid "_Help"
+msgstr "A_ide"
+
+#: ../sflphone-client-gnome/src/menus.c:296
+#: ../sflphone-client-gnome/src/menus.c:953
+msgid "_New call"
+msgstr "_Nouvel appel"
+
+#: ../sflphone-client-gnome/src/menus.c:308
+#: ../sflphone-client-gnome/src/menus.c:785
+msgid "_Pick up"
+msgstr "_Décrocher"
+
+#: ../sflphone-client-gnome/src/menus.c:318
+#: ../sflphone-client-gnome/src/menus.c:797
+msgid "_Hang up"
+msgstr "_Raccrocher"
+
+#: ../sflphone-client-gnome/src/menus.c:328
+#: ../sflphone-client-gnome/src/menus.c:809
+msgid "On _Hold"
+msgstr "_Mettre en attente"
+
+#: ../sflphone-client-gnome/src/menus.c:340
+#: ../sflphone-client-gnome/src/menus.c:821
+msgid "_Record"
+msgstr "Enregistrer"
+
+#: ../sflphone-client-gnome/src/menus.c:354
+msgid "_Account creation wizard"
+msgstr "_Assistant de création de compte"
+
+#: ../sflphone-client-gnome/src/menus.c:384
+msgid "_Call"
+msgstr "_Actions"
+
+#: ../sflphone-client-gnome/src/menus.c:552
+msgid "Clear _history"
+msgstr "Effacer l'_historique"
+
+#: ../sflphone-client-gnome/src/menus.c:564
+msgid "_Accounts"
+msgstr "Co_mptes"
+
+#: ../sflphone-client-gnome/src/menus.c:579
+msgid "_Edit"
+msgstr "_Editer"
+
+#: ../sflphone-client-gnome/src/menus.c:631
+msgid "_Dialpad"
+msgstr "_Clavier"
+
+#: ../sflphone-client-gnome/src/menus.c:643
+msgid "_Volume controls"
+msgstr "Contrôle du _volume"
+
+#: ../sflphone-client-gnome/src/menus.c:661
+msgid "_View"
+msgstr "A_ffichage"
+
+#: ../sflphone-client-gnome/src/menus.c:881
+msgid "_Call back"
+msgstr "_Rappeler"
+
+#: ../sflphone-client-gnome/src/menus.c:1061
+msgid "Edit phone number"
+msgstr "Éditer le numéro"
+
+#: ../sflphone-client-gnome/src/menus.c:1072
+msgid "Edit the phone number before making a call"
+msgstr "Éditer le numéro de téléphone avant d'appeler"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:71
+#: ../sflphone-client-gnome/src/sflnotify.c:91
+#, c-format
+msgid "%s account : %s"
+msgstr "%s account : %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:75
+#, c-format
+msgid "<i>From</i> %s"
+msgstr "<i>De</i> %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:111
+#, c-format
+msgid "Calling with %s account <i>%s</i>"
+msgstr "Appel avec le compte %s <i>%s</i>"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:115
+msgid "Current account"
+msgstr "Compte courant"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:130
+msgid "You have no accounts set up"
+msgstr "Vous n'avez pas configuré de compte"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:131
+#: ../sflphone-client-gnome/src/sflnotify.c:148
+msgid "Error"
+msgstr "Erreur"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:147
+msgid "You have no registered accounts"
+msgstr "Vous n'avez aucun compte enregistré"
+
+#: ../sflphone-client-gnome/src/statusicon.c:91
+msgid "_Show main window"
+msgstr "_Afficher la fenêtre principale"
+
+#: ../sflphone-client-gnome/src/statusicon.c:127
+#, c-format
+msgid "%i account configured"
+msgid_plural "%i accounts configured"
+msgstr[0] "%i compte configuré"
+msgstr[1] "%i comptes configurés"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:113
+msgid "Account settings"
+msgstr "Paramètre des comptes"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:147
+msgid "_Enable this account"
+msgstr "Activer ce compte"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:161
+msgid "_Protocol"
+msgstr "P_rotocole"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:179
+msgid "Unknown"
+msgstr "Inconnu"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:312
+msgid "_Use Evolution address books"
+msgstr "_Utiliser les carnets d'adresse d'Évolution"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:319
+msgid "Download limit :"
+msgstr "Limite de téléchargement :"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:327
+msgid "cards"
+msgstr "entrées"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:333
+msgid "_Display contact photo if available"
+msgstr "_Afficher la photo si disponible"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:341
+msgid "Fields from Evolution's address books"
+msgstr "Utiliser les champs suivants des carnets d'adresse d'Évolution"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:345
+msgid "_Work"
+msgstr "_Professionnels"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:351
+msgid "_Home"
+msgstr "P_ersonnels"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:357
+msgid "_Mobile"
+msgstr "_Mobiles"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:364
+msgid "Address Books"
+msgstr "Carnets d'adresses"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:368
+msgid "Select which Evolution address books to use"
+msgstr "Sélectionnez les carnets d'adresses d'Evolution à utiliser"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:404
+#: ../sflphone-client-gnome/src/config/audioconf.c:576
+msgid "Name"
+msgstr "Nom"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:741
+msgid "_Voice Activity Detection"
+msgstr "Détection de l'activité de la voix"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:751
+msgid "_Noise Reduction (Narrow-Band Companding)"
+msgstr "Réduction du bruit (Compresseur extenseur LBR)"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:780
+msgid "Sound Manager"
+msgstr "Interface Audio"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:783
+msgid "_Pulseaudio"
+msgstr "_Pulseaudio"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:788
+msgid "_ALSA"
+msgstr "_ALSA"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:835
+msgid "Ringtones"
+msgstr "Sonneries"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:841
+msgid "_Enable ringtones"
+msgstr "_Activer les sonneries"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:847
+msgid "Choose a ringtone"
+msgstr "Sélectionner une sonnerie"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
+msgid "Audio Files"
+msgstr "Fichier Audio"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:589
+msgid "Desktop Notifications"
+msgstr "Notifications de Bureau"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:593
+msgid "_Enable notifications"
+msgstr "_Activer les notifications"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:599
+msgid "Enable voicemail _notifications"
+msgstr "Activer les notifications de boîte _vocale"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:611
+msgid "System Tray Icon"
+msgstr "Icône dans la barre des tâches"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:614
+msgid "_Popup main window on incoming call"
+msgstr "Faire apparaître la fenêtre _principale lors d'appel entrant"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:619
+msgid "Ne_ver popup main window"
+msgstr "Ne _jamais afficher la fenêtre principale"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:623
+msgid "Hide SFLphone window on _startup"
+msgstr "_Cacher la fenêtre de SFLphone au démarrage"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:629
+msgid "Calls History"
+msgstr "Historique des appels"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:632
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "_Keep my history for at least"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:647
+msgid "PulseAudio sound server"
+msgstr "Serveur de son PulseAudio"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:650
+msgid "_Mute other applications during a call"
+msgstr "Éteindre le _son des autres applications lors d'un appel"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:677
+msgid "Port"
+msgstr "Port"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:732
+msgid "Select a folder"
+msgstr "Choisissez un dossier"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:766
+msgid "Preferences"
+msgstr "Préférences"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:845
+msgid "Configured Accounts"
+msgstr "Comptes Configurés"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:141
+msgid "Trigger on specific _SIP header"
+msgstr "Déclencher sur un entête _SIP spécifique"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:150
+msgid "Trigger on _IAX2 URL"
+msgstr "Déclencher en _IAX2"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:155
+msgid "Command to _run"
+msgstr "Commande à e_xécuter"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:169
+msgid "_Prefix dialed numbers with"
+msgstr "_Préfixer les numéros composés par"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+msgid "Search all"
+msgstr "Rechercher dans tous"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:57
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:70
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:82
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:94
+msgid "Click here to change the search type"
+msgstr "Cliquez ici pour changer le type de recherche"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+msgid "Search by missed call"
+msgstr "Rechercher dans les appels manqués"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+msgid "Search by incoming call"
+msgstr "Rechercher dans les appels entrants"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+msgid "Search by outgoing call"
+msgstr "Rechercher dans les appels sortants"
+
+#~ msgid "User"
+#~ msgstr "Nom d'utilisateur"
+
+#~ msgid "Mailbox"
+#~ msgstr "Boîte vocale"
+
+#~ msgid "State"
+#~ msgstr "Statut"
+
+#~ msgid "Stun settings will be applied on each account"
+#~ msgstr "Les paramètres de STUN seront appliqués à tous les comptes"
+
+#~ msgid "Audio device"
+#~ msgstr "Fichier Audio"
+
+#~ msgid "&Codecs"
+#~ msgstr "Codecs"
+
+#~ msgid "Out"
+#~ msgstr "Sortie"
+
+#~ msgid "On &incoming calls"
+#~ msgstr "Lors d'appels entrants"
+
+#~ msgid "days"
+#~ msgstr "jours"
+
+#~ msgid "Custom commands with URL %s will be replaced with the passed URL."
+#~ msgstr "%s sera remplacé par l'URL passé en argument."
+
+#~ msgid "Phone number formatting"
+#~ msgstr "Réécriture des numéros appelés"
+
+#~ msgid "Add phone number prefix"
+#~ msgstr "Ajouter un préfixe au numéro"
+
+#~ msgid "General"
+#~ msgstr "Général"
+
+#~ msgid "Hold"
+#~ msgstr "Mettre en attente"
+
+#~ msgid "Configure accounts"
+#~ msgstr "Comptes Configurés"
+
+#~ msgid "Configure audio"
+#~ msgstr "Configurer l'audio"
+
+#~ msgctxt "Action record a call"
+#~ msgid "Record"
+#~ msgstr "Enregistrer"
+
+#~ msgid "accounr state"
+#~ msgstr "Paramètre des comptes"
+
+#~ msgid "%s - %s"
+#~ msgstr "%s - %s"
+
+#~ msgid "Registered"
+#~ msgstr "Enregistré"
+
+#~ msgid "Not Registered"
+#~ msgstr "Non Enregistré"
+
+#~ msgid "Trying..."
+#~ msgstr "En cours..."
+
+#~ msgid "Bad authentification"
+#~ msgstr "Erreur d'authentification"
+
+#~ msgid "Network unreachable"
+#~ msgstr "Réseau non trouvé"
+
+#~ msgid "Host unreachable"
+#~ msgstr "Serveur introuvable"
+
+#~ msgid "Stun configuration error"
+#~ msgstr "Erreur de configuration Stun"
+
+#~ msgid "Stun server invalid"
+#~ msgstr "Serveur Stun invalide"
+
+#~ msgid "Invalid"
+#~ msgstr "Non valide"
+
+#~ msgid "%d voice mails"
+#~ msgstr "%d messages vocaux"
+
+#~ msgid "Using %s (%s)"
+#~ msgstr "Utilise %s (%s)"
+
+#~ msgid "No registered account"
+#~ msgstr "Aucun compte enregistré"
+
+#~ msgid "Using %s (%s) - Codec: %s"
+#~ msgstr "Utilise %s (%s) - Codec: %s"
+
+#~ msgid ""
+#~ "This assistant is now finished.\n"
+#~ "You can at any time check your registration state or modify your accounts "
+#~ "parameters in the Options/Accounts window.\n"
+#~ "\n"
+#~ "Alias :    %s\n"
+#~ "Server :   %s\n"
+#~ "Username : %s\n"
+#~ msgstr ""
+#~ "Cet assistant est maintenant terminé.\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.\n"
+#~ "\n"
+#~ "Alias :    %s\n"
+#~ "Serveur :   %s\n"
+#~ "Nom d'usager : %s\n"
+
+#~ msgid "SFLphone account configuration wizard"
+#~ msgstr "Assistant de configuration de compte"
+
+#~ msgid "Welcome to SFLphone!"
+#~ msgstr "Bienvenue dans SFLphone"
+
+#~ msgid "Select an account type:"
+#~ msgstr "Choisissez un type de compte:"
+
+#~ msgid "Please select one of the following option:"
+#~ msgstr "Veuillez remplir les champs suivants:"
+
+#~ msgid "SIP account configuration"
+#~ msgstr "Configuration d'un compte SIP"
+
+#~ msgid "Please fill the following information:"
+#~ msgstr "Veuillez remplir les champs suivants:"
+
+#~ msgid "Optional Email Address "
+#~ msgstr "Courriel optionnel"
+
+#~ msgid "This email address will be use to send your voicemail messages"
+#~ msgstr "Vos messages vocaux seront envoyés par courriel à cette adresse "
+
+#~ msgid "_Email"
+#~ msgstr "_Email"
+
+#~ msgid "IAX2 account configuration"
+#~ msgstr "Configuration d'un compte IAX2"
+
+#~ msgid "Network Address Translation"
+#~ msgstr "Traduction d'adresse réseau (NAT)"
+
+#~ msgid "Edit phone"
+#~ msgstr "Éditer numéro"
+
+#~ msgid "%s account: %s"
+#~ msgstr "Compte %s: %s"
+
+#~ msgid "<i>From:</i> %s"
+#~ msgstr "<i>De:</i> %s"
+
+#~ msgid "You haven't setup any accounts"
+#~ msgstr "Vous n'avez aucun compte configuré"
+
+#~ msgid "SFLphone - %i accounts configured"
+#~ msgstr "SFLphone - %i comptes configurés"
+
+#~ msgid "\"Voicemail\" <%s>"
+#~ msgstr "\"Boite vocale\" <%s>"
+
+#~ msgid "Place a call"
+#~ msgstr "Appeler"
+
+#~ msgid "Off Hold"
+#~ msgstr "Reprendre"
+
+#~ msgid "On Hold"
+#~ msgstr "Mettre en attente"
+
+#~ msgid "Record a call"
+#~ msgstr "_Enregistrer un appel"
+
+#~ msgid "Account Parameters"
+#~ msgstr "Paramètres du Compte"
+
+#~ msgid "Download limit:"
+#~ msgstr "Limite de _téléchargement:"
+
+#~ msgid "_Business phone"
+#~ msgstr "Tél du _bureau"
+
+#~ msgid "_Home phone"
+#~ msgstr "Tél du _domicile"
+
+#~ msgid "_Mobile phone"
+#~ msgstr "Tél _portable"
+
+#~ msgid "Select which Evolution address books to use:"
+#~ msgstr "Sélectionner quels carnets d'adresse d'Évolution utiliser:"
+
+#~ msgid "audio device index for output = %d"
+#~ msgstr "index du device audio de sortie = %d"
+
+#~ msgid "ALSA configuration"
+#~ msgstr "Configuration ALSA"
+
+#~ msgid "Stun parameters will apply to each SIP account created."
+#~ msgstr "Les paramètres STUN sont appliqués à tous les comptes SIP créés"
+
+#~ msgid "Enable it if you are behind a firewall"
+#~ msgstr ""
+#~ "À activer si vous êtes derrière un pare-feu, puis redémarrez SFLphone"
+
+#~ msgid "Format: name.server:port"
+#~ msgstr "Format: nom.serveur:port"
+
+#~ msgid "Recordings folder"
+#~ msgstr "Dossier pour les enregistrements"
+
+#~ msgid "General Settings"
+#~ msgstr "Préférences"
+
+#~ msgid "Audio Settings"
+#~ msgstr "Paramètres Audio"
+
+#~ msgid "Recordings"
+#~ msgstr "Enregistrements"
+
+#~ msgid "Address Book"
+#~ msgstr "Carnet d'adresse"
+
+#~ msgid "Hooks"
+#~ msgstr "Ancrage"
+
+#~ msgid "Accounts"
+#~ msgstr "Comptes"
+
+#~ msgid "URL Passing"
+#~ msgstr "Passage d'URL"
+
+#~ msgid "Command to _run: "
+#~ msgstr "Commande à _exécuter: "
+
+#~ msgid "Phone Number Rewriting"
+#~ msgstr "Rééecriture du numéro"
+
+#~ msgid "_Prefix dialed numbers with:"
+#~ msgstr "_Préfixer les numéros composés par:"
+
+#~ msgid "Accept"
+#~ msgstr "Accepter"
+
+#~ msgid "Refuse"
+#~ msgstr "Refuser"
+
+#~ msgid "Ignore"
+#~ msgstr "Ignorer"
+
+#~ msgid "<small>Missed call</small>"
+#~ msgstr "<small>Appel manqué</small>"
+
+#~ msgid "<small>Duration:</small> %s"
+#~ msgstr "<small>Durée:</small> %s"
+
+#~ msgid "Fields"
+#~ msgstr "Champs"
+
+#~ msgid "_History size limit"
+#~ msgstr "_Taille limite de l'historique"
+
+#~ msgid ""
+#~ "SFLphone can run custom commands if incoming calls come with an URL "
+#~ "attached.\n"
+#~ "In this case, %s will be replaced with the passed URL."
+#~ msgstr ""
+#~ "SFLphone peut exécuter des commandes lors d'appels entrants qui ont un "
+#~ "URL associé.\n"
+#~ "Dans ce cas, %s sera remplacé par l'URL en question."
+
+#~ msgid "Search history"
+#~ msgstr "Rechercher"
+
+#~ msgid "Search contact"
+#~ msgstr "Rechercher un contact"
+
+#~ msgid "Registered to %s (%s)"
+#~ msgstr "Connecté avec %s (%s)"
+
+#~ msgid "%s account- %s             %s"
+#~ msgstr "compte %s- %s             %s"
+
+#~ msgid "Books"
+#~ msgstr "Carnets d'adresse"
+
+#~ msgid "_Enable"
+#~ msgstr "_Activer"
+
+#~ msgid "_Notify voice mails"
+#~ msgstr "_Notifier les messages vocaux"
+
+#~ msgid "_Start hidden"
+#~ msgstr "_Démarrer caché"
+
+#~ msgid "_Maximum number of calls"
+#~ msgstr "N_ombre maximum d'appels"
+
+#~ msgid "_Control running applications volume"
+#~ msgstr "_Autoriser à modifier le volume des autres applications"
+
+#~ msgid "Account previously setup"
+#~ msgstr "Liste des comptes existants"
+
+#~ msgid "URL argument"
+#~ msgstr "Argument URL"
+
+#~ msgid "_SIP protocol"
+#~ msgstr "_Protocole SIP"
+
+#~ msgid "_SIP Header: "
+#~ msgstr "En-tête SIP: "
+
+#~ msgid "_IAX2 protocol"
+#~ msgstr "_Protocole IAX2"
+
+#~ msgid "_Prepend: "
+#~ msgstr "Préfixe: "
diff --git a/sflphone-client-gnome/po/ru/sflphone-client-gnome.po b/sflphone-client-gnome/po/ru/sflphone-client-gnome.po
new file mode 100644
index 0000000000000000000000000000000000000000..a8b2eaea36ae7a02279f3c6aa95d17a1ad393b72
--- /dev/null
+++ b/sflphone-client-gnome/po/ru/sflphone-client-gnome.po
@@ -0,0 +1,1257 @@
+# Russian Translation.
+# Copyright (C) 2009 Savoir-Faire Linux Inc.
+# This file is distributed under the same license as the sflphone package.
+# Hussein Abdallah <hussein.abdallah@savoirfairelinux.com>.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: SFLphone 0.9.6\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-07-17 16:14-0400\n"
+"PO-Revision-Date: 2009-06-08 10:19 GMT-5\n"
+"Last-Translator: HUSSEIN ABDALLAH <hussein.abdallah@savoirfairelinux.com>\n"
+"Language-Team:  Savoir-Faire Linux Inc <sflphoneteam@savoirfairelinux.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../sflphone-client-kde/src/Account.cpp:34
+#: ../sflphone-client-gnome/src/accountlist.c:175
+msgctxt "account state"
+msgid "Registered"
+msgstr "Зарегистрирован"
+
+#: ../sflphone-client-kde/src/Account.cpp:36
+#: ../sflphone-client-gnome/src/accountlist.c:178
+msgctxt "account state"
+msgid "Not Registered"
+msgstr "Не зарегистрирован"
+
+#: ../sflphone-client-kde/src/Account.cpp:38
+#: ../sflphone-client-gnome/src/accountlist.c:181
+msgctxt "account state"
+msgid "Trying..."
+msgstr "Пробует подключиться..."
+
+#: ../sflphone-client-kde/src/Account.cpp:40
+#: ../sflphone-client-gnome/src/accountlist.c:184
+msgctxt "account state"
+msgid "Error"
+msgstr "Ошибка"
+
+#: ../sflphone-client-kde/src/Account.cpp:42
+#: ../sflphone-client-gnome/src/accountlist.c:187
+msgctxt "account state"
+msgid "Authentication Failed"
+msgstr "Неправильная идентификация"
+
+#: ../sflphone-client-kde/src/Account.cpp:44
+#: ../sflphone-client-gnome/src/accountlist.c:190
+msgctxt "account state"
+msgid "Network unreachable"
+msgstr "Сеть недоступна"
+
+#: ../sflphone-client-kde/src/Account.cpp:46
+#: ../sflphone-client-gnome/src/accountlist.c:193
+msgctxt "account state"
+msgid "Host unreachable"
+msgstr "Хост недоступен"
+
+#: ../sflphone-client-kde/src/Account.cpp:48
+#: ../sflphone-client-gnome/src/accountlist.c:196
+msgctxt "account state"
+msgid "Stun configuration error"
+msgstr "Ошибка настройки Stun"
+
+#: ../sflphone-client-kde/src/Account.cpp:50
+#: ../sflphone-client-gnome/src/accountlist.c:199
+msgctxt "account state"
+msgid "Stun server invalid"
+msgstr "Недействительный Stun-сервер"
+
+#: ../sflphone-client-kde/src/Account.cpp:51
+#: ../sflphone-client-gnome/src/accountlist.c:202
+msgctxt "account state"
+msgid "Invalid"
+msgstr "Недействительный"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:163
+#: ../sflphone-client-kde/src/AccountWizard.cpp:278
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:393
+msgid "Account creation wizard"
+msgstr "Мастер настройки SFLphone"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:199
+#: ../sflphone-client-kde/src/AccountWizard.cpp:217
+#: ../sflphone-client-kde/src/AccountWizard.cpp:561
+#: ../sflphone-client-gnome/src/assistant.c:68
+#, c-format
+msgid "This assistant is now finished."
+msgstr "Мастер закончил настройку."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:211
+msgid "Creation of account has failed for the reason"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:255
+#: ../sflphone-client-kde/src/AccountWizard.cpp:440
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:363
+#: ../sflphone-client-gnome/src/assistant.c:72
+msgid "Alias"
+msgstr "Псевдоним"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:256
+#: ../sflphone-client-kde/src/AccountWizard.cpp:441
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:370
+#: ../sflphone-client-gnome/src/assistant.c:75
+msgid "Server"
+msgstr "Сервер"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:257
+#: ../sflphone-client-kde/src/AccountWizard.cpp:442
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:371
+#: ../sflphone-client-gnome/src/assistant.c:78
+msgid "Username"
+msgstr "Пользователь"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:258
+#: ../sflphone-client-kde/src/AccountWizard.cpp:443
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:372
+msgid "Password"
+msgstr "Пароль"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:259
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:364
+#: ../sflphone-client-gnome/src/config/configwindow.c:418
+msgid "Protocol"
+msgstr "Протокол"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:260
+#: ../sflphone-client-kde/src/AccountWizard.cpp:444
+msgid "Voicemail number"
+msgstr "Номер автоответчика #"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:279
+#: ../sflphone-client-gnome/src/assistant.c:216
+msgid "Welcome to the Account creation wizard of SFLphone!"
+msgstr "Добро пожаловать в SFLphone!"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:281
+#: ../sflphone-client-gnome/src/assistant.c:217
+msgid "This installation wizard will help you configure an account."
+msgstr "Этот мастер установки поможет вам настроить ваш аккаунт."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:309
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Account"
+msgstr "Аккаунты"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:310
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Please select one of the following options"
+msgstr "Введите пожалуйста следующие данные"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:312
+#: ../sflphone-client-gnome/src/assistant.c:251
+msgid "Create a free SIP/IAX2 account on sflphone.org"
+msgstr "Создать бесплатный SIP/IAX2-аккаунт на sflphone.org"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:313
+#: ../sflphone-client-gnome/src/assistant.c:253
+msgid "Register an existing SIP or IAX2 account"
+msgstr "Зарегистрировать существующий SIP или IAX2 аккаунт"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:352
+#: ../sflphone-client-gnome/src/assistant.c:231
+msgid "VoIP Protocols"
+msgstr "VoIP-протоколы"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:353
+#: ../sflphone-client-gnome/src/assistant.c:231
+msgid "Select an account type"
+msgstr "Выберите тип аккаунта"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:355
+#: ../sflphone-client-gnome/src/assistant.c:233
+msgid "SIP (Session Initiation Protocol)"
+msgstr "SIP (Session Initiation Protocol)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:356
+#: ../sflphone-client-gnome/src/assistant.c:235
+msgid "IAX2 (InterAsterix Exchange)"
+msgstr "IAX2 (InterAsterix Exchange)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:395
+#: ../sflphone-client-gnome/src/assistant.c:339
+msgid "Optional email address"
+msgstr "Электронный адрес (необязательный)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:396
+#: ../sflphone-client-gnome/src/assistant.c:339
+msgid "This email address will be used to send your voicemail messages."
+msgstr "Этот электронный адрес будет использоваться для речевых сообщений"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:398
+msgid "Email address"
+msgstr "Адрес эл. почты"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:432
+#: ../sflphone-client-gnome/src/assistant.c:266
+msgid "SIP account settings"
+msgstr "Настройка SIP-аккаунта"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:436
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "IAX2 account settings"
+msgstr "Настройка IAX2-аккаунта"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:438
+#: ../sflphone-client-gnome/src/assistant.c:266
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "Please fill the following information"
+msgstr "Введите пожалуйста следующие данные"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:523
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:856
+msgid "Network Address Translation (NAT)"
+msgstr "Network Address Translation (NAT)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:524
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:536
+msgid "You should probably enable this if you are behind a firewall."
+msgstr "Вы наверное должны это включить если вы находитесь за сетевым экраном."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:526
+msgid "Enable STUN"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:527
+msgid "Stun Server"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:562
+msgid ""
+"After checking the settings you chose, click \"Finish\" to create the "
+"account."
+msgstr ""
+
+#: ../sflphone-client-kde/src/ActionSetAccountFirst.cpp:26
+msgid "Default account"
+msgstr ""
+
+#: ../sflphone-client-kde/src/Call.cpp:116
+#: ../sflphone-client-gnome/src/contacts/calltree.c:322
+msgid "Transfer to : "
+msgstr ""
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:89
+#: ../sflphone-client-gnome/src/actions.c:816
+msgid "Codec"
+msgstr "Codec"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:93
+#: ../sflphone-client-gnome/src/config/audioconf.c:581
+msgid "Frequency"
+msgstr "Частота"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:97
+#: ../sflphone-client-gnome/src/config/audioconf.c:586
+msgid "Bitrate"
+msgstr "Битрейт"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:101
+#: ../sflphone-client-gnome/src/config/audioconf.c:591
+msgid "Bandwidth"
+msgstr "Пропускная способность"
+
+#: ../sflphone-client-kde/src/main.cpp:38
+msgid "SFLphone KDE Client"
+msgstr ""
+
+#: ../sflphone-client-kde/src/main.cpp:42
+msgid "(C) 2009 Savoir-faire Linux"
+msgstr ""
+
+#: ../sflphone-client-kde/src/main.cpp:46
+msgid "Jérémy Quentin"
+msgstr ""
+
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr ""
+
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr ""
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:62
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-gnome/src/statusicon.c:126
+msgid "SFLphone"
+msgstr ""
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:209
+msgid "Incoming call"
+msgstr ""
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
+msgid "You have an incoming call from"
+msgstr ""
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
+msgid "Click to accept or refuse it."
+msgstr ""
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:716
+msgid "Address book loading..."
+msgstr ""
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:901
+#: ../sflphone-client-gnome/src/actions.c:89
+msgid "No registered accounts"
+msgstr "У вас нет зарегистрированных аккаунтов"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:905
+#: ../sflphone-client-gnome/src/actions.c:83
+#: ../sflphone-client-gnome/src/actions.c:813
+msgid "Using account"
+msgstr ""
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
+msgid "Main screen"
+msgstr ""
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:165
+msgid "Call history"
+msgstr ""
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:394
+#: ../sflphone-client-gnome/src/toolbar.c:243
+#: ../sflphone-client-gnome/src/toolbar.c:245
+msgid "Address book"
+msgstr "Адресная книга"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1108
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1173
+msgid "Edit before call"
+msgstr ""
+
+#: ../sflphone-client-kde/src/sflphone_const.h:41
+#: ../sflphone-client-gnome/src/toolbar.c:167
+#: ../sflphone-client-gnome/src/toolbar.c:169
+msgid "New call"
+msgstr "Новый звонок"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:42
+#: ../sflphone-client-kde/src/sflphone_const.h:47
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:381
+#: ../sflphone-client-gnome/src/toolbar.c:186
+#: ../sflphone-client-gnome/src/toolbar.c:188
+msgid "Hang up"
+msgstr "Положить трубку"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:43
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:382
+#: ../sflphone-client-gnome/src/toolbar.c:207
+#: ../sflphone-client-gnome/src/toolbar.c:209
+msgid "Hold on"
+msgstr "Удержать звонок"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:44
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:383
+#: ../sflphone-client-gnome/src/toolbar.c:220
+#: ../sflphone-client-gnome/src/toolbar.c:222
+msgid "Transfer"
+msgstr "Переслать звонок на другой номер"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:45
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:392
+#: ../sflphone-client-gnome/src/toolbar.c:263
+msgid "Record"
+msgstr "Записать переговор"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:46
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:380
+#: ../sflphone-client-gnome/src/toolbar.c:176
+#: ../sflphone-client-gnome/src/toolbar.c:178
+msgid "Pick up"
+msgstr "Взять трубку"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:48
+#: ../sflphone-client-gnome/src/toolbar.c:196
+#: ../sflphone-client-gnome/src/toolbar.c:198
+msgid "Hold off"
+msgstr "Снова взять"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:49
+msgid "Give up transfer"
+msgstr ""
+
+#: ../sflphone-client-kde/src/sflphone_const.h:50
+msgid "Call back"
+msgstr ""
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:48
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:91
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
+#: ../sflphone-client-gnome/src/config/configwindow.c:722
+#: ../sflphone-client-gnome/src/config/configwindow.c:791
+msgctxt "Config section"
+msgid "General"
+msgstr "Общие настройки"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:49
+msgctxt "Config section"
+msgid "Display"
+msgstr ""
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:50
+#: ../sflphone-client-gnome/src/config/configwindow.c:833
+msgctxt "Config section"
+msgid "Accounts"
+msgstr ""
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:51
+#: ../sflphone-client-gnome/src/config/configwindow.c:786
+msgctxt "Config section"
+msgid "Audio"
+msgstr "звука"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:52
+#: ../sflphone-client-gnome/src/config/configwindow.c:801
+msgctxt "Config section"
+msgid "Address Book"
+msgstr "Адресная книга"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:53
+#: ../sflphone-client-gnome/src/config/configwindow.c:796
+msgctxt "Config section"
+msgid "Recordings"
+msgstr "Запись"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:54
+#: ../sflphone-client-gnome/src/config/configwindow.c:806
+msgctxt "Config section"
+msgid "Hooks"
+msgstr "перехватчики (hooks)"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:328
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows. Enable/disable them by checking/unchecking "
+"them on the left of the item. Add or remove some with \"Plus\" and \"Sub\" "
+"buttons. Edit the selected account with the form on the right."
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:332
+msgid "Remove the selected account"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:335
+msgid ""
+"This button will remove the selected account in the list below. Be sure you "
+"really don't need it anymore. If you think you might use it again later, "
+"just uncheck it."
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:340
+msgid "Remove"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:342
+msgid "Add a new account"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:345
+msgid ""
+"This button enables you to initialize a new account. You will then be able "
+"to edit it using the form on the right."
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:347
+msgid "Add"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:349
+msgid "Get this account down"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:352
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:359
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows."
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:354
+msgid "Down"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:356
+msgid "Get this account up"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:361
+msgid "Up"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:362
+msgid "Apply"
+msgstr "Применить"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:367
+msgid "SIP"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:368
+msgid "IAX"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:373
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:385
+#: ../sflphone-client-gnome/src/toolbar.c:52
+#: ../sflphone-client-gnome/src/toolbar.c:251
+#: ../sflphone-client-gnome/src/toolbar.c:255
+msgid "Voicemail"
+msgstr "Автоответчик"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:374
+#: ../sflphone-client-gnome/src/config/configwindow.c:425
+msgid "Status"
+msgstr "Статус"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:377
+#: ../sflphone-client-gnome/src/config/configwindow.c:528
+msgid "Stun parameters will be applied on each SIP account created."
+msgstr "STUN-параметры будут эффективны для каждого созданного SIP-аккаунта"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:378
+msgid "Enable Stun"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:380
+#: ../sflphone-client-gnome/src/config/configwindow.c:544
+msgid "Format : name.server:port"
+msgstr "Формат: имя.сервер:порт"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:382
+msgid "choose Stun server (example : stunserver.org)"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:154
+msgid "Enable address book"
+msgstr "Адресная книга"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:155
+msgid "Maximum results"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:156
+msgid "Display photo if available"
+msgstr "_Показать фотографию контакта (если имеется):"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:157
+msgid "Display phone numbers of these types :"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:158
+msgid "Work"
+msgstr "Рабочий"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:159
+msgid "Mobile"
+msgstr "Мобильный"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:160
+msgid "Home"
+msgstr "Домашний"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:225
+msgid "Sound manager"
+msgstr "Менеджер звука"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:228
+msgid "ALSA"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:229
+msgid "PulseAudio"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:231
+msgid "Enable ringtones"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:232
+#: ../sflphone-client-gnome/src/config/audioconf.c:812
+msgid "Codecs"
+msgstr "Кодеки"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:233
+#: ../sflphone-client-gnome/src/config/audioconf.c:795
+msgid "ALSA settings"
+msgstr "Настройка ALSA"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:234
+#: ../sflphone-client-gnome/src/config/audioconf.c:662
+msgid "ALSA plugin"
+msgstr "ALSA-плагин"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:235
+#: ../sflphone-client-gnome/src/config/audioconf.c:706
+msgid "Input"
+msgstr "Вход"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:236
+#: ../sflphone-client-gnome/src/config/audioconf.c:684
+msgid "Output"
+msgstr "Выход"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:237
+msgid "PulseAudio settings"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:238
+msgid "Mute other applications during a call"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:121
+msgid "Enable notifications"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:122
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:126
+msgid "On incoming calls"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:123
+msgid "On messages"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:124
+msgid "Show main window"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:125
+msgid "On start"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:166
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "Keep my history for at least"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:167
+#: ../sflphone-client-gnome/src/config/configwindow.c:643
+msgctxt "End of 'Keep my history for at least n days.'"
+msgid "days"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:168
+msgid "Clear history"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:169
+msgid "Connection"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:170
+#: ../sflphone-client-gnome/src/config/configwindow.c:664
+msgid "SIP Port"
+msgstr "SIP-порт"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:180
+#: ../sflphone-client-gnome/src/config/hooks-config.c:130
+msgid "URL Argument"
+msgstr "Передача URL"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:181
+#: ../sflphone-client-gnome/src/config/hooks-config.c:135
+msgid "Custom commands on incoming calls with URL"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:182
+msgid "Trigger on specific SIP header"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:183
+msgid "Trigger on IAX2 URL"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:184
+msgid "Command to run"
+msgstr "Выполнить команду:"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:185
+#: ../sflphone-client-gnome/src/config/hooks-config.c:138
+#, c-format
+msgid "%s will be replaced with the passed URL."
+msgstr "%s будет заменена на переданную URL"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:186
+#: ../sflphone-client-gnome/src/config/hooks-config.c:165
+msgid "Phone number rewriting"
+msgstr "Переписка номера телефона"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:187
+msgid "Prefix dialed numbers with"
+msgstr "Добавить перед на набранными номерами"
+
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:92
+#: ../sflphone-client-gnome/src/config/configwindow.c:726
+msgid "Destination folder"
+msgstr "Папка назначения"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:384
+#: ../sflphone-client-gnome/src/toolbar.c:232
+#: ../sflphone-client-gnome/src/toolbar.c:234
+msgid "History"
+msgstr "Журнал"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:386
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:388
+msgid "Configure SFLphone"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:390
+msgid "Display volume controls"
+msgstr "_Настройки громкости"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:391
+msgid "Display dialpad"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:396
+msgid "Attention:number of results exceeds max displayed."
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:398
+#: ../sflphone-client-gnome/src/sliders.c:163
+msgid "Mic volume"
+msgstr "Громкость микрофона"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:402
+#: ../sflphone-client-gnome/src/sliders.c:161
+msgid "Speakers volume"
+msgstr "Громкость"
+
+#: ../sflphone-client-gnome/src/actions.c:54
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+#, c-format
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] "%d речевое сообщение"
+msgstr[1] "%d речевое сообщение"
+
+#: ../sflphone-client-gnome/src/actions.c:234
+msgid ""
+"Unable to connect to the SFLphone server.\n"
+"Make sure the daemon is running."
+msgstr ""
+"Невозможно подключиться к SFLphone-серверу.\n"
+"Проверьте если демон работает."
+
+#: ../sflphone-client-gnome/src/actions.c:809
+#, c-format
+msgid "IP call - %s"
+msgstr "IP звонок  - %s"
+
+#: ../sflphone-client-gnome/src/actions.c:908
+#, 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>Ошибка: звуковые кодеки не найдены.\n"
+"\n"
+"</b> Звуковые кодеки SFL должны находиться в <i>%s</i> или в <b>.sflphone</"
+"b> каталоге в вашем домашнем каталоге( <i>%s</i> )"
+
+#: ../sflphone-client-gnome/src/assistant.c:70
+msgid ""
+"You can at any time check your registration state or modify your accounts "
+"parameters in the Options/Accounts window."
+msgstr ""
+"Вы можете в любое время проверить статус регистрации или изменитьпараметры  "
+"ваших аккаунтов в меню Правка / Аккаунты."
+
+#: ../sflphone-client-gnome/src/assistant.c:190
+msgid "SFLphone account creation wizard"
+msgstr "Мастер настройки SFLphone"
+
+#: ../sflphone-client-gnome/src/assistant.c:274
+#: ../sflphone-client-gnome/src/assistant.c:370
+#: ../sflphone-client-gnome/src/config/accountwindow.c:153
+msgid "_Alias"
+msgstr "_Псевдоним"
+
+#: ../sflphone-client-gnome/src/assistant.c:282
+#: ../sflphone-client-gnome/src/assistant.c:378
+#: ../sflphone-client-gnome/src/config/accountwindow.c:189
+msgid "_Host name"
+msgstr "Имя или IP-адрес _сервера"
+
+#: ../sflphone-client-gnome/src/assistant.c:290
+#: ../sflphone-client-gnome/src/assistant.c:386
+#: ../sflphone-client-gnome/src/config/accountwindow.c:197
+msgid "_User name"
+msgstr "Имя или _номер пользователя"
+
+#: ../sflphone-client-gnome/src/assistant.c:306
+#: ../sflphone-client-gnome/src/assistant.c:401
+#: ../sflphone-client-gnome/src/config/accountwindow.c:212
+msgid "_Password"
+msgstr "Па_роль"
+
+#: ../sflphone-client-gnome/src/assistant.c:324
+#: ../sflphone-client-gnome/src/assistant.c:417
+#: ../sflphone-client-gnome/src/config/accountwindow.c:228
+msgid "_Voicemail number"
+msgstr "Номер _автоответчика #"
+
+#: ../sflphone-client-gnome/src/assistant.c:347
+msgid "_Email address"
+msgstr "_Адрес эл. почты"
+
+#: ../sflphone-client-gnome/src/assistant.c:444
+#: ../sflphone-client-gnome/src/config/configwindow.c:532
+msgid "E_nable STUN"
+msgstr "Включить STUN"
+
+#: ../sflphone-client-gnome/src/assistant.c:451
+msgid "_STUN server"
+msgstr "_STUN-сервер"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Account Registration"
+msgstr "Регистрация аккаунта"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Congratulations!"
+msgstr "Поздравляем!"
+
+#: ../sflphone-client-gnome/src/errors.c:29
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening playback device"
+msgstr ""
+"<b>ALSA-nпредупреждение</b>\n"
+"\n"
+"Ошибка во время активирования устройства проигрывания"
+
+#: ../sflphone-client-gnome/src/errors.c:32
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening capture device"
+msgstr ""
+"<b>ALSA-nпредупреждение</b>\n"
+"\n"
+"Ошибка во время активирования устройства входа"
+
+#: ../sflphone-client-gnome/src/errors.c:35
+msgid ""
+"Pulseaudio notification\n"
+"\n"
+"Pulseaudio is not running"
+msgstr ""
+"<b>Предупреждение Pulseaudio</b>\n"
+"\n"
+"Pulseaudio не работает"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:70
+msgid "There is one call in progress."
+msgstr "Звонок ещё не окончен."
+
+#: ../sflphone-client-gnome/src/mainwindow.c:74
+msgid "There are calls in progress."
+msgstr "Несколько звонков ещё не окончены."
+
+#: ../sflphone-client-gnome/src/mainwindow.c:83
+msgid "Do you still want to quit?"
+msgstr "Вы уверенны что хотите выйти?"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:284
+msgid "SFLphone Error"
+msgstr "Ошибка SFLphone."
+
+#: ../sflphone-client-gnome/src/menus.c:134
+msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr "SFLphone - SIP и IAX2-совместимый VoIP-клиент "
+
+#: ../sflphone-client-gnome/src/menus.c:137
+msgid "About SFLphone"
+msgstr "О SFLphone"
+
+#: ../sflphone-client-gnome/src/menus.c:161
+msgid "_Help"
+msgstr "_Помощь"
+
+#: ../sflphone-client-gnome/src/menus.c:296
+#: ../sflphone-client-gnome/src/menus.c:953
+msgid "_New call"
+msgstr "_Новый звонок"
+
+#: ../sflphone-client-gnome/src/menus.c:308
+#: ../sflphone-client-gnome/src/menus.c:785
+msgid "_Pick up"
+msgstr "_Взять трубку"
+
+#: ../sflphone-client-gnome/src/menus.c:318
+#: ../sflphone-client-gnome/src/menus.c:797
+msgid "_Hang up"
+msgstr "_Положить трубку"
+
+#: ../sflphone-client-gnome/src/menus.c:328
+#: ../sflphone-client-gnome/src/menus.c:809
+msgid "On _Hold"
+msgstr "_Удержать звонок"
+
+#: ../sflphone-client-gnome/src/menus.c:340
+#: ../sflphone-client-gnome/src/menus.c:821
+msgid "_Record"
+msgstr "Записать"
+
+#: ../sflphone-client-gnome/src/menus.c:354
+msgid "_Account creation wizard"
+msgstr "Мастер настройки SFLphone"
+
+#: ../sflphone-client-gnome/src/menus.c:384
+msgid "_Call"
+msgstr "_Звонок"
+
+#: ../sflphone-client-gnome/src/menus.c:552
+msgid "Clear _history"
+msgstr "_Стереть журнал"
+
+#: ../sflphone-client-gnome/src/menus.c:564
+msgid "_Accounts"
+msgstr "_Аккаунты"
+
+#: ../sflphone-client-gnome/src/menus.c:579
+msgid "_Edit"
+msgstr "_Правка"
+
+#: ../sflphone-client-gnome/src/menus.c:631
+msgid "_Dialpad"
+msgstr "_Клавиатура"
+
+#: ../sflphone-client-gnome/src/menus.c:643
+msgid "_Volume controls"
+msgstr "_Настройки громкости"
+
+#: ../sflphone-client-gnome/src/menus.c:661
+msgid "_View"
+msgstr "_Вид"
+
+#: ../sflphone-client-gnome/src/menus.c:881
+msgid "_Call back"
+msgstr "_Перезвонить"
+
+#: ../sflphone-client-gnome/src/menus.c:1061
+msgid "Edit phone number"
+msgstr "Мобильный телефон"
+
+#: ../sflphone-client-gnome/src/menus.c:1072
+msgid "Edit the phone number before making a call"
+msgstr "Изменить номер телефона перед звонком"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:71
+#: ../sflphone-client-gnome/src/sflnotify.c:91
+#, c-format
+msgid "%s account : %s"
+msgstr "%s аккаунт: %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:75
+#, c-format
+msgid "<i>From</i> %s"
+msgstr "<i>От:</i> %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:111
+#, c-format
+msgid "Calling with %s account <i>%s</i>"
+msgstr "Звонок с аккаунтом %s <i>%s</i>"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:115
+msgid "Current account"
+msgstr "Нынешний аккаунт"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:130
+msgid "You have no accounts set up"
+msgstr "Вы не настроили ни одного аккаунта"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:131
+#: ../sflphone-client-gnome/src/sflnotify.c:148
+msgid "Error"
+msgstr "Ошибка"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:147
+msgid "You have no registered accounts"
+msgstr "У вас нет зарегистрированных аккаунтов"
+
+#: ../sflphone-client-gnome/src/statusicon.c:91
+msgid "_Show main window"
+msgstr "_Показать главное окно"
+
+#: ../sflphone-client-gnome/src/statusicon.c:127
+#, c-format
+msgid "%i account configured"
+msgid_plural "%i accounts configured"
+msgstr[0] ""
+msgstr[1] "SFLphone - Зарегистрировано %i аккаунтов"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:113
+msgid "Account settings"
+msgstr "Настройки аккаунта"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:147
+msgid "_Enable this account"
+msgstr "_Включить"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:161
+msgid "_Protocol"
+msgstr "Пр_отокол"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:179
+msgid "Unknown"
+msgstr "Неизвестный"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:312
+msgid "_Use Evolution address books"
+msgstr "_Использовать адресную книгу Evolution"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:319
+msgid "Download limit :"
+msgstr "Ограничение скорости скачивания:"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:327
+msgid "cards"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:333
+msgid "_Display contact photo if available"
+msgstr "_Показать фотографию контакта (если имеется):"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:341
+msgid "Fields from Evolution's address books"
+msgstr "Исполоьзовать следующие поля из адресной книги Evolution:"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:345
+msgid "_Work"
+msgstr "_Рабочий"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:351
+msgid "_Home"
+msgstr "_Домашний"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:357
+msgid "_Mobile"
+msgstr "_Мобильный"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:364
+msgid "Address Books"
+msgstr "Адресная книга"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:368
+msgid "Select which Evolution address books to use"
+msgstr "Выбрать адресную книгу Evolution:"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:404
+#: ../sflphone-client-gnome/src/config/audioconf.c:576
+msgid "Name"
+msgstr "Имя"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:741
+msgid "_Voice Activity Detection"
+msgstr "Включить детектор тишины"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:751
+msgid "_Noise Reduction (Narrow-Band Companding)"
+msgstr "Шумоподавление"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:780
+msgid "Sound Manager"
+msgstr "Менеджер звука"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:783
+msgid "_Pulseaudio"
+msgstr "_Pulseaudio"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:788
+msgid "_ALSA"
+msgstr "_ALSA"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:835
+msgid "Ringtones"
+msgstr "Звонки"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:841
+msgid "_Enable ringtones"
+msgstr "Включить звонок"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:847
+msgid "Choose a ringtone"
+msgstr "Выберите звонок"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
+msgid "Audio Files"
+msgstr "Звуковые файлы"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:589
+msgid "Desktop Notifications"
+msgstr "Извещения на рабочем столе"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:593
+msgid "_Enable notifications"
+msgstr "Включить звонок"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:599
+msgid "Enable voicemail _notifications"
+msgstr "Включить предупреждения о речевых сообщениях"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:611
+msgid "System Tray Icon"
+msgstr "System Tray Icon"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:614
+msgid "_Popup main window on incoming call"
+msgstr "_Показать главное окно при входящем звонке"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:619
+msgid "Ne_ver popup main window"
+msgstr "Никогда не показывать главное окно"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:623
+msgid "Hide SFLphone window on _startup"
+msgstr "Спрятать окно SFLphone при пуске"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:629
+msgid "Calls History"
+msgstr "Журнал звонков"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:632
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "_Keep my history for at least"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:647
+msgid "PulseAudio sound server"
+msgstr "Сервер звука PulseAudio"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:650
+msgid "_Mute other applications during a call"
+msgstr "Приглушать звук других програм во время звонка"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:677
+msgid "Port"
+msgstr "Порт"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:732
+msgid "Select a folder"
+msgstr "Выберите папку"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:766
+msgid "Preferences"
+msgstr "Предпочтения"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:845
+msgid "Configured Accounts"
+msgstr "Нынешний аккаунт"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:141
+msgid "Trigger on specific _SIP header"
+msgstr "Запустить при определëнном SIP-заголовке"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:150
+msgid "Trigger on _IAX2 URL"
+msgstr "Запустить при наличии URL _IAX2"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:155
+msgid "Command to _run"
+msgstr "_Выполнить команду:"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:169
+msgid "_Prefix dialed numbers with"
+msgstr "Добавить перед на набранными номерами"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+msgid "Search all"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:57
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:70
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:82
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:94
+msgid "Click here to change the search type"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+msgid "Search by missed call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+msgid "Search by incoming call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+msgid "Search by outgoing call"
+msgstr ""
+
+#~ msgid "User"
+#~ msgstr "Пользователь"
+
+#~ msgid "State"
+#~ msgstr "Статус"
+
+#~ msgid "Stun settings will be applied on each account"
+#~ msgstr "STUN-параметры будут эффективны для каждого созданного SIP-аккаунта"
+
+#~ msgid "Audio device"
+#~ msgstr "Звуковые файлы"
+
+#~ msgid "&Codecs"
+#~ msgstr "Кодеки"
+
+#~ msgid "Out"
+#~ msgstr "Выход"
+
+#~ msgid "Custom commands with URL %s will be replaced with the passed URL."
+#~ msgstr "%s будет заменена на переданную URL"
+
+#~ msgid "Phone number formatting"
+#~ msgstr "Переписка номера телефона"
+
+#~ msgid "Add phone number prefix"
+#~ msgstr "Мобильный телефон"
+
+#~ msgid "General"
+#~ msgstr "Общие настройки"
+
+#~ msgid "Hold"
+#~ msgstr "Удержать звонок"
+
+#~ msgid "Configure accounts"
+#~ msgstr "Нынешний аккаунт"
+
+#~ msgid "Configure audio"
+#~ msgstr "Нынешний аккаунт"
+
+#~ msgctxt "Action record a call"
+#~ msgid "Record"
+#~ msgstr "Записать переговор"
+
+#~ msgid "accounr state"
+#~ msgstr "Настройки аккаунта"
diff --git a/sflphone-common/po/sflphone_es.po.patch b/sflphone-client-gnome/po/sflphone_es.po.patch
similarity index 100%
rename from sflphone-common/po/sflphone_es.po.patch
rename to sflphone-client-gnome/po/sflphone_es.po.patch
diff --git a/sflphone-client-gnome/po/zh_CN/sflphone-client-gnome.po b/sflphone-client-gnome/po/zh_CN/sflphone-client-gnome.po
new file mode 100644
index 0000000000000000000000000000000000000000..08c96f7a7251ef4bc815abeaecd578cde3645edc
--- /dev/null
+++ b/sflphone-client-gnome/po/zh_CN/sflphone-client-gnome.po
@@ -0,0 +1,1522 @@
+# Chinese translation of SFLphone.
+# Copyright (C) 2008 The Free Software Foundation, Inc.
+# This file is distributed under the GNU General Public License Version 3.
+# 
+# Yun Liu <yun.liu@savoirfairelinux.com>, 2008.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: SFLphone 0.9.2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-07-17 16:14-0400\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"
+"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"
+
+#: ../sflphone-client-kde/src/Account.cpp:34
+#: ../sflphone-client-gnome/src/accountlist.c:175
+msgctxt "account state"
+msgid "Registered"
+msgstr "已注册"
+
+#: ../sflphone-client-kde/src/Account.cpp:36
+#: ../sflphone-client-gnome/src/accountlist.c:178
+msgctxt "account state"
+msgid "Not Registered"
+msgstr "未注册"
+
+#: ../sflphone-client-kde/src/Account.cpp:38
+#: ../sflphone-client-gnome/src/accountlist.c:181
+msgctxt "account state"
+msgid "Trying..."
+msgstr "正在连接..."
+
+#: ../sflphone-client-kde/src/Account.cpp:40
+#: ../sflphone-client-gnome/src/accountlist.c:184
+msgctxt "account state"
+msgid "Error"
+msgstr "注册失败"
+
+#: ../sflphone-client-kde/src/Account.cpp:42
+#: ../sflphone-client-gnome/src/accountlist.c:187
+msgctxt "account state"
+msgid "Authentication Failed"
+msgstr "认证错误"
+
+#: ../sflphone-client-kde/src/Account.cpp:44
+#: ../sflphone-client-gnome/src/accountlist.c:190
+msgctxt "account state"
+msgid "Network unreachable"
+msgstr "网络连接失败"
+
+#: ../sflphone-client-kde/src/Account.cpp:46
+#: ../sflphone-client-gnome/src/accountlist.c:193
+msgctxt "account state"
+msgid "Host unreachable"
+msgstr "服务器连接失败"
+
+#: ../sflphone-client-kde/src/Account.cpp:48
+#: ../sflphone-client-gnome/src/accountlist.c:196
+msgctxt "account state"
+msgid "Stun configuration error"
+msgstr "STUN配置有误"
+
+#: ../sflphone-client-kde/src/Account.cpp:50
+#: ../sflphone-client-gnome/src/accountlist.c:199
+msgctxt "account state"
+msgid "Stun server invalid"
+msgstr "STUN服务器无效"
+
+#: ../sflphone-client-kde/src/Account.cpp:51
+#: ../sflphone-client-gnome/src/accountlist.c:202
+msgctxt "account state"
+msgid "Invalid"
+msgstr "无效"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:163
+#: ../sflphone-client-kde/src/AccountWizard.cpp:278
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:393
+msgid "Account creation wizard"
+msgstr "帐户创建向导"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:199
+#: ../sflphone-client-kde/src/AccountWizard.cpp:217
+#: ../sflphone-client-kde/src/AccountWizard.cpp:561
+#: ../sflphone-client-gnome/src/assistant.c:68
+#, c-format
+msgid "This assistant is now finished."
+msgstr "配置完成."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:211
+msgid "Creation of account has failed for the reason"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:255
+#: ../sflphone-client-kde/src/AccountWizard.cpp:440
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:363
+#: ../sflphone-client-gnome/src/assistant.c:72
+msgid "Alias"
+msgstr "别名"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:256
+#: ../sflphone-client-kde/src/AccountWizard.cpp:441
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:370
+#: ../sflphone-client-gnome/src/assistant.c:75
+msgid "Server"
+msgstr "服务器"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:257
+#: ../sflphone-client-kde/src/AccountWizard.cpp:442
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:371
+#: ../sflphone-client-gnome/src/assistant.c:78
+msgid "Username"
+msgstr "用户名"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:258
+#: ../sflphone-client-kde/src/AccountWizard.cpp:443
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:372
+msgid "Password"
+msgstr "密码"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:259
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:364
+#: ../sflphone-client-gnome/src/config/configwindow.c:418
+msgid "Protocol"
+msgstr "协议"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:260
+#: ../sflphone-client-kde/src/AccountWizard.cpp:444
+msgid "Voicemail number"
+msgstr "语音信箱号码"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:279
+#: ../sflphone-client-gnome/src/assistant.c:216
+msgid "Welcome to the Account creation wizard of SFLphone!"
+msgstr "欢迎使用SFLphone帐户创建向导!"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:281
+#: ../sflphone-client-gnome/src/assistant.c:217
+msgid "This installation wizard will help you configure an account."
+msgstr "安装向导将帮助您配置帐户"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:309
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Account"
+msgstr "帐户"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:310
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Please select one of the following options"
+msgstr "请选择以下选项中的一个"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:312
+#: ../sflphone-client-gnome/src/assistant.c:251
+msgid "Create a free SIP/IAX2 account on sflphone.org"
+msgstr "在sflphone.org上创建免费的SIP/IAX2帐户"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:313
+#: ../sflphone-client-gnome/src/assistant.c:253
+msgid "Register an existing SIP or IAX2 account"
+msgstr "注册已存在的SIP或IAX2帐户"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:352
+#: ../sflphone-client-gnome/src/assistant.c:231
+msgid "VoIP Protocols"
+msgstr "VoIP协议"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:353
+#: ../sflphone-client-gnome/src/assistant.c:231
+msgid "Select an account type"
+msgstr "选择帐户类型"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:355
+#: ../sflphone-client-gnome/src/assistant.c:233
+msgid "SIP (Session Initiation Protocol)"
+msgstr "SIP(会话初始化协议)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:356
+#: ../sflphone-client-gnome/src/assistant.c:235
+msgid "IAX2 (InterAsterix Exchange)"
+msgstr "IAX2(Asterisk内部交换协议)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:395
+#: ../sflphone-client-gnome/src/assistant.c:339
+msgid "Optional email address"
+msgstr "可选邮件地址"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:396
+#: ../sflphone-client-gnome/src/assistant.c:339
+msgid "This email address will be used to send your voicemail messages."
+msgstr "这个邮件地址将被用来发送您的语音邮箱消息"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:398
+msgid "Email address"
+msgstr "邮件地址"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:432
+#: ../sflphone-client-gnome/src/assistant.c:266
+msgid "SIP account settings"
+msgstr "SIP帐户设置"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:436
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "IAX2 account settings"
+msgstr "IAX2帐户设置"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:438
+#: ../sflphone-client-gnome/src/assistant.c:266
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "Please fill the following information"
+msgstr "请填写以下信息"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:523
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:856
+msgid "Network Address Translation (NAT)"
+msgstr "网络地址解析(NAT)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:524
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:536
+msgid "You should probably enable this if you are behind a firewall."
+msgstr "如果你使用网络使用防火墙，你很有可能需要设定此项."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:526
+msgid "Enable STUN"
+msgstr "使用STUN"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:527
+msgid "Stun Server"
+msgstr "STUN服务器"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:562
+msgid ""
+"After checking the settings you chose, click \"Finish\" to create the "
+"account."
+msgstr "当您检查完选定的设置, 请点击\"结束\"来创建帐户"
+
+#: ../sflphone-client-kde/src/ActionSetAccountFirst.cpp:26
+msgid "Default account"
+msgstr "默认帐户"
+
+#: ../sflphone-client-kde/src/Call.cpp:116
+#: ../sflphone-client-gnome/src/contacts/calltree.c:322
+msgid "Transfer to : "
+msgstr "转给:"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:89
+#: ../sflphone-client-gnome/src/actions.c:816
+msgid "Codec"
+msgstr "编码"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:93
+#: ../sflphone-client-gnome/src/config/audioconf.c:581
+msgid "Frequency"
+msgstr "频率"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:97
+#: ../sflphone-client-gnome/src/config/audioconf.c:586
+msgid "Bitrate"
+msgstr "比率"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:101
+#: ../sflphone-client-gnome/src/config/audioconf.c:591
+msgid "Bandwidth"
+msgstr "带宽"
+
+#: ../sflphone-client-kde/src/main.cpp:38
+msgid "SFLphone KDE Client"
+msgstr "SFLphone KDE客户端"
+
+#: ../sflphone-client-kde/src/main.cpp:42
+msgid "(C) 2009 Savoir-faire Linux"
+msgstr "(C) 2009 Savoir-faire Linux"
+
+#: ../sflphone-client-kde/src/main.cpp:46
+msgid "Jérémy Quentin"
+msgstr "Jérémy Quentin"
+
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Yun Liu"
+
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "yunliu2000@gmail.com"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:62
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-gnome/src/statusicon.c:126
+msgid "SFLphone"
+msgstr "SFLphone"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:209
+msgid "Incoming call"
+msgstr "来电"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
+msgid "You have an incoming call from"
+msgstr "您有一个电话,来自于"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
+msgid "Click to accept or refuse it."
+msgstr "请点击接听或拒绝"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:716
+msgid "Address book loading..."
+msgstr "载入地址簿......"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:901
+#: ../sflphone-client-gnome/src/actions.c:89
+msgid "No registered accounts"
+msgstr "没有已注册帐户"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:905
+#: ../sflphone-client-gnome/src/actions.c:83
+#: ../sflphone-client-gnome/src/actions.c:813
+msgid "Using account"
+msgstr "使用账户"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
+msgid "Main screen"
+msgstr "主屏幕"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:165
+msgid "Call history"
+msgstr "呼叫记录"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:394
+#: ../sflphone-client-gnome/src/toolbar.c:243
+#: ../sflphone-client-gnome/src/toolbar.c:245
+msgid "Address book"
+msgstr "地址簿"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1108
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1173
+msgid "Edit before call"
+msgstr "呼叫前进行编辑"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:41
+#: ../sflphone-client-gnome/src/toolbar.c:167
+#: ../sflphone-client-gnome/src/toolbar.c:169
+msgid "New call"
+msgstr "新电话"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:42
+#: ../sflphone-client-kde/src/sflphone_const.h:47
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:381
+#: ../sflphone-client-gnome/src/toolbar.c:186
+#: ../sflphone-client-gnome/src/toolbar.c:188
+msgid "Hang up"
+msgstr "放电话"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:43
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:382
+#: ../sflphone-client-gnome/src/toolbar.c:207
+#: ../sflphone-client-gnome/src/toolbar.c:209
+msgid "Hold on"
+msgstr "呼叫保持"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:44
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:383
+#: ../sflphone-client-gnome/src/toolbar.c:220
+#: ../sflphone-client-gnome/src/toolbar.c:222
+msgid "Transfer"
+msgstr "转接"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:45
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:392
+#: ../sflphone-client-gnome/src/toolbar.c:263
+msgid "Record"
+msgstr "记录"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:46
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:380
+#: ../sflphone-client-gnome/src/toolbar.c:176
+#: ../sflphone-client-gnome/src/toolbar.c:178
+msgid "Pick up"
+msgstr "接电话"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:48
+#: ../sflphone-client-gnome/src/toolbar.c:196
+#: ../sflphone-client-gnome/src/toolbar.c:198
+msgid "Hold off"
+msgstr "恢复通话"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:49
+msgid "Give up transfer"
+msgstr "取消转接"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:50
+msgid "Call back"
+msgstr "回叫"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:48
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:91
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
+#: ../sflphone-client-gnome/src/config/configwindow.c:722
+#: ../sflphone-client-gnome/src/config/configwindow.c:791
+msgctxt "Config section"
+msgid "General"
+msgstr "常用配置"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:49
+msgctxt "Config section"
+msgid "Display"
+msgstr "显示"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:50
+#: ../sflphone-client-gnome/src/config/configwindow.c:833
+msgctxt "Config section"
+msgid "Accounts"
+msgstr "帐户"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:51
+#: ../sflphone-client-gnome/src/config/configwindow.c:786
+msgctxt "Config section"
+msgid "Audio"
+msgstr "音频"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:52
+#: ../sflphone-client-gnome/src/config/configwindow.c:801
+msgctxt "Config section"
+msgid "Address Book"
+msgstr "地址簿"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:53
+#: ../sflphone-client-gnome/src/config/configwindow.c:796
+msgctxt "Config section"
+msgid "Recordings"
+msgstr "记录"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:54
+#: ../sflphone-client-gnome/src/config/configwindow.c:806
+msgctxt "Config section"
+msgid "Hooks"
+msgstr "钩键"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:328
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows. Enable/disable them by checking/unchecking "
+"them on the left of the item. Add or remove some with \"Plus\" and \"Sub\" "
+"buttons. Edit the selected account with the form on the right."
+msgstr ""
+"在默认情况下，当你打电话时，sflphone会使用列表当中第一个已注册的帐户。使用箭"
+"头\"上\"和\"下\"可以改变账户的顺序。选择账户名称左边的方框可以启用帐户，取消"
+"选择则会禁用该账户。通过\"加\"\"减\"按钮可以添加或删除账户。点击\"编辑\"按钮"
+"可以改变账户的设置。"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:332
+msgid "Remove the selected account"
+msgstr "删除所选账户"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:335
+msgid ""
+"This button will remove the selected account in the list below. Be sure you "
+"really don't need it anymore. If you think you might use it again later, "
+"just uncheck it."
+msgstr ""
+"该按钮会删除列表中被选定的账户。请确认你的操作。如果你希望继续使用某个账户，"
+"请取消对该账户的选择"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:340
+msgid "Remove"
+msgstr "删除"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:342
+msgid "Add a new account"
+msgstr "增加新帐户"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:345
+msgid ""
+"This button enables you to initialize a new account. You will then be able "
+"to edit it using the form on the right."
+msgstr ""
+"通过该按钮可以创建一个新账户。添加该账户之后你还可以通过编辑按钮来修改设置。"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:347
+msgid "Add"
+msgstr "添加"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:349
+msgid "Get this account down"
+msgstr "将该账户向下移动"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:352
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:359
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows."
+msgstr ""
+"在默认情况下，当你打电话时，sflphone会使用列表当中第一个已注册的帐户。使用箭"
+"头\"上\"和\"下\"可以改变账户的顺序。选择账户名称左边的方框可以启用帐户，取消"
+"选择则会禁用该账户。通过\"加\"\"减\"按钮可以添加或删除账户。"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:354
+msgid "Down"
+msgstr "下"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:356
+msgid "Get this account up"
+msgstr "把该账户向上移动"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:361
+msgid "Up"
+msgstr "上"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:362
+msgid "Apply"
+msgstr "应用"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:367
+msgid "SIP"
+msgstr "SIP"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:368
+msgid "IAX"
+msgstr "IAX"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:373
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:385
+#: ../sflphone-client-gnome/src/toolbar.c:52
+#: ../sflphone-client-gnome/src/toolbar.c:251
+#: ../sflphone-client-gnome/src/toolbar.c:255
+msgid "Voicemail"
+msgstr "语音信箱"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:374
+#: ../sflphone-client-gnome/src/config/configwindow.c:425
+msgid "Status"
+msgstr "状态"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:377
+#: ../sflphone-client-gnome/src/config/configwindow.c:528
+msgid "Stun parameters will be applied on each SIP account created."
+msgstr "STUN参数将应用于每一个注册的SIP帐户"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:378
+msgid "Enable Stun"
+msgstr "使用STUN"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:380
+#: ../sflphone-client-gnome/src/config/configwindow.c:544
+msgid "Format : name.server:port"
+msgstr "格式：名称.服务器:端口"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:382
+msgid "choose Stun server (example : stunserver.org)"
+msgstr "选择STUN服务器(例如:stunserver.org)"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:154
+msgid "Enable address book"
+msgstr "启用地址簿"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:155
+msgid "Maximum results"
+msgstr "结果最大值"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:156
+msgid "Display photo if available"
+msgstr "如果可行则显示联系人照片"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:157
+msgid "Display phone numbers of these types :"
+msgstr "显示这些格式的电话号码"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:158
+msgid "Work"
+msgstr "单位电话"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:159
+msgid "Mobile"
+msgstr "移动电话"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:160
+msgid "Home"
+msgstr "家庭电话"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:225
+msgid "Sound manager"
+msgstr "声音管理器"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:228
+msgid "ALSA"
+msgstr "ALSA"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:229
+msgid "PulseAudio"
+msgstr "PulseAudio"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:231
+msgid "Enable ringtones"
+msgstr "启用铃声"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:232
+#: ../sflphone-client-gnome/src/config/audioconf.c:812
+msgid "Codecs"
+msgstr "Codecs编码"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:233
+#: ../sflphone-client-gnome/src/config/audioconf.c:795
+msgid "ALSA settings"
+msgstr "ALSA设置"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:234
+#: ../sflphone-client-gnome/src/config/audioconf.c:662
+msgid "ALSA plugin"
+msgstr "ALSA插件"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:235
+#: ../sflphone-client-gnome/src/config/audioconf.c:706
+msgid "Input"
+msgstr "输入"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:236
+#: ../sflphone-client-gnome/src/config/audioconf.c:684
+msgid "Output"
+msgstr "输出"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:237
+msgid "PulseAudio settings"
+msgstr "PulseAudio设置"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:238
+msgid "Mute other applications during a call"
+msgstr "当有来电时静音其它应用程序"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:121
+msgid "Enable notifications"
+msgstr "启用提示"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:122
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:126
+msgid "On incoming calls"
+msgstr "有新来电"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:123
+msgid "On messages"
+msgstr "有新消息"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:124
+msgid "Show main window"
+msgstr "显示主窗口"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:125
+msgid "On start"
+msgstr "正在启动"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:166
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "Keep my history for at least"
+msgstr "保存呼叫记录至少"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:167
+#: ../sflphone-client-gnome/src/config/configwindow.c:643
+msgctxt "End of 'Keep my history for at least n days.'"
+msgid "days"
+msgstr "天"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:168
+msgid "Clear history"
+msgstr "清空历史记录"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:169
+msgid "Connection"
+msgstr "连接"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:170
+#: ../sflphone-client-gnome/src/config/configwindow.c:664
+msgid "SIP Port"
+msgstr "SIP端口号"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:180
+#: ../sflphone-client-gnome/src/config/hooks-config.c:130
+msgid "URL Argument"
+msgstr "URL参数"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:181
+#: ../sflphone-client-gnome/src/config/hooks-config.c:135
+msgid "Custom commands on incoming calls with URL"
+msgstr "定制对带有URL的来电的处理"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:182
+msgid "Trigger on specific SIP header"
+msgstr "激活指定的SIP头"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:183
+msgid "Trigger on IAX2 URL"
+msgstr "激活IAX2 URL"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:184
+msgid "Command to run"
+msgstr "要运行的命令"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:185
+#: ../sflphone-client-gnome/src/config/hooks-config.c:138
+#, c-format
+msgid "%s will be replaced with the passed URL."
+msgstr "传输的URL会被替换成%s."
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:186
+#: ../sflphone-client-gnome/src/config/hooks-config.c:165
+msgid "Phone number rewriting"
+msgstr "重设电话号码"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:187
+msgid "Prefix dialed numbers with"
+msgstr "号码前缀"
+
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:92
+#: ../sflphone-client-gnome/src/config/configwindow.c:726
+msgid "Destination folder"
+msgstr "目标文件夹"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:384
+#: ../sflphone-client-gnome/src/toolbar.c:232
+#: ../sflphone-client-gnome/src/toolbar.c:234
+msgid "History"
+msgstr "历史"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:386
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:388
+msgid "Configure SFLphone"
+msgstr "配置SFLphone"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:390
+msgid "Display volume controls"
+msgstr "显示音量控制"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:391
+msgid "Display dialpad"
+msgstr "显示拨号键盘"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:396
+msgid "Attention:number of results exceeds max displayed."
+msgstr "注意:结果超过可显示的最大值"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:398
+#: ../sflphone-client-gnome/src/sliders.c:163
+msgid "Mic volume"
+msgstr "话筒音量"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:402
+#: ../sflphone-client-gnome/src/sliders.c:161
+msgid "Speakers volume"
+msgstr "扬声器音量"
+
+#: ../sflphone-client-gnome/src/actions.c:54
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] "%d 个语音信息"
+msgstr[1] "%d 个语音信息"
+
+#: ../sflphone-client-gnome/src/actions.c:234
+msgid ""
+"Unable to connect to the SFLphone server.\n"
+"Make sure the daemon is running."
+msgstr ""
+"连接SFLphone服务器失败.\n"
+"请检查daemon是否还在运行."
+
+#: ../sflphone-client-gnome/src/actions.c:809
+#, c-format
+msgid "IP call - %s"
+msgstr "IP 电话 - %s"
+
+#: ../sflphone-client-gnome/src/actions.c:908
+#, 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>错误：无法找到codecs编码文件.\n"
+"\n"
+"</b> SFL声音codecs文件应位于<i>%s</i> 或 位于主目录( <i>%s</i> )的<b>."
+"sflphone</b>目录下"
+
+#: ../sflphone-client-gnome/src/assistant.c:70
+msgid ""
+"You can at any time check your registration state or modify your accounts "
+"parameters in the Options/Accounts window."
+msgstr "你可以随时在 选项/帐户 窗口中查看注册状态或者修改帐户参数."
+
+#: ../sflphone-client-gnome/src/assistant.c:190
+msgid "SFLphone account creation wizard"
+msgstr "SFLphone账户创建向导"
+
+#: ../sflphone-client-gnome/src/assistant.c:274
+#: ../sflphone-client-gnome/src/assistant.c:370
+#: ../sflphone-client-gnome/src/config/accountwindow.c:153
+msgid "_Alias"
+msgstr "别名(A)"
+
+#: ../sflphone-client-gnome/src/assistant.c:282
+#: ../sflphone-client-gnome/src/assistant.c:378
+#: ../sflphone-client-gnome/src/config/accountwindow.c:189
+msgid "_Host name"
+msgstr "主机名(H)"
+
+#: ../sflphone-client-gnome/src/assistant.c:290
+#: ../sflphone-client-gnome/src/assistant.c:386
+#: ../sflphone-client-gnome/src/config/accountwindow.c:197
+msgid "_User name"
+msgstr "用户名(U)"
+
+#: ../sflphone-client-gnome/src/assistant.c:306
+#: ../sflphone-client-gnome/src/assistant.c:401
+#: ../sflphone-client-gnome/src/config/accountwindow.c:212
+msgid "_Password"
+msgstr "密码(P)"
+
+#: ../sflphone-client-gnome/src/assistant.c:324
+#: ../sflphone-client-gnome/src/assistant.c:417
+#: ../sflphone-client-gnome/src/config/accountwindow.c:228
+msgid "_Voicemail number"
+msgstr "语音信箱号码(V)"
+
+#: ../sflphone-client-gnome/src/assistant.c:347
+msgid "_Email address"
+msgstr "邮件地址(E)"
+
+#: ../sflphone-client-gnome/src/assistant.c:444
+#: ../sflphone-client-gnome/src/config/configwindow.c:532
+msgid "E_nable STUN"
+msgstr "使用STUN(n)"
+
+#: ../sflphone-client-gnome/src/assistant.c:451
+msgid "_STUN server"
+msgstr "STUN服务器(S)"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Account Registration"
+msgstr "帐户注册"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Congratulations!"
+msgstr "恭喜！"
+
+#: ../sflphone-client-gnome/src/errors.c:29
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening playback device"
+msgstr ""
+"ALSA提示\n"
+"\n"
+"打开回放设备时出错"
+
+#: ../sflphone-client-gnome/src/errors.c:32
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening capture device"
+msgstr ""
+"ALSA提示\n"
+"\n"
+"打开采集设备时出错"
+
+#: ../sflphone-client-gnome/src/errors.c:35
+msgid ""
+"Pulseaudio notification\n"
+"\n"
+"Pulseaudio is not running"
+msgstr ""
+"Pulseaudio提示\n"
+"\n"
+"Pulseaudio未运行"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:70
+msgid "There is one call in progress."
+msgstr "有一个电话正在处理"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:74
+msgid "There are calls in progress."
+msgstr "有电话正在处理中"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:83
+msgid "Do you still want to quit?"
+msgstr "确认要退出?"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:284
+msgid "SFLphone Error"
+msgstr "SFLphone出错"
+
+#: ../sflphone-client-gnome/src/menus.c:134
+msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr "SFLphone是一个VoIP客户端，它兼容SIP和IAX2协议."
+
+#: ../sflphone-client-gnome/src/menus.c:137
+msgid "About SFLphone"
+msgstr "关于SFLphone"
+
+#: ../sflphone-client-gnome/src/menus.c:161
+msgid "_Help"
+msgstr "帮助(H)"
+
+#: ../sflphone-client-gnome/src/menus.c:296
+#: ../sflphone-client-gnome/src/menus.c:953
+msgid "_New call"
+msgstr "新电话(N)"
+
+#: ../sflphone-client-gnome/src/menus.c:308
+#: ../sflphone-client-gnome/src/menus.c:785
+msgid "_Pick up"
+msgstr "拨出(P)"
+
+#: ../sflphone-client-gnome/src/menus.c:318
+#: ../sflphone-client-gnome/src/menus.c:797
+msgid "_Hang up"
+msgstr "放下(H)"
+
+#: ../sflphone-client-gnome/src/menus.c:328
+#: ../sflphone-client-gnome/src/menus.c:809
+msgid "On _Hold"
+msgstr "保持(H)"
+
+#: ../sflphone-client-gnome/src/menus.c:340
+#: ../sflphone-client-gnome/src/menus.c:821
+msgid "_Record"
+msgstr "记录(R)"
+
+#: ../sflphone-client-gnome/src/menus.c:354
+msgid "_Account creation wizard"
+msgstr "帐户创建向导"
+
+#: ../sflphone-client-gnome/src/menus.c:384
+msgid "_Call"
+msgstr "电话"
+
+#: ../sflphone-client-gnome/src/menus.c:552
+msgid "Clear _history"
+msgstr "清空历史记录(C)"
+
+#: ../sflphone-client-gnome/src/menus.c:564
+msgid "_Accounts"
+msgstr "帐户(A)"
+
+#: ../sflphone-client-gnome/src/menus.c:579
+msgid "_Edit"
+msgstr "编辑(E)"
+
+#: ../sflphone-client-gnome/src/menus.c:631
+msgid "_Dialpad"
+msgstr "拨号面板"
+
+#: ../sflphone-client-gnome/src/menus.c:643
+msgid "_Volume controls"
+msgstr "音量控制(V)"
+
+#: ../sflphone-client-gnome/src/menus.c:661
+msgid "_View"
+msgstr "查看(V)"
+
+#: ../sflphone-client-gnome/src/menus.c:881
+msgid "_Call back"
+msgstr "回叫(C)"
+
+#: ../sflphone-client-gnome/src/menus.c:1061
+msgid "Edit phone number"
+msgstr "编辑电话号码"
+
+#: ../sflphone-client-gnome/src/menus.c:1072
+msgid "Edit the phone number before making a call"
+msgstr "拨出电话前编辑电话号码"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:71
+#: ../sflphone-client-gnome/src/sflnotify.c:91
+#, c-format
+msgid "%s account : %s"
+msgstr "%s 帐户: %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:75
+#, c-format
+msgid "<i>From</i> %s"
+msgstr "<i>拨入方</i> %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:111
+#, c-format
+msgid "Calling with %s account <i>%s</i>"
+msgstr "使用%s帐户<i>%s</i>呼叫"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:115
+msgid "Current account"
+msgstr "当前帐户"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:130
+msgid "You have no accounts set up"
+msgstr "你没有设置任何账户"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:131
+#: ../sflphone-client-gnome/src/sflnotify.c:148
+msgid "Error"
+msgstr "注册失败"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:147
+msgid "You have no registered accounts"
+msgstr "未发现已注册帐户"
+
+#: ../sflphone-client-gnome/src/statusicon.c:91
+msgid "_Show main window"
+msgstr "显示主窗口(S)"
+
+#: ../sflphone-client-gnome/src/statusicon.c:127
+#, c-format
+msgid "%i account configured"
+msgid_plural "%i accounts configured"
+msgstr[0] "已配置了%i个账户"
+msgstr[1] "已配置了%i个账户"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:113
+msgid "Account settings"
+msgstr "帐户设置"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:147
+msgid "_Enable this account"
+msgstr "启用该账户(E)"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:161
+msgid "_Protocol"
+msgstr "协议(P)"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:179
+msgid "Unknown"
+msgstr "未知"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:312
+msgid "_Use Evolution address books"
+msgstr "使用Evolution地址薄(U)"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:319
+msgid "Download limit :"
+msgstr "下载上限:"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:327
+msgid "cards"
+msgstr "卡"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:333
+msgid "_Display contact photo if available"
+msgstr "如果可行则显示联系人照片(D)"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:341
+msgid "Fields from Evolution's address books"
+msgstr "使用Evolution地址薄中的如下字段:"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:345
+msgid "_Work"
+msgstr "单位电话(W)"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:351
+msgid "_Home"
+msgstr "家庭电话(H)"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:357
+msgid "_Mobile"
+msgstr "移动电话(M)"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:364
+msgid "Address Books"
+msgstr "地址簿"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:368
+msgid "Select which Evolution address books to use"
+msgstr "选择使用如下Evolution地址薄"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:404
+#: ../sflphone-client-gnome/src/config/audioconf.c:576
+msgid "Name"
+msgstr "名称"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:741
+msgid "_Voice Activity Detection"
+msgstr "声音状态检测(V)"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:751
+msgid "_Noise Reduction (Narrow-Band Companding)"
+msgstr "降噪处理-窄频压缩(N)"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:780
+msgid "Sound Manager"
+msgstr "音频管理器"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:783
+msgid "_Pulseaudio"
+msgstr "Pulseaudio"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:788
+msgid "_ALSA"
+msgstr "ALSA"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:835
+msgid "Ringtones"
+msgstr "铃声"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:841
+msgid "_Enable ringtones"
+msgstr "启用铃声(E)"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:847
+msgid "Choose a ringtone"
+msgstr "选择铃声"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
+msgid "Audio Files"
+msgstr "音频文件"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:589
+msgid "Desktop Notifications"
+msgstr "桌面提示"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:593
+msgid "_Enable notifications"
+msgstr "启用提示(E)"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:599
+msgid "Enable voicemail _notifications"
+msgstr "启用语音邮箱提示(n)"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:611
+msgid "System Tray Icon"
+msgstr "系统托盘图标"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:614
+msgid "_Popup main window on incoming call"
+msgstr "来电时弹出主窗口(P)"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:619
+msgid "Ne_ver popup main window"
+msgstr "从不弹出主窗口(v)"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:623
+msgid "Hide SFLphone window on _startup"
+msgstr "在启动时隐藏SFLphone主窗口"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:629
+msgid "Calls History"
+msgstr "拨号历史"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:632
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "_Keep my history for at least"
+msgstr "保留历史记录至少(K)"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:647
+msgid "PulseAudio sound server"
+msgstr "PulseAudio服务器"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:650
+msgid "_Mute other applications during a call"
+msgstr "当有来电时静音其它应用程序(c)"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:677
+msgid "Port"
+msgstr "端口"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:732
+msgid "Select a folder"
+msgstr "选择文件夹"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:766
+msgid "Preferences"
+msgstr "属性"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:845
+msgid "Configured Accounts"
+msgstr "已配置帐户"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:141
+msgid "Trigger on specific _SIP header"
+msgstr "激活指定的SIP头(S)"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:150
+msgid "Trigger on _IAX2 URL"
+msgstr "激活IAX2 URL(I)"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:155
+msgid "Command to _run"
+msgstr "运行命令(r)"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:169
+msgid "_Prefix dialed numbers with"
+msgstr "号码前缀(P)"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+msgid "Search all"
+msgstr "查询所有"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:57
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:70
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:82
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:94
+msgid "Click here to change the search type"
+msgstr "请点击此处改变查询方式"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+msgid "Search by missed call"
+msgstr "从未接电话中查询"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+msgid "Search by incoming call"
+msgstr "从来电中查询"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+msgid "Search by outgoing call"
+msgstr "从拨出电话中查询"
+
+#~ msgid "User"
+#~ msgstr "用户名"
+
+#~ msgid "Mailbox"
+#~ msgstr "语音邮件"
+
+#~ msgctxt "Action record a call"
+#~ msgid "Record"
+#~ msgstr "记录"
+
+#~ msgid "%s - %s"
+#~ msgstr "%s - %s"
+
+#~ msgid "Registered"
+#~ msgstr "已注册"
+
+#~ msgid "Not Registered"
+#~ msgstr "未注册"
+
+#~ msgid "Trying..."
+#~ msgstr "正在连接..."
+
+#~ msgid "Bad authentification"
+#~ msgstr "认证错误"
+
+#~ msgid "Network unreachable"
+#~ msgstr "网络连接失败"
+
+#~ msgid "Host unreachable"
+#~ msgstr "服务器连接失败"
+
+#~ msgid "Stun configuration error"
+#~ msgstr "Stun配置有误"
+
+#~ msgid "Stun server invalid"
+#~ msgstr "Stun服务器无效"
+
+#~ msgid "Invalid"
+#~ msgstr "无效"
+
+#~ msgid "%d voice mails"
+#~ msgstr "%d 个语音信息"
+
+#~ msgid "No registered account"
+#~ msgstr "未发现已注册帐户"
+
+#~ msgid ""
+#~ "This assistant is now finished.\n"
+#~ "You can at any time check your registration state or modify your accounts "
+#~ "parameters in the Options/Accounts window.\n"
+#~ "\n"
+#~ "Alias :    %s\n"
+#~ "Server :   %s\n"
+#~ "Username : %s\n"
+#~ msgstr ""
+#~ "配置完成.\n"
+#~ "你可以随时在 选项/帐户 窗口中查看注册状态或者修改帐户参数.\n"
+#~ "\n"
+#~ "别名:     %s\n"
+#~ "服务器:   %s\n"
+#~ "用户名:   %s\n"
+
+#~ msgid "SFLphone account configuration wizard"
+#~ msgstr "SFLphone 帐户设置向导"
+
+#~ msgid "Welcome to SFLphone!"
+#~ msgstr "欢迎使用SFLphone!"
+
+#~ msgid "Select an account type:"
+#~ msgstr "选择帐户类型:"
+
+#~ msgid "Please select one of the following option:"
+#~ msgstr "请选择以下选项中的一个:"
+
+#~ msgid "SIP account configuration"
+#~ msgstr "SIP帐户配置"
+
+#~ msgid "Please fill the following information:"
+#~ msgstr "请填写以下信息:"
+
+#~ msgid "Optional Email Address "
+#~ msgstr "可选邮件地址 "
+
+#~ msgid "This email address will be use to send your voicemail messages"
+#~ msgstr "这个邮件地址将被用来发送您的语音邮箱消息"
+
+#~ msgid "_Email"
+#~ msgstr " 邮件(E)"
+
+#~ msgid "IAX2 account configuration"
+#~ msgstr "IAX2帐户配置"
+
+#~ msgid "Network Address Translation"
+#~ msgstr "网络地址解析"
+
+#~ msgid "Edit phone"
+#~ msgstr "编辑电话"
+
+#~ msgid "%s account: %s"
+#~ msgstr "%s 帐户: %s"
+
+#~ msgid "<i>From:</i> %s"
+#~ msgstr "<i>拨入方：</i> %s"
+
+#~ msgid "You haven't setup any accounts"
+#~ msgstr "你没有设置任何帐户"
+
+#~ msgid "SFLphone - %i accounts configured"
+#~ msgstr "SFLphone - %i 个帐户已配置"
+
+#~ msgid "\"Voicemail\" <%s>"
+#~ msgstr "\"语音邮件\" <%s>"
+
+#~ msgid "Place a call"
+#~ msgstr "拨号"
+
+#~ msgid "Off Hold"
+#~ msgstr "恢复通话"
+
+#~ msgid "On Hold"
+#~ msgstr "待机"
+
+#~ msgid "Record a call"
+#~ msgstr "记录通话"
+
+#~ msgid "Account Parameters"
+#~ msgstr "帐户相关参数"
+
+#~ msgid "General"
+#~ msgstr "常用配置"
+
+#~ msgid "Download limit:"
+#~ msgstr "下载上限:"
+
+#~ msgid "_Business phone"
+#~ msgstr "商务电话(B)"
+
+#~ msgid "_Home phone"
+#~ msgstr "家庭电话(H)"
+
+#~ msgid "_Mobile phone"
+#~ msgstr "移动电话(M)"
+
+#~ msgid "Select which Evolution address books to use:"
+#~ msgstr "选择使用如下Evolution地址薄:"
+
+#~ msgid "audio device index for output = %d"
+#~ msgstr "音频设备输出索引 ＝ %d"
+
+#~ msgid "ALSA configuration"
+#~ msgstr "ALSA 配置"
+
+#~ msgid "Stun parameters will apply to each SIP account created."
+#~ msgstr "Stun参数将应用于每一个注册的SIP帐户"
+
+#~ msgid "Enable it if you are behind a firewall"
+#~ msgstr "当使用防火墙时,启用该项"
+
+#~ msgid "Format: name.server:port"
+#~ msgstr "格式：name.server:port"
+
+#~ msgid "Port:"
+#~ msgstr "端口:"
+
+#~ msgid "Recordings folder"
+#~ msgstr "记录文件夹(R)"
+
+#~ msgid "General Settings"
+#~ msgstr "常用配置"
+
+#~ msgid "Audio Settings"
+#~ msgstr "音频配置"
+
+#~ msgid "Recordings"
+#~ msgstr "记录"
+
+#~ msgid "Address Book"
+#~ msgstr "地址簿"
+
+#~ msgid "Hooks"
+#~ msgstr "钩键"
+
+#~ msgid "Accounts"
+#~ msgstr "帐户"
+
+#~ msgid "URL Passing"
+#~ msgstr "传输URL"
+
+
+#~ msgid "Phone Number Rewriting"
+#~ msgstr "重设电话号码"
+
+#~ msgid "_Prefix dialed numbers with:"
+#~ msgstr "号码前缀:"
+
+#~ msgid "Accept"
+#~ msgstr "接受"
+
+#~ msgid "Refuse"
+#~ msgstr "拒绝"
+
+#~ msgid "Ignore"
+#~ msgstr "忽略"
+
+#~ msgid "<small>Missed call</small>"
+#~ msgstr "<small>未接电话</small>"
+
+#~ msgid "<small>Duration:</small> %s"
+#~ msgstr "<small>时长:</small> %s"
+
+#~ msgid "Fields"
+#~ msgstr "字段"
+
+#~ msgid "_History size limit"
+#~ msgstr "历史记录上限(H)"
+
+#~ msgid ""
+#~ "SFLphone can run custom commands if incoming calls come with an URL "
+#~ "attached.\n"
+#~ "In this case, %s will be replaced with the passed URL."
+#~ msgstr ""
+#~ "当来电有附加的URL时,SFLphone可运行客户命令.\n"
+#~ "在此情况下,传输的URL会被替换成%s."
+
+#~ msgid "Search history"
+#~ msgstr "查找历史记录"
+
+#~ msgid "Search contact"
+#~ msgstr "查找联系人(S)"
+
+#~ msgid "Registered to %s (%s)"
+#~ msgstr "注册到 %s (%s)"
+
+#~ msgid "%s account- %s             %s"
+#~ msgstr "%s 帐户- %s             %s"
+
+#~ msgid "Books"
+#~ msgstr "钩键"
+
+#~ msgid "_Enable"
+#~ msgstr "启用(E)"
+
+#~ msgid "_Notify voice mails"
+#~ msgstr "通知语音邮件(N)"
+
+#~ msgid "_Start hidden"
+#~ msgstr "启动时隐藏(S)"
+
+#~ msgid "_Maximum number of calls"
+#~ msgstr "最大拨号数(M)"
+
+#~ msgid "_Control running applications volume"
+#~ msgstr "控制正在运行的应用程序的音量(C)"
+
+#~ msgid "Account previously setup"
+#~ msgstr "帐户以前设置"
+
+#~ msgid "URL argument"
+#~ msgstr "URL参数"
+
+#~ msgid "_SIP protocol"
+#~ msgstr "SIP 协议(S)"
+
+#~ msgid "_SIP Header: "
+#~ msgstr "SIP消息头(S):"
+
+#~ msgid "_IAX2 protocol"
+#~ msgstr "IAX2 协议(I)"
+
+#~ msgid "Search"
+#~ msgstr "查找"
+
+#~ msgid "_Enabled"
+#~ msgstr "启用(E)"
+
+#~ msgid "%s account- %s"
+#~ msgstr "%s 帐户- %s"
+
+#~ msgid "Noise reduction"
+#~ msgstr "降噪"
+
+#~ msgid "_Destination folder"
+#~ msgstr "目标文件夹(D)"
+
+#~ msgid "_Account Assistant"
+#~ msgstr "帐户向导(A)"
+
+#~ msgid "Setup Accounts"
+#~ msgstr "设定帐户"
+
+#~ msgid "Search Parameters"
+#~ msgstr "查找相关参数"
+
+#~ msgid "Maximum result number for a request: "
+#~ msgstr "最大拨号数"
+
+#~ msgid "Search for and display: "
+#~ msgstr "查找并显示:"
+
+#~ msgid "_STUN Server"
+#~ msgstr "STUN服务器(S)"
diff --git a/sflphone-client-gnome/po/zh_HK/sflphone-client-gnome.po b/sflphone-client-gnome/po/zh_HK/sflphone-client-gnome.po
new file mode 100644
index 0000000000000000000000000000000000000000..ac82aea3bff5b3811789dbe507048c11a521c20e
--- /dev/null
+++ b/sflphone-client-gnome/po/zh_HK/sflphone-client-gnome.po
@@ -0,0 +1,1523 @@
+# Chinese translation of SFLphone.
+# Copyright (C) 2008 The Free Software Foundation, Inc.
+# This file is distributed under the GNU General Public License Version 3.
+# 
+# Yun Liu <yun.liu@savoirfairelinux.com>, 2008.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: SFLphone 0.9.2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-07-17 16:14-0400\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"
+"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"
+
+#: ../sflphone-client-kde/src/Account.cpp:34
+#: ../sflphone-client-gnome/src/accountlist.c:175
+msgctxt "account state"
+msgid "Registered"
+msgstr "已註冊"
+
+#: ../sflphone-client-kde/src/Account.cpp:36
+#: ../sflphone-client-gnome/src/accountlist.c:178
+msgctxt "account state"
+msgid "Not Registered"
+msgstr "未註冊"
+
+#: ../sflphone-client-kde/src/Account.cpp:38
+#: ../sflphone-client-gnome/src/accountlist.c:181
+msgctxt "account state"
+msgid "Trying..."
+msgstr "正在連接..."
+
+#: ../sflphone-client-kde/src/Account.cpp:40
+#: ../sflphone-client-gnome/src/accountlist.c:184
+msgctxt "account state"
+msgid "Error"
+msgstr "註冊失敗"
+
+#: ../sflphone-client-kde/src/Account.cpp:42
+#: ../sflphone-client-gnome/src/accountlist.c:187
+msgctxt "account state"
+msgid "Authentication Failed"
+msgstr "認證錯誤"
+
+#: ../sflphone-client-kde/src/Account.cpp:44
+#: ../sflphone-client-gnome/src/accountlist.c:190
+msgctxt "account state"
+msgid "Network unreachable"
+msgstr "網路連線失敗"
+
+#: ../sflphone-client-kde/src/Account.cpp:46
+#: ../sflphone-client-gnome/src/accountlist.c:193
+msgctxt "account state"
+msgid "Host unreachable"
+msgstr "伺服器連線失敗"
+
+#: ../sflphone-client-kde/src/Account.cpp:48
+#: ../sflphone-client-gnome/src/accountlist.c:196
+msgctxt "account state"
+msgid "Stun configuration error"
+msgstr "STUN配置有誤"
+
+#: ../sflphone-client-kde/src/Account.cpp:50
+#: ../sflphone-client-gnome/src/accountlist.c:199
+msgctxt "account state"
+msgid "Stun server invalid"
+msgstr "STUN伺服器無效"
+
+#: ../sflphone-client-kde/src/Account.cpp:51
+#: ../sflphone-client-gnome/src/accountlist.c:202
+msgctxt "account state"
+msgid "Invalid"
+msgstr "無效"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:163
+#: ../sflphone-client-kde/src/AccountWizard.cpp:278
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:393
+msgid "Account creation wizard"
+msgstr "帳戶創建向導"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:199
+#: ../sflphone-client-kde/src/AccountWizard.cpp:217
+#: ../sflphone-client-kde/src/AccountWizard.cpp:561
+#: ../sflphone-client-gnome/src/assistant.c:68
+#, c-format
+msgid "This assistant is now finished."
+msgstr "配置完成."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:211
+msgid "Creation of account has failed for the reason"
+msgstr ""
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:255
+#: ../sflphone-client-kde/src/AccountWizard.cpp:440
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:363
+#: ../sflphone-client-gnome/src/assistant.c:72
+msgid "Alias"
+msgstr "別稱"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:256
+#: ../sflphone-client-kde/src/AccountWizard.cpp:441
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:370
+#: ../sflphone-client-gnome/src/assistant.c:75
+msgid "Server"
+msgstr "伺服器"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:257
+#: ../sflphone-client-kde/src/AccountWizard.cpp:442
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:371
+#: ../sflphone-client-gnome/src/assistant.c:78
+msgid "Username"
+msgstr "使用者名稱"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:258
+#: ../sflphone-client-kde/src/AccountWizard.cpp:443
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:372
+msgid "Password"
+msgstr "密碼"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:259
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:364
+#: ../sflphone-client-gnome/src/config/configwindow.c:418
+msgid "Protocol"
+msgstr "協議"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:260
+#: ../sflphone-client-kde/src/AccountWizard.cpp:444
+msgid "Voicemail number"
+msgstr "語音郵箱"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:279
+#: ../sflphone-client-gnome/src/assistant.c:216
+msgid "Welcome to the Account creation wizard of SFLphone!"
+msgstr "歡迎使用SFLphone帳戶創建嚮導!"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:281
+#: ../sflphone-client-gnome/src/assistant.c:217
+msgid "This installation wizard will help you configure an account."
+msgstr "安裝向導將幫助您配置帳戶"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:309
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Account"
+msgstr "帳戶"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:310
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Please select one of the following options"
+msgstr "請選擇以下選項中的一個"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:312
+#: ../sflphone-client-gnome/src/assistant.c:251
+msgid "Create a free SIP/IAX2 account on sflphone.org"
+msgstr "在sflphone.org上創建免費的SIP/IAX2帳戶"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:313
+#: ../sflphone-client-gnome/src/assistant.c:253
+msgid "Register an existing SIP or IAX2 account"
+msgstr "註冊已存在的SIP或IAX2帳戶"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:352
+#: ../sflphone-client-gnome/src/assistant.c:231
+msgid "VoIP Protocols"
+msgstr "VoIP協議"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:353
+#: ../sflphone-client-gnome/src/assistant.c:231
+msgid "Select an account type"
+msgstr "選擇帳戶類型"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:355
+#: ../sflphone-client-gnome/src/assistant.c:233
+msgid "SIP (Session Initiation Protocol)"
+msgstr "SIP(會話初始化協議)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:356
+#: ../sflphone-client-gnome/src/assistant.c:235
+msgid "IAX2 (InterAsterix Exchange)"
+msgstr "IAX2(Asterisk內部交換協議)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:395
+#: ../sflphone-client-gnome/src/assistant.c:339
+msgid "Optional email address"
+msgstr "可選郵件地址"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:396
+#: ../sflphone-client-gnome/src/assistant.c:339
+msgid "This email address will be used to send your voicemail messages."
+msgstr "這個郵件地址將被用來發送您的語音"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:398
+msgid "Email address"
+msgstr "郵件地址"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:432
+#: ../sflphone-client-gnome/src/assistant.c:266
+msgid "SIP account settings"
+msgstr "SIP帳戶配置"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:436
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "IAX2 account settings"
+msgstr "IAX2帳戶配置"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:438
+#: ../sflphone-client-gnome/src/assistant.c:266
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "Please fill the following information"
+msgstr "請填寫如下信息"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:523
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:856
+msgid "Network Address Translation (NAT)"
+msgstr "网络地址解析(NAT)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:524
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:536
+msgid "You should probably enable this if you are behind a firewall."
+msgstr "如果你使用網路防火牆，你很有可能需要設定該項."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:526
+msgid "Enable STUN"
+msgstr "啟用STUN"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:527
+msgid "Stun Server"
+msgstr "STUN伺服器"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:562
+msgid ""
+"After checking the settings you chose, click \"Finish\" to create the "
+"account."
+msgstr "當您檢查完選定的設置,請點擊\"結束\"來創建帳戶"
+
+#: ../sflphone-client-kde/src/ActionSetAccountFirst.cpp:26
+msgid "Default account"
+msgstr "默認帳戶"
+
+#: ../sflphone-client-kde/src/Call.cpp:116
+#: ../sflphone-client-gnome/src/contacts/calltree.c:322
+msgid "Transfer to : "
+msgstr "轉給:"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:89
+#: ../sflphone-client-gnome/src/actions.c:816
+msgid "Codec"
+msgstr "編碼"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:93
+#: ../sflphone-client-gnome/src/config/audioconf.c:581
+msgid "Frequency"
+msgstr "顰律"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:97
+#: ../sflphone-client-gnome/src/config/audioconf.c:586
+msgid "Bitrate"
+msgstr "比率"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:101
+#: ../sflphone-client-gnome/src/config/audioconf.c:591
+msgid "Bandwidth"
+msgstr "顰寬"
+
+#: ../sflphone-client-kde/src/main.cpp:38
+msgid "SFLphone KDE Client"
+msgstr "SFLphone KDE客戶端"
+
+#: ../sflphone-client-kde/src/main.cpp:42
+msgid "(C) 2009 Savoir-faire Linux"
+msgstr "(C) 2009 Savoir-faire Linux"
+
+#: ../sflphone-client-kde/src/main.cpp:46
+msgid "Jérémy Quentin"
+msgstr "Jérémy Quentin"
+
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Yun Liu"
+
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "yunliu2000@gmail.com"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:62
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-gnome/src/statusicon.c:126
+msgid "SFLphone"
+msgstr "SFLphone"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:209
+msgid "Incoming call"
+msgstr "來電"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
+msgid "You have an incoming call from"
+msgstr "您有一個電話,來自於"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
+msgid "Click to accept or refuse it."
+msgstr "請點擊接聽或拒絕"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:716
+msgid "Address book loading..."
+msgstr "載入地址簿......"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:901
+#: ../sflphone-client-gnome/src/actions.c:89
+msgid "No registered accounts"
+msgstr "沒有已註冊帳戶"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:905
+#: ../sflphone-client-gnome/src/actions.c:83
+#: ../sflphone-client-gnome/src/actions.c:813
+msgid "Using account"
+msgstr "使用賬戶"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
+msgid "Main screen"
+msgstr "主屏幕"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:165
+msgid "Call history"
+msgstr "呼叫記錄"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:394
+#: ../sflphone-client-gnome/src/toolbar.c:243
+#: ../sflphone-client-gnome/src/toolbar.c:245
+msgid "Address book"
+msgstr "地址簿"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1108
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1173
+msgid "Edit before call"
+msgstr "呼叫前進行編輯"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:41
+#: ../sflphone-client-gnome/src/toolbar.c:167
+#: ../sflphone-client-gnome/src/toolbar.c:169
+msgid "New call"
+msgstr "新電話"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:42
+#: ../sflphone-client-kde/src/sflphone_const.h:47
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:381
+#: ../sflphone-client-gnome/src/toolbar.c:186
+#: ../sflphone-client-gnome/src/toolbar.c:188
+msgid "Hang up"
+msgstr "放電話"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:43
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:382
+#: ../sflphone-client-gnome/src/toolbar.c:207
+#: ../sflphone-client-gnome/src/toolbar.c:209
+msgid "Hold on"
+msgstr "呼叫保持"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:44
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:383
+#: ../sflphone-client-gnome/src/toolbar.c:220
+#: ../sflphone-client-gnome/src/toolbar.c:222
+msgid "Transfer"
+msgstr "轉接"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:45
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:392
+#: ../sflphone-client-gnome/src/toolbar.c:263
+msgid "Record"
+msgstr "記錄"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:46
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:380
+#: ../sflphone-client-gnome/src/toolbar.c:176
+#: ../sflphone-client-gnome/src/toolbar.c:178
+msgid "Pick up"
+msgstr "接電話"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:48
+#: ../sflphone-client-gnome/src/toolbar.c:196
+#: ../sflphone-client-gnome/src/toolbar.c:198
+msgid "Hold off"
+msgstr "恢復通話"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:49
+msgid "Give up transfer"
+msgstr "取消轉接"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:50
+msgid "Call back"
+msgstr "回叫"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:48
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:91
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
+#: ../sflphone-client-gnome/src/config/configwindow.c:722
+#: ../sflphone-client-gnome/src/config/configwindow.c:791
+msgctxt "Config section"
+msgid "General"
+msgstr "常用配置"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:49
+msgctxt "Config section"
+msgid "Display"
+msgstr "顯示"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:50
+#: ../sflphone-client-gnome/src/config/configwindow.c:833
+msgctxt "Config section"
+msgid "Accounts"
+msgstr "帳戶"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:51
+#: ../sflphone-client-gnome/src/config/configwindow.c:786
+msgctxt "Config section"
+msgid "Audio"
+msgstr "音頻"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:52
+#: ../sflphone-client-gnome/src/config/configwindow.c:801
+msgctxt "Config section"
+msgid "Address Book"
+msgstr "地址簿"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:53
+#: ../sflphone-client-gnome/src/config/configwindow.c:796
+msgctxt "Config section"
+msgid "Recordings"
+msgstr "記錄"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:54
+#: ../sflphone-client-gnome/src/config/configwindow.c:806
+msgctxt "Config section"
+msgid "Hooks"
+msgstr "鉤鍵"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:328
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows. Enable/disable them by checking/unchecking "
+"them on the left of the item. Add or remove some with \"Plus\" and \"Sub\" "
+"buttons. Edit the selected account with the form on the right."
+msgstr ""
+"在默認情況下，當你打電話時，sflphone會使用列表當中第一個已註冊的帳戶。使用箭"
+"頭\"上\"和\"下\"可以改變賬戶的順序。選擇賬戶名稱左邊的方框可以啟用帳戶，取消"
+"選擇則會禁用該賬戶。通過\"加\"\"減\"按鈕可以添加或刪除賬戶。點擊\"編輯\"按鈕"
+"可以改變賬戶的設置。"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:332
+msgid "Remove the selected account"
+msgstr "刪除所選賬戶"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:335
+msgid ""
+"This button will remove the selected account in the list below. Be sure you "
+"really don't need it anymore. If you think you might use it again later, "
+"just uncheck it."
+msgstr ""
+"該按鈕會刪除列表中被選定的賬戶。請確認你的操作。如果你希望繼續使用某個賬戶，"
+"請取消對該賬戶的選擇"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:340
+msgid "Remove"
+msgstr "刪除"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:342
+msgid "Add a new account"
+msgstr "增加新帳戶"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:345
+msgid ""
+"This button enables you to initialize a new account. You will then be able "
+"to edit it using the form on the right."
+msgstr ""
+"通過該按鈕可以創建一個新賬戶。添加該賬戶之後你還可以通過編輯按鈕來修改設置。"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:347
+msgid "Add"
+msgstr "添加"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:349
+msgid "Get this account down"
+msgstr "將該賬戶向下移動"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:352
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:359
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows."
+msgstr ""
+"在默認情況下，當你打電話時，sflphone會使用列表當中第一個已註冊的帳戶。使用箭"
+"頭\"上\"和\"下\"可以改變賬戶的順序。選擇賬戶名稱左邊的方框可以啟用帳戶，取消"
+"選擇則會禁用該賬戶。通過\"加\"\"減\"按鈕可以添加或刪除賬戶。"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:354
+msgid "Down"
+msgstr "下"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:356
+msgid "Get this account up"
+msgstr "把該賬戶向上移動"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:361
+msgid "Up"
+msgstr "上"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:362
+msgid "Apply"
+msgstr "套用"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:367
+msgid "SIP"
+msgstr "SIP"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:368
+msgid "IAX"
+msgstr "IAX"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:373
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:385
+#: ../sflphone-client-gnome/src/toolbar.c:52
+#: ../sflphone-client-gnome/src/toolbar.c:251
+#: ../sflphone-client-gnome/src/toolbar.c:255
+msgid "Voicemail"
+msgstr "語音郵件"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:374
+#: ../sflphone-client-gnome/src/config/configwindow.c:425
+msgid "Status"
+msgstr "狀態"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:377
+#: ../sflphone-client-gnome/src/config/configwindow.c:528
+msgid "Stun parameters will be applied on each SIP account created."
+msgstr "STUN參數將應用於每一個註冊的SIP帳戶"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:378
+msgid "Enable Stun"
+msgstr "啟用STUN"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:380
+#: ../sflphone-client-gnome/src/config/configwindow.c:544
+msgid "Format : name.server:port"
+msgstr "格式 : 名稱.服務器:端口"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:382
+msgid "choose Stun server (example : stunserver.org)"
+msgstr "選擇STUN服務器(例如:stunserver.org)"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:154
+msgid "Enable address book"
+msgstr "啟用地址簿"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:155
+msgid "Maximum results"
+msgstr "結果最大值"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:156
+msgid "Display photo if available"
+msgstr "如果可以則顯示聯繫人照片"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:157
+msgid "Display phone numbers of these types :"
+msgstr "顯示這些格式的電話號碼"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:158
+msgid "Work"
+msgstr "單位電話"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:159
+msgid "Mobile"
+msgstr "移動電話"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:160
+msgid "Home"
+msgstr "家庭電話"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:225
+msgid "Sound manager"
+msgstr "聲音管理器"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:228
+msgid "ALSA"
+msgstr "ALSA"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:229
+msgid "PulseAudio"
+msgstr "PulseAudio"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:231
+msgid "Enable ringtones"
+msgstr "啟動鈴聲"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:232
+#: ../sflphone-client-gnome/src/config/audioconf.c:812
+msgid "Codecs"
+msgstr "編碼"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:233
+#: ../sflphone-client-gnome/src/config/audioconf.c:795
+msgid "ALSA settings"
+msgstr "ALSA 配置"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:234
+#: ../sflphone-client-gnome/src/config/audioconf.c:662
+msgid "ALSA plugin"
+msgstr "ALSA插件"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:235
+#: ../sflphone-client-gnome/src/config/audioconf.c:706
+msgid "Input"
+msgstr "輸入"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:236
+#: ../sflphone-client-gnome/src/config/audioconf.c:684
+msgid "Output"
+msgstr "輸出"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:237
+msgid "PulseAudio settings"
+msgstr "PulseAudio 配置"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:238
+msgid "Mute other applications during a call"
+msgstr "當有來電時靜音其它應用程序"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:121
+msgid "Enable notifications"
+msgstr "啟動提示"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:122
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:126
+msgid "On incoming calls"
+msgstr "有新來電"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:123
+msgid "On messages"
+msgstr "有新消息"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:124
+msgid "Show main window"
+msgstr "顯示主窗口"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:125
+msgid "On start"
+msgstr "正在啟動"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:166
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "Keep my history for at least"
+msgstr "保存呼叫記錄數至少"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:167
+#: ../sflphone-client-gnome/src/config/configwindow.c:643
+msgctxt "End of 'Keep my history for at least n days.'"
+msgid "days"
+msgstr "天"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:168
+msgid "Clear history"
+msgstr "清空曆史記錄"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:169
+msgid "Connection"
+msgstr "連接"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:170
+#: ../sflphone-client-gnome/src/config/configwindow.c:664
+msgid "SIP Port"
+msgstr "SIP端口"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:180
+#: ../sflphone-client-gnome/src/config/hooks-config.c:130
+msgid "URL Argument"
+msgstr "URL參數"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:181
+#: ../sflphone-client-gnome/src/config/hooks-config.c:135
+msgid "Custom commands on incoming calls with URL"
+msgstr "定制對帶有URL的來電的處理"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:182
+msgid "Trigger on specific SIP header"
+msgstr "激活指定的SIP頭"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:183
+msgid "Trigger on IAX2 URL"
+msgstr "激活IAX2 URL"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:184
+msgid "Command to run"
+msgstr "要運行的命令"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:185
+#: ../sflphone-client-gnome/src/config/hooks-config.c:138
+#, c-format
+msgid "%s will be replaced with the passed URL."
+msgstr "傳輸的URL會被替換成%s."
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:186
+#: ../sflphone-client-gnome/src/config/hooks-config.c:165
+msgid "Phone number rewriting"
+msgstr "重設電話號碼"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:187
+msgid "Prefix dialed numbers with"
+msgstr "號碼前綴"
+
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:92
+#: ../sflphone-client-gnome/src/config/configwindow.c:726
+msgid "Destination folder"
+msgstr "目標文件夾"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:384
+#: ../sflphone-client-gnome/src/toolbar.c:232
+#: ../sflphone-client-gnome/src/toolbar.c:234
+msgid "History"
+msgstr "歷史"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:386
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:388
+msgid "Configure SFLphone"
+msgstr "配置SFLphone"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:390
+msgid "Display volume controls"
+msgstr "顯示音量控制"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:391
+msgid "Display dialpad"
+msgstr "顯示撥號鍵盤"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:396
+msgid "Attention:number of results exceeds max displayed."
+msgstr "注意:結果超過可顯示的最大值"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:398
+#: ../sflphone-client-gnome/src/sliders.c:163
+msgid "Mic volume"
+msgstr "話筒音量"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:402
+#: ../sflphone-client-gnome/src/sliders.c:161
+msgid "Speakers volume"
+msgstr "揚聲器音量"
+
+#: ../sflphone-client-gnome/src/actions.c:54
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] "%d 個語音郵件"
+msgstr[1] "%d 個語音郵件"
+
+#: ../sflphone-client-gnome/src/actions.c:234
+msgid ""
+"Unable to connect to the SFLphone server.\n"
+"Make sure the daemon is running."
+msgstr ""
+"連接SFLphone伺服器失敗.\n"
+"請核查daemon是否正在運行."
+
+#: ../sflphone-client-gnome/src/actions.c:809
+#, c-format
+msgid "IP call - %s"
+msgstr "IP電話- %s"
+
+#: ../sflphone-client-gnome/src/actions.c:908
+#, 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>錯誤：無法找到音訊編碼檔案.\n"
+"\n"
+"</b> SFL聲音編碼檔案應該位于<i>%s</i> 或者位于主目錄( <i>%s</i> )的<b>."
+"sflphone</b>目錄下"
+
+#: ../sflphone-client-gnome/src/assistant.c:70
+msgid ""
+"You can at any time check your registration state or modify your accounts "
+"parameters in the Options/Accounts window."
+msgstr "你可以隨時在 選項/帳戶 中查看註冊狀態或者修改帳戶信息."
+
+#: ../sflphone-client-gnome/src/assistant.c:190
+msgid "SFLphone account creation wizard"
+msgstr "SFLphone賬戶創建嚮導"
+
+#: ../sflphone-client-gnome/src/assistant.c:274
+#: ../sflphone-client-gnome/src/assistant.c:370
+#: ../sflphone-client-gnome/src/config/accountwindow.c:153
+msgid "_Alias"
+msgstr "別稱(A)"
+
+#: ../sflphone-client-gnome/src/assistant.c:282
+#: ../sflphone-client-gnome/src/assistant.c:378
+#: ../sflphone-client-gnome/src/config/accountwindow.c:189
+msgid "_Host name"
+msgstr "主机名稱(H)"
+
+#: ../sflphone-client-gnome/src/assistant.c:290
+#: ../sflphone-client-gnome/src/assistant.c:386
+#: ../sflphone-client-gnome/src/config/accountwindow.c:197
+msgid "_User name"
+msgstr "使用者名稱(U)"
+
+#: ../sflphone-client-gnome/src/assistant.c:306
+#: ../sflphone-client-gnome/src/assistant.c:401
+#: ../sflphone-client-gnome/src/config/accountwindow.c:212
+msgid "_Password"
+msgstr "密碼(P)"
+
+#: ../sflphone-client-gnome/src/assistant.c:324
+#: ../sflphone-client-gnome/src/assistant.c:417
+#: ../sflphone-client-gnome/src/config/accountwindow.c:228
+msgid "_Voicemail number"
+msgstr "語音郵箱(V)"
+
+#: ../sflphone-client-gnome/src/assistant.c:347
+msgid "_Email address"
+msgstr "郵件地址(E)"
+
+#: ../sflphone-client-gnome/src/assistant.c:444
+#: ../sflphone-client-gnome/src/config/configwindow.c:532
+msgid "E_nable STUN"
+msgstr "啟用STUN(n)"
+
+#: ../sflphone-client-gnome/src/assistant.c:451
+msgid "_STUN server"
+msgstr "STUN伺服器(S)"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Account Registration"
+msgstr "帳戶註冊"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Congratulations!"
+msgstr "恭喜！"
+
+#: ../sflphone-client-gnome/src/errors.c:29
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening playback device"
+msgstr ""
+"ALSA提示\n"
+"\n"
+"打開回放設備時出錯"
+
+#: ../sflphone-client-gnome/src/errors.c:32
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening capture device"
+msgstr ""
+"ALSA提示\n"
+"\n"
+"打開采集設備時出錯"
+
+#: ../sflphone-client-gnome/src/errors.c:35
+msgid ""
+"Pulseaudio notification\n"
+"\n"
+"Pulseaudio is not running"
+msgstr ""
+"Pulseaudio提示\n"
+"\n"
+"Pulseaudio未運行"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:70
+msgid "There is one call in progress."
+msgstr "有一個電話正在處理中."
+
+#: ../sflphone-client-gnome/src/mainwindow.c:74
+msgid "There are calls in progress."
+msgstr "有電話正在處理中."
+
+#: ../sflphone-client-gnome/src/mainwindow.c:83
+msgid "Do you still want to quit?"
+msgstr "確認要退出?"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:284
+msgid "SFLphone Error"
+msgstr "SFLphone 出錯"
+
+#: ../sflphone-client-gnome/src/menus.c:134
+msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr "SFLphone是一個VoIP客戶端，它兼容SIP和IAX2协议."
+
+#: ../sflphone-client-gnome/src/menus.c:137
+msgid "About SFLphone"
+msgstr "有關SFLphone"
+
+#: ../sflphone-client-gnome/src/menus.c:161
+msgid "_Help"
+msgstr "幫助(H)"
+
+#: ../sflphone-client-gnome/src/menus.c:296
+#: ../sflphone-client-gnome/src/menus.c:953
+msgid "_New call"
+msgstr "新電話(N)"
+
+#: ../sflphone-client-gnome/src/menus.c:308
+#: ../sflphone-client-gnome/src/menus.c:785
+msgid "_Pick up"
+msgstr "撥出(P)"
+
+#: ../sflphone-client-gnome/src/menus.c:318
+#: ../sflphone-client-gnome/src/menus.c:797
+msgid "_Hang up"
+msgstr "放下(H)"
+
+#: ../sflphone-client-gnome/src/menus.c:328
+#: ../sflphone-client-gnome/src/menus.c:809
+msgid "On _Hold"
+msgstr "待机"
+
+#: ../sflphone-client-gnome/src/menus.c:340
+#: ../sflphone-client-gnome/src/menus.c:821
+msgid "_Record"
+msgstr "記錄(R)"
+
+#: ../sflphone-client-gnome/src/menus.c:354
+msgid "_Account creation wizard"
+msgstr "帳戶創建向導(A)"
+
+#: ../sflphone-client-gnome/src/menus.c:384
+msgid "_Call"
+msgstr "電話"
+
+#: ../sflphone-client-gnome/src/menus.c:552
+msgid "Clear _history"
+msgstr "清空曆史記錄(C)"
+
+#: ../sflphone-client-gnome/src/menus.c:564
+msgid "_Accounts"
+msgstr "帳戶(A)"
+
+#: ../sflphone-client-gnome/src/menus.c:579
+msgid "_Edit"
+msgstr "編輯(E)"
+
+#: ../sflphone-client-gnome/src/menus.c:631
+msgid "_Dialpad"
+msgstr "撥號面板"
+
+#: ../sflphone-client-gnome/src/menus.c:643
+msgid "_Volume controls"
+msgstr "音量控制(V)"
+
+#: ../sflphone-client-gnome/src/menus.c:661
+msgid "_View"
+msgstr "查看(V)"
+
+#: ../sflphone-client-gnome/src/menus.c:881
+msgid "_Call back"
+msgstr "回叫(C)"
+
+#: ../sflphone-client-gnome/src/menus.c:1061
+msgid "Edit phone number"
+msgstr "編輯電話號碼"
+
+#: ../sflphone-client-gnome/src/menus.c:1072
+msgid "Edit the phone number before making a call"
+msgstr "撥出電話前編輯電話號碼"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:71
+#: ../sflphone-client-gnome/src/sflnotify.c:91
+#, c-format
+msgid "%s account : %s"
+msgstr "%s 帳戶 : %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:75
+#, c-format
+msgid "<i>From</i> %s"
+msgstr "<i>撥入方</i> %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:111
+#, c-format
+msgid "Calling with %s account <i>%s</i>"
+msgstr "使用%s帳戶<i>%s</i>呼叫"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:115
+msgid "Current account"
+msgstr "當前帳戶"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:130
+msgid "You have no accounts set up"
+msgstr "你沒有設置任何賬戶"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:131
+#: ../sflphone-client-gnome/src/sflnotify.c:148
+msgid "Error"
+msgstr "註冊失敗"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:147
+msgid "You have no registered accounts"
+msgstr "未發現已註冊帳戶"
+
+#: ../sflphone-client-gnome/src/statusicon.c:91
+msgid "_Show main window"
+msgstr "顯示主窗口(S)"
+
+#: ../sflphone-client-gnome/src/statusicon.c:127
+#, c-format
+msgid "%i account configured"
+msgid_plural "%i accounts configured"
+msgstr[0] "已配置了%i個賬戶"
+msgstr[1] "已配置了%i個賬戶"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:113
+msgid "Account settings"
+msgstr "帳戶設置"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:147
+msgid "_Enable this account"
+msgstr "啟用該賬戶(E)"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:161
+msgid "_Protocol"
+msgstr "協議(P)"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:179
+msgid "Unknown"
+msgstr "未知"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:312
+msgid "_Use Evolution address books"
+msgstr "使用Evolution地址薄(U)"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:319
+msgid "Download limit :"
+msgstr "下載上限:"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:327
+msgid "cards"
+msgstr "卡"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:333
+msgid "_Display contact photo if available"
+msgstr "如果可以則顯示聯繫人照片(D)"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:341
+msgid "Fields from Evolution's address books"
+msgstr "使用Evolution地址薄中的如下字段:"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:345
+msgid "_Work"
+msgstr "單位電話(W)"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:351
+msgid "_Home"
+msgstr "家庭電話(H)"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:357
+msgid "_Mobile"
+msgstr "移動電話(M)"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:364
+msgid "Address Books"
+msgstr "地址簿"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:368
+msgid "Select which Evolution address books to use"
+msgstr "選擇使用如下Evolution地址薄"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:404
+#: ../sflphone-client-gnome/src/config/audioconf.c:576
+msgid "Name"
+msgstr "名稱"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:741
+msgid "_Voice Activity Detection"
+msgstr "聲音狀態檢測(V)"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:751
+msgid "_Noise Reduction (Narrow-Band Companding)"
+msgstr "降噪處理-窄頻壓縮(N)"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:780
+msgid "Sound Manager"
+msgstr "聲音管理器"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:783
+msgid "_Pulseaudio"
+msgstr "Pulseaudio"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:788
+msgid "_ALSA"
+msgstr "ALSA"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:835
+msgid "Ringtones"
+msgstr "鈴聲"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:841
+msgid "_Enable ringtones"
+msgstr "啟動鈴聲(E)"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:847
+msgid "Choose a ringtone"
+msgstr "鈴聲選擇"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
+msgid "Audio Files"
+msgstr "音訊檔案"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:589
+msgid "Desktop Notifications"
+msgstr "桌面提示"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:593
+msgid "_Enable notifications"
+msgstr "啟動提示(E)"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:599
+msgid "Enable voicemail _notifications"
+msgstr "啟用語音郵箱提示(n)"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:611
+msgid "System Tray Icon"
+msgstr "系統托盤圖標"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:614
+msgid "_Popup main window on incoming call"
+msgstr "來電話時彈出主視窗(P)"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:619
+msgid "Ne_ver popup main window"
+msgstr "從不彈出主視窗(v)"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:623
+msgid "Hide SFLphone window on _startup"
+msgstr "在啟動時隱藏SFLphone主窗口"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:629
+msgid "Calls History"
+msgstr "打電話歷史"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:632
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "_Keep my history for at least"
+msgstr "保留歷史記錄至少(K)"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:647
+msgid "PulseAudio sound server"
+msgstr "PulseAudio聲音伺服器"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:650
+msgid "_Mute other applications during a call"
+msgstr "當有來電時靜音其它應用程序(c)"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:677
+msgid "Port"
+msgstr "端口"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:732
+msgid "Select a folder"
+msgstr "選擇文件夾"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:766
+msgid "Preferences"
+msgstr "屬性"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:845
+msgid "Configured Accounts"
+msgstr "已配置帳戶"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:141
+msgid "Trigger on specific _SIP header"
+msgstr "激活指定的SIP頭(S)"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:150
+msgid "Trigger on _IAX2 URL"
+msgstr "激活IAX2 URL(I)"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:155
+msgid "Command to _run"
+msgstr "運行命令(r)"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:169
+msgid "_Prefix dialed numbers with"
+msgstr "號碼前綴(P)"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+msgid "Search all"
+msgstr "查詢所有"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:57
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:70
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:82
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:94
+msgid "Click here to change the search type"
+msgstr "請點擊此處改變查詢方式"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+msgid "Search by missed call"
+msgstr "從未接電話中查詢"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+msgid "Search by incoming call"
+msgstr "從來電中查詢"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+msgid "Search by outgoing call"
+msgstr "從撥出電話中查詢"
+
+#~ msgid "User"
+#~ msgstr "使用者名稱"
+
+#~ msgid "Mailbox"
+#~ msgstr "語音郵件"
+
+#~ msgctxt "Action record a call"
+#~ msgid "Record"
+#~ msgstr "記錄"
+
+#~ msgid "%s - %s"
+#~ msgstr "%s - %s"
+
+#~ msgid "Registered"
+#~ msgstr "已註冊"
+
+#~ msgid "Not Registered"
+#~ msgstr "未註冊"
+
+#~ msgid "Trying..."
+#~ msgstr "正在連接..."
+
+#~ msgid "Bad authentification"
+#~ msgstr "認證錯誤"
+
+#~ msgid "Network unreachable"
+#~ msgstr "網路連線失敗"
+
+#~ msgid "Host unreachable"
+#~ msgstr "伺服器連線失敗"
+
+#~ msgid "Stun configuration error"
+#~ msgstr "Stun配置有誤"
+
+#~ msgid "Stun server invalid"
+#~ msgstr "Stun伺服器無效"
+
+#~ msgid "Invalid"
+#~ msgstr "無效"
+
+#~ msgid "%d voice mails"
+#~ msgstr "%d 個語音郵件"
+
+#~ msgid "No registered account"
+#~ msgstr "未發現已註冊帳戶"
+
+#~ msgid ""
+#~ "This assistant is now finished.\n"
+#~ "You can at any time check your registration state or modify your accounts "
+#~ "parameters in the Options/Accounts window.\n"
+#~ "\n"
+#~ "Alias :    %s\n"
+#~ "Server :   %s\n"
+#~ "Username : %s\n"
+#~ msgstr ""
+#~ "配置完成.\n"
+#~ "你可以隨時在 選項/帳戶 中查看註冊狀態或者修改帳戶信息\n"
+#~ "別稱:         %s\n"
+#~ "伺服器:       %s\n"
+#~ "使用者名稱:   %s\n"
+
+#~ msgid "SFLphone account configuration wizard"
+#~ msgstr "SFLphone 帳戶設置向導"
+
+#~ msgid "Welcome to SFLphone!"
+#~ msgstr "歡迎使用SFLphone!"
+
+#~ msgid "Select an account type:"
+#~ msgstr "選擇帳戶類型:"
+
+#~ msgid "Please select one of the following option:"
+#~ msgstr "請選擇以下選項中的一個:"
+
+#~ msgid "SIP account configuration"
+#~ msgstr "SIP帳戶配置"
+
+#~ msgid "Please fill the following information:"
+#~ msgstr "請填寫如下信息:"
+
+#~ msgid "Optional Email Address "
+#~ msgstr "可選郵件地址 "
+
+#~ msgid "This email address will be use to send your voicemail messages"
+#~ msgstr "這個郵件地址將被用來發送您的語音郵箱消息"
+
+#~ msgid "_Email"
+#~ msgstr "郵件(E)"
+
+#~ msgid "IAX2 account configuration"
+#~ msgstr "IAX2帳戶配置"
+
+#~ msgid "Network Address Translation"
+#~ msgstr "網路地址分析"
+
+#~ msgid "Edit phone"
+#~ msgstr "編輯電話"
+
+#~ msgid "%s account: %s"
+#~ msgstr "%s 帳戶: %s"
+
+#~ msgid "<i>From:</i> %s"
+#~ msgstr "<i>撥入方：</i> %s"
+
+#~ msgid "You haven't setup any accounts"
+#~ msgstr "你沒有設置任何帳戶"
+
+#~ msgid "SFLphone - %i accounts configured"
+#~ msgstr "SFLphone - %i 個帳戶已配置"
+
+#~ msgid "\"Voicemail\" <%s>"
+#~ msgstr "\"語音郵件\" <%s>"
+
+#~ msgid "Place a call"
+#~ msgstr "打電話"
+
+#~ msgid "Off Hold"
+#~ msgstr "恢复通話"
+
+#~ msgid "On Hold"
+#~ msgstr "待机"
+
+#~ msgid "Record a call"
+#~ msgstr "記錄通話"
+
+#~ msgid "Account Parameters"
+#~ msgstr "帳戶相關參數"
+
+#~ msgid "General"
+#~ msgstr "常用配置"
+
+#~ msgid "Download limit:"
+#~ msgstr "下載上限:"
+
+#~ msgid "_Business phone"
+#~ msgstr "商務電話(B)"
+
+#~ msgid "_Home phone"
+#~ msgstr "家庭電話(H)"
+
+#~ msgid "_Mobile phone"
+#~ msgstr "移動電話(M)"
+
+#~ msgid "Select which Evolution address books to use:"
+#~ msgstr "選擇使用如下Evolution地址薄:"
+
+#~ msgid "audio device index for output = %d"
+#~ msgstr "音訊設備輸出索引 ＝ %d"
+
+#~ msgid "ALSA configuration"
+#~ msgstr "ALSA 配置"
+
+#~ msgid "Stun parameters will apply to each SIP account created."
+#~ msgstr "Stun參數將應用於每一個註冊的SIP帳戶"
+
+#~ msgid "Enable it if you are behind a firewall"
+#~ msgstr "當使用防火牆時，需要設定此項"
+
+#~ msgid "Format: name.server:port"
+#~ msgstr "格式：name.server:port"
+
+#~ msgid "Port:"
+#~ msgstr "端口:"
+
+#~ msgid "Recordings folder"
+#~ msgstr "記錄文件夾(R)"
+
+#~ msgid "General Settings"
+#~ msgstr "常用配置"
+
+#~ msgid "Audio Settings"
+#~ msgstr "音訊配置"
+
+#~ msgid "Recordings"
+#~ msgstr "記錄"
+
+#~ msgid "Address Book"
+#~ msgstr "地址簿"
+
+#~ msgid "Hooks"
+#~ msgstr "鉤鍵"
+
+#~ msgid "Accounts"
+#~ msgstr "帳戶"
+
+#~ msgid "URL Passing"
+#~ msgstr "傳輸URL"
+
+#~ msgid "Command to _run: "
+#~ msgstr "運行命令(C):"
+
+#~ msgid "Phone Number Rewriting"
+#~ msgstr "重設電話號碼"
+
+#~ msgid "_Prefix dialed numbers with:"
+#~ msgstr "號碼前綴:"
+
+#~ msgid "Accept"
+#~ msgstr "接受"
+
+#~ msgid "Refuse"
+#~ msgstr "拒絕"
+
+#~ msgid "Ignore"
+#~ msgstr "忽略"
+
+#~ msgid "<small>Missed call</small>"
+#~ msgstr "<small>未接電話</small>"
+
+#~ msgid "<small>Duration:</small> %s"
+#~ msgstr "<small>時長:</small> %s"
+
+#~ msgid "Fields"
+#~ msgstr "字段"
+
+#~ msgid "_History size limit"
+#~ msgstr "歷史記錄上限(H)"
+
+#~ msgid ""
+#~ "SFLphone can run custom commands if incoming calls come with an URL "
+#~ "attached.\n"
+#~ "In this case, %s will be replaced with the passed URL."
+#~ msgstr ""
+#~ "當來電有附加的URL時,SFLphone可運行客戶命令.\n"
+#~ "在此情況下,傳輸的URL會被替換成%s."
+
+#~ msgid "Search history"
+#~ msgstr "搜尋歷史記錄"
+
+#~ msgid "Search contact"
+#~ msgstr "搜尋聯繫人(S)"
+
+#~ msgid "Registered to %s (%s)"
+#~ msgstr "註冊到 %s (%s)"
+
+#~ msgid "%s account- %s             %s"
+#~ msgstr "%s 帳戶- %s\t\t%s"
+
+#~ msgid "Books"
+#~ msgstr "鉤鍵"
+
+#~ msgid "_Enable"
+#~ msgstr "啟用(E)"
+
+#~ msgid "_Notify voice mails"
+#~ msgstr "語音郵件通知(N)"
+
+#~ msgid "_Start hidden"
+#~ msgstr "啟動時隱藏(S)"
+
+#~ msgid "_Maximum number of calls"
+#~ msgstr "最大打出電話數目(M)"
+
+#~ msgid "_Control running applications volume"
+#~ msgstr "控制正在運行中的應用程式的音量(C)"
+
+#~ msgid "Account previously setup"
+#~ msgstr "帳戶以前設定"
+
+#~ msgid "URL argument"
+#~ msgstr "URL參數"
+
+#~ msgid "_SIP protocol"
+#~ msgstr "SIP 協議(S)"
+
+#~ msgid "_SIP Header: "
+#~ msgstr "SIP消息頭(S):"
+
+#~ msgid "_IAX2 protocol"
+#~ msgstr "IAX2 協議(I)"
+
+#~ msgid "Search"
+#~ msgstr "搜尋"
+
+#~ msgid "_Enabled"
+#~ msgstr "啟用(E)"
+
+#~ msgid "%s account- %s"
+#~ msgstr "%s 帳戶- %s"
+
+#~ msgid "Noise reduction"
+#~ msgstr "降噪"
+
+#~ msgid "_Destination folder"
+#~ msgstr "目標文件夾(D)"
+
+#~ msgid "_Account Assistant"
+#~ msgstr "帳戶向導(A)"
+
+#~ msgid "Setup Accounts"
+#~ msgstr "設定帳戶"
+
+#~ msgid "Search Parameters"
+#~ msgstr "搜尋相關參數"
+
+#~ msgid "Maximum result number for a request: "
+#~ msgstr "最大打出電話數目"
+
+#~ msgid "Search for and display: "
+#~ msgstr "搜尋並顯示:"
+
+#~ msgid "_STUN Server"
+#~ msgstr "STUN伺服器(S)"
diff --git a/sflphone-client-gnome/src/accountlist.c b/sflphone-client-gnome/src/accountlist.c
index cd635575ff56021e1dda0dd4343caa37915b87fd..314fe544d41c4923c98b7354ce87107b76894691 100644
--- a/sflphone-client-gnome/src/accountlist.c
+++ b/sflphone-client-gnome/src/accountlist.c
@@ -172,34 +172,34 @@ const gchar * account_state_name(account_state_t s)
   switch(s)
   {
   case ACCOUNT_STATE_REGISTERED:
-    state = _("Registered");
+    state = c_("account state", "Registered");
     break;
   case ACCOUNT_STATE_UNREGISTERED:
-    state = _("Not Registered");
+    state = c_("account state", "Not Registered");
     break;
   case ACCOUNT_STATE_TRYING:
-    state = _("Trying...");
+    state = c_("account state", "Trying...");
     break;
   case ACCOUNT_STATE_ERROR:
-    state = _("Error");
+    state = c_("account state", "Error");
     break;
   case ACCOUNT_STATE_ERROR_AUTH:
-    state = _("Bad authentification");
+    state = c_("account state", "Authentication Failed");
     break;
   case ACCOUNT_STATE_ERROR_NETWORK:
-    state = _("Network unreachable");
+    state = c_("account state", "Network unreachable");
     break;
   case ACCOUNT_STATE_ERROR_HOST:
-    state = _("Host unreachable");
+    state = c_("account state", "Host unreachable");
     break;
   case ACCOUNT_STATE_ERROR_CONF_STUN:
-    state = _("Stun configuration error");
+    state = c_("account state", "Stun configuration error");
     break;
   case ACCOUNT_STATE_ERROR_EXIST_STUN:
-    state = _("Stun server invalid");
+    state = c_("account state", "Stun server invalid");
     break;
   default:
-    state = _("Invalid");
+    state = c_("account state", "Invalid");
     break;
   }
   return state;
diff --git a/sflphone-client-gnome/src/actions.c b/sflphone-client-gnome/src/actions.c
index 4e632c9ca245a117de4dc626474625a8e87f4d77..a741ce1e83e4dcac42b27537208c424a8b28132e 100644
--- a/sflphone-client-gnome/src/actions.c
+++ b/sflphone-client-gnome/src/actions.c
@@ -51,10 +51,11 @@ sflphone_notify_voice_mail ( const gchar* accountID , guint count )
     if(count > 0)
     {
         gchar * message = g_new0(gchar, 50);
-        if( count > 1)
-            g_sprintf(message, _("%d voice mails"), count);
-        else
-            g_sprintf(message, _("%d voice mail"), count);
+        g_sprintf(message, n_("%d voice mail", "%d voice mails", count), count);
+//         if( count > 1)
+//             g_sprintf(message, _("%d voice mails"), count);
+//         else
+//             g_sprintf(message, _("%d voice mail"), count);
         statusbar_push_message(message,  __MSG_VOICE_MAILS);
         g_free(message);
     }
@@ -78,13 +79,14 @@ status_bar_display_account ()
 
     acc = account_list_get_current ();
     if(acc){
-        msg = g_markup_printf_escaped(_("Using %s (%s)") ,
+        msg = g_markup_printf_escaped("%s %s (%s)" ,
+                _("Using account"),
                 (gchar*)g_hash_table_lookup( acc->properties , ACCOUNT_ALIAS),
                 (gchar*)g_hash_table_lookup( acc->properties , ACCOUNT_TYPE));
     }
     else
     {
-        msg = g_markup_printf_escaped(_("No registered account"));
+        msg = g_markup_printf_escaped(_("No registered accounts"));
     }
     statusbar_push_message( msg , __MSG_ACCOUNT_DEFAULT);
     g_free(msg);
@@ -499,14 +501,15 @@ process_dialing(callable_obj_t * c, guint keyval, gchar * key)
                 gchar * before = c->_peer_number;
                 if(strlen(c->_peer_number) >= 1){
 
-                    c->_peer_number = g_strndup(c->_peer_number, strlen(c->_peer_number) -1);
-                    g_free(before);
-                    DEBUG("TO: backspace %s", c->_peer_number);
-
-                    if(c->_state == CALL_STATE_DIALING)
-                    {
-                        //g_free(c->_peer_name);
-                        //c->_peer_name = g_strconcat("\"\" <", c->_peer_number, ">", NULL);
+					if (c->_state == CALL_STATE_TRANSFERT)
+					{
+						c->_trsft_to = g_strndup (c->_trsft_to, strlen(c->_trsft_to) - 1);
+					}
+					else
+					{
+						c->_peer_number = g_strndup(c->_peer_number, strlen(c->_peer_number) -1);
+						g_free(before);
+						DEBUG("TO: backspace %s", c->_peer_number);
                     }
                     calltree_update_call(current_calls,c);
                 }
@@ -579,7 +582,6 @@ sflphone_new_call()
     void
 sflphone_keypad( guint keyval, gchar * key)
 {
-    DEBUG("sflphone_keypad \n");
     callable_obj_t * c = calltab_get_selected_call(current_calls);
 
     if((active_calltree != current_calls) || (active_calltree == current_calls && !c))
@@ -807,9 +809,11 @@ sflphone_display_selected_codec (const gchar* codecName)
                 msg = g_markup_printf_escaped (_("IP call - %s"), codecName);
             }
             else {
-                msg = g_markup_printf_escaped(_("Using %s (%s) - Codec: %s") ,
+                msg = g_markup_printf_escaped("%s %s (%s) - %s %s" ,
+                        _("Using account"),
                         (gchar*)g_hash_table_lookup( acc->properties , ACCOUNT_ALIAS),
                         (gchar*)g_hash_table_lookup( acc->properties , ACCOUNT_TYPE),
+                        _("Codec"),
                         codecName);
             }
             statusbar_push_message( msg , __MSG_ACCOUNT_DEFAULT);
diff --git a/sflphone-client-gnome/src/assistant.c b/sflphone-client-gnome/src/assistant.c
index a642da19bc35a1e351f2669cc45b88110309d025..192c3269958933cadff2e9791ff2556dbbe009ce 100644
--- a/sflphone-client-gnome/src/assistant.c
+++ b/sflphone-client-gnome/src/assistant.c
@@ -32,7 +32,7 @@
 
 #define SFLPHONE_ORG_SERVER "sip.sflphone.org"
 #define SFLPHONE_ORG_ALIAS "sflphone.org"
-#define MESSAGE_SUMMARY _("This assistant is now finished.\nYou can at any time check your registration state or modify your accounts parameters in the Options/Accounts window.\n\nAlias :    %s\nServer :   %s\nUsername : %s\n")
+
 
 
 struct _wizard *wiz;
@@ -59,6 +59,27 @@ void set_account_type( GtkWidget* widget , gpointer data UNUSED ) {
 	}
 }
 
+/**
+ * Fills string message with the final message of account registration
+ * with alias, server and username specified.
+ */
+void getMessageSummary( char * message , const gchar * alias, const gchar * server, const gchar * username) {
+	char var[64];
+	sprintf( message, _("This assistant is now finished."));
+	strcat( message, "\n" );
+	strcat( message, _("You can at any time check your registration state or modify your accounts parameters in the Options/Accounts window."));
+	strcat( message, "\n\n");
+	strcat( message, _("Alias"));
+	sprintf( var, " :   %s\n", alias);
+	strcat( message, var);
+	strcat( message, _("Server"));
+	sprintf( var, " :   %s\n", server);
+	strcat( message, var);
+	strcat( message, _("Username"));
+	sprintf( var, " :   %s\n", username);
+	strcat( message, var);
+}
+
 void set_sflphone_org( GtkWidget* widget , gpointer data UNUSED ) {
 	use_sflphone_org = (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))?1:0) ;
 }
@@ -108,12 +129,17 @@ static void sip_apply_callback( void ) {
 		g_hash_table_insert(current->properties, g_strdup(ACCOUNT_SIP_STUN_SERVER), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->addr))));
 
 		dbus_add_account( current );
-        	sprintf(message, MESSAGE_SUMMARY,
+		getMessageSummary(message, 
 			gtk_entry_get_text (GTK_ENTRY(wiz->sip_alias)),
 			gtk_entry_get_text (GTK_ENTRY(wiz->sip_server)),
 			gtk_entry_get_text (GTK_ENTRY(wiz->sip_username))
+		) ;
+//         	sprintf(message, MESSAGE_SUMMARY,
+// 			gtk_entry_get_text (GTK_ENTRY(wiz->sip_alias)),
+// 			gtk_entry_get_text (GTK_ENTRY(wiz->sip_server)),
+// 			gtk_entry_get_text (GTK_ENTRY(wiz->sip_username))
                        	// gtk_entry_get_text (GTK_ENTRY(wiz->sip_password))
-				) ;
+// 				) ;
 	gtk_label_set_text (GTK_LABEL(wiz->label_summary), message);
 	}
 }
@@ -132,11 +158,16 @@ static void iax_apply_callback( void ) {
 		g_hash_table_insert(current->properties, g_strdup(ACCOUNT_HOSTNAME), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->iax_server))));
 		g_hash_table_insert(current->properties, g_strdup(ACCOUNT_PASSWORD), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->iax_password))));
 		dbus_add_account( current );
-        	sprintf(message, MESSAGE_SUMMARY,
+		getMessageSummary(message, 
 			gtk_entry_get_text (GTK_ENTRY(wiz->iax_alias)),
 			gtk_entry_get_text (GTK_ENTRY(wiz->iax_server)),
 			gtk_entry_get_text (GTK_ENTRY(wiz->iax_username))
-			) ;
+		) ;
+//         	sprintf(message, MESSAGE_SUMMARY,
+// 			gtk_entry_get_text (GTK_ENTRY(wiz->iax_alias)),
+// 			gtk_entry_get_text (GTK_ENTRY(wiz->iax_server)),
+// 			gtk_entry_get_text (GTK_ENTRY(wiz->iax_username))
+// 			) ;
 		gtk_label_set_text (GTK_LABEL(wiz->label_summary), message);
 	}
 }
@@ -156,7 +187,7 @@ void build_wizard( void ) {
 
 	wiz->assistant = gtk_assistant_new( );
 
-	gtk_window_set_title( GTK_WINDOW(wiz->assistant), _("SFLphone account configuration wizard") );
+	gtk_window_set_title( GTK_WINDOW(wiz->assistant), _("SFLphone account creation wizard") );
 	gtk_window_set_position(GTK_WINDOW(wiz->assistant), GTK_WIN_POS_CENTER);
 	gtk_window_set_default_size(GTK_WINDOW(wiz->assistant), 200 , 200);
 
@@ -182,7 +213,7 @@ void build_wizard( void ) {
 GtkWidget* build_intro() {
 	GtkWidget *label;
 
-	wiz->intro = create_vbox( GTK_ASSISTANT_PAGE_INTRO  , "SFLphone GNOME client" , _("Welcome to SFLphone!"));
+	wiz->intro = create_vbox( GTK_ASSISTANT_PAGE_INTRO  , "SFLphone GNOME client" , _("Welcome to the Account creation wizard of SFLphone!"));
 	label = gtk_label_new(_("This installation wizard will help you configure an account.")) ;
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
 	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
@@ -197,11 +228,11 @@ GtkWidget* build_select_account() {
 	GtkWidget* sip;
 	GtkWidget* iax;
 
-	wiz->protocols = create_vbox( GTK_ASSISTANT_PAGE_CONTENT , _("VoIP Protocols") , _("Select an account type:"));
+	wiz->protocols = create_vbox( GTK_ASSISTANT_PAGE_CONTENT , _("VoIP Protocols") , _("Select an account type"));
 
-	sip = gtk_radio_button_new_with_label(NULL,"SIP (Session Initiation Protocol)");
+	sip = gtk_radio_button_new_with_label(NULL, _("SIP (Session Initiation Protocol)"));
 	gtk_box_pack_start( GTK_BOX(wiz->protocols) , sip , TRUE, TRUE, 0);
-	iax = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(sip), "IAX2 (InterAsterix Exchange)");
+	iax = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(sip), _("IAX2 (InterAsterix Exchange)"));
 	gtk_box_pack_start( GTK_BOX(wiz->protocols) , iax , TRUE, TRUE, 0);
 
 	g_signal_connect(G_OBJECT( sip ) , "clicked" , G_CALLBACK( set_account_type ) , NULL );
@@ -215,7 +246,7 @@ GtkWidget* build_sfl_or_account() {
 	GtkWidget* sfl;
 	GtkWidget* cus;
 
-	wiz->sflphone_org = create_vbox( GTK_ASSISTANT_PAGE_CONTENT , _("Account") , _("Please select one of the following option:"));
+	wiz->sflphone_org = create_vbox( GTK_ASSISTANT_PAGE_CONTENT , _("Account") , _("Please select one of the following options"));
 
 	sfl = gtk_radio_button_new_with_label( NULL, _("Create a free SIP/IAX2 account on sflphone.org"));
 	gtk_box_pack_start( GTK_BOX(wiz->sflphone_org) , sfl , TRUE, TRUE, 0);
@@ -232,7 +263,7 @@ GtkWidget* build_sip_account_configuration( void ) {
 	GtkWidget* label;
     GtkWidget *image;
 
-	wiz->sip_account = create_vbox( GTK_ASSISTANT_PAGE_CONTENT , _("SIP account configuration") , _("Please fill the following information:"));
+	wiz->sip_account = create_vbox( GTK_ASSISTANT_PAGE_CONTENT , _("SIP account settings") , _("Please fill the following information"));
 	// table
 	table = gtk_table_new ( 5, 2  ,  FALSE/* homogeneous */);
 	gtk_table_set_row_spacings( GTK_TABLE(table), 10);
@@ -305,7 +336,7 @@ GtkWidget* build_email_configuration( void ) {
 	GtkWidget* label;
 	GtkWidget*  table;
 
-	wiz->email = create_vbox( GTK_ASSISTANT_PAGE_CONTENT , _("Optional Email Address ") , _("This email address will be use to send your voicemail messages"));
+	wiz->email = create_vbox( GTK_ASSISTANT_PAGE_CONTENT , _("Optional email address") , _("This email address will be used to send your voicemail messages."));
 
 	table = gtk_table_new ( 4, 2  ,  FALSE/* homogeneous */);
 	gtk_table_set_row_spacings( GTK_TABLE(table), 10);
@@ -313,7 +344,7 @@ GtkWidget* build_email_configuration( void ) {
 	gtk_box_pack_start( GTK_BOX(wiz->email) , table , TRUE, TRUE, 0);
 
 	// email field
-	label = gtk_label_new_with_mnemonic (_("_Email"));
+	label = gtk_label_new_with_mnemonic (_("_Email address"));
 	gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
 	gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
 	wiz->mailbox = gtk_entry_new();
@@ -328,7 +359,7 @@ GtkWidget* build_iax_account_configuration( void ) {
 	GtkWidget*  table;
     GtkWidget *image;
 
-	wiz->iax_account = create_vbox( GTK_ASSISTANT_PAGE_CONFIRM , _("IAX2 account configuration") , _("Please fill the following information:"));
+	wiz->iax_account = create_vbox( GTK_ASSISTANT_PAGE_CONFIRM , _("IAX2 account settings") , _("Please fill the following information"));
 
 	table = gtk_table_new ( 5, 2  ,  FALSE/* homogeneous */);
 	gtk_table_set_row_spacings( GTK_TABLE(table), 10);
@@ -401,7 +432,7 @@ GtkWidget* build_nat_settings( void ) {
 	GtkWidget* label;
 	GtkWidget* table;
 
-	wiz->nat = create_vbox( GTK_ASSISTANT_PAGE_CONFIRM , _("Network Address Translation") , _("You should probably enable this if you are behind a firewall."));
+	wiz->nat = create_vbox( GTK_ASSISTANT_PAGE_CONFIRM , _("Network Address Translation (NAT)") , _("You should probably enable this if you are behind a firewall."));
 
 	// table
 	table = gtk_table_new ( 2, 2  ,  FALSE/* homogeneous */);
diff --git a/sflphone-client-gnome/src/callable_obj.c b/sflphone-client-gnome/src/callable_obj.c
index 99a46a8dcae524e182723094e388d1343255822f..4b1d075c6c1b000c8421afaae9bc3593acb1ece8 100644
--- a/sflphone-client-gnome/src/callable_obj.c
+++ b/sflphone-client-gnome/src/callable_obj.c
@@ -108,9 +108,16 @@ void create_new_call_from_details (const gchar *call_id, GHashTable *details, ca
     peer_name = g_strdup ("");
     state_str = g_hash_table_lookup (details, "CALL_STATE");
 
+
     if (g_strcasecmp (state_str, "CURRENT") == 0)
         state = CALL_STATE_CURRENT;
 
+	else if (g_strcasecmp (state_str, "RINGING") == 0)
+		state = CALL_STATE_RINGING;
+
+	else if (g_strcasecmp (state_str, "INCOMING") == 0)
+		state = CALL_STATE_INCOMING;
+
     else if (g_strcasecmp (state_str, "HOLD") == 0)
         state = CALL_STATE_HOLD;
 
diff --git a/sflphone-client-gnome/src/config/accountwindow.c b/sflphone-client-gnome/src/config/accountwindow.c
index 198d0c9eba3fb9bbd2133ab293aab40264ef0763..43c4ec66f35268bab1d7b493f6fcd66a83c2860d 100644
--- a/sflphone-client-gnome/src/config/accountwindow.c
+++ b/sflphone-client-gnome/src/config/accountwindow.c
@@ -122,7 +122,7 @@ show_account_window (account_t * a)
     gtk_dialog_set_has_separator(dialog, TRUE);
     gtk_container_set_border_width (GTK_CONTAINER(dialog), 0);
 
-    gnome_main_section_new (_("Account Parameters"), &frame);
+    gnome_main_section_new ("", &frame);
     gtk_box_pack_start(GTK_BOX(dialog->vbox), frame, FALSE, FALSE, 0);
     gtk_widget_show(frame);
 
diff --git a/sflphone-client-gnome/src/config/addressbook-config.c b/sflphone-client-gnome/src/config/addressbook-config.c
index 6a866d1bce5d900166552ab3c784b981b38634cb..639525d32fe0fad2fa02d308fda36983289a087d 100644
--- a/sflphone-client-gnome/src/config/addressbook-config.c
+++ b/sflphone-client-gnome/src/config/addressbook-config.c
@@ -303,7 +303,7 @@ create_addressbook_settings()
     ret = gtk_vbox_new(FALSE, 10);
     gtk_container_set_border_width(GTK_CONTAINER(ret), 10);
 
-    gnome_main_section_new_with_table (_("General"), &result_frame, &table, 3, 3);
+    gnome_main_section_new_with_table (c_("Config section", "General"), &result_frame, &table, 3, 3);
     gtk_box_pack_start(GTK_BOX(ret), result_frame, FALSE, FALSE, 0);
     // gtk_widget_show (result_frame);
 
@@ -316,7 +316,7 @@ create_addressbook_settings()
 
     // SCALE BUTTON - NUMBER OF RESULTS
     scale_button = gtk_hbox_new(FALSE, 0);
-    scale_label = gtk_label_new (_("Download limit:"));
+    scale_label = gtk_label_new (_("Download limit :"));
     gtk_box_pack_start(GTK_BOX(scale_button),scale_label,FALSE,FALSE,0);
     value = gtk_spin_button_new_with_range(1, 500, 1);
     gtk_label_set_mnemonic_widget (GTK_LABEL (scale_label), value);
@@ -342,19 +342,19 @@ create_addressbook_settings()
     gtk_box_pack_start(GTK_BOX(ret), result_frame, FALSE, FALSE, 0);
     // gtk_widget_show (result_frame);
 
-    business = gtk_check_button_new_with_mnemonic( _("_Business phone"));
+    business = gtk_check_button_new_with_mnemonic( _("_Work"));
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(business), addressbook_config->search_phone_business);
     g_signal_connect (G_OBJECT(business) , "clicked" , G_CALLBACK (search_phone_business_cb) , NULL);
     gtk_table_attach ( GTK_TABLE( table ), business, 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
     gtk_widget_set_sensitive(business, FALSE);
 
-    home = gtk_check_button_new_with_mnemonic( _("_Home phone"));
+    home = gtk_check_button_new_with_mnemonic( _("_Home"));
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(home), addressbook_config->search_phone_home);
     g_signal_connect (G_OBJECT(home) , "clicked" , G_CALLBACK (search_phone_home_cb) , NULL);
     gtk_table_attach ( GTK_TABLE( table ), home, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
     gtk_widget_set_sensitive(home, FALSE);
 
-    mobile = gtk_check_button_new_with_mnemonic( _("_Mobile phone"));
+    mobile = gtk_check_button_new_with_mnemonic( _("_Mobile"));
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(mobile), addressbook_config->search_phone_mobile);
     g_signal_connect (G_OBJECT(mobile) , "clicked" , G_CALLBACK (search_phone_mobile_cb) , NULL);
     gtk_table_attach ( GTK_TABLE( table ), mobile, 0, 1, 2, 3, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
@@ -365,7 +365,7 @@ create_addressbook_settings()
     gtk_box_pack_start(GTK_BOX(ret), result_frame, TRUE, TRUE, 0);
     gtk_widget_show (result_frame);
 
-    scrolled_label = gtk_label_new (_("Select which Evolution address books to use:"));
+    scrolled_label = gtk_label_new (_("Select which Evolution address books to use"));
     gtk_misc_set_alignment(GTK_MISC(scrolled_label), 0.00, 0.2);
     
     gtk_table_attach ( GTK_TABLE( table ), scrolled_label, 1, 4, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
diff --git a/sflphone-client-gnome/src/config/audioconf.c b/sflphone-client-gnome/src/config/audioconf.c
index 363e22b5d1848702619fcb819717e30b3b25e3d8..949b69227a14ef9e6bfcaddcdca59101aedd3d72 100644
--- a/sflphone-client-gnome/src/config/audioconf.c
+++ b/sflphone-client-gnome/src/config/audioconf.c
@@ -152,7 +152,7 @@ select_active_output_audio_device()
         // Select active output device on server
         devices = dbus_get_current_audio_devices_index();
         currentDeviceIndex = atoi(devices[0]);
-        DEBUG(_("audio device index for output = %d"), currentDeviceIndex);
+        DEBUG("audio device index for output = %d", currentDeviceIndex);
         model = gtk_combo_box_get_model(GTK_COMBO_BOX(output));
 
         // Find the currently set output device
@@ -792,7 +792,7 @@ GtkWidget* create_audio_configuration()
  
 
     // Box for the ALSA configuration
-    gnome_main_section_new (_("ALSA configuration"), &alsa_conf);
+    gnome_main_section_new (_("ALSA settings"), &alsa_conf);
     gtk_box_pack_start(GTK_BOX(ret), alsa_conf, FALSE, FALSE, 0);
     // gtk_widget_hide( GTK_CONTAINER(alsa_conf) );
     gtk_widget_show( alsa_conf );
diff --git a/sflphone-client-gnome/src/config/configwindow.c b/sflphone-client-gnome/src/config/configwindow.c
index 6117837739e39e9204fc27f8cf5cd130876389f9..36f352502621a1fb672de48e5686c9d5fb67d6ae 100644
--- a/sflphone-client-gnome/src/config/configwindow.c
+++ b/sflphone-client-gnome/src/config/configwindow.c
@@ -525,7 +525,7 @@ GtkWidget* create_stun_tab()
     tableNat = gtk_table_new ( 3, 2  , FALSE/* homogeneous */);
 
     // NAT detection code section
-    label = gtk_label_new(_("Stun parameters will apply to each SIP account created."));
+    label = gtk_label_new(_("Stun parameters will be applied on each SIP account created."));
     gtk_table_attach( GTK_TABLE( tableNat ), label, 0, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
     gtk_misc_set_alignment(GTK_MISC (label), 0.5, 0.5);
 
@@ -533,7 +533,7 @@ GtkWidget* create_stun_tab()
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(stunEnable), strcmp(stun_enabled,"TRUE") == 0 ? TRUE: FALSE);
     g_signal_connect( G_OBJECT (GTK_TOGGLE_BUTTON(stunEnable)) , "toggled" , G_CALLBACK( stun_state ), NULL);
 #if GTK_CHECK_VERSION(2,12,0)
-    gtk_widget_set_tooltip_text( GTK_WIDGET( stunEnable ) , _("Enable it if you are behind a firewall"));
+    gtk_widget_set_tooltip_text( GTK_WIDGET( stunEnable ) , _("You should probably enable this if you are behind a firewall."));
 #endif
     gtk_table_attach ( GTK_TABLE( tableNat ), stunEnable, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
 
@@ -541,7 +541,7 @@ GtkWidget* create_stun_tab()
     gtk_label_set_mnemonic_widget (GTK_LABEL (label), stunServer);
     gtk_entry_set_text(GTK_ENTRY(stunServer), stun_server);
 #if GTK_CHECK_VERSION(2,12,0)
-    gtk_widget_set_tooltip_text( GTK_WIDGET( stunServer ) , _("Format: name.server:port"));
+    gtk_widget_set_tooltip_text( GTK_WIDGET( stunServer ) , _("Format : name.server:port"));
 #endif
     gtk_table_attach ( GTK_TABLE( tableNat ), stunServer, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
     gtk_widget_set_sensitive( GTK_WIDGET( stunServer ), gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stunEnable)));
@@ -629,7 +629,7 @@ create_general_settings ()
     gnome_main_section_new_with_table (_("Calls History"), &frame, &table, 3, 1);
     gtk_box_pack_start(GTK_BOX(ret), frame, FALSE, FALSE, 0);
 
-    history_w = gtk_check_button_new_with_mnemonic(_("_Keep my history for at least"));
+    history_w = gtk_check_button_new_with_mnemonic(c_("Beginning of 'Keep my history for at least n days.'", "_Keep my history for at least"));
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (history_w), history_enabled);
     g_signal_connect (G_OBJECT (history_w) , "clicked" , G_CALLBACK (history_enabled_cb) , NULL);
     gtk_table_attach( GTK_TABLE(table), history_w, 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 5);
@@ -640,7 +640,7 @@ create_general_settings ()
     gtk_widget_set_sensitive (GTK_WIDGET (history_value), gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (history_w)));
     gtk_table_attach( GTK_TABLE(table), history_value, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 5); 
 
-    label = gtk_label_new(_(" days"));
+    label = gtk_label_new(c_("End of 'Keep my history for at least n days.'", "days"));
     gtk_table_attach( GTK_TABLE(table), label, 2, 3, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 5);
     
     /** PULSEAUDIO CONFIGURATION */
@@ -674,7 +674,7 @@ create_general_settings ()
     //gtk_widget_set_size_request(applyButton, 100, 35);
     //gtk_widget_set_sensitive( GTK_WIDGET(applyButton), (n==0)?FALSE:TRUE );
 
-    label = gtk_label_new(_("Port:"));
+    label = gtk_label_new(_("Port"));
     // gtk_misc_set_alignment(GTK_MISC(label), 0.03, 0.4);
     entryPort = gtk_spin_button_new_with_range(1, 65535, 1);
     gtk_label_set_mnemonic_widget (GTK_LABEL (label), entryPort);
@@ -719,11 +719,11 @@ create_recording_settings ()
     gtk_container_set_border_width(GTK_CONTAINER(ret), 10);
 
     // Recorded file saving path
-    gnome_main_section_new_with_table (_("General"), &savePathFrame, &table, 1, 2);
+    gnome_main_section_new_with_table (c_("Config section", "General"), &savePathFrame, &table, 1, 2);
     gtk_box_pack_start(GTK_BOX(ret), savePathFrame, FALSE, FALSE, 5);
 
     // label
-    label = gtk_label_new(_("Recordings folder"));
+    label = gtk_label_new(_("Destination folder"));
     gtk_table_attach( GTK_TABLE(table), label, 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 5);
     // gtk_misc_set_alignment(GTK_MISC(label), 0.08, 0.5);
 
@@ -783,27 +783,27 @@ show_config_window ()
 
     // Audio tab
     tab = create_audio_configuration();
-    gtk_notebook_append_page(GTK_NOTEBOOK(notebook), tab, gtk_label_new(_("Audio Settings")));
+    gtk_notebook_append_page(GTK_NOTEBOOK(notebook), tab, gtk_label_new(c_("Config section", "Audio")));
     gtk_notebook_page_num(GTK_NOTEBOOK(notebook), tab);
 
     // General settings tab
     tab = create_general_settings();
-    gtk_notebook_append_page(GTK_NOTEBOOK(notebook), tab, gtk_label_new(_("General Settings")));
+    gtk_notebook_append_page(GTK_NOTEBOOK(notebook), tab, gtk_label_new(c_("Config section", "General")));
     gtk_notebook_page_num(GTK_NOTEBOOK(notebook), tab);
 
     // Recording tab
     tab = create_recording_settings();
-    gtk_notebook_append_page(GTK_NOTEBOOK(notebook), tab, gtk_label_new(_("Recordings")));
+    gtk_notebook_append_page(GTK_NOTEBOOK(notebook), tab, gtk_label_new(c_("Config section", "Recordings")));
     gtk_notebook_page_num(GTK_NOTEBOOK(notebook), tab);
 
     // Addressbook tab
     tab = create_addressbook_settings();
-    gtk_notebook_append_page(GTK_NOTEBOOK(notebook), tab, gtk_label_new(_("Address Book")));
+    gtk_notebook_append_page(GTK_NOTEBOOK(notebook), tab, gtk_label_new(c_("Config section", "Address Book")));
     gtk_notebook_page_num(GTK_NOTEBOOK(notebook), tab);
 
     // HookS tab
     tab = create_hooks_settings();
-    gtk_notebook_append_page(GTK_NOTEBOOK(notebook), tab, gtk_label_new(_("Hooks")));
+    gtk_notebook_append_page(GTK_NOTEBOOK(notebook), tab, gtk_label_new(c_("Config section", "Hooks")));
     gtk_notebook_page_num(GTK_NOTEBOOK(notebook), tab);
 
     gtk_notebook_set_current_page( GTK_NOTEBOOK( notebook) ,  0);
@@ -830,7 +830,7 @@ show_accounts_window( void )
 
     accDialogOpen = TRUE;
 
-    dialog = GTK_DIALOG(gtk_dialog_new_with_buttons (_("Accounts"),
+    dialog = GTK_DIALOG(gtk_dialog_new_with_buttons (c_("Config section", "Accounts"),
                 GTK_WINDOW(get_main_window()),
                 GTK_DIALOG_DESTROY_WITH_PARENT,
                 GTK_STOCK_CLOSE,
@@ -853,7 +853,7 @@ show_accounts_window( void )
     gtk_container_add(GTK_CONTAINER(accountFrame) , tab);
 
     // Stun Frame, displayed only if at least 1 SIP account is configured
-    gnome_main_section_new (_("Network Address Translation"), &stunFrame);
+    gnome_main_section_new (_("Network Address Translation (NAT)"), &stunFrame);
     gtk_box_pack_start( GTK_BOX( dialog->vbox ), stunFrame , TRUE, TRUE, 0);
     gtk_container_set_border_width(GTK_CONTAINER(stunFrame), 10);
     gtk_widget_show(stunFrame);
diff --git a/sflphone-client-gnome/src/config/hooks-config.c b/sflphone-client-gnome/src/config/hooks-config.c
index a13d2f9598fbaf835a0031b9912f6ee938d5677d..0272afd58b0a71b103cbc189aa8a6239cc040fba 100644
--- a/sflphone-client-gnome/src/config/hooks-config.c
+++ b/sflphone-client-gnome/src/config/hooks-config.c
@@ -127,16 +127,16 @@ GtkWidget* create_hooks_settings (){
     ret = gtk_vbox_new(FALSE, 10);
     gtk_container_set_border_width(GTK_CONTAINER(ret), 10);
 
-    gnome_main_section_new_with_table (_("URL Passing"), &frame, &table, 5, 2);
+    gnome_main_section_new_with_table (_("URL Argument"), &frame, &table, 5, 2);
     gtk_box_pack_start(GTK_BOX(ret), frame, FALSE, FALSE, 0);
     gtk_widget_show (frame);
 
 
-    label = gtk_label_new(_("Custom commands on incoming calls with URL,"));
-    gtk_table_attach ( GTK_TABLE( table ), label, 0, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+    label = gtk_label_new(_("Custom commands on incoming calls with URL"));
+    gtk_table_attach ( GTK_TABLE( table ), label, 0, 2, 0, 1, GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
 
     label = gtk_label_new(_("%s will be replaced with the passed URL."));
-    gtk_table_attach ( GTK_TABLE( table ), label, 0, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+    gtk_table_attach ( GTK_TABLE( table ), label, 0, 2, 1, 2, GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
 
     widg = gtk_check_button_new_with_mnemonic( _("Trigger on specific _SIP header"));
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(widg), (g_strcasecmp (_urlhook_config->sip_enabled, "1")==0)?TRUE:FALSE);
@@ -152,7 +152,7 @@ GtkWidget* create_hooks_settings (){
     g_signal_connect (G_OBJECT(widg) , "clicked" , G_CALLBACK (iax2_enabled_cb), NULL);
     gtk_table_attach ( GTK_TABLE( table ), widg, 0, 2, 3, 4, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
 
-    label = gtk_label_new_with_mnemonic (_("Command to _run: "));
+    label = gtk_label_new_with_mnemonic (_("Command to _run"));
     gtk_misc_set_alignment(GTK_MISC(label), 0.05, 0.5);
     gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 4, 5, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
     command = gtk_entry_new ();
@@ -162,11 +162,11 @@ GtkWidget* create_hooks_settings (){
 
 
 
-    gnome_main_section_new_with_table (_("Phone Number Rewriting"), &frame, &table, 4, 2);
+    gnome_main_section_new_with_table (_("Phone number rewriting"), &frame, &table, 4, 2);
     gtk_box_pack_start(GTK_BOX(ret), frame, FALSE, FALSE, 0);
     gtk_widget_show (frame);
 
-    widg = gtk_check_button_new_with_mnemonic( _("_Prefix dialed numbers with:"));
+    widg = gtk_check_button_new_with_mnemonic( _("_Prefix dialed numbers with"));
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(widg), (g_strcasecmp (_urlhook_config->phone_number_enabled, "1")==0)?TRUE:FALSE);
     g_signal_connect (G_OBJECT(widg) , "clicked" , G_CALLBACK (phone_number_enabled_cb), NULL);
     gtk_table_attach ( GTK_TABLE( table ), widg, 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
diff --git a/sflphone-client-gnome/src/contacts/calltree.c b/sflphone-client-gnome/src/contacts/calltree.c
index 2eb489fa725500504404a34c4462174b0526d473..c90853a4c0945b73487522532eedab485ae252dc 100644
--- a/sflphone-client-gnome/src/contacts/calltree.c
+++ b/sflphone-client-gnome/src/contacts/calltree.c
@@ -316,9 +316,10 @@ calltree_update_call (calltab_t* tab, callable_obj_t * c)
                 gchar * duration="";
                 if(c->_state == CALL_STATE_TRANSFERT)
                 {
-                    description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>\n<i>Transfert to:%s</i> ",
+                    description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>\n<i>%s%s</i> ",
                             c->_peer_number,
                             c->_peer_name,
+                            _("Transfer to : "),
                             c->_trsft_to
                             );
                 }
diff --git a/sflphone-client-gnome/src/contacts/history.c b/sflphone-client-gnome/src/contacts/history.c
index c547ac0fcab219d4d1cb72c706e3c64773f69753..5ce53416f65c3120f79739d92033776cab2cba65 100644
--- a/sflphone-client-gnome/src/contacts/history.c
+++ b/sflphone-client-gnome/src/contacts/history.c
@@ -65,50 +65,46 @@ static GtkTreeModel* history_create_filter (GtkTreeModel* child)
 
 static gboolean history_is_visible (GtkTreeModel* model, GtkTreeIter* iter, gpointer data UNUSED) 
 {
-    if (SHOW_SEARCHBAR)
-    {
-        GValue val, obj;
+    GValue val, obj;
 
-        callable_obj_t *history_entry = NULL;
-        gchar* text = NULL;
-        gchar* search = (gchar*)gtk_entry_get_text(GTK_ENTRY(history_searchbar_widget));
-        memset (&val, 0, sizeof(val));
-        memset (&obj, 0, sizeof(obj));
-        
-        // Fetch the call description
-        gtk_tree_model_get_value (GTK_TREE_MODEL(model), iter, 1, &val);
-        if(G_VALUE_HOLDS_STRING(&val)){
-            text = (gchar *)g_value_get_string(&val);
-        }
-        
-        // Fetch the call type
-        gtk_tree_model_get_value (GTK_TREE_MODEL(model), iter, 2, &obj);
-        if (G_VALUE_HOLDS_POINTER (&obj)){
-            history_entry = (gpointer) g_value_get_pointer (&obj);
-        }
+    callable_obj_t *history_entry = NULL;
+    gchar* text = NULL;
+    gchar* search = (gchar*)gtk_entry_get_text(GTK_ENTRY(history_searchbar_widget));
+    memset (&val, 0, sizeof(val));
+    memset (&obj, 0, sizeof(obj));
+    
+    // Fetch the call description
+    gtk_tree_model_get_value (GTK_TREE_MODEL(model), iter, 1, &val);
+    if(G_VALUE_HOLDS_STRING(&val)){
+        text = (gchar *)g_value_get_string(&val);
+    }
+    
+    // Fetch the call type
+    gtk_tree_model_get_value (GTK_TREE_MODEL(model), iter, 2, &obj);
+    if (G_VALUE_HOLDS_POINTER (&obj)){
+        history_entry = (gpointer) g_value_get_pointer (&obj);
+    }
 
-        if(text != NULL)
+    if(text != NULL)
+    {
+        if (history_entry)
         {
-            if (history_entry)
+            // Filter according to the type of call
+            // MISSED, INCOMING, OUTGOING, ALL
+            if ((int)get_current_history_search_type () == SEARCH_ALL)
+                return g_regex_match_simple(search, text, G_REGEX_CASELESS, 0);
+            else
             {
-                // Filter according to the type of call
-                // MISSED, INCOMING, OUTGOING, ALL
-                if ((int)get_current_history_search_type () == SEARCH_ALL)
-                    return g_regex_match_simple(search, text, G_REGEX_CASELESS, 0);
-                else
-                {
-                    // We need a match on the history_state_t and the current search type
-                    return (history_entry->_history_state + 1) == (int)get_current_history_search_type () &&  
-                        g_regex_match_simple(search, text, G_REGEX_CASELESS, 0);
-                }
+                // We need a match on the history_state_t and the current search type
+                return (history_entry->_history_state + 1) == (int)get_current_history_search_type () &&  
+                    g_regex_match_simple(search, text, G_REGEX_CASELESS, 0);
             }
         }
+    }
 
-        // Clean up 
-        g_value_unset (&val);
-        g_value_unset (&obj);
+    // Clean up 
+    g_value_unset (&val);
+    g_value_unset (&obj);
 
-        return TRUE;
-    }
     return TRUE;
 }
diff --git a/sflphone-client-gnome/src/contacts/searchbar.c b/sflphone-client-gnome/src/contacts/searchbar.c
index 764516345a3158481170274b5e63ec80ca99a5da..80a7cf55bf43786f00bfba456f43167ea0d09307 100644
--- a/sflphone-client-gnome/src/contacts/searchbar.c
+++ b/sflphone-client-gnome/src/contacts/searchbar.c
@@ -52,8 +52,9 @@ static void search_all (GtkWidget *item, GtkEntry  *entry)
 
     gtk_entry_set_icon_from_stock (entry, GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_FIND);
     gtk_entry_set_icon_tooltip_text (entry, GTK_ENTRY_ICON_PRIMARY,
-            _("Search all\n"
-            "Click here to change the search type"));
+            g_markup_printf_escaped("%s\n%s", 
+                  _("Search all"),
+                  _("Click here to change the search type")));
 
     history_search (HistorySearchType);
 } 
@@ -64,9 +65,9 @@ static void search_by_missed (GtkWidget *item, GtkEntry  *entry)
 
     gtk_entry_set_icon_from_pixbuf (entry, GTK_ENTRY_ICON_PRIMARY, missed_pixbuf);
     gtk_entry_set_icon_tooltip_text (entry, GTK_ENTRY_ICON_PRIMARY,
-            _("Search by missed call\n"
-            "Click here to change the search type"));
-
+            g_markup_printf_escaped("%s\n%s", 
+                  _("Search by missed call"),
+                  _("Click here to change the search type")));
     history_search (HistorySearchType);
 } 
 
@@ -76,9 +77,9 @@ static void search_by_incoming (GtkWidget *item, GtkEntry *entry)
 
     gtk_entry_set_icon_from_pixbuf (entry, GTK_ENTRY_ICON_PRIMARY, incoming_pixbuf);
     gtk_entry_set_icon_tooltip_text (entry, GTK_ENTRY_ICON_PRIMARY,
-            _("Search by incoming call\n"
-            "Click here to change the search type"));
-
+            g_markup_printf_escaped("%s\n%s", 
+                  _("Search by incoming call"),
+                  _("Click here to change the search type")));
     history_search (HistorySearchType);
 } 
 
@@ -88,9 +89,9 @@ static void search_by_outgoing (GtkWidget *item, GtkEntry  *entry)
 
     gtk_entry_set_icon_from_pixbuf (entry, GTK_ENTRY_ICON_PRIMARY, outgoing_pixbuf);
     gtk_entry_set_icon_tooltip_text (entry, GTK_ENTRY_ICON_PRIMARY,
-            _("Search by outgoing call\n"
-            "Click here to change the search type"));
-
+            g_markup_printf_escaped("%s\n%s", 
+                  _("Search by outgoing call"),
+                  _("Click here to change the search type")));
     history_search (HistorySearchType);
 } 
 
diff --git a/sflphone-client-gnome/src/dbus/dbus.c b/sflphone-client-gnome/src/dbus/dbus.c
index 97ee5588913a567e7890461b4c387fe9025cdf20..5e83cbb0372300807823cb29fb8c0d403fa9c878 100644
--- a/sflphone-client-gnome/src/dbus/dbus.c
+++ b/sflphone-client-gnome/src/dbus/dbus.c
@@ -18,6 +18,7 @@
  *  along with this program; if not, write to the Free Software
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <calltab.h>
 #include <callmanager-glue.h>
@@ -34,6 +35,8 @@
 #include <actions.h>
 #include <string.h>
 
+#define DEFAULT_DBUS_TIMEOUT 30000
+
 DBusGConnection * connection;
 DBusGProxy * callManagerProxy;
 DBusGProxy * configurationManagerProxy;
@@ -389,6 +392,14 @@ dbus_connect ()
             "errorAlert", G_TYPE_INT , G_TYPE_INVALID);
     dbus_g_proxy_connect_signal (configurationManagerProxy,
             "errorAlert", G_CALLBACK(error_alert), NULL, NULL);
+            
+    /* Defines a default timeout for the proxies */
+#if HAVE_DBUS_G_PROXY_SET_DEFAULT_TIMEOUT
+    dbus_g_proxy_set_default_timeout(callManagerProxy, DEFAULT_DBUS_TIMEOUT);
+    dbus_g_proxy_set_default_timeout(instanceProxy, DEFAULT_DBUS_TIMEOUT);
+    dbus_g_proxy_set_default_timeout(configurationManagerProxy, DEFAULT_DBUS_TIMEOUT);
+#endif
+    
     return TRUE;
 }
 
diff --git a/sflphone-client-gnome/src/main.c b/sflphone-client-gnome/src/main.c
index 64ba26c23b26753b7a890ba55ed059bdc6f2d847..c454111a93aedcdb3974967d07cab1d3ebae18fd 100644
--- a/sflphone-client-gnome/src/main.c
+++ b/sflphone-client-gnome/src/main.c
@@ -82,8 +82,8 @@ There is NO WARRANTY, to the extent permitted by law.\n\n");
   srand(time(NULL));
 
   // Internationalization
-  bindtextdomain("sflphone", "/usr/share/locale");
-  textdomain("sflphone");
+  bindtextdomain("sflphone-client-gnome", "/usr/share/locale");
+  textdomain("sflphone-client-gnome");
 
   if (sflphone_init())
     {
diff --git a/sflphone-client-gnome/src/mainwindow.c b/sflphone-client-gnome/src/mainwindow.c
index 9b987c66b1ac7652c90da6e7448fa70229fa72aa..d481473024f30dfcfc20cb8d4455417d554bfed5 100644
--- a/sflphone-client-gnome/src/mainwindow.c
+++ b/sflphone-client-gnome/src/mainwindow.c
@@ -197,21 +197,9 @@ create_main_window ()
   gtk_box_pack_start (GTK_BOX (vbox), history->tree, TRUE /*expand*/, TRUE /*fill*/,  0 /*padding*/);
   gtk_box_pack_start (GTK_BOX (vbox), contacts->tree, TRUE /*expand*/, TRUE /*fill*/,  0 /*padding*/);
 
-  // gtk_box_pack_start (GTK_BOX (vbox), current_calls->searchbar, TRUE /*expand*/, TRUE /*fill*/,  0 /*padding*/);
-  // gtk_box_pack_start (GTK_BOX (vbox), history->searchbar, TRUE /*expand*/, TRUE /*fill*/,  0 /*padding*/);
-  // gtk_box_pack_start (GTK_BOX (vbox), contacts ->searchbar, TRUE /*expand*/, TRUE /*fill*/,  0 /*padding*/);
-
   gtk_box_pack_start (GTK_BOX (vbox), subvbox, FALSE /*expand*/, FALSE /*fill*/, 0 /*padding*/);
 
-
-  // if( SHOW_SEARCHBAR ){
-  //   filterEntry = create_filter_entry();
-  //   gtk_box_pack_start (GTK_BOX (subvbox), filterEntry, FALSE /*expand*/, TRUE /*fill*/,  0 /*padding*/);
-  //   gtk_widget_show_all ( filterEntry );
-  // }
-
-
- if( SHOW_VOLUME ){
+  if( SHOW_VOLUME ){
     speaker_control = create_slider("speaker");
     gtk_box_pack_end (GTK_BOX (subvbox), speaker_control, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
     gtk_widget_show_all (speaker_control);
@@ -350,22 +338,6 @@ main_window_volume_controls( gboolean *state ){
   }
 }
 
-void
-main_window_searchbar( gboolean *state UNUSED){
-  if( !SHOW_SEARCHBAR )
-  {
-    // filterEntry = create_filter_entry();
-    // gtk_box_pack_start (GTK_BOX (subvbox), filterEntry, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
-    // gtk_widget_show_all (filterEntry);
-    // *state = TRUE;
-  }
-  else
-  {
-    // gtk_container_remove( GTK_CONTAINER(subvbox) , filterEntry );
-    // *state = FALSE;
-  }
-}
-
 void
 statusbar_push_message(const gchar * message, guint id)
 {
diff --git a/sflphone-client-gnome/src/mainwindow.h b/sflphone-client-gnome/src/mainwindow.h
index bdf3c0af125353ceb8ffa9ba4f7894805b004746..77825fbb512b09a6b0cf45715b389a34079bfba9 100644
--- a/sflphone-client-gnome/src/mainwindow.h
+++ b/sflphone-client-gnome/src/mainwindow.h
@@ -90,8 +90,6 @@ void statusbar_push_message( const gchar* message , guint id );
  */
 void statusbar_pop_message( guint id );
 
-void main_window_searchbar( gboolean *state );
-
 //static gboolean
 //on_key_released (GtkWidget *widget, GdkEventKey *event,
 //                 gpointer user_data);
diff --git a/sflphone-client-gnome/src/menus.c b/sflphone-client-gnome/src/menus.c
index db443f2a523ac0b208115078f7789297c9dbf81a..aac5a60be32da2f70e0f7da8b7417cde06147d69 100644
--- a/sflphone-client-gnome/src/menus.c
+++ b/sflphone-client-gnome/src/menus.c
@@ -614,16 +614,7 @@ view_volume_controls  (GtkImageMenuItem *imagemenuitem UNUSED,
     dbus_set_volume_controls( state );
 }
 
-/*
-   static void
-   view_searchbar  (GtkImageMenuItem *imagemenuitem UNUSED,
-   void* foo UNUSED)
-   {
-   gboolean state;
-   main_window_searchbar( &state );
-   dbus_set_searchbar( state );
-   }
-   */
+
     GtkWidget *
 create_view_menu()
 {
@@ -1067,7 +1058,7 @@ void show_edit_number (callable_obj_t *call) {
 
     // Set window properties
     gtk_window_set_default_size(GTK_WINDOW(edit_dialog), 300, 20);
-    gtk_window_set_title(GTK_WINDOW(edit_dialog), _("Edit phone"));
+    gtk_window_set_title(GTK_WINDOW(edit_dialog), _("Edit phone number"));
     gtk_window_set_resizable (GTK_WINDOW (edit_dialog), FALSE);
 
     g_signal_connect (G_OBJECT (edit_dialog), "delete-event", G_CALLBACK (on_delete), NULL);
diff --git a/sflphone-client-gnome/src/sflnotify.c b/sflphone-client-gnome/src/sflnotify.c
index 48e568fe49dc5704e00d3dbc5423d1c488c7439f..6bcfb37797d4a070f3524a30e283184dd452480b 100644
--- a/sflphone-client-gnome/src/sflnotify.c
+++ b/sflphone-client-gnome/src/sflnotify.c
@@ -68,11 +68,11 @@ notify_incoming_call (callable_obj_t* c)
             title = g_markup_printf_escaped ("IP-to-IP call");
         }
         else {
-            title = g_markup_printf_escaped(_("%s account: %s") ,
+            title = g_markup_printf_escaped(_("%s account : %s") ,
                     (gchar*)g_hash_table_lookup(account_list_get_by_id(c->_accountID)->properties , ACCOUNT_TYPE) ,
                     (gchar*)g_hash_table_lookup(account_list_get_by_id(c->_accountID)->properties , ACCOUNT_ALIAS) ) ;
         }
-        callerid = g_markup_printf_escaped(_("<i>From:</i> %s") , c->_peer_number);
+        callerid = g_markup_printf_escaped(_("<i>From</i> %s"), c->_peer_number);
 
         create_new_gnome_notification (title,
                                         callerid, 
@@ -88,10 +88,10 @@ notify_voice_mails (guint count, account_t* acc)
         gchar* title;
         gchar* body;
 
-        title = g_markup_printf_escaped(_("%s account: %s") ,
+        title = 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) ) ;
-        body = g_markup_printf_escaped(_("%d voice mails"), count);
+        body = g_markup_printf_escaped(n_("%d voice mail", "%d voice mails", count), count);
 
         create_new_gnome_notification (title,
                                         body, 
@@ -127,7 +127,7 @@ notify_no_accounts ()
     gchar* title;
     gchar* body="";
 
-    body = g_markup_printf_escaped(_("You haven't setup any accounts"));
+    body = g_markup_printf_escaped(_("You have no accounts set up"));
     title = g_markup_printf_escaped(_("Error"));
 
     create_new_gnome_notification (title,
diff --git a/sflphone-client-gnome/src/sflphone_const.h b/sflphone-client-gnome/src/sflphone_const.h
index f576ea22a2f459e2802ef330f8d5a91b47faa7cc..57820d70c99a15de58dfc78737ce8721df5ac254 100644
--- a/sflphone-client-gnome/src/sflphone_const.h
+++ b/sflphone-client-gnome/src/sflphone_const.h
@@ -36,7 +36,9 @@
 #define CONTACTS            "contacts"
 
 /** Locale */
-#define _(STRING)   gettext( STRING )
+#define _(STRING)             gettext( STRING )
+#define c_(COMMENT,STRING)    gettext(STRING) 
+#define n_(SING,PLUR,COUNT)   ngettext(SING,PLUR,COUNT)
 
 /** Warnings unused variables **/
 #define UNUSED_VAR(var)      (void*)var
@@ -77,8 +79,6 @@ log4c_category_t* log4c_sfl_gtk_category;
 #define SHOW_DIALPAD	( dbus_get_dialpad() )
 /** Show/Hide the volume controls */
 #define SHOW_VOLUME	( dbus_get_volume_controls() )
-/** Show/Hide the dialpad */
-#define SHOW_SEARCHBAR	( dbus_get_searchbar() )
 /** Show/Hide the alsa configuration panel */
 #define SHOW_ALSA_CONF  ( dbus_get_audio_manager() == ALSA )
 
diff --git a/sflphone-client-gnome/src/statusicon.c b/sflphone-client-gnome/src/statusicon.c
index 18fd693c13be0226b7edc7dbfc01cbf5f7e1fe63..9757996a6aedd89beec22c308f112e6cd20a73ed 100644
--- a/sflphone-client-gnome/src/statusicon.c
+++ b/sflphone-client-gnome/src/statusicon.c
@@ -121,7 +121,10 @@ show_status_icon()
 			  create_menu());			  
 
   // Add a tooltip to the system tray icon
-  gchar *tip =  g_markup_printf_escaped (_("SFLphone - %i accounts configured") , account_list_get_size());
+  int count = account_list_get_size();
+  gchar *tip =  g_markup_printf_escaped ("%s - %s" , 
+                       _("SFLphone"), 
+                       g_markup_printf_escaped(n_("%i account configured", "%i accounts configured", count),count));
   gtk_status_icon_set_tooltip( status , tip );
   g_free(tip);
 }
diff --git a/sflphone-client-gnome/src/toolbar.c b/sflphone-client-gnome/src/toolbar.c
index 7b9f52b78fc9727e8dd91944f1eab6941c135e72..428e829c492b57017f527951fd3e55f67bde7a69 100644
--- a/sflphone-client-gnome/src/toolbar.c
+++ b/sflphone-client-gnome/src/toolbar.c
@@ -47,10 +47,9 @@ call_mailbox( GtkWidget* widget UNUSED, gpointer data UNUSED)
         return;
 
     to = g_strdup(g_hash_table_lookup(current->properties, ACCOUNT_MAILBOX));
-    from = g_markup_printf_escaped(_("\"Voicemail\" <%s>"),  to);
     account_id = g_strdup (current->accountID);
 
-    create_new_call (CALL, CALL_STATE_DIALING, "", account_id, "Voicemail", to, &mailbox_call);
+    create_new_call (CALL, CALL_STATE_DIALING, "", account_id, _("Voicemail"), to, &mailbox_call);
     DEBUG("TO : %s" , mailbox_call->_peer_number);
     calllist_add( current_calls , mailbox_call );
     calltree_add_call( current_calls , mailbox_call );
@@ -165,9 +164,9 @@ GtkWidget *create_toolbar ()
     gtk_toolbar_set_style(GTK_TOOLBAR(ret), GTK_TOOLBAR_ICONS);
 
     image = gtk_image_new_from_file( ICONS_DIR "/dial.svg");
-    callButton = gtk_tool_button_new (image, _("Place a call"));
+    callButton = gtk_tool_button_new (image, _("New call"));
 #if GTK_CHECK_VERSION(2,12,0)
-    gtk_widget_set_tooltip_text(GTK_WIDGET(callButton), _("Place a call"));
+    gtk_widget_set_tooltip_text(GTK_WIDGET(callButton), _("New call"));
 #endif
     g_signal_connect (G_OBJECT (callButton), "clicked",
             G_CALLBACK (call_button), NULL);
@@ -194,9 +193,9 @@ GtkWidget *create_toolbar ()
     gtk_toolbar_insert(GTK_TOOLBAR(ret), GTK_TOOL_ITEM(hangupButton), -1);
 
     image = gtk_image_new_from_file( ICONS_DIR "/unhold.svg");
-    unholdButton = gtk_tool_button_new (image, _("Off Hold"));
+    unholdButton = gtk_tool_button_new (image, _("Hold off"));
 #if GTK_CHECK_VERSION(2,12,0)
-    gtk_widget_set_tooltip_text(GTK_WIDGET(unholdButton), _("Off Hold"));
+    gtk_widget_set_tooltip_text(GTK_WIDGET(unholdButton), _("Hold off"));
 #endif
     gtk_widget_set_state( GTK_WIDGET(unholdButton), GTK_STATE_INSENSITIVE);
     g_signal_connect (G_OBJECT (unholdButton), "clicked",
@@ -205,9 +204,9 @@ GtkWidget *create_toolbar ()
     gtk_widget_show_all(GTK_WIDGET(unholdButton));
 
     image = gtk_image_new_from_file( ICONS_DIR "/hold.svg");
-    holdButton =  gtk_tool_button_new (image, _("On Hold"));
+    holdButton =  gtk_tool_button_new (image, _("Hold on"));
 #if GTK_CHECK_VERSION(2,12,0)
-    gtk_widget_set_tooltip_text(GTK_WIDGET(holdButton), _("On Hold"));
+    gtk_widget_set_tooltip_text(GTK_WIDGET(holdButton), _("Hold on"));
 #endif
     gtk_widget_set_state( GTK_WIDGET(holdButton), GTK_STATE_INSENSITIVE);
     g_signal_connect (G_OBJECT (holdButton), "clicked",
@@ -261,7 +260,7 @@ GtkWidget *create_toolbar ()
 
     recButton = gtk_tool_button_new_from_stock (GTK_STOCK_MEDIA_RECORD);
 #if GTK_CHECK_VERSION(2,12,0)
-    gtk_widget_set_tooltip_text(GTK_WIDGET(recButton), _("Record a call"));
+    gtk_widget_set_tooltip_text(GTK_WIDGET(recButton), _("Record"));
 #endif
     gtk_widget_set_state( GTK_WIDGET(recButton), GTK_STATE_INSENSITIVE);
     g_signal_connect (G_OBJECT (recButton), "clicked",
diff --git a/sflphone-client-kde/CMakeLists.txt b/sflphone-client-kde/CMakeLists.txt
index aaa0aebe205ab8407ccfb3d3dea6ad151692a155..65b269cfd0d95d8477259389787519d1fa829449 100644
--- a/sflphone-client-kde/CMakeLists.txt
+++ b/sflphone-client-kde/CMakeLists.txt
@@ -23,10 +23,10 @@ INCLUDE (  ${CMAKE_ROOT}/Modules/CheckIncludeFiles.cmake  )
 INCLUDE(   ${QT_USE_FILE}   )
 
 
+add_subdirectory(data)
 add_subdirectory(src)
 add_subdirectory(doc)
 add_subdirectory(man)
-add_subdirectory(data)
 add_subdirectory(po)
 
 
diff --git a/sflphone-client-kde/data/sflphone-client-kdeui.rc b/sflphone-client-kde/data/sflphone-client-kdeui.rc
index a9111dba1061b649b2f2ba81eed118ba4deef20a..4402357f0571e624558ff8a88f7497ed08a03501 100644
--- a/sflphone-client-kde/data/sflphone-client-kdeui.rc
+++ b/sflphone-client-kde/data/sflphone-client-kdeui.rc
@@ -17,12 +17,12 @@
 			<Action name="action_hold" />
 			<Action name="action_transfer" />
 			<Action name="action_record" />
+			<Action name="action_mailBox" />
 			<Separator />
+			<Action name="action_main" />
 			<Action name="action_history" />
 			<Action name="action_addressBook" />
 			<Separator />
-			<Action name="action_mailBox" />
-			<Separator />
 			<Action name="action_close" />
 			<Separator />
 			<Action name="action_quit" />
@@ -32,24 +32,24 @@
 			<Action name="action_displayVolumeControls" />
 			<Action name="action_displayDialpad" />
 			<Separator />
-<!-- 			<Action name="action_configureAccounts" /> -->
-<!-- 			<Action name="action_configureAudio" /> -->
 			<Action name="action_configureSflPhone" />
 			<Separator />
 			<Action name="action_accountCreationWizard" />
 		</Menu>
 	</MenuBar>
 	
-	<!--<ToolBar name="mainToolBar" position="Top" noMerge="1" fullWidth="true" newline="true" >
+	<ToolBar name="callsToolBar" iconText="icononly" position="Top" noMerge="1" fullWidth="true" newline="true" >
 		<Action name="action_accept" />
 		<Action name="action_refuse" />
 		<Action name="action_hold" />
 		<Action name="action_transfer" />
 		<Action name="action_record" />
-		<Separator />
+		<Action name="action_mailBox" />
+	</ToolBar>
+	
+	<ToolBar name="screenToolBar" iconText="icononly" position="Top" noMerge="1" fullWidth="true" newline="true" >
+		<Action name="action_main" />
 		<Action name="action_history" />
 		<Action name="action_addressBook" />
-		<Separator />
-		<Action name="action_mailBox" />
-	</ToolBar>	-->
+	</ToolBar>	
 </gui>
\ No newline at end of file
diff --git a/sflphone-client-kde/doc/index.docbook b/sflphone-client-kde/doc/index.docbook
index 0e82203c8da98de7e837cca8c99e59936ce7c58b..5bf4cfa21d6bc2433964c81cd9dc02b11667ec93 100644
--- a/sflphone-client-kde/doc/index.docbook
+++ b/sflphone-client-kde/doc/index.docbook
@@ -13,7 +13,7 @@
   <!ENTITY pt-cell "cell phone">
   <!ENTITY pt-work "work phone">
 
-  <!ENTITY sflphone "SFLPhone">
+  <!ENTITY sflphone "SFLphone">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE" >
   
diff --git a/sflphone-client-kde/po/CMakeLists.txt b/sflphone-client-kde/po/CMakeLists.txt
index 7addefd5a57ceaee920dfac5a20a78da5ab50474..8618944166c9c62bc031ce4f7e2e32b873be2a90 100644
--- a/sflphone-client-kde/po/CMakeLists.txt
+++ b/sflphone-client-kde/po/CMakeLists.txt
@@ -7,4 +7,9 @@ MESSAGE(FATAL_ERROR "Please install msgmerge binary")
 endif (NOT GETTEXT_MSGFMT_EXECUTABLE)
 
 add_subdirectory(fr)
+add_subdirectory(es)
+add_subdirectory(de)
+add_subdirectory(ru)
+add_subdirectory(zh_CN)
+add_subdirectory(zh_HK)
 
diff --git a/sflphone-client-kde/po/README b/sflphone-client-kde/po/README
index ab2bcad9f3573ccd744aa27f191b2d5eedafdcb8..163854cefa2388102ad20d7fdf8952f58cd45932 100644
--- a/sflphone-client-kde/po/README
+++ b/sflphone-client-kde/po/README
@@ -1,19 +1,5 @@
-If you need to update translations files, just execute:
+These are translation files for both Gnome and KDE clients.
 
-	./update.sh
-	
-in the current directory.
+If you want to update the translations, refere to the lang folder at the root directory of git repository, where the po files to edit are gathered.
 
-
-
-If you want to do it yourself, do the following steps:
-
-	xgettext --c++ --kde -ktr2i18n -kki18nc:2c,1 -kki18n -o sflphone-client-kde.pot ../src/*.cpp ../src/*.h ../build/src/*.h ../build/src/*.cpp
-
-This command will update the template file with the current source files.
-To be able to add strings from the ui files, and other non-c++ files which generates some c++ source, you have to first build and make the project in build directory (see the INSTALL file in root directory sflphone-client-kde).
-
-	for fichier in `find  .  -name *.po `  ;  do  msgmerge --update $fichier sflphone-client-kde.pot  ;  done
-	
-This command will update the po files in every subdirectory with the new pot file.
-You will then be able to translate the new strings in each po file.
\ No newline at end of file
+DO NOT EDIT THESE PO FILES since they are to be replaced by the new ones from lang folder. All changes might be lost.
diff --git a/sflphone-client-kde/po/de/sflphone-client-kde.po b/sflphone-client-kde/po/de/sflphone-client-kde.po
index ccbeede61592a5763e3af4c480a68b36ed2542a1..9513fd6b0668446b77fa0db7a249045e7eecd938 100644
--- a/sflphone-client-kde/po/de/sflphone-client-kde.po
+++ b/sflphone-client-kde/po/de/sflphone-client-kde.po
@@ -1,610 +1,1282 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# German translation of SFLphone.
+# Copyright (C) 2008 The Free Software Foundation, Inc.
+# This file is distributed under the GNU General Public License Version 3.
 #
-#, fuzzy
+# Sven Werlen <sven.werlen@savoirfairelinux.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: sflphone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-17 15:48-0400\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"
+"POT-Creation-Date: 2009-07-17 16:14-0400\n"
+"PO-Revision-Date: 2009-01-08 10:46-0500\n"
+"Last-Translator: Sven Werlen <sven.werlen@savoirfairelinux.com>\n"
+"Language-Team: SavoirFaire Linux Inc <sflphoneteam@savoirfairelinux.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-
-#: ../src/AccountWizard.cpp:161 ../src/AccountWizard.cpp:275
-msgid "Account Creation Wizard"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:200
-msgid "Creation of account succeed with these parameters"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:211
+"X-Generator: Lokalize 0.2\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../sflphone-client-kde/src/Account.cpp:34
+#: ../sflphone-client-gnome/src/accountlist.c:175
+msgctxt "account state"
+msgid "Registered"
+msgstr "Registriert"
+
+#: ../sflphone-client-kde/src/Account.cpp:36
+#: ../sflphone-client-gnome/src/accountlist.c:178
+msgctxt "account state"
+msgid "Not Registered"
+msgstr "Nicht registriert"
+
+#: ../sflphone-client-kde/src/Account.cpp:38
+#: ../sflphone-client-gnome/src/accountlist.c:181
+msgctxt "account state"
+msgid "Trying..."
+msgstr "Am versuchen..."
+
+#: ../sflphone-client-kde/src/Account.cpp:40
+#: ../sflphone-client-gnome/src/accountlist.c:184
+msgctxt "account state"
+msgid "Error"
+msgstr "Fehler"
+
+#: ../sflphone-client-kde/src/Account.cpp:42
+#: ../sflphone-client-gnome/src/accountlist.c:187
+msgctxt "account state"
+msgid "Authentication Failed"
+msgstr "Falsche Authentifizierung"
+
+#: ../sflphone-client-kde/src/Account.cpp:44
+#: ../sflphone-client-gnome/src/accountlist.c:190
+msgctxt "account state"
+msgid "Network unreachable"
+msgstr "Kein netzwerk"
+
+#: ../sflphone-client-kde/src/Account.cpp:46
+#: ../sflphone-client-gnome/src/accountlist.c:193
+msgctxt "account state"
+msgid "Host unreachable"
+msgstr "Host unerreichbar"
+
+#: ../sflphone-client-kde/src/Account.cpp:48
+#: ../sflphone-client-gnome/src/accountlist.c:196
+msgctxt "account state"
+msgid "Stun configuration error"
+msgstr "Stun: Konfigurationsfehler"
+
+#: ../sflphone-client-kde/src/Account.cpp:50
+#: ../sflphone-client-gnome/src/accountlist.c:199
+msgctxt "account state"
+msgid "Stun server invalid"
+msgstr "Ungültiger Stun server"
+
+#: ../sflphone-client-kde/src/Account.cpp:51
+#: ../sflphone-client-gnome/src/accountlist.c:202
+msgctxt "account state"
+msgid "Invalid"
+msgstr "Ungültig"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:163
+#: ../sflphone-client-kde/src/AccountWizard.cpp:278
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:393
+msgid "Account creation wizard"
+msgstr "SFLphone Konto (Konfigurationsassistent)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:199
+#: ../sflphone-client-kde/src/AccountWizard.cpp:217
+#: ../sflphone-client-kde/src/AccountWizard.cpp:561
+#: ../sflphone-client-gnome/src/assistant.c:68
+#, c-format
+msgid "This assistant is now finished."
+msgstr "Assistent beendet."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:211
 msgid "Creation of account has failed for the reason"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:217
-msgid "Register of account succeed with these parameters"
-msgstr ""
+msgstr "Konfigurationsassistent mit Fehler beendet"
 
-#: ../src/AccountWizard.cpp:253 ../src/AccountWizard.cpp:437
+#: ../sflphone-client-kde/src/AccountWizard.cpp:255
+#: ../sflphone-client-kde/src/AccountWizard.cpp:440
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:363
+#: ../sflphone-client-gnome/src/assistant.c:72
 msgid "Alias"
-msgstr ""
+msgstr "Alias"
 
-#: ../src/AccountWizard.cpp:254 ../src/AccountWizard.cpp:438
+#: ../sflphone-client-kde/src/AccountWizard.cpp:256
+#: ../sflphone-client-kde/src/AccountWizard.cpp:441
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:370
+#: ../sflphone-client-gnome/src/assistant.c:75
 msgid "Server"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:255 ../src/AccountWizard.cpp:439
-msgid "User"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:256 ../src/AccountWizard.cpp:440
+msgstr "Server"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:257
+#: ../sflphone-client-kde/src/AccountWizard.cpp:442
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:371
+#: ../sflphone-client-gnome/src/assistant.c:78
+msgid "Username"
+msgstr "Benutzername"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:258
+#: ../sflphone-client-kde/src/AccountWizard.cpp:443
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:372
 msgid "Password"
-msgstr ""
+msgstr "Passwort"
 
-#: ../src/AccountWizard.cpp:257
+#: ../sflphone-client-kde/src/AccountWizard.cpp:259
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:364
+#: ../sflphone-client-gnome/src/config/configwindow.c:418
 msgid "Protocol"
-msgstr ""
+msgstr "Protokoll"
 
-#: ../src/AccountWizard.cpp:258
-msgid "Mailbox"
-msgstr ""
+#: ../sflphone-client-kde/src/AccountWizard.cpp:260
+#: ../sflphone-client-kde/src/AccountWizard.cpp:444
+msgid "Voicemail number"
+msgstr "Voicemail Nummer"
 
-#: ../src/AccountWizard.cpp:276
-msgid "Welcome to the Account creation wizard of SFLPhone"
-msgstr ""
+#: ../sflphone-client-kde/src/AccountWizard.cpp:279
+#: ../sflphone-client-gnome/src/assistant.c:216
+msgid "Welcome to the Account creation wizard of SFLphone!"
+msgstr "Wilkommen zu SFLphone!"
 
-#: ../src/AccountWizard.cpp:278
-msgid "This wizard will help you setting up an account."
+#: ../sflphone-client-kde/src/AccountWizard.cpp:281
+#: ../sflphone-client-gnome/src/assistant.c:217
+msgid "This installation wizard will help you configure an account."
 msgstr ""
+"The Installationsassistent wird Ihnen helfen, ein Konto zu konfigurieren."
 
-#: ../src/AccountWizard.cpp:306 ../build/src/ui_ConfigDialog.h:1259
-msgid "Accounts"
-msgstr ""
+#: ../sflphone-client-kde/src/AccountWizard.cpp:309
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Account"
+msgstr "Konto"
 
-#: ../src/AccountWizard.cpp:307
-msgid "Please choose between those options :"
-msgstr ""
+#: ../sflphone-client-kde/src/AccountWizard.cpp:310
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Please select one of the following options"
+msgstr "Bitte eine Option auswählen"
 
-#: ../src/AccountWizard.cpp:309
+#: ../sflphone-client-kde/src/AccountWizard.cpp:312
+#: ../sflphone-client-gnome/src/assistant.c:251
 msgid "Create a free SIP/IAX2 account on sflphone.org"
-msgstr ""
+msgstr "SIP/IAX2 Konto bei sflphone.org erstellen lassen"
 
-#: ../src/AccountWizard.cpp:310
-msgid "Register an existing SIP/IAX2 account"
-msgstr ""
+#: ../sflphone-client-kde/src/AccountWizard.cpp:313
+#: ../sflphone-client-gnome/src/assistant.c:253
+msgid "Register an existing SIP or IAX2 account"
+msgstr "Existierendes SIP/IAX2 Konto registrieren"
 
-#: ../src/AccountWizard.cpp:349
+#: ../sflphone-client-kde/src/AccountWizard.cpp:352
+#: ../sflphone-client-gnome/src/assistant.c:231
 msgid "VoIP Protocols"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:350
-msgid "Choose the account type"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:352
-msgid "Register a SIP (Session Initiation Protocol) account"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:353
-msgid "Register a IAX2 (InterAsterisk eXchange) account"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:392
-msgid "Optionnal Email Address"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:393
+msgstr "VoIP Protokoll"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:353
+#: ../sflphone-client-gnome/src/assistant.c:231
+msgid "Select an account type"
+msgstr "Kontotyp auswählen"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:355
+#: ../sflphone-client-gnome/src/assistant.c:233
+msgid "SIP (Session Initiation Protocol)"
+msgstr "SIP (Session Initiation Protocol)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:356
+#: ../sflphone-client-gnome/src/assistant.c:235
+msgid "IAX2 (InterAsterix Exchange)"
+msgstr "IAX2 (InterAsterisk Exchange)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:395
+#: ../sflphone-client-gnome/src/assistant.c:339
+msgid "Optional email address"
+msgstr "Fakultative E-mail-Adresse"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:396
+#: ../sflphone-client-gnome/src/assistant.c:339
 msgid "This email address will be used to send your voicemail messages."
 msgstr ""
+"Diese E-mail-Adresse wird benutzt, um Ihnen voicemail Meldungen zu schicken."
 
-#: ../src/AccountWizard.cpp:395
+#: ../sflphone-client-kde/src/AccountWizard.cpp:398
 msgid "Email address"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:429
-msgid "SIP Account Settings"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:433
-msgid "IAX2 Account Settings"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:435
-msgid "Please full these settings fields."
-msgstr ""
-
-#: ../src/AccountWizard.cpp:512
+msgstr "E-mail-Adresse"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:432
+#: ../sflphone-client-gnome/src/assistant.c:266
+msgid "SIP account settings"
+msgstr "Konfiguration des SIP Konto"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:436
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "IAX2 account settings"
+msgstr "Konfiguration des IAX2 Konto"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:438
+#: ../sflphone-client-gnome/src/assistant.c:266
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "Please fill the following information"
+msgstr "Folgende Informationen bitte ausfühlen"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:523
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:856
 msgid "Network Address Translation (NAT)"
-msgstr ""
+msgstr "Network Address Translation (NAT)"
 
-#: ../src/AccountWizard.cpp:513
-msgid ""
-"You should probably enable this option if you're placed under a firewall"
-msgstr ""
+#: ../sflphone-client-kde/src/AccountWizard.cpp:524
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:536
+msgid "You should probably enable this if you are behind a firewall."
+msgstr "Sie sollten dieses einschalten, falls Sie hinter einer Firewall sind."
 
-#: ../src/AccountWizard.cpp:515
+#: ../sflphone-client-kde/src/AccountWizard.cpp:526
 msgid "Enable STUN"
-msgstr ""
+msgstr "STUN einschalten"
 
-#: ../src/AccountWizard.cpp:516
+#: ../sflphone-client-kde/src/AccountWizard.cpp:527
 msgid "Stun Server"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:550
-msgid "Account Definition Finished"
-msgstr ""
+msgstr "Stun Server"
 
-#: ../src/AccountWizard.cpp:551
+#: ../sflphone-client-kde/src/AccountWizard.cpp:562
 msgid ""
 "After checking the settings you chose, click \"Finish\" to create the "
 "account."
-msgstr ""
-
-#: ../src/Call.cpp:116
-msgid "Transfer to : "
-msgstr ""
+msgstr "Einstellungen prüfen, dann \"Finish\" drücken."
 
-#: ../src/ConfigDialog.cpp:131 ../src/ConfigDialog.cpp:263
-msgid "Attention : SIP port must be over 1024 !"
-msgstr ""
+#: ../sflphone-client-kde/src/ActionSetAccountFirst.cpp:26
+msgid "Default account"
+msgstr "Default Konto"
 
-#: ../src/ConfigDialog.cpp:136 ../src/ConfigDialog.cpp:266
-msgid "Attention : SIP port must be under 65536 !"
-msgstr ""
-
-#: ../src/main.cpp:49 ../src/main.cpp:50
-msgctxt "Your names"
-msgid "NAME OF TRANSLATORS"
-msgstr ""
+#: ../sflphone-client-kde/src/Call.cpp:116
+#: ../sflphone-client-gnome/src/contacts/calltree.c:322
+msgid "Transfer to : "
+msgstr "Weiterleiten zu : "
 
-#: ../src/main.cpp:50 ../src/main.cpp:51
-msgctxt "Your emails"
-msgid "EMAIL OF TRANSLATORS"
-msgstr ""
+#: ../sflphone-client-kde/src/CodecListModel.cpp:89
+#: ../sflphone-client-gnome/src/actions.c:816
+msgid "Codec"
+msgstr "Codec"
 
-#: ../src/SFLPhone.cpp:55 ../src/sflphone_kdeview.cpp:1051
-#: ../src/sflphone_kdeview.cpp:1056 ../src/sflphone_kdeview.cpp:1061
-msgid "SFLPhone"
-msgstr ""
+#: ../sflphone-client-kde/src/CodecListModel.cpp:93
+#: ../sflphone-client-gnome/src/config/audioconf.c:581
+msgid "Frequency"
+msgstr "Frequenz"
 
-#: ../src/SFLPhone.cpp:154
-msgid "You still have some calls open. Please close all calls before quitting."
-msgstr ""
+#: ../sflphone-client-kde/src/CodecListModel.cpp:97
+#: ../sflphone-client-gnome/src/config/audioconf.c:586
+msgid "Bitrate"
+msgstr "Bitrate"
 
-#: ../src/SFLPhone.cpp:182
+#: ../sflphone-client-kde/src/CodecListModel.cpp:101
+#: ../sflphone-client-gnome/src/config/audioconf.c:591
+msgid "Bandwidth"
+msgstr "Bandbreite"
+
+#: ../sflphone-client-kde/src/main.cpp:38
+msgid "SFLphone KDE Client"
+msgstr "SFLphone KDE Client"
+
+#: ../sflphone-client-kde/src/main.cpp:42
+msgid "(C) 2009 Savoir-faire Linux"
+msgstr "(C) 2009 Savoir-faire Linux"
+
+#: ../sflphone-client-kde/src/main.cpp:46
+msgid "Jérémy Quentin"
+msgstr "Jérémy Quentin"
+
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Ihre Namen"
+
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "Ihre E-Mail-Adressen"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:62
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-gnome/src/statusicon.c:126
+msgid "SFLphone"
+msgstr "SFLphone"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:209
 msgid "Incoming call"
-msgstr ""
+msgstr "Eingehende Anrufe"
 
-#: ../src/SFLPhone.cpp:183
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
 msgid "You have an incoming call from"
-msgstr ""
+msgstr "Sie haben einen Anruf aus"
 
-#: ../src/SFLPhone.cpp:183
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
 msgid "Click to accept or refuse it."
-msgstr ""
+msgstr "Klicken, um zu akzeptieren oder abzulehnen."
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:716
+msgid "Address book loading..."
+msgstr "Adressbuch Laden..."
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:901
+#: ../sflphone-client-gnome/src/actions.c:89
+msgid "No registered accounts"
+msgstr "Kein registriertes Konto"
 
-#: ../src/sflphone_kdeview.cpp:1051
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:905
+#: ../sflphone-client-gnome/src/actions.c:83
+#: ../sflphone-client-gnome/src/actions.c:813
+msgid "Using account"
+msgstr "Mit Konto"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
 msgid "Main screen"
-msgstr ""
+msgstr "Hauptbildschirm"
 
-#: ../src/sflphone_kdeview.cpp:1056 ../build/src/ui_ConfigDialog.h:1271
-#: ../build/src/ui_dlggeneralbase.h:160
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:165
 msgid "Call history"
-msgstr ""
+msgstr "Liste der vorherigen Anrufen"
 
-#: ../src/sflphone_kdeview.cpp:1061
-#: ../build/src/ui_sflphone_kdeview_base.h:507
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:394
+#: ../sflphone-client-gnome/src/toolbar.c:243
+#: ../sflphone-client-gnome/src/toolbar.c:245
 msgid "Address book"
-msgstr ""
+msgstr "Adressbuch"
 
-#: ../src/sflphone_kdeview.cpp:1075 ../src/sflphone_kdeview.cpp:1131
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1108
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1173
 msgid "Edit before call"
-msgstr ""
+msgstr "Vor Aufruf bearbeiten"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:41
+#: ../sflphone-client-gnome/src/toolbar.c:167
+#: ../sflphone-client-gnome/src/toolbar.c:169
+msgid "New call"
+msgstr "Neuer Anruf"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:42
+#: ../sflphone-client-kde/src/sflphone_const.h:47
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:381
+#: ../sflphone-client-gnome/src/toolbar.c:186
+#: ../sflphone-client-gnome/src/toolbar.c:188
+msgid "Hang up"
+msgstr "Auflegen"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:43
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:382
+#: ../sflphone-client-gnome/src/toolbar.c:207
+#: ../sflphone-client-gnome/src/toolbar.c:209
+msgid "Hold on"
+msgstr "In Warteschleife"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:44
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:383
+#: ../sflphone-client-gnome/src/toolbar.c:220
+#: ../sflphone-client-gnome/src/toolbar.c:222
+msgid "Transfer"
+msgstr "Weiterleiten"
 
-#: ../src/sflphone_const.h:56
-msgid "Call"
-msgstr ""
+#: ../sflphone-client-kde/src/sflphone_const.h:45
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:392
+#: ../sflphone-client-gnome/src/toolbar.c:263
+msgid "Record"
+msgstr "Gespräch aufzeichnen"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:46
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:380
+#: ../sflphone-client-gnome/src/toolbar.c:176
+#: ../sflphone-client-gnome/src/toolbar.c:178
+msgid "Pick up"
+msgstr "Abnehmen"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:48
+#: ../sflphone-client-gnome/src/toolbar.c:196
+#: ../sflphone-client-gnome/src/toolbar.c:198
+msgid "Hold off"
+msgstr "Aus Warteschleife"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:49
+msgid "Give up transfer"
+msgstr "Transfer aufgeben"
 
-#: ../src/sflphone_const.h:57
-msgid "Hang up"
-msgstr ""
+#: ../sflphone-client-kde/src/sflphone_const.h:50
+msgid "Call back"
+msgstr "Zurückrufen"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:48
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:91
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
+#: ../sflphone-client-gnome/src/config/configwindow.c:722
+#: ../sflphone-client-gnome/src/config/configwindow.c:791
+msgctxt "Config section"
+msgid "General"
+msgstr "Allgemein"
 
-#: ../src/sflphone_const.h:58
-msgid "Hold"
-msgstr ""
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:49
+msgctxt "Config section"
+msgid "Display"
+msgstr "Display"
 
-#: ../src/sflphone_const.h:59
-msgid "Transfer"
-msgstr ""
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:50
+#: ../sflphone-client-gnome/src/config/configwindow.c:833
+msgctxt "Config section"
+msgid "Accounts"
+msgstr "Konten"
 
-#: ../src/sflphone_const.h:60 ../build/src/ui_ConfigDialog.h:1263
-msgid "Record"
-msgstr ""
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:51
+#: ../sflphone-client-gnome/src/config/configwindow.c:786
+msgctxt "Config section"
+msgid "Audio"
+msgstr "Audio"
 
-#: ../src/sflphone_const.h:61
-msgid "Accept"
-msgstr ""
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:52
+#: ../sflphone-client-gnome/src/config/configwindow.c:801
+msgctxt "Config section"
+msgid "Address Book"
+msgstr "Adressbuch"
 
-#: ../src/sflphone_const.h:62
-msgid "Refuse"
-msgstr ""
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:53
+#: ../sflphone-client-gnome/src/config/configwindow.c:796
+msgctxt "Config section"
+msgid "Recordings"
+msgstr "Tonaufnahmen"
 
-#: ../src/sflphone_const.h:63
-msgid "Unhold"
-msgstr ""
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:54
+#: ../sflphone-client-gnome/src/config/configwindow.c:806
+msgctxt "Config section"
+msgid "Hooks"
+msgstr "Hooks"
 
-#: ../src/sflphone_const.h:64
-msgid "Give up transfer"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:328
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows. Enable/disable them by checking/unchecking "
+"them on the left of the item. Add or remove some with \"Plus\" and \"Sub\" "
+"buttons. Edit the selected account with the form on the right."
+msgstr ""
+"Sflphone verwendet das erste \"registrierte\" Konto in der Liste, wenn Sie "
+"anrufen. Benutzen Sie die Pfeile, um die Anordnung der Kontos zu ändern. Mit "
+"\"Plus\" und \"Minus\" können Sie ein Konto anlegen bzgl. entfernen. Mit "
+"\"Editieren\" können Sie ein Konto bearbeiten. "
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:332
+msgid "Remove the selected account"
+msgstr "Entfernen Sie das ausgewählte Konto"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:335
+msgid ""
+"This button will remove the selected account in the list below. Be sure you "
+"really don't need it anymore. If you think you might use it again later, "
+"just uncheck it."
 msgstr ""
+"Diese Aktion entfernt das ausgewählte Konto aus der Liste. Stellen Sie "
+"sicher, dass Sie es wirklich nicht mehr brauchen."
 
-#: ../src/sflphone_const.h:65
-msgid "Call back"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:340
+msgid "Remove"
+msgstr "Entfernen"
 
-#: ../src/sflphone_const.h:66
-msgid "Give up search"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:342
+msgid "Add a new account"
+msgstr "Neues Konto anlegen"
 
-#: ../build/src/ui_ConfigDialog.h:1249
-msgid "Configuration Dialog"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:345
+msgid ""
+"This button enables you to initialize a new account. You will then be able "
+"to edit it using the form on the right."
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1250
-msgid "about"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:347
+msgid "Add"
+msgstr "Hinzufügen"
 
-#: ../build/src/ui_ConfigDialog.h:1255 ../build/src/ui_ConfigDialog.h:1337
-msgid "General"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:349
+msgid "Get this account down"
+msgstr "Konto nach unten"
 
-#: ../build/src/ui_ConfigDialog.h:1257
-msgid "Display"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:352
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:359
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows."
 msgstr ""
+"Sflphone verwendet das erste \"registrierte\" Konto in der Liste, wenn Sie "
+"anrufen. Benutzen Sie die Pfeile, um die Anordnung der Kontos zu ändern."
 
-#: ../build/src/ui_ConfigDialog.h:1261
-msgid "Audio"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:354
+msgid "Down"
+msgstr "Unten"
 
-#: ../build/src/ui_ConfigDialog.h:1265
-msgid "Address Book"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:356
+msgid "Get this account up"
+msgstr "Nach oben"
 
-#: ../build/src/ui_ConfigDialog.h:1267
-msgid "Hooks"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:361
+msgid "Up"
+msgstr "Oben"
 
-#: ../build/src/ui_ConfigDialog.h:1270
-msgid "Configure general settings"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:362
+msgid "Apply"
+msgstr "übernehmen"
 
-#: ../build/src/ui_ConfigDialog.h:1272 ../build/src/ui_dlggeneralbase.h:161
-msgid "&Capacity"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:367
+msgid "SIP"
+msgstr "SIP"
 
-#: ../build/src/ui_ConfigDialog.h:1273 ../build/src/ui_dlggeneralbase.h:162
-msgid "C&lear history"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:368
+msgid "IAX"
+msgstr "IAX"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:373
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:385
+#: ../sflphone-client-gnome/src/toolbar.c:52
+#: ../sflphone-client-gnome/src/toolbar.c:251
+#: ../sflphone-client-gnome/src/toolbar.c:255
+msgid "Voicemail"
+msgstr "Voicemail"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:374
+#: ../sflphone-client-gnome/src/config/configwindow.c:425
+msgid "Status"
+msgstr "Status"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:377
+#: ../sflphone-client-gnome/src/config/configwindow.c:528
+msgid "Stun parameters will be applied on each SIP account created."
+msgstr "Alle SIP Kontos werden mit Stun Einstellungen angepasst."
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:378
+msgid "Enable Stun"
+msgstr "Stun aktivieren"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:380
+#: ../sflphone-client-gnome/src/config/configwindow.c:544
+msgid "Format : name.server:port"
+msgstr "Format: Name.Server:Port"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:382
+msgid "choose Stun server (example : stunserver.org)"
+msgstr "Stun Server auswählen (Bsp: stunserver.org)"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:154
+msgid "Enable address book"
+msgstr "Aktivieren Adressbuch"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:155
+#, fuzzy
+msgid "Maximum results"
+msgstr "Maximale Anzahl Resultaten"
 
-#: ../build/src/ui_ConfigDialog.h:1274 ../build/src/ui_dlggeneralbase.h:163
-msgid "Connection"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:156
+#, fuzzy
+msgid "Display photo if available"
+msgstr "Foto anzeigen"
 
-#: ../build/src/ui_ConfigDialog.h:1275 ../build/src/ui_dlggeneralbase.h:164
-msgid "SIP &Port"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:157
+#, fuzzy
+msgid "Display phone numbers of these types :"
+msgstr "Nummer anzeigen für Typen :"
 
-#: ../build/src/ui_ConfigDialog.h:1276 ../build/src/ui_dlggeneralbase.h:165
-msgid "Attention "
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:158
+#, fuzzy
+msgid "Work"
+msgstr "Arbeit"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:159
+#, fuzzy
+msgid "Mobile"
+msgstr "Handy"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:160
+#, fuzzy
+msgid "Home"
+msgstr "Heim"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:225
+msgid "Sound manager"
+msgstr "Sound Manager"
 
-#: ../build/src/ui_ConfigDialog.h:1277
-msgid "Configure display"
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:228
+msgid "ALSA"
+msgstr "ALSA"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:229
+msgid "PulseAudio"
+msgstr "Pulseaudio"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:231
+msgid "Enable ringtones"
+msgstr "Klingeltöne aktivieren"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:232
+#: ../sflphone-client-gnome/src/config/audioconf.c:812
+msgid "Codecs"
+msgstr "Codecs"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:233
+#: ../sflphone-client-gnome/src/config/audioconf.c:795
+msgid "ALSA settings"
+msgstr "ALSA Konfiguration"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:234
+#: ../sflphone-client-gnome/src/config/audioconf.c:662
+msgid "ALSA plugin"
+msgstr "ALSA Plugin"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:235
+#: ../sflphone-client-gnome/src/config/audioconf.c:706
+msgid "Input"
+msgstr "Eingabe"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:236
+#: ../sflphone-client-gnome/src/config/audioconf.c:684
+msgid "Output"
+msgstr "Ausgabe"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:237
+msgid "PulseAudio settings"
+msgstr "Pulseaudio Einstellungen "
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:238
+msgid "Mute other applications during a call"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1278
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:121
 msgid "Enable notifications"
-msgstr ""
+msgstr "Aktivieren Benachrichtungungen"
 
-#: ../build/src/ui_ConfigDialog.h:1279
-msgid "On incoming &calls"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:122
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:126
+#, fuzzy
+msgid "On incoming calls"
+msgstr "Auf eingehende Anrufe "
 
-#: ../build/src/ui_ConfigDialog.h:1280
-msgid "On &messages"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:123
+#, fuzzy
+msgid "On messages"
+msgstr "Auf Nachrichten"
 
-#: ../build/src/ui_ConfigDialog.h:1281
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:124
 msgid "Show main window"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1282
-msgid "On &start"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:125
+#, fuzzy
+msgid "On start"
+msgstr "Am Start"
 
-#: ../build/src/ui_ConfigDialog.h:1283
-msgid "On &incoming calls"
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:166
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "Keep my history for at least"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1284
-msgid "Configure user accounts"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:167
+#: ../sflphone-client-gnome/src/config/configwindow.c:643
+msgctxt "End of 'Keep my history for at least n days.'"
+msgid "days"
+msgstr "Tag"
 
-#: ../build/src/ui_ConfigDialog.h:1286
-msgid "Remove this account"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:168
+msgid "Clear history"
+msgstr "Vorherigen Anrufen leeren"
 
-#: ../build/src/ui_ConfigDialog.h:1287
-msgid "Backspace, Return"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:169
+msgid "Connection"
+msgstr "Connection"
 
-#: ../build/src/ui_ConfigDialog.h:1288
-msgid "Add a new account"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:170
+#: ../sflphone-client-gnome/src/config/configwindow.c:664
+msgid "SIP Port"
+msgstr "SIP Port"
 
-#: ../build/src/ui_ConfigDialog.h:1289
-msgid "Down"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:180
+#: ../sflphone-client-gnome/src/config/hooks-config.c:130
+msgid "URL Argument"
+msgstr "URL Argumen"
 
-#: ../build/src/ui_ConfigDialog.h:1290
-msgid "Up"
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:181
+#: ../sflphone-client-gnome/src/config/hooks-config.c:135
+msgid "Custom commands on incoming calls with URL"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1291
-msgid "Apply"
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:182
+msgid "Trigger on specific SIP header"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1292
-msgid "&Alias"
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:183
+msgid "Trigger on IAX2 URL"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1293
-msgid "&Protocol"
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:184
+msgid "Command to run"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1296
-msgid "SIP"
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:185
+#: ../sflphone-client-gnome/src/config/hooks-config.c:138
+#, c-format
+msgid "%s will be replaced with the passed URL."
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1297
-msgid "IAX"
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:186
+#: ../sflphone-client-gnome/src/config/hooks-config.c:165
+msgid "Phone number rewriting"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1299
-msgid "&Server"
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:187
+msgid "Prefix dialed numbers with"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1300
-msgid "&User"
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:92
+#: ../sflphone-client-gnome/src/config/configwindow.c:726
+msgid "Destination folder"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1301
-msgid "Pass&word"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:384
+#: ../sflphone-client-gnome/src/toolbar.c:232
+#: ../sflphone-client-gnome/src/toolbar.c:234
+msgid "History"
+msgstr "Vorherige Anrufe"
 
-#: ../build/src/ui_ConfigDialog.h:1302
-#: ../build/src/ui_sflphone_kdeview_base.h:498
-msgid "&Mailbox"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:386
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:388
+msgid "Configure SFLphone"
+msgstr "Konfigurieren SFLphone"
 
-#: ../build/src/ui_ConfigDialog.h:1303
-msgid "State"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:390
+#, fuzzy
+msgid "Display volume controls"
+msgstr "Lautstärke Kontrollen"
 
-#: ../build/src/ui_ConfigDialog.h:1306
-msgid "Stun settings will be applied on each account"
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:391
+msgid "Display dialpad"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1307
-msgid "&Enable Stun"
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:396
+msgid "Attention:number of results exceeds max displayed."
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1308
-msgid "Configure audio settings"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:398
+#: ../sflphone-client-gnome/src/sliders.c:163
+msgid "Mic volume"
+msgstr "Mikro Lautstärke"
 
-#: ../build/src/ui_ConfigDialog.h:1310
-msgid "Audio &device"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:402
+#: ../sflphone-client-gnome/src/sliders.c:161
+msgid "Speakers volume"
+msgstr "Lautsprecher Lautstärke"
 
-#: ../build/src/ui_ConfigDialog.h:1313
-msgid "ALSA"
-msgstr ""
+#: ../sflphone-client-gnome/src/actions.c:54
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+#, c-format
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] "%d Voice Nachricht"
+msgstr[1] "%d Voice Nachricht"
 
-#: ../build/src/ui_ConfigDialog.h:1314
-msgid "PulseAudio"
+#: ../sflphone-client-gnome/src/actions.c:234
+msgid ""
+"Unable to connect to the SFLphone server.\n"
+"Make sure the daemon is running."
 msgstr ""
+"SFLphone Server kann nicht verbunden werden. Stellen Sie sicher, dass der "
+"Dämon läuft."
 
-#: ../build/src/ui_ConfigDialog.h:1316
-msgid "&Enable ringtones"
-msgstr ""
+#: ../sflphone-client-gnome/src/actions.c:809
+#, c-format
+msgid "IP call - %s"
+msgstr "IP Anruf - %s"
 
-#: ../build/src/ui_ConfigDialog.h:1317
-msgid "&Codecs"
+#: ../sflphone-client-gnome/src/actions.c:908
+#, 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>Fehler: Kein Audio-Codec gefunden.\n"
+"\n"
+"</b> SFL Audio-Codecs müssen in <i>%s</i> oder <b>.sflphone</b> Ihres HOME-"
+"Verzeichniss ( <i>%s</i> ) gespeichert werden."
 
-#: ../build/src/ui_ConfigDialog.h:1321
-msgid "Active"
+#: ../sflphone-client-gnome/src/assistant.c:70
+msgid ""
+"You can at any time check your registration state or modify your accounts "
+"parameters in the Options/Accounts window."
+msgstr ""
+"Sie können jederzeit Ihres Registrierungsstatus überprüfen oder "
+"IhreKontoparameter ändern (Optionen/Konten)."
+
+#: ../sflphone-client-gnome/src/assistant.c:190
+msgid "SFLphone account creation wizard"
+msgstr "SFLphone Konto (Konfigurationsassistent)"
+
+#: ../sflphone-client-gnome/src/assistant.c:274
+#: ../sflphone-client-gnome/src/assistant.c:370
+#: ../sflphone-client-gnome/src/config/accountwindow.c:153
+msgid "_Alias"
+msgstr "_Alias"
+
+#: ../sflphone-client-gnome/src/assistant.c:282
+#: ../sflphone-client-gnome/src/assistant.c:378
+#: ../sflphone-client-gnome/src/config/accountwindow.c:189
+msgid "_Host name"
+msgstr "_Hostname"
+
+#: ../sflphone-client-gnome/src/assistant.c:290
+#: ../sflphone-client-gnome/src/assistant.c:386
+#: ../sflphone-client-gnome/src/config/accountwindow.c:197
+msgid "_User name"
+msgstr "_Benutzername"
+
+#: ../sflphone-client-gnome/src/assistant.c:306
+#: ../sflphone-client-gnome/src/assistant.c:401
+#: ../sflphone-client-gnome/src/config/accountwindow.c:212
+msgid "_Password"
+msgstr "_Passwort"
+
+#: ../sflphone-client-gnome/src/assistant.c:324
+#: ../sflphone-client-gnome/src/assistant.c:417
+#: ../sflphone-client-gnome/src/config/accountwindow.c:228
+msgid "_Voicemail number"
+msgstr "_Voicemail Nummer"
+
+#: ../sflphone-client-gnome/src/assistant.c:347
+msgid "_Email address"
+msgstr "_Email"
+
+#: ../sflphone-client-gnome/src/assistant.c:444
+#: ../sflphone-client-gnome/src/config/configwindow.c:532
+msgid "E_nable STUN"
+msgstr "STUN Ei_nschalten"
+
+#: ../sflphone-client-gnome/src/assistant.c:451
+msgid "_STUN server"
+msgstr "_STUN Server"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Account Registration"
+msgstr "Konto Registrierung"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Congratulations!"
+msgstr "Gratulation!"
+
+#: ../sflphone-client-gnome/src/errors.c:29
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening playback device"
 msgstr ""
+"ALSA Benachrichtigung\n"
+"\n"
+"Fehler während Öffnen des \"playback device\""
 
-#: ../build/src/ui_ConfigDialog.h:1323
-msgid "Name"
+#: ../sflphone-client-gnome/src/errors.c:32
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening capture device"
 msgstr ""
+"ALSA Benachrichtigung\n"
+"\n"
+"Fehler während Öffnen des \"capture device\""
 
-#: ../build/src/ui_ConfigDialog.h:1325
-msgid "Frequency"
+#: ../sflphone-client-gnome/src/errors.c:35
+msgid ""
+"Pulseaudio notification\n"
+"\n"
+"Pulseaudio is not running"
 msgstr ""
+"Pulseaudio Benachrichtigung\n"
+"\n"
+"Pulseaudio nicht gestartet"
 
-#: ../build/src/ui_ConfigDialog.h:1327
-msgid "Bitrate"
-msgstr ""
+#: ../sflphone-client-gnome/src/mainwindow.c:70
+msgid "There is one call in progress."
+msgstr "Laufender Anruf."
 
-#: ../build/src/ui_ConfigDialog.h:1329
-msgid "Bandwidth"
-msgstr ""
+#: ../sflphone-client-gnome/src/mainwindow.c:74
+msgid "There are calls in progress."
+msgstr "Laufende Anrufe."
 
-#: ../build/src/ui_ConfigDialog.h:1330
-msgid "ALSA settings"
+#: ../sflphone-client-gnome/src/mainwindow.c:83
+msgid "Do you still want to quit?"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1331
-msgid "&In"
-msgstr ""
+#: ../sflphone-client-gnome/src/mainwindow.c:284
+msgid "SFLphone Error"
+msgstr "SFLphone Fehler"
 
-#: ../build/src/ui_ConfigDialog.h:1332
-msgid "&Out"
-msgstr ""
+#: ../sflphone-client-gnome/src/menus.c:134
+msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr "SFLphone ist ein VoIP Client (kompatibel mit SIP und IAX2 Protokolle)"
 
-#: ../build/src/ui_ConfigDialog.h:1333
-msgid "ALSA &plugin"
-msgstr ""
+#: ../sflphone-client-gnome/src/menus.c:137
+msgid "About SFLphone"
+msgstr "Über SFLphone"
 
-#: ../build/src/ui_ConfigDialog.h:1334
-msgid "PulseAudio settings"
-msgstr ""
+#: ../sflphone-client-gnome/src/menus.c:161
+msgid "_Help"
+msgstr "_Hilfe"
 
-#: ../build/src/ui_ConfigDialog.h:1335
-msgid "Mute other applications during a call"
-msgstr ""
+#: ../sflphone-client-gnome/src/menus.c:296
+#: ../sflphone-client-gnome/src/menus.c:953
+msgid "_New call"
+msgstr "_Neuer Anruf"
 
-#: ../build/src/ui_ConfigDialog.h:1336
-msgid "Configure record settings"
-msgstr ""
+#: ../sflphone-client-gnome/src/menus.c:308
+#: ../sflphone-client-gnome/src/menus.c:785
+msgid "_Pick up"
+msgstr "_Abnehmen"
 
-#: ../build/src/ui_ConfigDialog.h:1338
-msgid "Destination folder"
-msgstr ""
+#: ../sflphone-client-gnome/src/menus.c:318
+#: ../sflphone-client-gnome/src/menus.c:797
+msgid "_Hang up"
+msgstr "A_uflegen"
 
-#: ../build/src/ui_ConfigDialog.h:1339
-msgid "Configure address book settings"
-msgstr ""
+#: ../sflphone-client-gnome/src/menus.c:328
+#: ../sflphone-client-gnome/src/menus.c:809
+msgid "On _Hold"
+msgstr "in _Warteschleife"
+
+#: ../sflphone-client-gnome/src/menus.c:340
+#: ../sflphone-client-gnome/src/menus.c:821
+msgid "_Record"
+msgstr "_Gespräch aufzeichnen"
 
-#: ../build/src/ui_ConfigDialog.h:1340
-msgid "Maximum &results"
-msgstr ""
+#: ../sflphone-client-gnome/src/menus.c:354
+msgid "_Account creation wizard"
+msgstr "SFLphone _Konto (Konfigurationsassistent)"
 
-#: ../build/src/ui_ConfigDialog.h:1341
-msgid "Display &photo if available"
-msgstr ""
+#: ../sflphone-client-gnome/src/menus.c:384
+msgid "_Call"
+msgstr "_Anruf"
 
-#: ../build/src/ui_ConfigDialog.h:1342
-msgid "Display phone numbers of these &types :"
-msgstr ""
+#: ../sflphone-client-gnome/src/menus.c:552
+msgid "Clear _history"
+msgstr "Liste der vorherigen Anrufen _leeren"
 
-#: ../build/src/ui_ConfigDialog.h:1343
-msgid "&Work"
-msgstr ""
+#: ../sflphone-client-gnome/src/menus.c:564
+msgid "_Accounts"
+msgstr "_Konten"
 
-#: ../build/src/ui_ConfigDialog.h:1344
-msgid "&Mobile"
-msgstr ""
+#: ../sflphone-client-gnome/src/menus.c:579
+msgid "_Edit"
+msgstr "_Editieren"
 
-#: ../build/src/ui_ConfigDialog.h:1345
-msgid "&Home"
-msgstr ""
+#: ../sflphone-client-gnome/src/menus.c:631
+msgid "_Dialpad"
+msgstr "_Wählscheibe"
 
-#: ../build/src/ui_ConfigDialog.h:1346
-msgid "Configure hooks settings"
-msgstr ""
+#: ../sflphone-client-gnome/src/menus.c:643
+msgid "_Volume controls"
+msgstr "Lautstärke Kontrollen"
 
-#: ../build/src/ui_ConfigDialog.h:1347
-msgid "URL Argument"
-msgstr ""
+#: ../sflphone-client-gnome/src/menus.c:661
+msgid "_View"
+msgstr "_Anzeigen"
 
-#: ../build/src/ui_ConfigDialog.h:1348
-msgid "SIP Protocol"
-msgstr ""
+#: ../sflphone-client-gnome/src/menus.c:881
+msgid "_Call back"
+msgstr "_zurückrufen"
 
-#: ../build/src/ui_ConfigDialog.h:1349
-msgid "IAX2 Protocol"
+#: ../sflphone-client-gnome/src/menus.c:1061
+msgid "Edit phone number"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1350
-msgid "SIP Header"
+#: ../sflphone-client-gnome/src/menus.c:1072
+msgid "Edit the phone number before making a call"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1351
-msgid "Command"
+#: ../sflphone-client-gnome/src/sflnotify.c:71
+#: ../sflphone-client-gnome/src/sflnotify.c:91
+#, c-format
+msgid "%s account : %s"
+msgstr "Konto %s : %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:75
+#, c-format
+msgid "<i>From</i> %s"
+msgstr "<i>Von</i> %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:111
+#, c-format
+msgid "Calling with %s account <i>%s</i>"
+msgstr "Mit %s Konto <i>%s</i> anrufen"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:115
+msgid "Current account"
+msgstr "Aktuelles Konto"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:130
+msgid "You have no accounts set up"
+msgstr "Sie haben noch kein Konto eingestellt"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:131
+#: ../sflphone-client-gnome/src/sflnotify.c:148
+msgid "Error"
+msgstr "Fehler"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:147
+msgid "You have no registered accounts"
+msgstr "Sie haben noch kein registriertes Konto"
+
+#: ../sflphone-client-gnome/src/statusicon.c:91
+msgid "_Show main window"
+msgstr "_Hauptfenster anzeigen"
+
+#: ../sflphone-client-gnome/src/statusicon.c:127
+#, c-format
+msgid "%i account configured"
+msgid_plural "%i accounts configured"
+msgstr[0] "%i Konto konfiguriert"
+msgstr[1] "%i Konten konfiguriert"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:113
+msgid "Account settings"
+msgstr "Kontoeinstellungen"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:147
+msgid "_Enable this account"
+msgstr "_Einschalten"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:161
+msgid "_Protocol"
+msgstr "_Protokoll"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:179
+msgid "Unknown"
+msgstr "unbekannt"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:312
+msgid "_Use Evolution address books"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1352
-msgid "Phone number formatting"
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:319
+msgid "Download limit :"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1353
-msgid "Add phone number prefix"
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:327
+msgid "cards"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1354
-msgid "Prepend"
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:333
+msgid "_Display contact photo if available"
 msgstr ""
 
-#: ../build/src/ui_dlggeneralbase.h:159
-#: ../build/src/ui_sflphone_kdeview_base.h:492
-msgid "Form"
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:341
+msgid "Fields from Evolution's address books"
 msgstr ""
 
-#: ../build/src/ui_sflphone_kdeview_base.h:493
-msgid "&Pick up"
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:345
+msgid "_Work"
 msgstr ""
 
-#: ../build/src/ui_sflphone_kdeview_base.h:494
-msgid "&Hang up"
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:351
+msgid "_Home"
 msgstr ""
 
-#: ../build/src/ui_sflphone_kdeview_base.h:495
-msgid "H&old"
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:357
+msgid "_Mobile"
 msgstr ""
 
-#: ../build/src/ui_sflphone_kdeview_base.h:496
-msgid "&Transfer"
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:364
+msgid "Address Books"
+msgstr "Adressbücher"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:368
+msgid "Select which Evolution address books to use"
 msgstr ""
 
-#: ../build/src/ui_sflphone_kdeview_base.h:497
-msgid "H&istory"
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:404
+#: ../sflphone-client-gnome/src/config/audioconf.c:576
+msgid "Name"
+msgstr "Name"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:741
+msgid "_Voice Activity Detection"
 msgstr ""
 
-#: ../build/src/ui_sflphone_kdeview_base.h:499
-msgid "Configure &accounts"
+#: ../sflphone-client-gnome/src/config/audioconf.c:751
+msgid "_Noise Reduction (Narrow-Band Companding)"
 msgstr ""
 
-#: ../build/src/ui_sflphone_kdeview_base.h:500
-msgid "Configure a&udio"
+#: ../sflphone-client-gnome/src/config/audioconf.c:780
+msgid "Sound Manager"
+msgstr "Sound Manager"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:783
+msgid "_Pulseaudio"
+msgstr "Pulseaudio"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:788
+msgid "_ALSA"
+msgstr "ALSA"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:835
+msgid "Ringtones"
+msgstr "Klingeltöne"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:841
+msgid "_Enable ringtones"
+msgstr "Klingeltöne _einschalten"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:847
+msgid "Choose a ringtone"
+msgstr "Klingelton auswählen"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
+msgid "Audio Files"
+msgstr "Audio Dateien"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:589
+msgid "Desktop Notifications"
+msgstr "Desktopbenachrichtigungen"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:593
+msgid "_Enable notifications"
+msgstr "Benachrichtigungen _einschalten"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:599
+msgid "Enable voicemail _notifications"
+msgstr "_Benachrichtigung für Voice Nachrichten"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:611
+msgid "System Tray Icon"
+msgstr "Benachrichtigungsfeld (\"System Tray\") Icon"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:614
+msgid "_Popup main window on incoming call"
+msgstr "Hauptfenster anzeigen wenn eingehendes Gespräch"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:619
+msgid "Ne_ver popup main window"
+msgstr "_Hauptfenster nie anzeigen"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:623
+msgid "Hide SFLphone window on _startup"
+msgstr "_Unsichtbar beim Start"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:629
+msgid "Calls History"
+msgstr "Liste der vorherigen Anrufen"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:632
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "_Keep my history for at least"
 msgstr ""
 
-#: ../build/src/ui_sflphone_kdeview_base.h:501
-msgid "&Configure SFLPhone"
+#: ../sflphone-client-gnome/src/config/configwindow.c:647
+msgid "PulseAudio sound server"
+msgstr "PulseAudio Sound Server"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:650
+msgid "_Mute other applications during a call"
 msgstr ""
 
-#: ../build/src/ui_sflphone_kdeview_base.h:502
-msgid "Display &volume bars"
+#: ../sflphone-client-gnome/src/config/configwindow.c:677
+msgid "Port"
+msgstr "Port"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:732
+msgid "Select a folder"
 msgstr ""
 
-#: ../build/src/ui_sflphone_kdeview_base.h:503
-msgid "&About"
+#: ../sflphone-client-gnome/src/config/configwindow.c:766
+msgid "Preferences"
+msgstr "Einstellungen"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:845
+msgid "Configured Accounts"
+msgstr "Konfigurierten Konten"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:141
+msgid "Trigger on specific _SIP header"
 msgstr ""
 
-#: ../build/src/ui_sflphone_kdeview_base.h:504
-msgid "Display &dialpad"
+#: ../sflphone-client-gnome/src/config/hooks-config.c:150
+msgid "Trigger on _IAX2 URL"
 msgstr ""
 
-#: ../build/src/ui_sflphone_kdeview_base.h:505
-msgid "&Record"
+#: ../sflphone-client-gnome/src/config/hooks-config.c:155
+msgid "Command to _run"
 msgstr ""
 
-#: ../build/src/ui_sflphone_kdeview_base.h:506
-msgid "Account creation &wizard"
+#: ../sflphone-client-gnome/src/config/hooks-config.c:169
+msgid "_Prefix dialed numbers with"
 msgstr ""
 
-#: ../build/src/ui_sflphone_kdeview_base.h:508
-msgid "Attention:number of results exceeds max displayed."
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+msgid "Search all"
+msgstr "Suche in allen"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:57
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:70
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:82
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:94
+msgid "Click here to change the search type"
 msgstr ""
 
-#~ msgid "Account Wizard"
-#~ msgstr "SFLphone Konto (Konfigurationsassistent)"
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+msgid "Search by missed call"
+msgstr "Suche nach Anruf in Abwesenheit "
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+msgid "Search by incoming call"
+msgstr "Suche nach eingehenden Anruf "
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+msgid "Search by outgoing call"
+msgstr "Suche nach ausgehenden Anru"
+
+#~ msgid "User"
+#~ msgstr "Benutzername"
+
+#~ msgid "Mailbox"
+#~ msgstr "Mailbox"
+
+#~ msgid "State"
+#~ msgstr "Status"
+
+#~ msgid "Stun settings will be applied on each account"
+#~ msgstr "Alle SIP Kontos werden mit Stun Einstellungen angepasst."
+
+#~ msgid "Audio device"
+#~ msgstr "Audio Dateien"
+
+#~ msgid "&Codecs"
+#~ msgstr "Codecs"
+
+#~ msgid "Out"
+#~ msgstr "Ausgabe"
+
+#~ msgid "On &incoming calls"
+#~ msgstr "Auf eingehende Anrufe "
+
+#~ msgid "days"
+#~ msgstr "Tag"
+
+#~ msgid "General"
+#~ msgstr "Allgemein"
+
+#~ msgid "Hold"
+#~ msgstr "In Warteschleife"
+
+#~ msgid "Configure accounts"
+#~ msgstr "Konfigurierten Konten"
+
+#~ msgid "Configure audio"
+#~ msgstr "Konfigurieren SFLphone"
+
+#~ msgctxt "Action record a call"
+#~ msgid "Record"
+#~ msgstr "Gespräch aufzeichnen"
+
+#~ msgid "accounr state"
+#~ msgstr "Kontoeinstellungen"
+
+#~ msgid "%s - %s"
+#~ msgstr "%s - %s"
diff --git a/sflphone-client-kde/po/es/sflphone-client-kde.po b/sflphone-client-kde/po/es/sflphone-client-kde.po
index d8af45b68bdc669a021952c89c623dfdfc4621c0..178c397bbfcf2e4f1f8fb72a36ad500e4cf63eef 100644
--- a/sflphone-client-kde/po/es/sflphone-client-kde.po
+++ b/sflphone-client-kde/po/es/sflphone-client-kde.po
@@ -1,607 +1,1478 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Spanish translation of SFLphone.
+# Copyright (C) 2008 2009 The Free Software Foundation, Inc.
+# This file is distributed under the GNU General Public License Version 3.
+# 
+# Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>, 2008.
+# 
+# POT-Creation-Date: 2007-01-13 01:39+0100\n
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: SFLphone 0.9.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-17 15:48-0400\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"
+"POT-Creation-Date: 2009-07-17 16:14-0400\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"
-
-#: ../src/AccountWizard.cpp:161 ../src/AccountWizard.cpp:275
-msgid "Account Creation Wizard"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:200
-msgid "Creation of account succeed with these parameters"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:211
+"Plural-Forms: nplurals=2; plural=n>1;\n"
+
+#: ../sflphone-client-kde/src/Account.cpp:34
+#: ../sflphone-client-gnome/src/accountlist.c:175
+msgctxt "account state"
+msgid "Registered"
+msgstr "Registrado"
+
+#: ../sflphone-client-kde/src/Account.cpp:36
+#: ../sflphone-client-gnome/src/accountlist.c:178
+msgctxt "account state"
+msgid "Not Registered"
+msgstr "No registrado"
+
+#: ../sflphone-client-kde/src/Account.cpp:38
+#: ../sflphone-client-gnome/src/accountlist.c:181
+msgctxt "account state"
+msgid "Trying..."
+msgstr "Intentando..."
+
+#: ../sflphone-client-kde/src/Account.cpp:40
+#: ../sflphone-client-gnome/src/accountlist.c:184
+msgctxt "account state"
+msgid "Error"
+msgstr "Error"
+
+#: ../sflphone-client-kde/src/Account.cpp:42
+#: ../sflphone-client-gnome/src/accountlist.c:187
+msgctxt "account state"
+msgid "Authentication Failed"
+msgstr "Autenticación erronea"
+
+#: ../sflphone-client-kde/src/Account.cpp:44
+#: ../sflphone-client-gnome/src/accountlist.c:190
+msgctxt "account state"
+msgid "Network unreachable"
+msgstr "Red Inaccesible"
+
+#: ../sflphone-client-kde/src/Account.cpp:46
+#: ../sflphone-client-gnome/src/accountlist.c:193
+msgctxt "account state"
+msgid "Host unreachable"
+msgstr "Parte del servidor"
+
+#: ../sflphone-client-kde/src/Account.cpp:48
+#: ../sflphone-client-gnome/src/accountlist.c:196
+msgctxt "account state"
+msgid "Stun configuration error"
+msgstr "Error de configuración Stun"
+
+#: ../sflphone-client-kde/src/Account.cpp:50
+#: ../sflphone-client-gnome/src/accountlist.c:199
+msgctxt "account state"
+msgid "Stun server invalid"
+msgstr "Servidor stun inválido"
+
+#: ../sflphone-client-kde/src/Account.cpp:51
+#: ../sflphone-client-gnome/src/accountlist.c:202
+msgctxt "account state"
+msgid "Invalid"
+msgstr "Inválido"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:163
+#: ../sflphone-client-kde/src/AccountWizard.cpp:278
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:393
+msgid "Account creation wizard"
+msgstr "Asistente de configuración de cuentas"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:199
+#: ../sflphone-client-kde/src/AccountWizard.cpp:217
+#: ../sflphone-client-kde/src/AccountWizard.cpp:561
+#: ../sflphone-client-gnome/src/assistant.c:68
+#, c-format
+msgid "This assistant is now finished."
+msgstr "Ese asistante ha finalizado."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:211
 msgid "Creation of account has failed for the reason"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:217
-msgid "Register of account succeed with these parameters"
-msgstr ""
+msgstr "Creación de cuenta ha fallado por la razón"
 
-#: ../src/AccountWizard.cpp:253 ../src/AccountWizard.cpp:437
+#: ../sflphone-client-kde/src/AccountWizard.cpp:255
+#: ../sflphone-client-kde/src/AccountWizard.cpp:440
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:363
+#: ../sflphone-client-gnome/src/assistant.c:72
 msgid "Alias"
-msgstr ""
+msgstr "Alias"
 
-#: ../src/AccountWizard.cpp:254 ../src/AccountWizard.cpp:438
+#: ../sflphone-client-kde/src/AccountWizard.cpp:256
+#: ../sflphone-client-kde/src/AccountWizard.cpp:441
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:370
+#: ../sflphone-client-gnome/src/assistant.c:75
 msgid "Server"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:255 ../src/AccountWizard.cpp:439
-msgid "User"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:256 ../src/AccountWizard.cpp:440
+msgstr "Servidor"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:257
+#: ../sflphone-client-kde/src/AccountWizard.cpp:442
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:371
+#: ../sflphone-client-gnome/src/assistant.c:78
+msgid "Username"
+msgstr "Usuario"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:258
+#: ../sflphone-client-kde/src/AccountWizard.cpp:443
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:372
 msgid "Password"
-msgstr ""
+msgstr "Contraseña"
 
-#: ../src/AccountWizard.cpp:257
+#: ../sflphone-client-kde/src/AccountWizard.cpp:259
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:364
+#: ../sflphone-client-gnome/src/config/configwindow.c:418
 msgid "Protocol"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:258
-msgid "Mailbox"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:276
-msgid "Welcome to the Account creation wizard of SFLPhone"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:278
-msgid "This wizard will help you setting up an account."
-msgstr ""
-
-#: ../src/AccountWizard.cpp:306 ../build/src/ui_ConfigDialog.h:1259
-msgid "Accounts"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:307
-msgid "Please choose between those options :"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:309
+msgstr "Protocolo"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:260
+#: ../sflphone-client-kde/src/AccountWizard.cpp:444
+msgid "Voicemail number"
+msgstr "Número de buzón de voz"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:279
+#: ../sflphone-client-gnome/src/assistant.c:216
+msgid "Welcome to the Account creation wizard of SFLphone!"
+msgstr "¡Bienvenido al asistente de configuración de cuentas de SFLphone"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:281
+#: ../sflphone-client-gnome/src/assistant.c:217
+msgid "This installation wizard will help you configure an account."
+msgstr "Este asistente de instalación le ayudará a configurar una cuenta."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:309
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Account"
+msgstr "Cuenta"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:310
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Please select one of the following options"
+msgstr "Por favor, elija una de las siguientes opciones"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:312
+#: ../sflphone-client-gnome/src/assistant.c:251
 msgid "Create a free SIP/IAX2 account on sflphone.org"
-msgstr ""
+msgstr "Crear una cuenta SIP/IAX2 gratis en sflphone.org"
 
-#: ../src/AccountWizard.cpp:310
-msgid "Register an existing SIP/IAX2 account"
-msgstr ""
+#: ../sflphone-client-kde/src/AccountWizard.cpp:313
+#: ../sflphone-client-gnome/src/assistant.c:253
+msgid "Register an existing SIP or IAX2 account"
+msgstr "Registrar una cuenta SIP o IAX2 existente"
 
-#: ../src/AccountWizard.cpp:349
+#: ../sflphone-client-kde/src/AccountWizard.cpp:352
+#: ../sflphone-client-gnome/src/assistant.c:231
 msgid "VoIP Protocols"
-msgstr ""
+msgstr "Protocolos VoIP"
 
-#: ../src/AccountWizard.cpp:350
-msgid "Choose the account type"
-msgstr ""
+#: ../sflphone-client-kde/src/AccountWizard.cpp:353
+#: ../sflphone-client-gnome/src/assistant.c:231
+msgid "Select an account type"
+msgstr "Escoja un tipo de cuenta"
 
-#: ../src/AccountWizard.cpp:352
-msgid "Register a SIP (Session Initiation Protocol) account"
+#: ../sflphone-client-kde/src/AccountWizard.cpp:355
+#: ../sflphone-client-gnome/src/assistant.c:233
+msgid "SIP (Session Initiation Protocol)"
 msgstr ""
 
-#: ../src/AccountWizard.cpp:353
-msgid "Register a IAX2 (InterAsterisk eXchange) account"
+#: ../sflphone-client-kde/src/AccountWizard.cpp:356
+#: ../sflphone-client-gnome/src/assistant.c:235
+msgid "IAX2 (InterAsterix Exchange)"
 msgstr ""
 
-#: ../src/AccountWizard.cpp:392
-msgid "Optionnal Email Address"
-msgstr ""
+#: ../sflphone-client-kde/src/AccountWizard.cpp:395
+#: ../sflphone-client-gnome/src/assistant.c:339
+msgid "Optional email address"
+msgstr "Dirección de correo opcional"
 
-#: ../src/AccountWizard.cpp:393
+#: ../sflphone-client-kde/src/AccountWizard.cpp:396
+#: ../sflphone-client-gnome/src/assistant.c:339
 msgid "This email address will be used to send your voicemail messages."
-msgstr ""
+msgstr "Esta dirección de correo se usará para mandar sus mensajes de voz"
 
-#: ../src/AccountWizard.cpp:395
+#: ../sflphone-client-kde/src/AccountWizard.cpp:398
 msgid "Email address"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:429
-msgid "SIP Account Settings"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:433
-msgid "IAX2 Account Settings"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:435
-msgid "Please full these settings fields."
-msgstr ""
-
-#: ../src/AccountWizard.cpp:512
+msgstr "Dirección de correo"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:432
+#: ../sflphone-client-gnome/src/assistant.c:266
+msgid "SIP account settings"
+msgstr "Configuración de cuenta SIP"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:436
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "IAX2 account settings"
+msgstr "Configuración de cuenta IAX2"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:438
+#: ../sflphone-client-gnome/src/assistant.c:266
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "Please fill the following information"
+msgstr "Por favor, rellene la siguiente información"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:523
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:856
 msgid "Network Address Translation (NAT)"
-msgstr ""
+msgstr "Conversión de Dirección de Red (NAT)"
 
-#: ../src/AccountWizard.cpp:513
-msgid ""
-"You should probably enable this option if you're placed under a firewall"
-msgstr ""
+#: ../sflphone-client-kde/src/AccountWizard.cpp:524
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:536
+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."
 
-#: ../src/AccountWizard.cpp:515
+#: ../sflphone-client-kde/src/AccountWizard.cpp:526
 msgid "Enable STUN"
-msgstr ""
+msgstr "Activar STUN"
 
-#: ../src/AccountWizard.cpp:516
+#: ../sflphone-client-kde/src/AccountWizard.cpp:527
 msgid "Stun Server"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:550
-msgid "Account Definition Finished"
-msgstr ""
+msgstr "Servidor STUN"
 
-#: ../src/AccountWizard.cpp:551
+#: ../sflphone-client-kde/src/AccountWizard.cpp:562
 msgid ""
 "After checking the settings you chose, click \"Finish\" to create the "
 "account."
 msgstr ""
+"Después de comprobar los ajustes usted eligió, haz clic \"Terminar\"para "
+"crear la cuenta."
 
-#: ../src/Call.cpp:116
+#: ../sflphone-client-kde/src/ActionSetAccountFirst.cpp:26
+msgid "Default account"
+msgstr "Cuenta por defecto"
+
+#: ../sflphone-client-kde/src/Call.cpp:116
+#: ../sflphone-client-gnome/src/contacts/calltree.c:322
 msgid "Transfer to : "
-msgstr ""
+msgstr "Transferir a : "
 
-#: ../src/ConfigDialog.cpp:131 ../src/ConfigDialog.cpp:263
-msgid "Attention : SIP port must be over 1024 !"
-msgstr ""
+#: ../sflphone-client-kde/src/CodecListModel.cpp:89
+#: ../sflphone-client-gnome/src/actions.c:816
+msgid "Codec"
+msgstr "Códec"
 
-#: ../src/ConfigDialog.cpp:136 ../src/ConfigDialog.cpp:266
-msgid "Attention : SIP port must be under 65536 !"
-msgstr ""
+#: ../sflphone-client-kde/src/CodecListModel.cpp:93
+#: ../sflphone-client-gnome/src/config/audioconf.c:581
+msgid "Frequency"
+msgstr "Frecuencia"
 
-#: ../src/main.cpp:49 ../src/main.cpp:50
-msgctxt "Your names"
-msgid "NAME OF TRANSLATORS"
-msgstr ""
+#: ../sflphone-client-kde/src/CodecListModel.cpp:97
+#: ../sflphone-client-gnome/src/config/audioconf.c:586
+msgid "Bitrate"
+msgstr "Tasa de transferencia"
 
-#: ../src/main.cpp:50 ../src/main.cpp:51
-msgctxt "Your emails"
-msgid "EMAIL OF TRANSLATORS"
-msgstr ""
+#: ../sflphone-client-kde/src/CodecListModel.cpp:101
+#: ../sflphone-client-gnome/src/config/audioconf.c:591
+msgid "Bandwidth"
+msgstr "Ancho de banda"
 
-#: ../src/SFLPhone.cpp:55 ../src/sflphone_kdeview.cpp:1051
-#: ../src/sflphone_kdeview.cpp:1056 ../src/sflphone_kdeview.cpp:1061
-msgid "SFLPhone"
+#: ../sflphone-client-kde/src/main.cpp:38
+msgid "SFLphone KDE Client"
+msgstr "Cliente KDE de SFLphone"
+
+#: ../sflphone-client-kde/src/main.cpp:42
+msgid "(C) 2009 Savoir-faire Linux"
 msgstr ""
 
-#: ../src/SFLPhone.cpp:154
-msgid "You still have some calls open. Please close all calls before quitting."
+#: ../sflphone-client-kde/src/main.cpp:46
+msgid "Jérémy Quentin"
 msgstr ""
 
-#: ../src/SFLPhone.cpp:182
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Maxime Chambreuil"
+
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "maxime.chambreuil@savoirfairelinux.com"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:62
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-gnome/src/statusicon.c:126
+msgid "SFLphone"
+msgstr "SFLphone"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:209
 msgid "Incoming call"
-msgstr ""
+msgstr "Llamada entrante"
 
-#: ../src/SFLPhone.cpp:183
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
 msgid "You have an incoming call from"
-msgstr ""
+msgstr "Tienes una llamada de"
 
-#: ../src/SFLPhone.cpp:183
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
 msgid "Click to accept or refuse it."
-msgstr ""
+msgstr "Haz clic para aceptar o rechazarlo"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:716
+msgid "Address book loading..."
+msgstr "Cargando el directorio..."
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:901
+#: ../sflphone-client-gnome/src/actions.c:89
+msgid "No registered accounts"
+msgstr "Ninguna cuenta registrada"
 
-#: ../src/sflphone_kdeview.cpp:1051
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:905
+#: ../sflphone-client-gnome/src/actions.c:83
+#: ../sflphone-client-gnome/src/actions.c:813
+msgid "Using account"
+msgstr "Usando la cuenta"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
 msgid "Main screen"
-msgstr ""
+msgstr "Pantalla principal"
 
-#: ../src/sflphone_kdeview.cpp:1056 ../build/src/ui_ConfigDialog.h:1271
-#: ../build/src/ui_dlggeneralbase.h:160
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:165
 msgid "Call history"
-msgstr ""
+msgstr "Historia de Llamada"
 
-#: ../src/sflphone_kdeview.cpp:1061
-#: ../build/src/ui_sflphone_kdeview_base.h:507
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:394
+#: ../sflphone-client-gnome/src/toolbar.c:243
+#: ../sflphone-client-gnome/src/toolbar.c:245
 msgid "Address book"
-msgstr ""
+msgstr "Libreta de contactos"
 
-#: ../src/sflphone_kdeview.cpp:1075 ../src/sflphone_kdeview.cpp:1131
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1108
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1173
 msgid "Edit before call"
-msgstr ""
+msgstr "Editar antes de llamar"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:41
+#: ../sflphone-client-gnome/src/toolbar.c:167
+#: ../sflphone-client-gnome/src/toolbar.c:169
+msgid "New call"
+msgstr "Nueva llamada"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:42
+#: ../sflphone-client-kde/src/sflphone_const.h:47
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:381
+#: ../sflphone-client-gnome/src/toolbar.c:186
+#: ../sflphone-client-gnome/src/toolbar.c:188
+msgid "Hang up"
+msgstr "Colgar"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:43
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:382
+#: ../sflphone-client-gnome/src/toolbar.c:207
+#: ../sflphone-client-gnome/src/toolbar.c:209
+msgid "Hold on"
+msgstr "Retener"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:44
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:383
+#: ../sflphone-client-gnome/src/toolbar.c:220
+#: ../sflphone-client-gnome/src/toolbar.c:222
+msgid "Transfer"
+msgstr "Transferir"
 
-#: ../src/sflphone_const.h:56
-msgid "Call"
-msgstr ""
+#: ../sflphone-client-kde/src/sflphone_const.h:45
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:392
+#: ../sflphone-client-gnome/src/toolbar.c:263
+msgid "Record"
+msgstr "Recordar"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:46
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:380
+#: ../sflphone-client-gnome/src/toolbar.c:176
+#: ../sflphone-client-gnome/src/toolbar.c:178
+msgid "Pick up"
+msgstr "Descolgar"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:48
+#: ../sflphone-client-gnome/src/toolbar.c:196
+#: ../sflphone-client-gnome/src/toolbar.c:198
+msgid "Hold off"
+msgstr "Seguir"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:49
+msgid "Give up transfer"
+msgstr "Abandonar transferencia"
 
-#: ../src/sflphone_const.h:57
-msgid "Hang up"
+#: ../sflphone-client-kde/src/sflphone_const.h:50
+msgid "Call back"
+msgstr "Llamar"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:48
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:91
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
+#: ../sflphone-client-gnome/src/config/configwindow.c:722
+#: ../sflphone-client-gnome/src/config/configwindow.c:791
+msgctxt "Config section"
+msgid "General"
 msgstr ""
 
-#: ../src/sflphone_const.h:58
-msgid "Hold"
-msgstr ""
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:49
+msgctxt "Config section"
+msgid "Display"
+msgstr "Mostrar"
 
-#: ../src/sflphone_const.h:59
-msgid "Transfer"
-msgstr ""
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:50
+#: ../sflphone-client-gnome/src/config/configwindow.c:833
+msgctxt "Config section"
+msgid "Accounts"
+msgstr "Cuentas"
 
-#: ../src/sflphone_const.h:60 ../build/src/ui_ConfigDialog.h:1263
-msgid "Record"
-msgstr ""
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:51
+#: ../sflphone-client-gnome/src/config/configwindow.c:786
+msgctxt "Config section"
+msgid "Audio"
+msgstr "Audio"
 
-#: ../src/sflphone_const.h:61
-msgid "Accept"
-msgstr ""
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:52
+#: ../sflphone-client-gnome/src/config/configwindow.c:801
+msgctxt "Config section"
+msgid "Address Book"
+msgstr "Libreta de direcciones"
 
-#: ../src/sflphone_const.h:62
-msgid "Refuse"
-msgstr ""
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:53
+#: ../sflphone-client-gnome/src/config/configwindow.c:796
+msgctxt "Config section"
+msgid "Recordings"
+msgstr "Grabaciones"
 
-#: ../src/sflphone_const.h:63
-msgid "Unhold"
-msgstr ""
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:54
+#: ../sflphone-client-gnome/src/config/configwindow.c:806
+msgctxt "Config section"
+msgid "Hooks"
+msgstr "Disparadores"
 
-#: ../src/sflphone_const.h:64
-msgid "Give up transfer"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:328
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows. Enable/disable them by checking/unchecking "
+"them on the left of the item. Add or remove some with \"Plus\" and \"Sub\" "
+"buttons. Edit the selected account with the form on the right."
+msgstr ""
+"Por defecto, sflphone usa la primera cuenta registrada en esa listapara "
+"llamar. Cambiar el orden de las cuentas con las flechas \"Arriba\" y \"Abajo"
+"\". Activar/Desactivar las si las selecciona/deselecciona a la izquierda. "
+"Añadir ò Eliminar algunas con los botones \"Mas\" y \"Menos\" Editar la "
+"cuenta seleccionada con el formulario a la derecha."
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:332
+msgid "Remove the selected account"
+msgstr "Eliminar la cuenta seleccionada"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:335
+msgid ""
+"This button will remove the selected account in the list below. Be sure you "
+"really don't need it anymore. If you think you might use it again later, "
+"just uncheck it."
 msgstr ""
+"Este botòn elimina la cuenta seleccionada en la siguiente lista. Esté "
+"seguroque usted no la necesita mas. Si usted piensa que, tal vez, lo va a "
+"necesitardespues, solo lo deselecciona."
 
-#: ../src/sflphone_const.h:65
-msgid "Call back"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:340
+msgid "Remove"
+msgstr "Eliminar"
 
-#: ../src/sflphone_const.h:66
-msgid "Give up search"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:342
+msgid "Add a new account"
+msgstr "Añadir una nueva cuenta"
 
-#: ../build/src/ui_ConfigDialog.h:1249
-msgid "Configuration Dialog"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:345
+msgid ""
+"This button enables you to initialize a new account. You will then be able "
+"to edit it using the form on the right."
 msgstr ""
+"Este botón le permite inicializar una nueva cuenta. Usted podrá "
+"corregirlocon el formulario a la derecha."
 
-#: ../build/src/ui_ConfigDialog.h:1250
-msgid "about"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:347
+msgid "Add"
+msgstr "Añadir"
 
-#: ../build/src/ui_ConfigDialog.h:1255 ../build/src/ui_ConfigDialog.h:1337
-msgid "General"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:349
+msgid "Get this account down"
+msgstr "Bajar esta cuenta"
 
-#: ../build/src/ui_ConfigDialog.h:1257
-msgid "Display"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:352
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:359
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows."
 msgstr ""
+"Por defecto, sflphone usa la primera cuenta registrada en esa listapara "
+"llamar. Cambiar el orden de las cuentas con las flechas \"Arriba\" y \"Abajo"
+"\"."
 
-#: ../build/src/ui_ConfigDialog.h:1261
-msgid "Audio"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:354
+msgid "Down"
+msgstr "Abajo"
 
-#: ../build/src/ui_ConfigDialog.h:1265
-msgid "Address Book"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:356
+msgid "Get this account up"
+msgstr "Subir esta cuenta"
 
-#: ../build/src/ui_ConfigDialog.h:1267
-msgid "Hooks"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:361
+msgid "Up"
+msgstr "Arriba"
 
-#: ../build/src/ui_ConfigDialog.h:1270
-msgid "Configure general settings"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:362
+msgid "Apply"
+msgstr "Aplicar"
 
-#: ../build/src/ui_ConfigDialog.h:1272 ../build/src/ui_dlggeneralbase.h:161
-msgid "&Capacity"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:367
+msgid "SIP"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1273 ../build/src/ui_dlggeneralbase.h:162
-msgid "C&lear history"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:368
+msgid "IAX"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1274 ../build/src/ui_dlggeneralbase.h:163
-msgid "Connection"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:373
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:385
+#: ../sflphone-client-gnome/src/toolbar.c:52
+#: ../sflphone-client-gnome/src/toolbar.c:251
+#: ../sflphone-client-gnome/src/toolbar.c:255
+msgid "Voicemail"
+msgstr "Mensaje de voz"
 
-#: ../build/src/ui_ConfigDialog.h:1275 ../build/src/ui_dlggeneralbase.h:164
-msgid "SIP &Port"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:374
+#: ../sflphone-client-gnome/src/config/configwindow.c:425
+msgid "Status"
+msgstr "Estado"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:377
+#: ../sflphone-client-gnome/src/config/configwindow.c:528
+msgid "Stun parameters will be applied on each SIP account created."
+msgstr "Parámetros de stun se aplicarán a cada cuenta SIP creada."
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:378
+msgid "Enable Stun"
+msgstr "Activar STUN"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:380
+#: ../sflphone-client-gnome/src/config/configwindow.c:544
+msgid "Format : name.server:port"
+msgstr "Formato : nombre.servidor:puerto"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:382
+msgid "choose Stun server (example : stunserver.org)"
+msgstr "Elija un servidor Stun (ejemplo : stunserver.org)"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:154
+msgid "Enable address book"
+msgstr "Activar la libreta de contactos"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:155
+msgid "Maximum results"
+msgstr "Resultados maximo"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:156
+msgid "Display photo if available"
+msgstr "Mostrar fotos de contactos, si está disponible"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:157
+msgid "Display phone numbers of these types :"
+msgstr "Mostrar números de este typo:"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:158
+msgid "Work"
+msgstr "Profesional"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:159
+msgid "Mobile"
+msgstr "Movil"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:160
+msgid "Home"
+msgstr "Personal"
 
-#: ../build/src/ui_ConfigDialog.h:1276 ../build/src/ui_dlggeneralbase.h:165
-msgid "Attention "
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:225
+msgid "Sound manager"
+msgstr "Gestor de audio"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:228
+msgid "ALSA"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1277
-msgid "Configure display"
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:229
+msgid "PulseAudio"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1278
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:231
+msgid "Enable ringtones"
+msgstr "Habilitar tonos de llamada"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:232
+#: ../sflphone-client-gnome/src/config/audioconf.c:812
+msgid "Codecs"
+msgstr "Códecs"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:233
+#: ../sflphone-client-gnome/src/config/audioconf.c:795
+msgid "ALSA settings"
+msgstr "Configuración de ALSA"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:234
+#: ../sflphone-client-gnome/src/config/audioconf.c:662
+msgid "ALSA plugin"
+msgstr "Plugin ALSA"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:235
+#: ../sflphone-client-gnome/src/config/audioconf.c:706
+msgid "Input"
+msgstr "Entrada"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:236
+#: ../sflphone-client-gnome/src/config/audioconf.c:684
+msgid "Output"
+msgstr "Salida"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:237
+msgid "PulseAudio settings"
+msgstr "Configuración de PulseAudio"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:238
+msgid "Mute other applications during a call"
+msgstr "Silenciar el resto de aplicaciones durante una llamada"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:121
 msgid "Enable notifications"
-msgstr ""
+msgstr "Habilitar notificaciones"
 
-#: ../build/src/ui_ConfigDialog.h:1279
-msgid "On incoming &calls"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:122
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:126
+msgid "On incoming calls"
+msgstr "Al recibir llamadas"
 
-#: ../build/src/ui_ConfigDialog.h:1280
-msgid "On &messages"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:123
+msgid "On messages"
+msgstr "Al recibir mensajes"
 
-#: ../build/src/ui_ConfigDialog.h:1281
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:124
 msgid "Show main window"
-msgstr ""
+msgstr "Mostrar ventana principal"
 
-#: ../build/src/ui_ConfigDialog.h:1282
-msgid "On &start"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:125
+msgid "On start"
+msgstr "En el arranque"
 
-#: ../build/src/ui_ConfigDialog.h:1283
-msgid "On &incoming calls"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:166
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "Keep my history for at least"
+msgstr "Guardar mi historia por lo menos"
 
-#: ../build/src/ui_ConfigDialog.h:1284
-msgid "Configure user accounts"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:167
+#: ../sflphone-client-gnome/src/config/configwindow.c:643
+msgctxt "End of 'Keep my history for at least n days.'"
+msgid "days"
+msgstr "días"
 
-#: ../build/src/ui_ConfigDialog.h:1286
-msgid "Remove this account"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:168
+msgid "Clear history"
+msgstr "Limpiar historia"
 
-#: ../build/src/ui_ConfigDialog.h:1287
-msgid "Backspace, Return"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:169
+msgid "Connection"
+msgstr "Connexión"
 
-#: ../build/src/ui_ConfigDialog.h:1288
-msgid "Add a new account"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:170
+#: ../sflphone-client-gnome/src/config/configwindow.c:664
+msgid "SIP Port"
+msgstr "Puerto SIP"
 
-#: ../build/src/ui_ConfigDialog.h:1289
-msgid "Down"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:180
+#: ../sflphone-client-gnome/src/config/hooks-config.c:130
+msgid "URL Argument"
+msgstr "Argumento de URL"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:181
+#: ../sflphone-client-gnome/src/config/hooks-config.c:135
+msgid "Custom commands on incoming calls with URL"
+msgstr "Comandos personalizados en llamada entrante con URL"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:182
+msgid "Trigger on specific SIP header"
+msgstr "Disparador en una cabecera SIP específica"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:183
+msgid "Trigger on IAX2 URL"
+msgstr "Disparador en una URL IAX2"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:184
+msgid "Command to run"
+msgstr "Comando de ejecutar"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:185
+#: ../sflphone-client-gnome/src/config/hooks-config.c:138
+#, c-format
+msgid "%s will be replaced with the passed URL."
+msgstr "%s se remplazará por la URL."
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:186
+#: ../sflphone-client-gnome/src/config/hooks-config.c:165
+msgid "Phone number rewriting"
+msgstr "Reescritura de número de teléfono"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:187
+msgid "Prefix dialed numbers with"
+msgstr "Prefijar los números marcados con"
+
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:92
+#: ../sflphone-client-gnome/src/config/configwindow.c:726
+msgid "Destination folder"
+msgstr "Carpeta de destino"
 
-#: ../build/src/ui_ConfigDialog.h:1290
-msgid "Up"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:384
+#: ../sflphone-client-gnome/src/toolbar.c:232
+#: ../sflphone-client-gnome/src/toolbar.c:234
+msgid "History"
+msgstr "Historia de Llamada"
 
-#: ../build/src/ui_ConfigDialog.h:1291
-msgid "Apply"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:386
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:388
+msgid "Configure SFLphone"
+msgstr "Configurar SFLphone"
 
-#: ../build/src/ui_ConfigDialog.h:1292
-msgid "&Alias"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:390
+msgid "Display volume controls"
+msgstr "Mostrar controles de volumen"
 
-#: ../build/src/ui_ConfigDialog.h:1293
-msgid "&Protocol"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:391
+msgid "Display dialpad"
+msgstr "Mostrar dialpad"
 
-#: ../build/src/ui_ConfigDialog.h:1296
-msgid "SIP"
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:396
+msgid "Attention:number of results exceeds max displayed."
+msgstr "Cuidado:número de resultatos excede el maximo a mostrar."
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:398
+#: ../sflphone-client-gnome/src/sliders.c:163
+msgid "Mic volume"
+msgstr "Volumen del micrófono"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:402
+#: ../sflphone-client-gnome/src/sliders.c:161
+msgid "Speakers volume"
+msgstr "Volumen de altavoces"
+
+#: ../sflphone-client-gnome/src/actions.c:54
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+#, c-format
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] "%d mensaje de voz"
+msgstr[1] "%d mensajes de voz"
+
+#: ../sflphone-client-gnome/src/actions.c:234
+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 que el demonio esté funcionando."
 
-#: ../build/src/ui_ConfigDialog.h:1297
-msgid "IAX"
-msgstr ""
+#: ../sflphone-client-gnome/src/actions.c:809
+#, c-format
+msgid "IP call - %s"
+msgstr "Llamada IP - %s"
 
-#: ../build/src/ui_ConfigDialog.h:1299
-msgid "&Server"
+#: ../sflphone-client-gnome/src/actions.c:908
+#, 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> )"
 
-#: ../build/src/ui_ConfigDialog.h:1300
-msgid "&User"
+#: ../sflphone-client-gnome/src/assistant.c:70
+msgid ""
+"You can at any time check your registration state or modify your accounts "
+"parameters in the Options/Accounts window."
+msgstr ""
+"Puede comprobar en cualquier momento su estado de registro o modificar la "
+"configuración de sus cuentas en la ventana de Opciones/Cuentas."
+
+#: ../sflphone-client-gnome/src/assistant.c:190
+msgid "SFLphone account creation wizard"
+msgstr "Asistente de creación de cuentas"
+
+#: ../sflphone-client-gnome/src/assistant.c:274
+#: ../sflphone-client-gnome/src/assistant.c:370
+#: ../sflphone-client-gnome/src/config/accountwindow.c:153
+msgid "_Alias"
+msgstr "_Alias"
+
+#: ../sflphone-client-gnome/src/assistant.c:282
+#: ../sflphone-client-gnome/src/assistant.c:378
+#: ../sflphone-client-gnome/src/config/accountwindow.c:189
+msgid "_Host name"
+msgstr "_Nombre de equipo"
+
+#: ../sflphone-client-gnome/src/assistant.c:290
+#: ../sflphone-client-gnome/src/assistant.c:386
+#: ../sflphone-client-gnome/src/config/accountwindow.c:197
+msgid "_User name"
+msgstr "_Usuario"
+
+#: ../sflphone-client-gnome/src/assistant.c:306
+#: ../sflphone-client-gnome/src/assistant.c:401
+#: ../sflphone-client-gnome/src/config/accountwindow.c:212
+msgid "_Password"
+msgstr "_Contraseña"
+
+#: ../sflphone-client-gnome/src/assistant.c:324
+#: ../sflphone-client-gnome/src/assistant.c:417
+#: ../sflphone-client-gnome/src/config/accountwindow.c:228
+msgid "_Voicemail number"
+msgstr "_Número de buzón de voz"
+
+#: ../sflphone-client-gnome/src/assistant.c:347
+msgid "_Email address"
+msgstr "_Correo"
+
+#: ../sflphone-client-gnome/src/assistant.c:444
+#: ../sflphone-client-gnome/src/config/configwindow.c:532
+msgid "E_nable STUN"
+msgstr "A_ctivar STUN"
+
+#: ../sflphone-client-gnome/src/assistant.c:451
+msgid "_STUN server"
+msgstr "_Servidor STUN"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Account Registration"
+msgstr "Registro de cuenta"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Congratulations!"
+msgstr "¡Enhorabuena!"
+
+#: ../sflphone-client-gnome/src/errors.c:29
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening playback device"
 msgstr ""
+"<b>Notificación ALSA</b>\n"
+"\n"
+"Error al abrir el dispositivo de reproducción"
 
-#: ../build/src/ui_ConfigDialog.h:1301
-msgid "Pass&word"
+#: ../sflphone-client-gnome/src/errors.c:32
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening capture device"
 msgstr ""
+"<b>Notificación ALSA</b>\n"
+"\n"
+"Error al abrir el dispositivo de captura"
 
-#: ../build/src/ui_ConfigDialog.h:1302
-#: ../build/src/ui_sflphone_kdeview_base.h:498
-msgid "&Mailbox"
-msgstr ""
+#: ../sflphone-client-gnome/src/errors.c:35
+msgid ""
+"Pulseaudio notification\n"
+"\n"
+"Pulseaudio is not running"
+msgstr ""
+"<b>Notificación de Pulseaudio</b>\n"
+"\n"
+"Pulseaudio no está funcionando"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:70
+msgid "There is one call in progress."
+msgstr "No hay llamada en curso"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:74
+msgid "There are calls in progress."
+msgstr "Hay llamadas en curso."
+
+#: ../sflphone-client-gnome/src/mainwindow.c:83
+msgid "Do you still want to quit?"
+msgstr "Sin embargo quiere parar ?"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:284
+msgid "SFLphone Error"
+msgstr "SFLphone Error"
+
+#: ../sflphone-client-gnome/src/menus.c:134
+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-client-gnome/src/menus.c:137
+msgid "About SFLphone"
+msgstr "Sobre SFLphone"
+
+#: ../sflphone-client-gnome/src/menus.c:161
+msgid "_Help"
+msgstr "_Ayuda"
+
+#: ../sflphone-client-gnome/src/menus.c:296
+#: ../sflphone-client-gnome/src/menus.c:953
+msgid "_New call"
+msgstr "_Nueva llamada"
+
+#: ../sflphone-client-gnome/src/menus.c:308
+#: ../sflphone-client-gnome/src/menus.c:785
+msgid "_Pick up"
+msgstr "_Descolgar"
+
+#: ../sflphone-client-gnome/src/menus.c:318
+#: ../sflphone-client-gnome/src/menus.c:797
+msgid "_Hang up"
+msgstr "_Colgar"
+
+#: ../sflphone-client-gnome/src/menus.c:328
+#: ../sflphone-client-gnome/src/menus.c:809
+msgid "On _Hold"
+msgstr "En _Espera"
+
+#: ../sflphone-client-gnome/src/menus.c:340
+#: ../sflphone-client-gnome/src/menus.c:821
+msgid "_Record"
+msgstr "_Recordar"
+
+#: ../sflphone-client-gnome/src/menus.c:354
+msgid "_Account creation wizard"
+msgstr "Asistente de configuración de cuentas"
+
+#: ../sflphone-client-gnome/src/menus.c:384
+msgid "_Call"
+msgstr "_Llamar"
+
+#: ../sflphone-client-gnome/src/menus.c:552
+msgid "Clear _history"
+msgstr "_Limpiar historia"
+
+#: ../sflphone-client-gnome/src/menus.c:564
+msgid "_Accounts"
+msgstr "_Cuentas"
+
+#: ../sflphone-client-gnome/src/menus.c:579
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../sflphone-client-gnome/src/menus.c:631
+msgid "_Dialpad"
+msgstr "_Teclado numérico"
+
+#: ../sflphone-client-gnome/src/menus.c:643
+msgid "_Volume controls"
+msgstr "_Controles de volumen"
+
+#: ../sflphone-client-gnome/src/menus.c:661
+msgid "_View"
+msgstr "_Ver"
+
+#: ../sflphone-client-gnome/src/menus.c:881
+msgid "_Call back"
+msgstr "_Llamar"
+
+#: ../sflphone-client-gnome/src/menus.c:1061
+msgid "Edit phone number"
+msgstr "Editar número de teléfono"
+
+#: ../sflphone-client-gnome/src/menus.c:1072
+msgid "Edit the phone number before making a call"
+msgstr "Editar el número de teléfono antes de llamar"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:71
+#: ../sflphone-client-gnome/src/sflnotify.c:91
+#, c-format
+msgid "%s account : %s"
+msgstr "%s cuenta : %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:75
+#, c-format
+msgid "<i>From</i> %s"
+msgstr "<i>De</i> %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:111
+#, c-format
+msgid "Calling with %s account <i>%s</i>"
+msgstr "Llamando con la cuenta %s <i>%s</i>"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:115
+msgid "Current account"
+msgstr "Cuenta actual"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:130
+msgid "You have no accounts set up"
+msgstr "Ninguna cuenta configurada"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:131
+#: ../sflphone-client-gnome/src/sflnotify.c:148
+msgid "Error"
+msgstr "Error"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:147
+msgid "You have no registered accounts"
+msgstr "No tiene ninguna cuenta registrada"
+
+#: ../sflphone-client-gnome/src/statusicon.c:91
+msgid "_Show main window"
+msgstr "Mostrar ventana principal"
+
+#: ../sflphone-client-gnome/src/statusicon.c:127
+#, c-format
+msgid "%i account configured"
+msgid_plural "%i accounts configured"
+msgstr[0] "%i cuenta configurada"
+msgstr[1] "%i cuentas configuradas"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:113
+msgid "Account settings"
+msgstr "Configuración de cuentas"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:147
+msgid "_Enable this account"
+msgstr "_Habilitar esta cuenta"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:161
+msgid "_Protocol"
+msgstr "_Protocolo"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:179
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:312
+msgid "_Use Evolution address books"
+msgstr "_Usar libreta de contactos de Evolution"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:319
+msgid "Download limit :"
+msgstr "Limite de descargo :"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:327
+msgid "cards"
+msgstr "tarjetas"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:333
+msgid "_Display contact photo if available"
+msgstr "_Mostrar fotos de contactos, si está disponible"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:341
+msgid "Fields from Evolution's address books"
+msgstr "Usar los siguientes campos de la libreta de direcciones de Evolution:"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:345
+msgid "_Work"
+msgstr "P_rofesional"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:351
+msgid "_Home"
+msgstr "_Personal"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:357
+msgid "_Mobile"
+msgstr "_Movil"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:364
+msgid "Address Books"
+msgstr "Directorios"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:368
+msgid "Select which Evolution address books to use"
+msgstr "Seleccione el directorio de Evolution a usar"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:404
+#: ../sflphone-client-gnome/src/config/audioconf.c:576
+msgid "Name"
+msgstr "Nombre"
 
-#: ../build/src/ui_ConfigDialog.h:1303
-msgid "State"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/audioconf.c:741
+msgid "_Voice Activity Detection"
+msgstr "_Detección de actividad de voz"
 
-#: ../build/src/ui_ConfigDialog.h:1306
-msgid "Stun settings will be applied on each account"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/audioconf.c:751
+msgid "_Noise Reduction (Narrow-Band Companding)"
+msgstr "_Reducción de ruido"
 
-#: ../build/src/ui_ConfigDialog.h:1307
-msgid "&Enable Stun"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/audioconf.c:780
+msgid "Sound Manager"
+msgstr "Gestor de audio"
 
-#: ../build/src/ui_ConfigDialog.h:1308
-msgid "Configure audio settings"
+#: ../sflphone-client-gnome/src/config/audioconf.c:783
+msgid "_Pulseaudio"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1310
-msgid "Audio &device"
+#: ../sflphone-client-gnome/src/config/audioconf.c:788
+msgid "_ALSA"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1313
-msgid "ALSA"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/audioconf.c:835
+msgid "Ringtones"
+msgstr "Tonos de llamada"
 
-#: ../build/src/ui_ConfigDialog.h:1314
-msgid "PulseAudio"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/audioconf.c:841
+msgid "_Enable ringtones"
+msgstr "_Habilitar tonos de llamada"
 
-#: ../build/src/ui_ConfigDialog.h:1316
-msgid "&Enable ringtones"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/audioconf.c:847
+msgid "Choose a ringtone"
+msgstr "Elija un tono de llmada"
 
-#: ../build/src/ui_ConfigDialog.h:1317
-msgid "&Codecs"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
+msgid "Audio Files"
+msgstr "Archivos de Audio"
 
-#: ../build/src/ui_ConfigDialog.h:1321
-msgid "Active"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:589
+msgid "Desktop Notifications"
+msgstr "Notificación de escritorio"
 
-#: ../build/src/ui_ConfigDialog.h:1323
-msgid "Name"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:593
+msgid "_Enable notifications"
+msgstr "_Activar notificaciones"
 
-#: ../build/src/ui_ConfigDialog.h:1325
-msgid "Frequency"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:599
+msgid "Enable voicemail _notifications"
+msgstr "Activar _notificaciones de mensajes de voz"
 
-#: ../build/src/ui_ConfigDialog.h:1327
-msgid "Bitrate"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:611
+msgid "System Tray Icon"
+msgstr "Icono de bandeja del sistema"
 
-#: ../build/src/ui_ConfigDialog.h:1329
-msgid "Bandwidth"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:614
+msgid "_Popup main window on incoming call"
+msgstr "_Popup ventana principal al recibir llamadas"
 
-#: ../build/src/ui_ConfigDialog.h:1330
-msgid "ALSA settings"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:619
+msgid "Ne_ver popup main window"
+msgstr "_Nunca mostrar ventana principal"
 
-#: ../build/src/ui_ConfigDialog.h:1331
-msgid "&In"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:623
+msgid "Hide SFLphone window on _startup"
+msgstr "Esconder SFLphone al principio"
 
-#: ../build/src/ui_ConfigDialog.h:1332
-msgid "&Out"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:629
+msgid "Calls History"
+msgstr "Historia de llamadas"
 
-#: ../build/src/ui_ConfigDialog.h:1333
-msgid "ALSA &plugin"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:632
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "_Keep my history for at least"
+msgstr "_Guardar mi historia por lo menos"
 
-#: ../build/src/ui_ConfigDialog.h:1334
-msgid "PulseAudio settings"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:647
+msgid "PulseAudio sound server"
+msgstr "Servidor de sonido Pulseaudio"
 
-#: ../build/src/ui_ConfigDialog.h:1335
-msgid "Mute other applications during a call"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:650
+msgid "_Mute other applications during a call"
+msgstr "Silenciar otras aplicaciones durante una llamada"
 
-#: ../build/src/ui_ConfigDialog.h:1336
-msgid "Configure record settings"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:677
+msgid "Port"
+msgstr "Puerto"
 
-#: ../build/src/ui_ConfigDialog.h:1338
-msgid "Destination folder"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:732
+msgid "Select a folder"
+msgstr "Seleccione una carpeta"
 
-#: ../build/src/ui_ConfigDialog.h:1339
-msgid "Configure address book settings"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:766
+msgid "Preferences"
+msgstr "Preferencias"
 
-#: ../build/src/ui_ConfigDialog.h:1340
-msgid "Maximum &results"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:845
+msgid "Configured Accounts"
+msgstr "Cuentas Configuradas"
 
-#: ../build/src/ui_ConfigDialog.h:1341
-msgid "Display &photo if available"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/hooks-config.c:141
+msgid "Trigger on specific _SIP header"
+msgstr "Disparador en una cabecera _SIP específica"
 
-#: ../build/src/ui_ConfigDialog.h:1342
-msgid "Display phone numbers of these &types :"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/hooks-config.c:150
+msgid "Trigger on _IAX2 URL"
+msgstr "Disparador con una URL _IAX2"
 
-#: ../build/src/ui_ConfigDialog.h:1343
-msgid "&Work"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/hooks-config.c:155
+msgid "Command to _run"
+msgstr "_Comando a ejecutar"
 
-#: ../build/src/ui_ConfigDialog.h:1344
-msgid "&Mobile"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/hooks-config.c:169
+msgid "_Prefix dialed numbers with"
+msgstr "_Prefijar los números marcados con"
 
-#: ../build/src/ui_ConfigDialog.h:1345
-msgid "&Home"
-msgstr ""
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+msgid "Search all"
+msgstr "Buscar todos"
 
-#: ../build/src/ui_ConfigDialog.h:1346
-msgid "Configure hooks settings"
-msgstr ""
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:57
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:70
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:82
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:94
+msgid "Click here to change the search type"
+msgstr "Haz clic aqui para cambiar el type de busqueda"
 
-#: ../build/src/ui_ConfigDialog.h:1347
-msgid "URL Argument"
-msgstr ""
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+msgid "Search by missed call"
+msgstr "Buscar en llamadas faltadas"
 
-#: ../build/src/ui_ConfigDialog.h:1348
-msgid "SIP Protocol"
-msgstr ""
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+msgid "Search by incoming call"
+msgstr "Buscar en llamadas entrantes"
 
-#: ../build/src/ui_ConfigDialog.h:1349
-msgid "IAX2 Protocol"
-msgstr ""
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+msgid "Search by outgoing call"
+msgstr "Buscar en llamadas saliente"
 
-#: ../build/src/ui_ConfigDialog.h:1350
-msgid "SIP Header"
-msgstr ""
+#~ msgid "User"
+#~ msgstr "Usuario"
 
-#: ../build/src/ui_ConfigDialog.h:1351
-msgid "Command"
-msgstr ""
+#~ msgid "Mailbox"
+#~ msgstr "Mensaje de voz"
 
-#: ../build/src/ui_ConfigDialog.h:1352
-msgid "Phone number formatting"
-msgstr ""
+#~ msgid "State"
+#~ msgstr "Estado"
 
-#: ../build/src/ui_ConfigDialog.h:1353
-msgid "Add phone number prefix"
-msgstr ""
+#~ msgid "Stun settings will be applied on each account"
+#~ msgstr "Parámetros de stun se aplicarán a cada cuenta SIP creada."
 
-#: ../build/src/ui_ConfigDialog.h:1354
-msgid "Prepend"
-msgstr ""
+#~ msgid "Audio device"
+#~ msgstr "Archivos de Audio"
 
-#: ../build/src/ui_dlggeneralbase.h:159
-#: ../build/src/ui_sflphone_kdeview_base.h:492
-msgid "Form"
-msgstr ""
+#~ msgid "&Codecs"
+#~ msgstr "Códecs"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:493
-msgid "&Pick up"
-msgstr ""
+#~ msgid "Out"
+#~ msgstr "Salida"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:494
-msgid "&Hang up"
-msgstr ""
+#~ msgid "On &incoming calls"
+#~ msgstr "Al recibir llamadas"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:495
-msgid "H&old"
-msgstr ""
+#~ msgid "Custom commands with URL %s will be replaced with the passed URL."
+#~ msgstr "%s se remplazará por la URL."
 
-#: ../build/src/ui_sflphone_kdeview_base.h:496
-msgid "&Transfer"
-msgstr ""
+#~ msgid "Phone number formatting"
+#~ msgstr "Reescritura de número de teléfono"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:497
-msgid "H&istory"
-msgstr ""
+#~ msgid "Add phone number prefix"
+#~ msgstr "Reescritura de número de teléfono"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:499
-msgid "Configure &accounts"
-msgstr ""
+#~ msgid "General"
+#~ msgstr "General"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:500
-msgid "Configure a&udio"
-msgstr ""
+#~ msgid "Hold"
+#~ msgstr "Retener"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:501
-msgid "&Configure SFLPhone"
-msgstr ""
+#~ msgid "Configure accounts"
+#~ msgstr "Cuentas Configuradas"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:502
-msgid "Display &volume bars"
-msgstr ""
+#~ msgid "Configure audio"
+#~ msgstr "Cuentas Configuradas"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:503
-msgid "&About"
-msgstr ""
+#~ msgid "accounr state"
+#~ msgstr "Configuración de cuentas"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:504
-msgid "Display &dialpad"
-msgstr ""
+#~ msgid "%s - %s"
+#~ msgstr "%s - %s"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:505
-msgid "&Record"
-msgstr ""
+#~ msgid "Registered"
+#~ msgstr "Registrado"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:506
-msgid "Account creation &wizard"
-msgstr ""
+#~ msgid "Not Registered"
+#~ msgstr "No registrado"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:508
-msgid "Attention:number of results exceeds max displayed."
-msgstr ""
+#~ msgid "Trying..."
+#~ msgstr "Intentando..."
+
+#~ msgid "Bad authentification"
+#~ msgstr "Autenticación erronea"
+
+#~ msgid "Network unreachable"
+#~ msgstr "Red Inaccesible"
+
+#~ msgid "Host unreachable"
+#~ msgstr "_Parte del servidor"
+
+#~ msgid "Stun configuration error"
+#~ msgstr "Error de configuración Stun"
+
+#~ msgid "Stun server invalid"
+#~ msgstr "Servidor stun inválido"
+
+#~ msgid "Invalid"
+#~ msgstr "Inválido"
+
+#~ msgid "%d voice mails"
+#~ msgstr "%d mensajes de voz"
+
+#~ msgid "No registered account"
+#~ msgstr "No tiene ninguna cuenta registrada"
+
+#~ msgid ""
+#~ "This assistant is now finished.\n"
+#~ "You can at any time check your registration state or modify your accounts "
+#~ "parameters in the Options/Accounts window.\n"
+#~ "\n"
+#~ "Alias :    %s\n"
+#~ "Server :   %s\n"
+#~ "Username : %s\n"
+#~ msgstr ""
+#~ "Ese asistante ha finalizado.\n"
+#~ "Puede comprobar en cualquier momento su estado de registro o modificar la "
+#~ "configuración de sus cuentas en la ventana de Opciones/Cuentas.\n"
+#~ "\n"
+#~ "Alias :    %s\n"
+#~ "Server :   %s\n"
+#~ "Username : %s\n"
+
+#~ msgid "SFLphone account configuration wizard"
+#~ msgstr "Asistente de configuración de cuentas de SFLphone"
+
+#~ msgid "Welcome to SFLphone!"
+#~ msgstr "¡Bienvenido a SFLphone!"
+
+#~ msgid "Select an account type:"
+#~ msgstr "Escoja un tipo de cuenta:"
+
+#~ msgid "Please select one of the following option:"
+#~ msgstr "Por favor, elija una de las siguientes opciones:"
+
+#~ msgid "SIP account configuration"
+#~ msgstr "Configuración de cuenta SIP"
+
+#~ msgid "Please fill the following information:"
+#~ msgstr "Por favor, rellene la siguiente información:"
+
+#~ msgid "Optional Email Address "
+#~ msgstr "Dirección de correo opcional "
+
+#~ msgid "This email address will be use to send your voicemail messages"
+#~ msgstr "Esta dirección de correo se usará para mandar sus mensajes de voz"
+
+#~ msgid "_Email"
+#~ msgstr "_Correo"
+
+#~ msgid "IAX2 account configuration"
+#~ msgstr "Configuración de cuenta IAX2"
+
+#~ msgid "Network Address Translation"
+#~ msgstr "Conversión de Dirección de Red (NAT)"
+
+#~ msgid "Edit phone"
+#~ msgstr "Editar teléfono"
+
+#~ msgid "%s account: %s"
+#~ msgstr "%s cuenta: %s"
+
+#~ msgid "<i>From:</i> %s"
+#~ msgstr "<i>De:</i> %s"
+
+#~ msgid "You haven't setup any accounts"
+#~ msgstr "No ha configurado cuentas"
+
+#~ msgid "SFLphone - %i accounts configured"
+#~ msgstr "SFLphone - %i cuentas configuradas"
+
+#~ msgid "\"Voicemail\" <%s>"
+#~ msgstr "\"Mensaje\" <%s>"
+
+#~ msgid "Place a call"
+#~ msgstr "Llamar"
+
+#~ msgid "Off Hold"
+#~ msgstr "Seguir"
+
+#~ msgid "Record a call"
+#~ msgstr "Grabar una llamada"
+
+#~ msgid "Account Parameters"
+#~ msgstr "Parámetros de cuenta"
+
+#~ msgid "Download limit:"
+#~ msgstr "Límite de descarga"
+
+#~ msgid "_Business phone"
+#~ msgstr "_Numero de teléfono profesional"
+
+#~ msgid "_Home phone"
+#~ msgstr "_Numero de teléfono personal"
+
+#~ msgid "_Mobile phone"
+#~ msgstr "_Número de movil"
+
+#~ msgid "Select which Evolution address books to use:"
+#~ msgstr "Seleccione las libretas de direcciones de Evolution a usar:"
+
+#~ msgid "audio device index for output = %d"
+#~ msgstr "índice del dispositivo de salida de audio = %d"
+
+#~ msgid "ALSA configuration"
+#~ msgstr "Configuración de ALSA"
+
+#~ msgid "Stun parameters will apply to each SIP account created."
+#~ msgstr "Parámetros de stun se aplicarán a cada cuenta SIP creada."
+
+#~ msgid "Enable it if you are behind a firewall"
+#~ msgstr "Actívelo si está detrás de un cortafuegos"
+
+#~ msgid "Format: name.server:port"
+#~ msgstr "Formato: nombre.servidor:puerto"
+
+#~ msgid "Port:"
+#~ msgstr "Puerto:"
+
+#~ msgid "Command to _run: "
+#~ msgstr "_Orden a ejecutar: "
+
+#~ msgid "Phone Number Rewriting"
+#~ msgstr "Reescritura de número de teléfono"
+
+#~ msgid "_Prefix dialed numbers with:"
+#~ msgstr "_prefijar los números marcados con:"
+
+#~ msgid "Accept"
+#~ msgstr "Aceptar"
+
+#~ msgid "Refuse"
+#~ msgstr "Rechazar"
+
+#~ msgid "Ignore"
+#~ msgstr "Ignorar"
+
+#~ msgid "<small>Missed call</small>"
+#~ msgstr "<small>Llamada fallida</small>"
+
+#~ msgid "<small>Duration:</small> %s"
+#~ msgstr "<small>Duración:</small> %s"
+
+#~ msgid "Fields"
+#~ msgstr "Campos"
+
+#~ msgid "_History size limit"
+#~ msgstr "Límite de tamaño de _historial"
+
+#~ msgid ""
+#~ "SFLphone can run custom commands if incoming calls come with an URL "
+#~ "attached.\n"
+#~ "In this case, %s will be replaced with the passed URL."
+#~ msgstr ""
+#~ "SFLphone puede ejecutar órdenes personalizadas si las llamadas entrantes "
+#~ "incluyen una URL.\n"
+#~ "En este caso, %s se remplazará por la URL."
+
+#~ msgid "Search history"
+#~ msgstr "Historial de búsquedas"
+
+#~ msgid "Search contact"
+#~ msgstr "_Buscar contacto"
+
+#~ msgid "Registered to %s (%s)"
+#~ msgstr "Registrado en %s (%s)"
+
+#~ msgid "%s account- %s             %s"
+#~ msgstr "%s cuenta- %s             %s"
diff --git a/sflphone-client-kde/po/fr/sflphone-client-kde.po b/sflphone-client-kde/po/fr/sflphone-client-kde.po
index fd63212aef25485185116a924b09f45c5cee4c8d..88626ad880061fb24f15e926d24083606f752ace 100644
--- a/sflphone-client-kde/po/fr/sflphone-client-kde.po
+++ b/sflphone-client-kde/po/fr/sflphone-client-kde.po
@@ -1,640 +1,1554 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# French translation of SFLphone.
+# Copyright (C) 2008 2009 The Free Software Foundation, Inc.
+# This file is distributed under the GNU General Public License Version 3.
 #
-#, fuzzy
+# Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>, 2008.
+#
+# POT-Creation-Date: 2008-01-13 01:39+0100\n
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: SFLphone 0.9.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-17 15:48-0400\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"
+"POT-Creation-Date: 2009-07-17 16:14-0400\n"
+"PO-Revision-Date: 2008-03-31 14:15\n"
+"Last-Translator: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>\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"
-
-#: ../src/AccountWizard.cpp:161 ../src/AccountWizard.cpp:275
-msgid "Account Creation Wizard"
+"Plural-Forms: nplurals=2; plural=n>1;\n"
+
+#: ../sflphone-client-kde/src/Account.cpp:34
+#: ../sflphone-client-gnome/src/accountlist.c:175
+msgctxt "account state"
+msgid "Registered"
+msgstr "Enregistré"
+
+#: ../sflphone-client-kde/src/Account.cpp:36
+#: ../sflphone-client-gnome/src/accountlist.c:178
+msgctxt "account state"
+msgid "Not Registered"
+msgstr "Non Enregistré"
+
+#: ../sflphone-client-kde/src/Account.cpp:38
+#: ../sflphone-client-gnome/src/accountlist.c:181
+msgctxt "account state"
+msgid "Trying..."
+msgstr "En cours..."
+
+#: ../sflphone-client-kde/src/Account.cpp:40
+#: ../sflphone-client-gnome/src/accountlist.c:184
+msgctxt "account state"
+msgid "Error"
+msgstr "Erreur"
+
+#: ../sflphone-client-kde/src/Account.cpp:42
+#: ../sflphone-client-gnome/src/accountlist.c:187
+msgctxt "account state"
+msgid "Authentication Failed"
+msgstr "Erreur d'authentification"
+
+#: ../sflphone-client-kde/src/Account.cpp:44
+#: ../sflphone-client-gnome/src/accountlist.c:190
+msgctxt "account state"
+msgid "Network unreachable"
+msgstr "Réseau introuvable"
+
+#: ../sflphone-client-kde/src/Account.cpp:46
+#: ../sflphone-client-gnome/src/accountlist.c:193
+msgctxt "account state"
+msgid "Host unreachable"
+msgstr "Serveur introuvable"
+
+#: ../sflphone-client-kde/src/Account.cpp:48
+#: ../sflphone-client-gnome/src/accountlist.c:196
+msgctxt "account state"
+msgid "Stun configuration error"
+msgstr "Erreur de configuration STUN"
+
+#: ../sflphone-client-kde/src/Account.cpp:50
+#: ../sflphone-client-gnome/src/accountlist.c:199
+msgctxt "account state"
+msgid "Stun server invalid"
+msgstr "Serveur STUN invalide"
+
+#: ../sflphone-client-kde/src/Account.cpp:51
+#: ../sflphone-client-gnome/src/accountlist.c:202
+msgctxt "account state"
+msgid "Invalid"
+msgstr "Non valide"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:163
+#: ../sflphone-client-kde/src/AccountWizard.cpp:278
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:393
+msgid "Account creation wizard"
 msgstr "Assistant de création de compte"
 
-#: ../src/AccountWizard.cpp:200
-#, fuzzy
-msgid "Creation of account succeed with these parameters"
-msgstr "Compte créé avec succès avec les paramètres :\n"
+#: ../sflphone-client-kde/src/AccountWizard.cpp:199
+#: ../sflphone-client-kde/src/AccountWizard.cpp:217
+#: ../sflphone-client-kde/src/AccountWizard.cpp:561
+#: ../sflphone-client-gnome/src/assistant.c:68
+#, c-format
+msgid "This assistant is now finished."
+msgstr "Cet assistant est maintenant terminé."
 
-#: ../src/AccountWizard.cpp:211
-#, fuzzy
+#: ../sflphone-client-kde/src/AccountWizard.cpp:211
 msgid "Creation of account has failed for the reason"
-msgstr "Création de compte échouée pour raison :\n"
-
-#: ../src/AccountWizard.cpp:217
-#, fuzzy
-msgid "Register of account succeed with these parameters"
-msgstr "Compte enregistré avec succès avec les paramètres :\n"
+msgstr "Échec de la création du compte pour les raisons suivantes"
 
-#: ../src/AccountWizard.cpp:253 ../src/AccountWizard.cpp:437
-#, fuzzy
+#: ../sflphone-client-kde/src/AccountWizard.cpp:255
+#: ../sflphone-client-kde/src/AccountWizard.cpp:440
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:363
+#: ../sflphone-client-gnome/src/assistant.c:72
 msgid "Alias"
 msgstr "Alias"
 
-#: ../src/AccountWizard.cpp:254 ../src/AccountWizard.cpp:438
-#, fuzzy
+#: ../sflphone-client-kde/src/AccountWizard.cpp:256
+#: ../sflphone-client-kde/src/AccountWizard.cpp:441
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:370
+#: ../sflphone-client-gnome/src/assistant.c:75
 msgid "Server"
 msgstr "Serveur"
 
-#: ../src/AccountWizard.cpp:255 ../src/AccountWizard.cpp:439
-#, fuzzy
-msgid "User"
-msgstr "Utilisateur"
+#: ../sflphone-client-kde/src/AccountWizard.cpp:257
+#: ../sflphone-client-kde/src/AccountWizard.cpp:442
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:371
+#: ../sflphone-client-gnome/src/assistant.c:78
+msgid "Username"
+msgstr "Nom d'utilisateur"
 
-#: ../src/AccountWizard.cpp:256 ../src/AccountWizard.cpp:440
-#, fuzzy
+#: ../sflphone-client-kde/src/AccountWizard.cpp:258
+#: ../sflphone-client-kde/src/AccountWizard.cpp:443
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:372
 msgid "Password"
-msgstr "Mot de passe *"
+msgstr "Mot de passe"
 
-#: ../src/AccountWizard.cpp:257
-#, fuzzy
+#: ../sflphone-client-kde/src/AccountWizard.cpp:259
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:364
+#: ../sflphone-client-gnome/src/config/configwindow.c:418
 msgid "Protocol"
 msgstr "Protocole"
 
-#: ../src/AccountWizard.cpp:258
-#, fuzzy
-msgid "Mailbox"
-msgstr "Boîte vocale"
-
-#: ../src/AccountWizard.cpp:276
-msgid "Welcome to the Account creation wizard of SFLPhone"
-msgstr "Bienvenue dans l'assistant de création de compte de SFLPhone"
-
-#: ../src/AccountWizard.cpp:278
-msgid "This wizard will help you setting up an account."
-msgstr "Cet assistant va vous aider à créer et paramètrer un compte"
-
-#: ../src/AccountWizard.cpp:306 ../build/src/ui_ConfigDialog.h:1259
-msgid "Accounts"
-msgstr "Comptes"
-
-#: ../src/AccountWizard.cpp:307
-msgid "Please choose between those options :"
-msgstr "Choisissez une des options :"
-
-#: ../src/AccountWizard.cpp:309
+#: ../sflphone-client-kde/src/AccountWizard.cpp:260
+#: ../sflphone-client-kde/src/AccountWizard.cpp:444
+msgid "Voicemail number"
+msgstr "Numéro de boîte vocale"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:279
+#: ../sflphone-client-gnome/src/assistant.c:216
+msgid "Welcome to the Account creation wizard of SFLphone!"
+msgstr "Bienvenue dans l'assistant de création de compte de SFLphone !"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:281
+#: ../sflphone-client-gnome/src/assistant.c:217
+msgid "This installation wizard will help you configure an account."
+msgstr "Cet assistant vous guidera dans la configuration d'un compte."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:309
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Account"
+msgstr "Compte"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:310
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Please select one of the following options"
+msgstr "Veuillez sélectionner une des options suivantes"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:312
+#: ../sflphone-client-gnome/src/assistant.c:251
 msgid "Create a free SIP/IAX2 account on sflphone.org"
-msgstr "Créer un compte gratuit SIP/IAX2 sur sflphone.org"
+msgstr "Créer un compte SIP/IAX2 gratuit sur sflphone.org"
 
-#: ../src/AccountWizard.cpp:310
-msgid "Register an existing SIP/IAX2 account"
-msgstr "Enregistrer un compte SIP/IAX2 existant"
+#: ../sflphone-client-kde/src/AccountWizard.cpp:313
+#: ../sflphone-client-gnome/src/assistant.c:253
+msgid "Register an existing SIP or IAX2 account"
+msgstr "Enregistrer un compte SIP ou IAX2 existant"
 
-#: ../src/AccountWizard.cpp:349
+#: ../sflphone-client-kde/src/AccountWizard.cpp:352
+#: ../sflphone-client-gnome/src/assistant.c:231
 msgid "VoIP Protocols"
 msgstr "Protocoles VoIP"
 
-#: ../src/AccountWizard.cpp:350
-#, fuzzy
-msgid "Choose the account type"
-msgstr "Choisissez le type de compte :"
+#: ../sflphone-client-kde/src/AccountWizard.cpp:353
+#: ../sflphone-client-gnome/src/assistant.c:231
+msgid "Select an account type"
+msgstr "Sélectionnez un type de compte"
 
-#: ../src/AccountWizard.cpp:352
-#, fuzzy
-msgid "Register a SIP (Session Initiation Protocol) account"
-msgstr "Créer un compte SIP (Session Initiation Protocol)"
+#: ../sflphone-client-kde/src/AccountWizard.cpp:355
+#: ../sflphone-client-gnome/src/assistant.c:233
+msgid "SIP (Session Initiation Protocol)"
+msgstr ""
 
-#: ../src/AccountWizard.cpp:353
-#, fuzzy
-msgid "Register a IAX2 (InterAsterisk eXchange) account"
-msgstr "Créer un compte IAX2 (InterAsterisk eXchange)"
+#: ../sflphone-client-kde/src/AccountWizard.cpp:356
+#: ../sflphone-client-gnome/src/assistant.c:235
+msgid "IAX2 (InterAsterix Exchange)"
+msgstr ""
 
-#: ../src/AccountWizard.cpp:392
-msgid "Optionnal Email Address"
-msgstr "Adresse email (optionnel)"
+#: ../sflphone-client-kde/src/AccountWizard.cpp:395
+#: ../sflphone-client-gnome/src/assistant.c:339
+msgid "Optional email address"
+msgstr "Adresse courriel optionnelle"
 
-#: ../src/AccountWizard.cpp:393
+#: ../sflphone-client-kde/src/AccountWizard.cpp:396
+#: ../sflphone-client-gnome/src/assistant.c:339
 msgid "This email address will be used to send your voicemail messages."
-msgstr ""
-"Cette adresse email sera utilisée pour l'envoi des messages vocaux et textes"
+msgstr "Vos messages vocaux seront envoyés par courriel à cette adresse."
 
-#: ../src/AccountWizard.cpp:395
+#: ../sflphone-client-kde/src/AccountWizard.cpp:398
 msgid "Email address"
-msgstr "Adresse email"
-
-#: ../src/AccountWizard.cpp:429
-msgid "SIP Account Settings"
-msgstr "Paramètre du compte SIP"
-
-#: ../src/AccountWizard.cpp:433
-msgid "IAX2 Account Settings"
-msgstr "Paramètre du compte IAX2"
-
-#: ../src/AccountWizard.cpp:435
-msgid "Please full these settings fields."
-msgstr "Remplissez les champs suivants."
-
-#: ../src/AccountWizard.cpp:512
+msgstr "Adresse courriel"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:432
+#: ../sflphone-client-gnome/src/assistant.c:266
+msgid "SIP account settings"
+msgstr "Paramètres de compte SIP"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:436
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "IAX2 account settings"
+msgstr "Paramètres de compte IAX2"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:438
+#: ../sflphone-client-gnome/src/assistant.c:266
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "Please fill the following information"
+msgstr "Veuillez remplir les champs suivants"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:523
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:856
 msgid "Network Address Translation (NAT)"
-msgstr "Traduction d'adresse réseau (NAT)"
+msgstr ""
 
-#: ../src/AccountWizard.cpp:513
-msgid ""
-"You should probably enable this option if you're placed under a firewall"
+#: ../sflphone-client-kde/src/AccountWizard.cpp:524
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:536
+msgid "You should probably enable this if you are behind a firewall."
 msgstr ""
+"Vous devriez probablement activer cette option si vous vous trouvez derrière "
+"un pare-feu."
 
-#: ../src/AccountWizard.cpp:515
+#: ../sflphone-client-kde/src/AccountWizard.cpp:526
 msgid "Enable STUN"
 msgstr "Activer STUN"
 
-#: ../src/AccountWizard.cpp:516
+#: ../sflphone-client-kde/src/AccountWizard.cpp:527
 msgid "Stun Server"
 msgstr "Serveur STUN"
 
-#: ../src/AccountWizard.cpp:550
-msgid "Account Definition Finished"
-msgstr "Définition du compte terminée"
-
-#: ../src/AccountWizard.cpp:551
+#: ../sflphone-client-kde/src/AccountWizard.cpp:562
 msgid ""
 "After checking the settings you chose, click \"Finish\" to create the "
 "account."
 msgstr ""
-"Une fois avoir vérifié vos paramètres, cliquez sur \"Terminer\" pour créer "
-"le compte."
+"Après avoir vérifié les paramètres choisis, cliquez sur \"Terminer\" pour "
+"créer le compte."
+
+#: ../sflphone-client-kde/src/ActionSetAccountFirst.cpp:26
+msgid "Default account"
+msgstr "Compte par défaut"
 
-#: ../src/Call.cpp:116
+#: ../sflphone-client-kde/src/Call.cpp:116
+#: ../sflphone-client-gnome/src/contacts/calltree.c:322
 msgid "Transfer to : "
-msgstr " Transférer à : "
+msgstr "Transférer à : "
 
-#: ../src/ConfigDialog.cpp:131 ../src/ConfigDialog.cpp:263
-msgid "Attention : SIP port must be over 1024 !"
-msgstr "Attention : le port SIP doit être supérieur à 1024 !"
+#: ../sflphone-client-kde/src/CodecListModel.cpp:89
+#: ../sflphone-client-gnome/src/actions.c:816
+msgid "Codec"
+msgstr "Codec"
 
-#: ../src/ConfigDialog.cpp:136 ../src/ConfigDialog.cpp:266
-msgid "Attention : SIP port must be under 65536 !"
-msgstr "Attention : le port SIP doit être inférieur à 65536 !"
+#: ../sflphone-client-kde/src/CodecListModel.cpp:93
+#: ../sflphone-client-gnome/src/config/audioconf.c:581
+msgid "Frequency"
+msgstr "Fréquence"
 
-#: ../src/main.cpp:49 ../src/main.cpp:50
-msgctxt "Your names"
-msgid "NAME OF TRANSLATORS"
-msgstr ""
+#: ../sflphone-client-kde/src/CodecListModel.cpp:97
+#: ../sflphone-client-gnome/src/config/audioconf.c:586
+msgid "Bitrate"
+msgstr "Bitrate"
 
-#: ../src/main.cpp:50 ../src/main.cpp:51
-msgctxt "Your emails"
-msgid "EMAIL OF TRANSLATORS"
-msgstr ""
+#: ../sflphone-client-kde/src/CodecListModel.cpp:101
+#: ../sflphone-client-gnome/src/config/audioconf.c:591
+msgid "Bandwidth"
+msgstr "Bande passante"
 
-#: ../src/SFLPhone.cpp:55 ../src/sflphone_kdeview.cpp:1051
-#: ../src/sflphone_kdeview.cpp:1056 ../src/sflphone_kdeview.cpp:1061
-msgid "SFLPhone"
-msgstr "SFLPhone"
+#: ../sflphone-client-kde/src/main.cpp:38
+msgid "SFLphone KDE Client"
+msgstr "SFLphone Client KDE"
 
-#: ../src/SFLPhone.cpp:154
-msgid "You still have some calls open. Please close all calls before quitting."
+#: ../sflphone-client-kde/src/main.cpp:42
+msgid "(C) 2009 Savoir-faire Linux"
 msgstr ""
-"Il reste des appels ouverts. Veuillez les raccrocher avant de quitter "
-"l'application."
 
-#: ../src/SFLPhone.cpp:182
+#: ../sflphone-client-kde/src/main.cpp:46
+msgid "Jérémy Quentin"
+msgstr ""
+
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Jérémy Quentin"
+
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "jeremy.quentin@savoirfairelinux.com"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:62
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-gnome/src/statusicon.c:126
+msgid "SFLphone"
+msgstr "SFLphone"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:209
 msgid "Incoming call"
 msgstr "Appel entrant"
 
-#: ../src/SFLPhone.cpp:183
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
 msgid "You have an incoming call from"
 msgstr "Vous avez un appel entrant de"
 
-#: ../src/SFLPhone.cpp:183
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
 msgid "Click to accept or refuse it."
-msgstr "Cliquez sur ce message pour accepter ou refuser"
+msgstr "Cliquez ici pour accepter ou refuser."
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:716
+msgid "Address book loading..."
+msgstr "Carnet d'adresse en cours de chargement..."
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:901
+#: ../sflphone-client-gnome/src/actions.c:89
+msgid "No registered accounts"
+msgstr "Pas de compte enregistré"
 
-#: ../src/sflphone_kdeview.cpp:1051
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:905
+#: ../sflphone-client-gnome/src/actions.c:83
+#: ../sflphone-client-gnome/src/actions.c:813
+msgid "Using account"
+msgstr "Utilise le compte"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
 msgid "Main screen"
 msgstr "Écran principal"
 
-#: ../src/sflphone_kdeview.cpp:1056 ../build/src/ui_ConfigDialog.h:1271
-#: ../build/src/ui_dlggeneralbase.h:160
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:165
 msgid "Call history"
-msgstr "Historique d'appel"
+msgstr "Historique d'appels"
 
-#: ../src/sflphone_kdeview.cpp:1061
-#: ../build/src/ui_sflphone_kdeview_base.h:507
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:394
+#: ../sflphone-client-gnome/src/toolbar.c:243
+#: ../sflphone-client-gnome/src/toolbar.c:245
 msgid "Address book"
-msgstr "Carnet d'adresse"
+msgstr "Carnet d'adresses"
 
-#: ../src/sflphone_kdeview.cpp:1075 ../src/sflphone_kdeview.cpp:1131
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1108
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1173
 msgid "Edit before call"
 msgstr "Éditer avant d'appeler"
 
-#: ../src/sflphone_const.h:56
-#, fuzzy
-msgid "Call"
-msgstr "Appeler"
-
-#: ../src/sflphone_const.h:57
+#: ../sflphone-client-kde/src/sflphone_const.h:41
+#: ../sflphone-client-gnome/src/toolbar.c:167
+#: ../sflphone-client-gnome/src/toolbar.c:169
+msgid "New call"
+msgstr "Nouvel appel"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:42
+#: ../sflphone-client-kde/src/sflphone_const.h:47
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:381
+#: ../sflphone-client-gnome/src/toolbar.c:186
+#: ../sflphone-client-gnome/src/toolbar.c:188
 msgid "Hang up"
 msgstr "Raccrocher"
 
-#: ../src/sflphone_const.h:58
-msgid "Hold"
+#: ../sflphone-client-kde/src/sflphone_const.h:43
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:382
+#: ../sflphone-client-gnome/src/toolbar.c:207
+#: ../sflphone-client-gnome/src/toolbar.c:209
+msgid "Hold on"
 msgstr "Mettre en attente"
 
-#: ../src/sflphone_const.h:59
+#: ../sflphone-client-kde/src/sflphone_const.h:44
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:383
+#: ../sflphone-client-gnome/src/toolbar.c:220
+#: ../sflphone-client-gnome/src/toolbar.c:222
 msgid "Transfer"
 msgstr "Transférer"
 
-#: ../src/sflphone_const.h:60 ../build/src/ui_ConfigDialog.h:1263
+#: ../sflphone-client-kde/src/sflphone_const.h:45
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:392
+#: ../sflphone-client-gnome/src/toolbar.c:263
 msgid "Record"
-msgstr "Enregistrement"
-
-#: ../src/sflphone_const.h:61
-msgid "Accept"
-msgstr "Accepter"
-
-#: ../src/sflphone_const.h:62
-msgid "Refuse"
-msgstr "Refuser"
-
-#: ../src/sflphone_const.h:63
-msgid "Unhold"
-msgstr "Reprendre l'appel"
-
-#: ../src/sflphone_const.h:64
+msgstr "Enregistrer"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:46
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:380
+#: ../sflphone-client-gnome/src/toolbar.c:176
+#: ../sflphone-client-gnome/src/toolbar.c:178
+msgid "Pick up"
+msgstr "Décrocher"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:48
+#: ../sflphone-client-gnome/src/toolbar.c:196
+#: ../sflphone-client-gnome/src/toolbar.c:198
+msgid "Hold off"
+msgstr "Reprendre"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:49
 msgid "Give up transfer"
-msgstr "Abander le transfert"
+msgstr "Abandonner le transfert"
 
-#: ../src/sflphone_const.h:65
+#: ../sflphone-client-kde/src/sflphone_const.h:50
 msgid "Call back"
 msgstr "Rappeler"
 
-#: ../src/sflphone_const.h:66
-msgid "Give up search"
-msgstr "Abandonner la recherche"
-
-#: ../build/src/ui_ConfigDialog.h:1249
-msgid "Configuration Dialog"
-msgstr "Dialogue de configuration"
-
-#: ../build/src/ui_ConfigDialog.h:1250
-msgid "about"
-msgstr "À propos"
-
-#: ../build/src/ui_ConfigDialog.h:1255 ../build/src/ui_ConfigDialog.h:1337
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:48
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:91
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
+#: ../sflphone-client-gnome/src/config/configwindow.c:722
+#: ../sflphone-client-gnome/src/config/configwindow.c:791
+msgctxt "Config section"
 msgid "General"
 msgstr "General"
 
-#: ../build/src/ui_ConfigDialog.h:1257
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:49
+msgctxt "Config section"
 msgid "Display"
 msgstr "Affichage"
 
-#: ../build/src/ui_ConfigDialog.h:1261
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:50
+#: ../sflphone-client-gnome/src/config/configwindow.c:833
+msgctxt "Config section"
+msgid "Accounts"
+msgstr "Comptes"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:51
+#: ../sflphone-client-gnome/src/config/configwindow.c:786
+msgctxt "Config section"
 msgid "Audio"
 msgstr "Audio"
 
-#: ../build/src/ui_ConfigDialog.h:1265
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:52
+#: ../sflphone-client-gnome/src/config/configwindow.c:801
+msgctxt "Config section"
 msgid "Address Book"
 msgstr "Carnet d'adresses"
 
-#: ../build/src/ui_ConfigDialog.h:1267
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:53
+#: ../sflphone-client-gnome/src/config/configwindow.c:796
+msgctxt "Config section"
+msgid "Recordings"
+msgstr "Enregistrements"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:54
+#: ../sflphone-client-gnome/src/config/configwindow.c:806
+msgctxt "Config section"
 msgid "Hooks"
 msgstr "Ancrage"
 
-#: ../build/src/ui_ConfigDialog.h:1270
-msgid "Configure general settings"
-msgstr "Configurer les paramètres généraux"
-
-#: ../build/src/ui_ConfigDialog.h:1272 ../build/src/ui_dlggeneralbase.h:161
-msgid "&Capacity"
-msgstr "&Capacité"
-
-#: ../build/src/ui_ConfigDialog.h:1273 ../build/src/ui_dlggeneralbase.h:162
-msgid "C&lear history"
-msgstr "&Effacer l'historique"
-
-#: ../build/src/ui_ConfigDialog.h:1274 ../build/src/ui_dlggeneralbase.h:163
-msgid "Connection"
-msgstr "Connexion"
-
-#: ../build/src/ui_ConfigDialog.h:1275 ../build/src/ui_dlggeneralbase.h:164
-msgid "SIP &Port"
-msgstr "Port &SIP"
-
-#: ../build/src/ui_ConfigDialog.h:1276 ../build/src/ui_dlggeneralbase.h:165
-msgid "Attention "
-msgstr "Attention "
-
-#: ../build/src/ui_ConfigDialog.h:1277
-msgid "Configure display"
-msgstr "Configurer les paramètres d'affichage"
-
-#: ../build/src/ui_ConfigDialog.h:1278
-msgid "Enable notifications"
-msgstr "Activer les notifications"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:328
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows. Enable/disable them by checking/unchecking "
+"them on the left of the item. Add or remove some with \"Plus\" and \"Sub\" "
+"buttons. Edit the selected account with the form on the right."
+msgstr ""
+"Par défaut, quand vous effectuez un appel, SFLphone utilise le premier "
+"compte dans cette liste en état \"Enregistré\". Utilisez les flèches vers le "
+"haut et vers le bas pour changer l'ordre des comptes. Activez/désactivez-les "
+"en les cochant/décochant. Ajoutez et supprimez-les avec les boutons \"+\" et "
+"\"-\". Éditez le compte sélectionné avec le formulaire de droite."
 
-#: ../build/src/ui_ConfigDialog.h:1279
-msgid "On incoming &calls"
-msgstr "Lors d'appels &entrants"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:332
+msgid "Remove the selected account"
+msgstr "Supprimer le compte sélectionné"
 
-#: ../build/src/ui_ConfigDialog.h:1280
-msgid "On &messages"
-msgstr "Lors de &messages"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:335
+msgid ""
+"This button will remove the selected account in the list below. Be sure you "
+"really don't need it anymore. If you think you might use it again later, "
+"just uncheck it."
+msgstr ""
+"Ce bouton supprime le compte actuellement sélectionné dans la liste ci-"
+"dessus. Si vous comptez réutiliser ce compte plus tard, choisissez plutôt de "
+"le décocher."
 
-#: ../build/src/ui_ConfigDialog.h:1281
-msgid "Show main window"
-msgstr "Mettre la fenêtre principale au premier plan"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:340
+msgid "Remove"
+msgstr "Supprimer"
 
-#: ../build/src/ui_ConfigDialog.h:1282
-msgid "On &start"
-msgstr "Au &démarrage"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:342
+msgid "Add a new account"
+msgstr "Ajouter un nouveau compte"
 
-#: ../build/src/ui_ConfigDialog.h:1283
-msgid "On &incoming calls"
-msgstr "Lors d'&appels entrants"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:345
+msgid ""
+"This button enables you to initialize a new account. You will then be able "
+"to edit it using the form on the right."
+msgstr ""
+"Ce bouton ajoute un nouveau compte à la liste. Vous pouvez ensuite l'éditer "
+"à partir du formulaire à droite de la liste."
 
-#: ../build/src/ui_ConfigDialog.h:1284
-msgid "Configure user accounts"
-msgstr "Configurer les comptes utilisateur"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:347
+msgid "Add"
+msgstr "Ajouter"
 
-#: ../build/src/ui_ConfigDialog.h:1286
-msgid "Remove this account"
-msgstr "Supprimer ce compte"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:349
+msgid "Get this account down"
+msgstr "Descendre ce compte dans la liste"
 
-#: ../build/src/ui_ConfigDialog.h:1287
-msgid "Backspace, Return"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:352
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:359
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows."
 msgstr ""
+"Par défaut, quand vous effectuez un appel, SFLphone utilise le premier "
+"compte dans cette liste en état \"Enregistré\". Utilisez les flèches vers le "
+"haut et vers le bas pour changer l'ordre des comptes."
 
-#: ../build/src/ui_ConfigDialog.h:1288
-msgid "Add a new account"
-msgstr "Ajouter un nouveau compte"
-
-#: ../build/src/ui_ConfigDialog.h:1289
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:354
 msgid "Down"
 msgstr "Descendre"
 
-#: ../build/src/ui_ConfigDialog.h:1290
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:356
+msgid "Get this account up"
+msgstr "Monter ce compte dans la liste"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:361
 msgid "Up"
 msgstr "Monter"
 
-#: ../build/src/ui_ConfigDialog.h:1291
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:362
 msgid "Apply"
 msgstr "Appliquer"
 
-#: ../build/src/ui_ConfigDialog.h:1292
-#, fuzzy
-msgid "&Alias"
-msgstr "Alias *"
-
-#: ../build/src/ui_ConfigDialog.h:1293
-#, fuzzy
-msgid "&Protocol"
-msgstr "Protocole : "
-
-#: ../build/src/ui_ConfigDialog.h:1296
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:367
 msgid "SIP"
-msgstr "SIP"
+msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1297
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:368
 msgid "IAX"
-msgstr "IAX"
-
-#: ../build/src/ui_ConfigDialog.h:1299
-#, fuzzy
-msgid "&Server"
-msgstr "Serveur *"
-
-#: ../build/src/ui_ConfigDialog.h:1300
-#, fuzzy
-msgid "&User"
-msgstr "Utilisateur *"
-
-#: ../build/src/ui_ConfigDialog.h:1301
-#, fuzzy
-msgid "Pass&word"
-msgstr "Mot de passe *"
-
-#: ../build/src/ui_ConfigDialog.h:1302
-#: ../build/src/ui_sflphone_kdeview_base.h:498
-#, fuzzy
-msgid "&Mailbox"
-msgstr "&Boîte vocale"
-
-#: ../build/src/ui_ConfigDialog.h:1303
-msgid "State"
-msgstr "État"
-
-#: ../build/src/ui_ConfigDialog.h:1306
-msgid "Stun settings will be applied on each account"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:373
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:385
+#: ../sflphone-client-gnome/src/toolbar.c:52
+#: ../sflphone-client-gnome/src/toolbar.c:251
+#: ../sflphone-client-gnome/src/toolbar.c:255
+msgid "Voicemail"
+msgstr "Boite vocale"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:374
+#: ../sflphone-client-gnome/src/config/configwindow.c:425
+msgid "Status"
+msgstr "Statut"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:377
+#: ../sflphone-client-gnome/src/config/configwindow.c:528
+msgid "Stun parameters will be applied on each SIP account created."
 msgstr "Les paramètres de STUN seront appliqués à tous les comptes"
 
-#: ../build/src/ui_ConfigDialog.h:1307
-#, fuzzy
-msgid "&Enable Stun"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:378
+msgid "Enable Stun"
 msgstr "Activer STUN"
 
-#: ../build/src/ui_ConfigDialog.h:1308
-msgid "Configure audio settings"
-msgstr "Configurer les paramètres audio"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:380
+#: ../sflphone-client-gnome/src/config/configwindow.c:544
+msgid "Format : name.server:port"
+msgstr "Format : nom.serveur:port"
 
-#: ../build/src/ui_ConfigDialog.h:1310
-msgid "Audio &device"
-msgstr "&Interface audio"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:382
+msgid "choose Stun server (example : stunserver.org)"
+msgstr "Choisissez un serveur STUN (exemple : stunserver.org)"
 
-#: ../build/src/ui_ConfigDialog.h:1313
-msgid "ALSA"
-msgstr "ALSA"
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:154
+msgid "Enable address book"
+msgstr "Activer le carnet d'adresses"
 
-#: ../build/src/ui_ConfigDialog.h:1314
-msgid "PulseAudio"
-msgstr "PulseAudio"
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:155
+msgid "Maximum results"
+msgstr "Nombre de résultats maximum"
 
-#: ../build/src/ui_ConfigDialog.h:1316
-msgid "&Enable ringtones"
-msgstr "&Activer les sonneries"
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:156
+msgid "Display photo if available"
+msgstr "Afficher la photo si disponible"
 
-#: ../build/src/ui_ConfigDialog.h:1317
-msgid "&Codecs"
-msgstr "&Codecs"
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:157
+msgid "Display phone numbers of these types :"
+msgstr "Afficher les numéros de téléphone"
 
-#: ../build/src/ui_ConfigDialog.h:1321
-msgid "Active"
-msgstr "Activé"
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:158
+msgid "Work"
+msgstr "Professionnels"
 
-#: ../build/src/ui_ConfigDialog.h:1323
-msgid "Name"
-msgstr "Nom"
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:159
+msgid "Mobile"
+msgstr "Mobiles"
 
-#: ../build/src/ui_ConfigDialog.h:1325
-msgid "Frequency"
-msgstr "Fréquence"
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:160
+msgid "Home"
+msgstr "Personnels"
 
-#: ../build/src/ui_ConfigDialog.h:1327
-msgid "Bitrate"
-msgstr "Bitrate"
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:225
+msgid "Sound manager"
+msgstr "Interface audio"
 
-#: ../build/src/ui_ConfigDialog.h:1329
-msgid "Bandwidth"
-msgstr "Bande passante"
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:228
+msgid "ALSA"
+msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1330
-#, fuzzy
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:229
+msgid "PulseAudio"
+msgstr ""
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:231
+msgid "Enable ringtones"
+msgstr "Activer les sonneries"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:232
+#: ../sflphone-client-gnome/src/config/audioconf.c:812
+msgid "Codecs"
+msgstr "Codecs"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:233
+#: ../sflphone-client-gnome/src/config/audioconf.c:795
 msgid "ALSA settings"
-msgstr "Paramètre du compte SIP"
+msgstr "Paramètres ALSA"
 
-#: ../build/src/ui_ConfigDialog.h:1331
-msgid "&In"
-msgstr "&Entrée"
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:234
+#: ../sflphone-client-gnome/src/config/audioconf.c:662
+msgid "ALSA plugin"
+msgstr "Greffon ALSA"
 
-#: ../build/src/ui_ConfigDialog.h:1332
-msgid "&Out"
-msgstr "&Sortie"
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:235
+#: ../sflphone-client-gnome/src/config/audioconf.c:706
+msgid "Input"
+msgstr "Entrée"
 
-#: ../build/src/ui_ConfigDialog.h:1333
-msgid "ALSA &plugin"
-msgstr "&Greffon ALSA"
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:236
+#: ../sflphone-client-gnome/src/config/audioconf.c:684
+msgid "Output"
+msgstr "Sortie"
 
-#: ../build/src/ui_ConfigDialog.h:1334
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:237
 msgid "PulseAudio settings"
-msgstr "Paramètres de PulseAudio"
+msgstr "Paramètres PulseAudio"
 
-#: ../build/src/ui_ConfigDialog.h:1335
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:238
 msgid "Mute other applications during a call"
 msgstr "Couper le son des autres applications pendant un appel"
 
-#: ../build/src/ui_ConfigDialog.h:1336
-msgid "Configure record settings"
-msgstr "Configurer les paramètres d'enregistrement"
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:121
+msgid "Enable notifications"
+msgstr "Activer les notifications"
 
-#: ../build/src/ui_ConfigDialog.h:1338
-msgid "Destination folder"
-msgstr "Dossier de destination"
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:122
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:126
+msgid "On incoming calls"
+msgstr "Lors d'appels entrants"
 
-#: ../build/src/ui_ConfigDialog.h:1339
-msgid "Configure address book settings"
-msgstr "Configurer les paramètres du carnet d'adresse"
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:123
+msgid "On messages"
+msgstr "Lors de réception de messages"
 
-#: ../build/src/ui_ConfigDialog.h:1340
-msgid "Maximum &results"
-msgstr "Nombre de résultats maximum"
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:124
+msgid "Show main window"
+msgstr "Mettre la fenêtre principale au premier plan"
 
-#: ../build/src/ui_ConfigDialog.h:1341
-msgid "Display &photo if available"
-msgstr "Afficher la &photo si disponible"
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:125
+msgid "On start"
+msgstr "Au démarrage"
 
-#: ../build/src/ui_ConfigDialog.h:1342
-msgid "Display phone numbers of these &types :"
-msgstr "Afficher les &numéros de téléphone"
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:166
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "Keep my history for at least"
+msgstr "Garder mon historique au moins"
 
-#: ../build/src/ui_ConfigDialog.h:1343
-msgid "&Work"
-msgstr "&Professionnels"
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:167
+#: ../sflphone-client-gnome/src/config/configwindow.c:643
+msgctxt "End of 'Keep my history for at least n days.'"
+msgid "days"
+msgstr "jours"
 
-#: ../build/src/ui_ConfigDialog.h:1344
-msgid "&Mobile"
-msgstr "&Mobiles"
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:168
+msgid "Clear history"
+msgstr "Effacer l'historique"
 
-#: ../build/src/ui_ConfigDialog.h:1345
-msgid "&Home"
-msgstr "P&ersonnels"
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:169
+msgid "Connection"
+msgstr "Connexion"
 
-#: ../build/src/ui_ConfigDialog.h:1346
-msgid "Configure hooks settings"
-msgstr "Configurer les paramètres d'ancrage"
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:170
+#: ../sflphone-client-gnome/src/config/configwindow.c:664
+msgid "SIP Port"
+msgstr "Port SIP"
 
-#: ../build/src/ui_ConfigDialog.h:1347
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:180
+#: ../sflphone-client-gnome/src/config/hooks-config.c:130
 msgid "URL Argument"
 msgstr "Argument URL"
 
-#: ../build/src/ui_ConfigDialog.h:1348
-#, fuzzy
-msgid "SIP Protocol"
-msgstr "Protocoles VoIP"
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:181
+#: ../sflphone-client-gnome/src/config/hooks-config.c:135
+msgid "Custom commands on incoming calls with URL"
+msgstr "Commandes personnalisées lors d'appels entrants avec une URL"
 
-#: ../build/src/ui_ConfigDialog.h:1349
-#, fuzzy
-msgid "IAX2 Protocol"
-msgstr "Protocoles VoIP"
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:182
+msgid "Trigger on specific SIP header"
+msgstr "Déclencher sur un entête SIP spécifique"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:183
+msgid "Trigger on IAX2 URL"
+msgstr "Déclencher en IAX2"
 
-#: ../build/src/ui_ConfigDialog.h:1350
-msgid "SIP Header"
-msgstr "Entête SIP"
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:184
+msgid "Command to run"
+msgstr "Commande à exécuter"
 
-#: ../build/src/ui_ConfigDialog.h:1351
-msgid "Command"
-msgstr "Commande"
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:185
+#: ../sflphone-client-gnome/src/config/hooks-config.c:138
+#, c-format
+msgid "%s will be replaced with the passed URL."
+msgstr "%s sera remplacé par l'URL passé en argument."
 
-#: ../build/src/ui_ConfigDialog.h:1352
-msgid "Phone number formatting"
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:186
+#: ../sflphone-client-gnome/src/config/hooks-config.c:165
+msgid "Phone number rewriting"
 msgstr "Réécriture des numéros appelés"
 
-#: ../build/src/ui_ConfigDialog.h:1353
-msgid "Add phone number prefix"
-msgstr "Ajouter un préfixe"
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:187
+msgid "Prefix dialed numbers with"
+msgstr "Ajouter le préfixe"
 
-#: ../build/src/ui_ConfigDialog.h:1354
-msgid "Prepend"
-msgstr "Préfixe"
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:92
+#: ../sflphone-client-gnome/src/config/configwindow.c:726
+msgid "Destination folder"
+msgstr "Dossier de destination"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:384
+#: ../sflphone-client-gnome/src/toolbar.c:232
+#: ../sflphone-client-gnome/src/toolbar.c:234
+msgid "History"
+msgstr "Historique"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:386
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:388
+msgid "Configure SFLphone"
+msgstr "Configurer SFLphone"
 
-#: ../build/src/ui_dlggeneralbase.h:159
-#: ../build/src/ui_sflphone_kdeview_base.h:492
-msgid "Form"
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:390
+msgid "Display volume controls"
+msgstr "Afficher les controles du volume"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:391
+msgid "Display dialpad"
+msgstr "Afficher le clavier"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:396
+msgid "Attention:number of results exceeds max displayed."
+msgstr "Attention:tous les résultats ne sont pas affichés."
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:398
+#: ../sflphone-client-gnome/src/sliders.c:163
+msgid "Mic volume"
+msgstr "Volume du micro"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:402
+#: ../sflphone-client-gnome/src/sliders.c:161
+msgid "Speakers volume"
+msgstr "Volume des hauts-parleurs"
+
+#: ../sflphone-client-gnome/src/actions.c:54
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+#, c-format
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] "%d message vocal"
+msgstr[1] "%d messages vocaux"
+
+#: ../sflphone-client-gnome/src/actions.c:234
+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é."
 
-#: ../build/src/ui_sflphone_kdeview_base.h:493
-msgid "&Pick up"
-msgstr "&Décrocher"
+#: ../sflphone-client-gnome/src/actions.c:809
+#, c-format
+msgid "IP call - %s"
+msgstr "Appel IP - %s"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:494
-#, fuzzy
-msgid "&Hang up"
-msgstr "&Raccrocher"
+#: ../sflphone-client-gnome/src/actions.c:908
+#, 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> )"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:495
-#, fuzzy
-msgid "H&old"
-msgstr "&Mettre en attente"
+#: ../sflphone-client-gnome/src/assistant.c:70
+msgid ""
+"You can at any time check your registration state or modify your accounts "
+"parameters in the Options/Accounts window."
+msgstr ""
+"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-client-gnome/src/assistant.c:190
+msgid "SFLphone account creation wizard"
+msgstr "Assistant de création de compte de SFLphone"
+
+#: ../sflphone-client-gnome/src/assistant.c:274
+#: ../sflphone-client-gnome/src/assistant.c:370
+#: ../sflphone-client-gnome/src/config/accountwindow.c:153
+msgid "_Alias"
+msgstr "A_lias"
+
+#: ../sflphone-client-gnome/src/assistant.c:282
+#: ../sflphone-client-gnome/src/assistant.c:378
+#: ../sflphone-client-gnome/src/config/accountwindow.c:189
+msgid "_Host name"
+msgstr "_Serveur"
+
+#: ../sflphone-client-gnome/src/assistant.c:290
+#: ../sflphone-client-gnome/src/assistant.c:386
+#: ../sflphone-client-gnome/src/config/accountwindow.c:197
+msgid "_User name"
+msgstr "Usa_ger"
+
+#: ../sflphone-client-gnome/src/assistant.c:306
+#: ../sflphone-client-gnome/src/assistant.c:401
+#: ../sflphone-client-gnome/src/config/accountwindow.c:212
+msgid "_Password"
+msgstr "_Mot de passe"
+
+#: ../sflphone-client-gnome/src/assistant.c:324
+#: ../sflphone-client-gnome/src/assistant.c:417
+#: ../sflphone-client-gnome/src/config/accountwindow.c:228
+msgid "_Voicemail number"
+msgstr "_Boite vocale #"
+
+#: ../sflphone-client-gnome/src/assistant.c:347
+msgid "_Email address"
+msgstr "A_dresse courriel"
+
+#: ../sflphone-client-gnome/src/assistant.c:444
+#: ../sflphone-client-gnome/src/config/configwindow.c:532
+msgid "E_nable STUN"
+msgstr "A_ctiver STUN"
+
+#: ../sflphone-client-gnome/src/assistant.c:451
+msgid "_STUN server"
+msgstr "S_erveur STUN"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Account Registration"
+msgstr "Enregistrement du compte"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Congratulations!"
+msgstr "Félicitations!"
+
+#: ../sflphone-client-gnome/src/errors.c:29
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening playback device"
+msgstr ""
+"Notification ALSA\n"
+"\n"
+"Erreur lors de l'ouverture du périphérique de sortie"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:496
-#, fuzzy
-msgid "&Transfer"
-msgstr "&Transférer"
+#: ../sflphone-client-gnome/src/errors.c:32
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening capture device"
+msgstr ""
+"Notification ALSA\n"
+"\n"
+"Erreur lors de l'ouverture du périphérique d'entrée"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:497
-msgid "H&istory"
-msgstr "&Historique"
+#: ../sflphone-client-gnome/src/errors.c:35
+msgid ""
+"Pulseaudio notification\n"
+"\n"
+"Pulseaudio is not running"
+msgstr ""
+"Notification Pulseaudio\n"
+"\n"
+"Pulseaudio n'est pas lancé"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:499
-msgid "Configure &accounts"
-msgstr "Configurer les &comptes"
+#: ../sflphone-client-gnome/src/mainwindow.c:70
+msgid "There is one call in progress."
+msgstr "Vous avez un appel en cours."
 
-#: ../build/src/ui_sflphone_kdeview_base.h:500
-msgid "Configure a&udio"
-msgstr "Configurer les paramètres &audio"
+#: ../sflphone-client-gnome/src/mainwindow.c:74
+msgid "There are calls in progress."
+msgstr "Vous avez des appels en cours."
 
-#: ../build/src/ui_sflphone_kdeview_base.h:501
-msgid "&Configure SFLPhone"
-msgstr "&Configurer SFLPhone"
+#: ../sflphone-client-gnome/src/mainwindow.c:83
+msgid "Do you still want to quit?"
+msgstr "Voulez-vous quitter?"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:502
-msgid "Display &volume bars"
-msgstr "Afficher les barres de &volume"
+#: ../sflphone-client-gnome/src/mainwindow.c:284
+msgid "SFLphone Error"
+msgstr "Erreur SFLphone"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:503
-msgid "&About"
-msgstr "À &propos"
+#: ../sflphone-client-gnome/src/menus.c:134
+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-client-gnome/src/menus.c:137
+msgid "About SFLphone"
+msgstr "A propos de SFLphone"
+
+#: ../sflphone-client-gnome/src/menus.c:161
+msgid "_Help"
+msgstr "A_ide"
+
+#: ../sflphone-client-gnome/src/menus.c:296
+#: ../sflphone-client-gnome/src/menus.c:953
+msgid "_New call"
+msgstr "_Nouvel appel"
+
+#: ../sflphone-client-gnome/src/menus.c:308
+#: ../sflphone-client-gnome/src/menus.c:785
+msgid "_Pick up"
+msgstr "_Décrocher"
+
+#: ../sflphone-client-gnome/src/menus.c:318
+#: ../sflphone-client-gnome/src/menus.c:797
+msgid "_Hang up"
+msgstr "_Raccrocher"
+
+#: ../sflphone-client-gnome/src/menus.c:328
+#: ../sflphone-client-gnome/src/menus.c:809
+msgid "On _Hold"
+msgstr "_Mettre en attente"
+
+#: ../sflphone-client-gnome/src/menus.c:340
+#: ../sflphone-client-gnome/src/menus.c:821
+msgid "_Record"
+msgstr "Enregistrer"
+
+#: ../sflphone-client-gnome/src/menus.c:354
+msgid "_Account creation wizard"
+msgstr "_Assistant de création de compte"
+
+#: ../sflphone-client-gnome/src/menus.c:384
+msgid "_Call"
+msgstr "_Actions"
+
+#: ../sflphone-client-gnome/src/menus.c:552
+msgid "Clear _history"
+msgstr "Effacer l'_historique"
+
+#: ../sflphone-client-gnome/src/menus.c:564
+msgid "_Accounts"
+msgstr "Co_mptes"
+
+#: ../sflphone-client-gnome/src/menus.c:579
+msgid "_Edit"
+msgstr "_Editer"
+
+#: ../sflphone-client-gnome/src/menus.c:631
+msgid "_Dialpad"
+msgstr "_Clavier"
+
+#: ../sflphone-client-gnome/src/menus.c:643
+msgid "_Volume controls"
+msgstr "Contrôle du _volume"
+
+#: ../sflphone-client-gnome/src/menus.c:661
+msgid "_View"
+msgstr "A_ffichage"
+
+#: ../sflphone-client-gnome/src/menus.c:881
+msgid "_Call back"
+msgstr "_Rappeler"
+
+#: ../sflphone-client-gnome/src/menus.c:1061
+msgid "Edit phone number"
+msgstr "Éditer le numéro"
+
+#: ../sflphone-client-gnome/src/menus.c:1072
+msgid "Edit the phone number before making a call"
+msgstr "Éditer le numéro de téléphone avant d'appeler"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:71
+#: ../sflphone-client-gnome/src/sflnotify.c:91
+#, c-format
+msgid "%s account : %s"
+msgstr "%s account : %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:75
+#, c-format
+msgid "<i>From</i> %s"
+msgstr "<i>De</i> %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:111
+#, c-format
+msgid "Calling with %s account <i>%s</i>"
+msgstr "Appel avec le compte %s <i>%s</i>"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:115
+msgid "Current account"
+msgstr "Compte courant"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:130
+msgid "You have no accounts set up"
+msgstr "Vous n'avez pas configuré de compte"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:131
+#: ../sflphone-client-gnome/src/sflnotify.c:148
+msgid "Error"
+msgstr "Erreur"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:147
+msgid "You have no registered accounts"
+msgstr "Vous n'avez aucun compte enregistré"
+
+#: ../sflphone-client-gnome/src/statusicon.c:91
+msgid "_Show main window"
+msgstr "_Afficher la fenêtre principale"
+
+#: ../sflphone-client-gnome/src/statusicon.c:127
+#, c-format
+msgid "%i account configured"
+msgid_plural "%i accounts configured"
+msgstr[0] "%i compte configuré"
+msgstr[1] "%i comptes configurés"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:113
+msgid "Account settings"
+msgstr "Paramètre des comptes"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:147
+msgid "_Enable this account"
+msgstr "Activer ce compte"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:161
+msgid "_Protocol"
+msgstr "P_rotocole"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:179
+msgid "Unknown"
+msgstr "Inconnu"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:312
+msgid "_Use Evolution address books"
+msgstr "_Utiliser les carnets d'adresse d'Évolution"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:319
+msgid "Download limit :"
+msgstr "Limite de téléchargement :"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:327
+msgid "cards"
+msgstr "entrées"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:333
+msgid "_Display contact photo if available"
+msgstr "_Afficher la photo si disponible"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:341
+msgid "Fields from Evolution's address books"
+msgstr "Utiliser les champs suivants des carnets d'adresse d'Évolution"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:345
+msgid "_Work"
+msgstr "_Professionnels"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:351
+msgid "_Home"
+msgstr "P_ersonnels"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:357
+msgid "_Mobile"
+msgstr "_Mobiles"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:364
+msgid "Address Books"
+msgstr "Carnets d'adresses"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:368
+msgid "Select which Evolution address books to use"
+msgstr "Sélectionnez les carnets d'adresses d'Evolution à utiliser"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:404
+#: ../sflphone-client-gnome/src/config/audioconf.c:576
+msgid "Name"
+msgstr "Nom"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:504
-msgid "Display &dialpad"
-msgstr "Afficher le &clavier"
+#: ../sflphone-client-gnome/src/config/audioconf.c:741
+msgid "_Voice Activity Detection"
+msgstr "Détection de l'activité de la voix"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:505
-#, fuzzy
-msgid "&Record"
-msgstr "&Enregistrer"
+#: ../sflphone-client-gnome/src/config/audioconf.c:751
+msgid "_Noise Reduction (Narrow-Band Companding)"
+msgstr "Réduction du bruit (Compresseur extenseur LBR)"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:506
-#, fuzzy
-msgid "Account creation &wizard"
-msgstr "Assistant de c&réation de compte"
+#: ../sflphone-client-gnome/src/config/audioconf.c:780
+msgid "Sound Manager"
+msgstr "Interface Audio"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:508
-msgid "Attention:number of results exceeds max displayed."
-msgstr "Attention:tous les résultats ne sont pas affichés."
+#: ../sflphone-client-gnome/src/config/audioconf.c:783
+msgid "_Pulseaudio"
+msgstr "_Pulseaudio"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:788
+msgid "_ALSA"
+msgstr "_ALSA"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:835
+msgid "Ringtones"
+msgstr "Sonneries"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:841
+msgid "_Enable ringtones"
+msgstr "_Activer les sonneries"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:847
+msgid "Choose a ringtone"
+msgstr "Sélectionner une sonnerie"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
+msgid "Audio Files"
+msgstr "Fichier Audio"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:589
+msgid "Desktop Notifications"
+msgstr "Notifications de Bureau"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:593
+msgid "_Enable notifications"
+msgstr "_Activer les notifications"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:599
+msgid "Enable voicemail _notifications"
+msgstr "Activer les notifications de boîte _vocale"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:611
+msgid "System Tray Icon"
+msgstr "Icône dans la barre des tâches"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:614
+msgid "_Popup main window on incoming call"
+msgstr "Faire apparaître la fenêtre _principale lors d'appel entrant"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:619
+msgid "Ne_ver popup main window"
+msgstr "Ne _jamais afficher la fenêtre principale"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:623
+msgid "Hide SFLphone window on _startup"
+msgstr "_Cacher la fenêtre de SFLphone au démarrage"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:629
+msgid "Calls History"
+msgstr "Historique des appels"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:632
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "_Keep my history for at least"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:647
+msgid "PulseAudio sound server"
+msgstr "Serveur de son PulseAudio"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:650
+msgid "_Mute other applications during a call"
+msgstr "Éteindre le _son des autres applications lors d'un appel"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:677
+msgid "Port"
+msgstr "Port"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:732
+msgid "Select a folder"
+msgstr "Choisissez un dossier"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:766
+msgid "Preferences"
+msgstr "Préférences"
+
+#: ../sflphone-client-gnome/src/config/configwindow.c:845
+msgid "Configured Accounts"
+msgstr "Comptes Configurés"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:141
+msgid "Trigger on specific _SIP header"
+msgstr "Déclencher sur un entête _SIP spécifique"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:150
+msgid "Trigger on _IAX2 URL"
+msgstr "Déclencher en _IAX2"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:155
+msgid "Command to _run"
+msgstr "Commande à e_xécuter"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:169
+msgid "_Prefix dialed numbers with"
+msgstr "_Préfixer les numéros composés par"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+msgid "Search all"
+msgstr "Rechercher dans tous"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:57
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:70
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:82
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:94
+msgid "Click here to change the search type"
+msgstr "Cliquez ici pour changer le type de recherche"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+msgid "Search by missed call"
+msgstr "Rechercher dans les appels manqués"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+msgid "Search by incoming call"
+msgstr "Rechercher dans les appels entrants"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+msgid "Search by outgoing call"
+msgstr "Rechercher dans les appels sortants"
+
+#~ msgid "User"
+#~ msgstr "Nom d'utilisateur"
+
+#~ msgid "Mailbox"
+#~ msgstr "Boîte vocale"
+
+#~ msgid "State"
+#~ msgstr "Statut"
+
+#~ msgid "Stun settings will be applied on each account"
+#~ msgstr "Les paramètres de STUN seront appliqués à tous les comptes"
+
+#~ msgid "Audio device"
+#~ msgstr "Fichier Audio"
+
+#~ msgid "&Codecs"
+#~ msgstr "Codecs"
+
+#~ msgid "Out"
+#~ msgstr "Sortie"
+
+#~ msgid "On &incoming calls"
+#~ msgstr "Lors d'appels entrants"
+
+#~ msgid "days"
+#~ msgstr "jours"
+
+#~ msgid "Custom commands with URL %s will be replaced with the passed URL."
+#~ msgstr "%s sera remplacé par l'URL passé en argument."
+
+#~ msgid "Phone number formatting"
+#~ msgstr "Réécriture des numéros appelés"
+
+#~ msgid "Add phone number prefix"
+#~ msgstr "Ajouter un préfixe au numéro"
+
+#~ msgid "General"
+#~ msgstr "Général"
+
+#~ msgid "Hold"
+#~ msgstr "Mettre en attente"
+
+#~ msgid "Configure accounts"
+#~ msgstr "Comptes Configurés"
+
+#~ msgid "Configure audio"
+#~ msgstr "Configurer l'audio"
+
+#~ msgctxt "Action record a call"
+#~ msgid "Record"
+#~ msgstr "Enregistrer"
+
+#~ msgid "accounr state"
+#~ msgstr "Paramètre des comptes"
+
+#~ msgid "%s - %s"
+#~ msgstr "%s - %s"
+
+#~ msgid "Registered"
+#~ msgstr "Enregistré"
+
+#~ msgid "Not Registered"
+#~ msgstr "Non Enregistré"
+
+#~ msgid "Trying..."
+#~ msgstr "En cours..."
+
+#~ msgid "Bad authentification"
+#~ msgstr "Erreur d'authentification"
+
+#~ msgid "Network unreachable"
+#~ msgstr "Réseau non trouvé"
+
+#~ msgid "Host unreachable"
+#~ msgstr "Serveur introuvable"
+
+#~ msgid "Stun configuration error"
+#~ msgstr "Erreur de configuration Stun"
+
+#~ msgid "Stun server invalid"
+#~ msgstr "Serveur Stun invalide"
+
+#~ msgid "Invalid"
+#~ msgstr "Non valide"
+
+#~ msgid "%d voice mails"
+#~ msgstr "%d messages vocaux"
+
+#~ msgid "Using %s (%s)"
+#~ msgstr "Utilise %s (%s)"
+
+#~ msgid "No registered account"
+#~ msgstr "Aucun compte enregistré"
+
+#~ msgid "Using %s (%s) - Codec: %s"
+#~ msgstr "Utilise %s (%s) - Codec: %s"
+
+#~ msgid ""
+#~ "This assistant is now finished.\n"
+#~ "You can at any time check your registration state or modify your accounts "
+#~ "parameters in the Options/Accounts window.\n"
+#~ "\n"
+#~ "Alias :    %s\n"
+#~ "Server :   %s\n"
+#~ "Username : %s\n"
+#~ msgstr ""
+#~ "Cet assistant est maintenant terminé.\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.\n"
+#~ "\n"
+#~ "Alias :    %s\n"
+#~ "Serveur :   %s\n"
+#~ "Nom d'usager : %s\n"
+
+#~ msgid "SFLphone account configuration wizard"
+#~ msgstr "Assistant de configuration de compte"
+
+#~ msgid "Welcome to SFLphone!"
+#~ msgstr "Bienvenue dans SFLphone"
+
+#~ msgid "Select an account type:"
+#~ msgstr "Choisissez un type de compte:"
+
+#~ msgid "Please select one of the following option:"
+#~ msgstr "Veuillez remplir les champs suivants:"
+
+#~ msgid "SIP account configuration"
+#~ msgstr "Configuration d'un compte SIP"
+
+#~ msgid "Please fill the following information:"
+#~ msgstr "Veuillez remplir les champs suivants:"
+
+#~ msgid "Optional Email Address "
+#~ msgstr "Courriel optionnel"
+
+#~ msgid "This email address will be use to send your voicemail messages"
+#~ msgstr "Vos messages vocaux seront envoyés par courriel à cette adresse "
+
+#~ msgid "_Email"
+#~ msgstr "_Email"
+
+#~ msgid "IAX2 account configuration"
+#~ msgstr "Configuration d'un compte IAX2"
+
+#~ msgid "Network Address Translation"
+#~ msgstr "Traduction d'adresse réseau (NAT)"
+
+#~ msgid "Edit phone"
+#~ msgstr "Éditer numéro"
+
+#~ msgid "%s account: %s"
+#~ msgstr "Compte %s: %s"
+
+#~ msgid "<i>From:</i> %s"
+#~ msgstr "<i>De:</i> %s"
+
+#~ msgid "You haven't setup any accounts"
+#~ msgstr "Vous n'avez aucun compte configuré"
+
+#~ msgid "SFLphone - %i accounts configured"
+#~ msgstr "SFLphone - %i comptes configurés"
+
+#~ msgid "\"Voicemail\" <%s>"
+#~ msgstr "\"Boite vocale\" <%s>"
+
+#~ msgid "Place a call"
+#~ msgstr "Appeler"
+
+#~ msgid "Off Hold"
+#~ msgstr "Reprendre"
+
+#~ msgid "On Hold"
+#~ msgstr "Mettre en attente"
+
+#~ msgid "Record a call"
+#~ msgstr "_Enregistrer un appel"
+
+#~ msgid "Account Parameters"
+#~ msgstr "Paramètres du Compte"
+
+#~ msgid "Download limit:"
+#~ msgstr "Limite de _téléchargement:"
+
+#~ msgid "_Business phone"
+#~ msgstr "Tél du _bureau"
+
+#~ msgid "_Home phone"
+#~ msgstr "Tél du _domicile"
+
+#~ msgid "_Mobile phone"
+#~ msgstr "Tél _portable"
+
+#~ msgid "Select which Evolution address books to use:"
+#~ msgstr "Sélectionner quels carnets d'adresse d'Évolution utiliser:"
+
+#~ msgid "audio device index for output = %d"
+#~ msgstr "index du device audio de sortie = %d"
+
+#~ msgid "ALSA configuration"
+#~ msgstr "Configuration ALSA"
+
+#~ msgid "Stun parameters will apply to each SIP account created."
+#~ msgstr "Les paramètres STUN sont appliqués à tous les comptes SIP créés"
+
+#~ msgid "Enable it if you are behind a firewall"
+#~ msgstr ""
+#~ "À activer si vous êtes derrière un pare-feu, puis redémarrez SFLphone"
+
+#~ msgid "Format: name.server:port"
+#~ msgstr "Format: nom.serveur:port"
+
+#~ msgid "Recordings folder"
+#~ msgstr "Dossier pour les enregistrements"
+
+#~ msgid "General Settings"
+#~ msgstr "Préférences"
+
+#~ msgid "Audio Settings"
+#~ msgstr "Paramètres Audio"
+
+#~ msgid "Recordings"
+#~ msgstr "Enregistrements"
+
+#~ msgid "Address Book"
+#~ msgstr "Carnet d'adresse"
+
+#~ msgid "Hooks"
+#~ msgstr "Ancrage"
+
+#~ msgid "Accounts"
+#~ msgstr "Comptes"
+
+#~ msgid "URL Passing"
+#~ msgstr "Passage d'URL"
+
+#~ msgid "Command to _run: "
+#~ msgstr "Commande à _exécuter: "
+
+#~ msgid "Phone Number Rewriting"
+#~ msgstr "Rééecriture du numéro"
+
+#~ msgid "_Prefix dialed numbers with:"
+#~ msgstr "_Préfixer les numéros composés par:"
+
+#~ msgid "Accept"
+#~ msgstr "Accepter"
+
+#~ msgid "Refuse"
+#~ msgstr "Refuser"
+
+#~ msgid "Ignore"
+#~ msgstr "Ignorer"
+
+#~ msgid "<small>Missed call</small>"
+#~ msgstr "<small>Appel manqué</small>"
+
+#~ msgid "<small>Duration:</small> %s"
+#~ msgstr "<small>Durée:</small> %s"
+
+#~ msgid "Fields"
+#~ msgstr "Champs"
+
+#~ msgid "_History size limit"
+#~ msgstr "_Taille limite de l'historique"
+
+#~ msgid ""
+#~ "SFLphone can run custom commands if incoming calls come with an URL "
+#~ "attached.\n"
+#~ "In this case, %s will be replaced with the passed URL."
+#~ msgstr ""
+#~ "SFLphone peut exécuter des commandes lors d'appels entrants qui ont un "
+#~ "URL associé.\n"
+#~ "Dans ce cas, %s sera remplacé par l'URL en question."
+
+#~ msgid "Search history"
+#~ msgstr "Rechercher"
+
+#~ msgid "Search contact"
+#~ msgstr "Rechercher un contact"
+
+#~ msgid "Registered to %s (%s)"
+#~ msgstr "Connecté avec %s (%s)"
+
+#~ msgid "%s account- %s             %s"
+#~ msgstr "compte %s- %s             %s"
+
+#~ msgid "Books"
+#~ msgstr "Carnets d'adresse"
+
+#~ msgid "_Enable"
+#~ msgstr "_Activer"
+
+#~ msgid "_Notify voice mails"
+#~ msgstr "_Notifier les messages vocaux"
+
+#~ msgid "_Start hidden"
+#~ msgstr "_Démarrer caché"
+
+#~ msgid "_Maximum number of calls"
+#~ msgstr "N_ombre maximum d'appels"
+
+#~ msgid "_Control running applications volume"
+#~ msgstr "_Autoriser à modifier le volume des autres applications"
+
+#~ msgid "Account previously setup"
+#~ msgstr "Liste des comptes existants"
+
+#~ msgid "URL argument"
+#~ msgstr "Argument URL"
+
+#~ msgid "_SIP protocol"
+#~ msgstr "_Protocole SIP"
+
+#~ msgid "_SIP Header: "
+#~ msgstr "En-tête SIP: "
+
+#~ msgid "_IAX2 protocol"
+#~ msgstr "_Protocole IAX2"
+
+#~ msgid "_Prepend: "
+#~ msgstr "Préfixe: "
diff --git a/sflphone-client-kde/po/ru/sflphone-client-kde.po b/sflphone-client-kde/po/ru/sflphone-client-kde.po
index d8af45b68bdc669a021952c89c623dfdfc4621c0..a8b2eaea36ae7a02279f3c6aa95d17a1ad393b72 100644
--- a/sflphone-client-kde/po/ru/sflphone-client-kde.po
+++ b/sflphone-client-kde/po/ru/sflphone-client-kde.po
@@ -1,607 +1,1257 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Russian Translation.
+# Copyright (C) 2009 Savoir-Faire Linux Inc.
+# This file is distributed under the same license as the sflphone package.
+# Hussein Abdallah <hussein.abdallah@savoirfairelinux.com>.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: SFLphone 0.9.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-17 15:48-0400\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"
+"POT-Creation-Date: 2009-07-17 16:14-0400\n"
+"PO-Revision-Date: 2009-06-08 10:19 GMT-5\n"
+"Last-Translator: HUSSEIN ABDALLAH <hussein.abdallah@savoirfairelinux.com>\n"
+"Language-Team:  Savoir-Faire Linux Inc <sflphoneteam@savoirfairelinux.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/AccountWizard.cpp:161 ../src/AccountWizard.cpp:275
-msgid "Account Creation Wizard"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:200
-msgid "Creation of account succeed with these parameters"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:211
+#: ../sflphone-client-kde/src/Account.cpp:34
+#: ../sflphone-client-gnome/src/accountlist.c:175
+msgctxt "account state"
+msgid "Registered"
+msgstr "Зарегистрирован"
+
+#: ../sflphone-client-kde/src/Account.cpp:36
+#: ../sflphone-client-gnome/src/accountlist.c:178
+msgctxt "account state"
+msgid "Not Registered"
+msgstr "Не зарегистрирован"
+
+#: ../sflphone-client-kde/src/Account.cpp:38
+#: ../sflphone-client-gnome/src/accountlist.c:181
+msgctxt "account state"
+msgid "Trying..."
+msgstr "Пробует подключиться..."
+
+#: ../sflphone-client-kde/src/Account.cpp:40
+#: ../sflphone-client-gnome/src/accountlist.c:184
+msgctxt "account state"
+msgid "Error"
+msgstr "Ошибка"
+
+#: ../sflphone-client-kde/src/Account.cpp:42
+#: ../sflphone-client-gnome/src/accountlist.c:187
+msgctxt "account state"
+msgid "Authentication Failed"
+msgstr "Неправильная идентификация"
+
+#: ../sflphone-client-kde/src/Account.cpp:44
+#: ../sflphone-client-gnome/src/accountlist.c:190
+msgctxt "account state"
+msgid "Network unreachable"
+msgstr "Сеть недоступна"
+
+#: ../sflphone-client-kde/src/Account.cpp:46
+#: ../sflphone-client-gnome/src/accountlist.c:193
+msgctxt "account state"
+msgid "Host unreachable"
+msgstr "Хост недоступен"
+
+#: ../sflphone-client-kde/src/Account.cpp:48
+#: ../sflphone-client-gnome/src/accountlist.c:196
+msgctxt "account state"
+msgid "Stun configuration error"
+msgstr "Ошибка настройки Stun"
+
+#: ../sflphone-client-kde/src/Account.cpp:50
+#: ../sflphone-client-gnome/src/accountlist.c:199
+msgctxt "account state"
+msgid "Stun server invalid"
+msgstr "Недействительный Stun-сервер"
+
+#: ../sflphone-client-kde/src/Account.cpp:51
+#: ../sflphone-client-gnome/src/accountlist.c:202
+msgctxt "account state"
+msgid "Invalid"
+msgstr "Недействительный"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:163
+#: ../sflphone-client-kde/src/AccountWizard.cpp:278
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:393
+msgid "Account creation wizard"
+msgstr "Мастер настройки SFLphone"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:199
+#: ../sflphone-client-kde/src/AccountWizard.cpp:217
+#: ../sflphone-client-kde/src/AccountWizard.cpp:561
+#: ../sflphone-client-gnome/src/assistant.c:68
+#, c-format
+msgid "This assistant is now finished."
+msgstr "Мастер закончил настройку."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:211
 msgid "Creation of account has failed for the reason"
 msgstr ""
 
-#: ../src/AccountWizard.cpp:217
-msgid "Register of account succeed with these parameters"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:253 ../src/AccountWizard.cpp:437
+#: ../sflphone-client-kde/src/AccountWizard.cpp:255
+#: ../sflphone-client-kde/src/AccountWizard.cpp:440
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:363
+#: ../sflphone-client-gnome/src/assistant.c:72
 msgid "Alias"
-msgstr ""
+msgstr "Псевдоним"
 
-#: ../src/AccountWizard.cpp:254 ../src/AccountWizard.cpp:438
+#: ../sflphone-client-kde/src/AccountWizard.cpp:256
+#: ../sflphone-client-kde/src/AccountWizard.cpp:441
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:370
+#: ../sflphone-client-gnome/src/assistant.c:75
 msgid "Server"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:255 ../src/AccountWizard.cpp:439
-msgid "User"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:256 ../src/AccountWizard.cpp:440
+msgstr "Сервер"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:257
+#: ../sflphone-client-kde/src/AccountWizard.cpp:442
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:371
+#: ../sflphone-client-gnome/src/assistant.c:78
+msgid "Username"
+msgstr "Пользователь"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:258
+#: ../sflphone-client-kde/src/AccountWizard.cpp:443
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:372
 msgid "Password"
-msgstr ""
+msgstr "Пароль"
 
-#: ../src/AccountWizard.cpp:257
+#: ../sflphone-client-kde/src/AccountWizard.cpp:259
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:364
+#: ../sflphone-client-gnome/src/config/configwindow.c:418
 msgid "Protocol"
-msgstr ""
+msgstr "Протокол"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:260
+#: ../sflphone-client-kde/src/AccountWizard.cpp:444
+msgid "Voicemail number"
+msgstr "Номер автоответчика #"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:279
+#: ../sflphone-client-gnome/src/assistant.c:216
+msgid "Welcome to the Account creation wizard of SFLphone!"
+msgstr "Добро пожаловать в SFLphone!"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:281
+#: ../sflphone-client-gnome/src/assistant.c:217
+msgid "This installation wizard will help you configure an account."
+msgstr "Этот мастер установки поможет вам настроить ваш аккаунт."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:309
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Account"
+msgstr "Аккаунты"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:310
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Please select one of the following options"
+msgstr "Введите пожалуйста следующие данные"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:312
+#: ../sflphone-client-gnome/src/assistant.c:251
+msgid "Create a free SIP/IAX2 account on sflphone.org"
+msgstr "Создать бесплатный SIP/IAX2-аккаунт на sflphone.org"
 
-#: ../src/AccountWizard.cpp:258
-msgid "Mailbox"
-msgstr ""
+#: ../sflphone-client-kde/src/AccountWizard.cpp:313
+#: ../sflphone-client-gnome/src/assistant.c:253
+msgid "Register an existing SIP or IAX2 account"
+msgstr "Зарегистрировать существующий SIP или IAX2 аккаунт"
 
-#: ../src/AccountWizard.cpp:276
-msgid "Welcome to the Account creation wizard of SFLPhone"
-msgstr ""
+#: ../sflphone-client-kde/src/AccountWizard.cpp:352
+#: ../sflphone-client-gnome/src/assistant.c:231
+msgid "VoIP Protocols"
+msgstr "VoIP-протоколы"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:353
+#: ../sflphone-client-gnome/src/assistant.c:231
+msgid "Select an account type"
+msgstr "Выберите тип аккаунта"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:355
+#: ../sflphone-client-gnome/src/assistant.c:233
+msgid "SIP (Session Initiation Protocol)"
+msgstr "SIP (Session Initiation Protocol)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:356
+#: ../sflphone-client-gnome/src/assistant.c:235
+msgid "IAX2 (InterAsterix Exchange)"
+msgstr "IAX2 (InterAsterix Exchange)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:395
+#: ../sflphone-client-gnome/src/assistant.c:339
+msgid "Optional email address"
+msgstr "Электронный адрес (необязательный)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:396
+#: ../sflphone-client-gnome/src/assistant.c:339
+msgid "This email address will be used to send your voicemail messages."
+msgstr "Этот электронный адрес будет использоваться для речевых сообщений"
 
-#: ../src/AccountWizard.cpp:278
-msgid "This wizard will help you setting up an account."
-msgstr ""
+#: ../sflphone-client-kde/src/AccountWizard.cpp:398
+msgid "Email address"
+msgstr "Адрес эл. почты"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:432
+#: ../sflphone-client-gnome/src/assistant.c:266
+msgid "SIP account settings"
+msgstr "Настройка SIP-аккаунта"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:436
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "IAX2 account settings"
+msgstr "Настройка IAX2-аккаунта"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:438
+#: ../sflphone-client-gnome/src/assistant.c:266
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "Please fill the following information"
+msgstr "Введите пожалуйста следующие данные"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:523
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:856
+msgid "Network Address Translation (NAT)"
+msgstr "Network Address Translation (NAT)"
 
-#: ../src/AccountWizard.cpp:306 ../build/src/ui_ConfigDialog.h:1259
-msgid "Accounts"
-msgstr ""
+#: ../sflphone-client-kde/src/AccountWizard.cpp:524
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:536
+msgid "You should probably enable this if you are behind a firewall."
+msgstr "Вы наверное должны это включить если вы находитесь за сетевым экраном."
 
-#: ../src/AccountWizard.cpp:307
-msgid "Please choose between those options :"
+#: ../sflphone-client-kde/src/AccountWizard.cpp:526
+msgid "Enable STUN"
 msgstr ""
 
-#: ../src/AccountWizard.cpp:309
-msgid "Create a free SIP/IAX2 account on sflphone.org"
+#: ../sflphone-client-kde/src/AccountWizard.cpp:527
+msgid "Stun Server"
 msgstr ""
 
-#: ../src/AccountWizard.cpp:310
-msgid "Register an existing SIP/IAX2 account"
+#: ../sflphone-client-kde/src/AccountWizard.cpp:562
+msgid ""
+"After checking the settings you chose, click \"Finish\" to create the "
+"account."
 msgstr ""
 
-#: ../src/AccountWizard.cpp:349
-msgid "VoIP Protocols"
+#: ../sflphone-client-kde/src/ActionSetAccountFirst.cpp:26
+msgid "Default account"
 msgstr ""
 
-#: ../src/AccountWizard.cpp:350
-msgid "Choose the account type"
+#: ../sflphone-client-kde/src/Call.cpp:116
+#: ../sflphone-client-gnome/src/contacts/calltree.c:322
+msgid "Transfer to : "
 msgstr ""
 
-#: ../src/AccountWizard.cpp:352
-msgid "Register a SIP (Session Initiation Protocol) account"
-msgstr ""
+#: ../sflphone-client-kde/src/CodecListModel.cpp:89
+#: ../sflphone-client-gnome/src/actions.c:816
+msgid "Codec"
+msgstr "Codec"
 
-#: ../src/AccountWizard.cpp:353
-msgid "Register a IAX2 (InterAsterisk eXchange) account"
-msgstr ""
+#: ../sflphone-client-kde/src/CodecListModel.cpp:93
+#: ../sflphone-client-gnome/src/config/audioconf.c:581
+msgid "Frequency"
+msgstr "Частота"
 
-#: ../src/AccountWizard.cpp:392
-msgid "Optionnal Email Address"
-msgstr ""
+#: ../sflphone-client-kde/src/CodecListModel.cpp:97
+#: ../sflphone-client-gnome/src/config/audioconf.c:586
+msgid "Bitrate"
+msgstr "Битрейт"
 
-#: ../src/AccountWizard.cpp:393
-msgid "This email address will be used to send your voicemail messages."
-msgstr ""
+#: ../sflphone-client-kde/src/CodecListModel.cpp:101
+#: ../sflphone-client-gnome/src/config/audioconf.c:591
+msgid "Bandwidth"
+msgstr "Пропускная способность"
 
-#: ../src/AccountWizard.cpp:395
-msgid "Email address"
+#: ../sflphone-client-kde/src/main.cpp:38
+msgid "SFLphone KDE Client"
 msgstr ""
 
-#: ../src/AccountWizard.cpp:429
-msgid "SIP Account Settings"
+#: ../sflphone-client-kde/src/main.cpp:42
+msgid "(C) 2009 Savoir-faire Linux"
 msgstr ""
 
-#: ../src/AccountWizard.cpp:433
-msgid "IAX2 Account Settings"
+#: ../sflphone-client-kde/src/main.cpp:46
+msgid "Jérémy Quentin"
 msgstr ""
 
-#: ../src/AccountWizard.cpp:435
-msgid "Please full these settings fields."
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
 msgstr ""
 
-#: ../src/AccountWizard.cpp:512
-msgid "Network Address Translation (NAT)"
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
 msgstr ""
 
-#: ../src/AccountWizard.cpp:513
-msgid ""
-"You should probably enable this option if you're placed under a firewall"
+#: ../sflphone-client-kde/src/SFLPhone.cpp:62
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-gnome/src/statusicon.c:126
+msgid "SFLphone"
 msgstr ""
 
-#: ../src/AccountWizard.cpp:515
-msgid "Enable STUN"
+#: ../sflphone-client-kde/src/SFLPhone.cpp:209
+msgid "Incoming call"
 msgstr ""
 
-#: ../src/AccountWizard.cpp:516
-msgid "Stun Server"
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
+msgid "You have an incoming call from"
 msgstr ""
 
-#: ../src/AccountWizard.cpp:550
-msgid "Account Definition Finished"
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
+msgid "Click to accept or refuse it."
 msgstr ""
 
-#: ../src/AccountWizard.cpp:551
-msgid ""
-"After checking the settings you chose, click \"Finish\" to create the "
-"account."
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:716
+msgid "Address book loading..."
 msgstr ""
 
-#: ../src/Call.cpp:116
-msgid "Transfer to : "
-msgstr ""
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:901
+#: ../sflphone-client-gnome/src/actions.c:89
+msgid "No registered accounts"
+msgstr "У вас нет зарегистрированных аккаунтов"
 
-#: ../src/ConfigDialog.cpp:131 ../src/ConfigDialog.cpp:263
-msgid "Attention : SIP port must be over 1024 !"
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:905
+#: ../sflphone-client-gnome/src/actions.c:83
+#: ../sflphone-client-gnome/src/actions.c:813
+msgid "Using account"
 msgstr ""
 
-#: ../src/ConfigDialog.cpp:136 ../src/ConfigDialog.cpp:266
-msgid "Attention : SIP port must be under 65536 !"
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
+msgid "Main screen"
 msgstr ""
 
-#: ../src/main.cpp:49 ../src/main.cpp:50
-msgctxt "Your names"
-msgid "NAME OF TRANSLATORS"
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:165
+msgid "Call history"
 msgstr ""
 
-#: ../src/main.cpp:50 ../src/main.cpp:51
-msgctxt "Your emails"
-msgid "EMAIL OF TRANSLATORS"
-msgstr ""
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:394
+#: ../sflphone-client-gnome/src/toolbar.c:243
+#: ../sflphone-client-gnome/src/toolbar.c:245
+msgid "Address book"
+msgstr "Адресная книга"
 
-#: ../src/SFLPhone.cpp:55 ../src/sflphone_kdeview.cpp:1051
-#: ../src/sflphone_kdeview.cpp:1056 ../src/sflphone_kdeview.cpp:1061
-msgid "SFLPhone"
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1108
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1173
+msgid "Edit before call"
 msgstr ""
 
-#: ../src/SFLPhone.cpp:154
-msgid "You still have some calls open. Please close all calls before quitting."
-msgstr ""
+#: ../sflphone-client-kde/src/sflphone_const.h:41
+#: ../sflphone-client-gnome/src/toolbar.c:167
+#: ../sflphone-client-gnome/src/toolbar.c:169
+msgid "New call"
+msgstr "Новый звонок"
 
-#: ../src/SFLPhone.cpp:182
-msgid "Incoming call"
-msgstr ""
+#: ../sflphone-client-kde/src/sflphone_const.h:42
+#: ../sflphone-client-kde/src/sflphone_const.h:47
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:381
+#: ../sflphone-client-gnome/src/toolbar.c:186
+#: ../sflphone-client-gnome/src/toolbar.c:188
+msgid "Hang up"
+msgstr "Положить трубку"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:43
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:382
+#: ../sflphone-client-gnome/src/toolbar.c:207
+#: ../sflphone-client-gnome/src/toolbar.c:209
+msgid "Hold on"
+msgstr "Удержать звонок"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:44
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:383
+#: ../sflphone-client-gnome/src/toolbar.c:220
+#: ../sflphone-client-gnome/src/toolbar.c:222
+msgid "Transfer"
+msgstr "Переслать звонок на другой номер"
 
-#: ../src/SFLPhone.cpp:183
-msgid "You have an incoming call from"
+#: ../sflphone-client-kde/src/sflphone_const.h:45
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:392
+#: ../sflphone-client-gnome/src/toolbar.c:263
+msgid "Record"
+msgstr "Записать переговор"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:46
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:380
+#: ../sflphone-client-gnome/src/toolbar.c:176
+#: ../sflphone-client-gnome/src/toolbar.c:178
+msgid "Pick up"
+msgstr "Взять трубку"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:48
+#: ../sflphone-client-gnome/src/toolbar.c:196
+#: ../sflphone-client-gnome/src/toolbar.c:198
+msgid "Hold off"
+msgstr "Снова взять"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:49
+msgid "Give up transfer"
 msgstr ""
 
-#: ../src/SFLPhone.cpp:183
-msgid "Click to accept or refuse it."
+#: ../sflphone-client-kde/src/sflphone_const.h:50
+msgid "Call back"
 msgstr ""
 
-#: ../src/sflphone_kdeview.cpp:1051
-msgid "Main screen"
-msgstr ""
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:48
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:91
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
+#: ../sflphone-client-gnome/src/config/configwindow.c:722
+#: ../sflphone-client-gnome/src/config/configwindow.c:791
+msgctxt "Config section"
+msgid "General"
+msgstr "Общие настройки"
 
-#: ../src/sflphone_kdeview.cpp:1056 ../build/src/ui_ConfigDialog.h:1271
-#: ../build/src/ui_dlggeneralbase.h:160
-msgid "Call history"
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:49
+msgctxt "Config section"
+msgid "Display"
 msgstr ""
 
-#: ../src/sflphone_kdeview.cpp:1061
-#: ../build/src/ui_sflphone_kdeview_base.h:507
-msgid "Address book"
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:50
+#: ../sflphone-client-gnome/src/config/configwindow.c:833
+msgctxt "Config section"
+msgid "Accounts"
 msgstr ""
 
-#: ../src/sflphone_kdeview.cpp:1075 ../src/sflphone_kdeview.cpp:1131
-msgid "Edit before call"
-msgstr ""
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:51
+#: ../sflphone-client-gnome/src/config/configwindow.c:786
+msgctxt "Config section"
+msgid "Audio"
+msgstr "звука"
 
-#: ../src/sflphone_const.h:56
-msgid "Call"
-msgstr ""
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:52
+#: ../sflphone-client-gnome/src/config/configwindow.c:801
+msgctxt "Config section"
+msgid "Address Book"
+msgstr "Адресная книга"
 
-#: ../src/sflphone_const.h:57
-msgid "Hang up"
-msgstr ""
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:53
+#: ../sflphone-client-gnome/src/config/configwindow.c:796
+msgctxt "Config section"
+msgid "Recordings"
+msgstr "Запись"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:54
+#: ../sflphone-client-gnome/src/config/configwindow.c:806
+msgctxt "Config section"
+msgid "Hooks"
+msgstr "перехватчики (hooks)"
 
-#: ../src/sflphone_const.h:58
-msgid "Hold"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:328
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows. Enable/disable them by checking/unchecking "
+"them on the left of the item. Add or remove some with \"Plus\" and \"Sub\" "
+"buttons. Edit the selected account with the form on the right."
 msgstr ""
 
-#: ../src/sflphone_const.h:59
-msgid "Transfer"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:332
+msgid "Remove the selected account"
 msgstr ""
 
-#: ../src/sflphone_const.h:60 ../build/src/ui_ConfigDialog.h:1263
-msgid "Record"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:335
+msgid ""
+"This button will remove the selected account in the list below. Be sure you "
+"really don't need it anymore. If you think you might use it again later, "
+"just uncheck it."
 msgstr ""
 
-#: ../src/sflphone_const.h:61
-msgid "Accept"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:340
+msgid "Remove"
 msgstr ""
 
-#: ../src/sflphone_const.h:62
-msgid "Refuse"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:342
+msgid "Add a new account"
 msgstr ""
 
-#: ../src/sflphone_const.h:63
-msgid "Unhold"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:345
+msgid ""
+"This button enables you to initialize a new account. You will then be able "
+"to edit it using the form on the right."
 msgstr ""
 
-#: ../src/sflphone_const.h:64
-msgid "Give up transfer"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:347
+msgid "Add"
 msgstr ""
 
-#: ../src/sflphone_const.h:65
-msgid "Call back"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:349
+msgid "Get this account down"
 msgstr ""
 
-#: ../src/sflphone_const.h:66
-msgid "Give up search"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:352
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:359
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows."
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1249
-msgid "Configuration Dialog"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:354
+msgid "Down"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1250
-msgid "about"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:356
+msgid "Get this account up"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1255 ../build/src/ui_ConfigDialog.h:1337
-msgid "General"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:361
+msgid "Up"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1257
-msgid "Display"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:362
+msgid "Apply"
+msgstr "Применить"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:367
+msgid "SIP"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1261
-msgid "Audio"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:368
+msgid "IAX"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1265
-msgid "Address Book"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:373
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:385
+#: ../sflphone-client-gnome/src/toolbar.c:52
+#: ../sflphone-client-gnome/src/toolbar.c:251
+#: ../sflphone-client-gnome/src/toolbar.c:255
+msgid "Voicemail"
+msgstr "Автоответчик"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:374
+#: ../sflphone-client-gnome/src/config/configwindow.c:425
+msgid "Status"
+msgstr "Статус"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:377
+#: ../sflphone-client-gnome/src/config/configwindow.c:528
+msgid "Stun parameters will be applied on each SIP account created."
+msgstr "STUN-параметры будут эффективны для каждого созданного SIP-аккаунта"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:378
+msgid "Enable Stun"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1267
-msgid "Hooks"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:380
+#: ../sflphone-client-gnome/src/config/configwindow.c:544
+msgid "Format : name.server:port"
+msgstr "Формат: имя.сервер:порт"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:382
+msgid "choose Stun server (example : stunserver.org)"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1270
-msgid "Configure general settings"
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:154
+msgid "Enable address book"
+msgstr "Адресная книга"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:155
+msgid "Maximum results"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1272 ../build/src/ui_dlggeneralbase.h:161
-msgid "&Capacity"
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:156
+msgid "Display photo if available"
+msgstr "_Показать фотографию контакта (если имеется):"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:157
+msgid "Display phone numbers of these types :"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1273 ../build/src/ui_dlggeneralbase.h:162
-msgid "C&lear history"
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:158
+msgid "Work"
+msgstr "Рабочий"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:159
+msgid "Mobile"
+msgstr "Мобильный"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:160
+msgid "Home"
+msgstr "Домашний"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:225
+msgid "Sound manager"
+msgstr "Менеджер звука"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:228
+msgid "ALSA"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1274 ../build/src/ui_dlggeneralbase.h:163
-msgid "Connection"
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:229
+msgid "PulseAudio"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1275 ../build/src/ui_dlggeneralbase.h:164
-msgid "SIP &Port"
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:231
+msgid "Enable ringtones"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1276 ../build/src/ui_dlggeneralbase.h:165
-msgid "Attention "
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:232
+#: ../sflphone-client-gnome/src/config/audioconf.c:812
+msgid "Codecs"
+msgstr "Кодеки"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:233
+#: ../sflphone-client-gnome/src/config/audioconf.c:795
+msgid "ALSA settings"
+msgstr "Настройка ALSA"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:234
+#: ../sflphone-client-gnome/src/config/audioconf.c:662
+msgid "ALSA plugin"
+msgstr "ALSA-плагин"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:235
+#: ../sflphone-client-gnome/src/config/audioconf.c:706
+msgid "Input"
+msgstr "Вход"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:236
+#: ../sflphone-client-gnome/src/config/audioconf.c:684
+msgid "Output"
+msgstr "Выход"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:237
+msgid "PulseAudio settings"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1277
-msgid "Configure display"
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:238
+msgid "Mute other applications during a call"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1278
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:121
 msgid "Enable notifications"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1279
-msgid "On incoming &calls"
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:122
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:126
+msgid "On incoming calls"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1280
-msgid "On &messages"
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:123
+msgid "On messages"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1281
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:124
 msgid "Show main window"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1282
-msgid "On &start"
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:125
+msgid "On start"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1283
-msgid "On &incoming calls"
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:166
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "Keep my history for at least"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1284
-msgid "Configure user accounts"
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:167
+#: ../sflphone-client-gnome/src/config/configwindow.c:643
+msgctxt "End of 'Keep my history for at least n days.'"
+msgid "days"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1286
-msgid "Remove this account"
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:168
+msgid "Clear history"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1287
-msgid "Backspace, Return"
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:169
+msgid "Connection"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1288
-msgid "Add a new account"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:170
+#: ../sflphone-client-gnome/src/config/configwindow.c:664
+msgid "SIP Port"
+msgstr "SIP-порт"
 
-#: ../build/src/ui_ConfigDialog.h:1289
-msgid "Down"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:180
+#: ../sflphone-client-gnome/src/config/hooks-config.c:130
+msgid "URL Argument"
+msgstr "Передача URL"
 
-#: ../build/src/ui_ConfigDialog.h:1290
-msgid "Up"
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:181
+#: ../sflphone-client-gnome/src/config/hooks-config.c:135
+msgid "Custom commands on incoming calls with URL"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1291
-msgid "Apply"
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:182
+msgid "Trigger on specific SIP header"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1292
-msgid "&Alias"
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:183
+msgid "Trigger on IAX2 URL"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1293
-msgid "&Protocol"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:184
+msgid "Command to run"
+msgstr "Выполнить команду:"
 
-#: ../build/src/ui_ConfigDialog.h:1296
-msgid "SIP"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:185
+#: ../sflphone-client-gnome/src/config/hooks-config.c:138
+#, c-format
+msgid "%s will be replaced with the passed URL."
+msgstr "%s будет заменена на переданную URL"
 
-#: ../build/src/ui_ConfigDialog.h:1297
-msgid "IAX"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:186
+#: ../sflphone-client-gnome/src/config/hooks-config.c:165
+msgid "Phone number rewriting"
+msgstr "Переписка номера телефона"
 
-#: ../build/src/ui_ConfigDialog.h:1299
-msgid "&Server"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:187
+msgid "Prefix dialed numbers with"
+msgstr "Добавить перед на набранными номерами"
 
-#: ../build/src/ui_ConfigDialog.h:1300
-msgid "&User"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:92
+#: ../sflphone-client-gnome/src/config/configwindow.c:726
+msgid "Destination folder"
+msgstr "Папка назначения"
 
-#: ../build/src/ui_ConfigDialog.h:1301
-msgid "Pass&word"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:384
+#: ../sflphone-client-gnome/src/toolbar.c:232
+#: ../sflphone-client-gnome/src/toolbar.c:234
+msgid "History"
+msgstr "Журнал"
 
-#: ../build/src/ui_ConfigDialog.h:1302
-#: ../build/src/ui_sflphone_kdeview_base.h:498
-msgid "&Mailbox"
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:386
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:388
+msgid "Configure SFLphone"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1303
-msgid "State"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:390
+msgid "Display volume controls"
+msgstr "_Настройки громкости"
 
-#: ../build/src/ui_ConfigDialog.h:1306
-msgid "Stun settings will be applied on each account"
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:391
+msgid "Display dialpad"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1307
-msgid "&Enable Stun"
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:396
+msgid "Attention:number of results exceeds max displayed."
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1308
-msgid "Configure audio settings"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:398
+#: ../sflphone-client-gnome/src/sliders.c:163
+msgid "Mic volume"
+msgstr "Громкость микрофона"
 
-#: ../build/src/ui_ConfigDialog.h:1310
-msgid "Audio &device"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:402
+#: ../sflphone-client-gnome/src/sliders.c:161
+msgid "Speakers volume"
+msgstr "Громкость"
 
-#: ../build/src/ui_ConfigDialog.h:1313
-msgid "ALSA"
-msgstr ""
+#: ../sflphone-client-gnome/src/actions.c:54
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+#, c-format
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] "%d речевое сообщение"
+msgstr[1] "%d речевое сообщение"
 
-#: ../build/src/ui_ConfigDialog.h:1314
-msgid "PulseAudio"
+#: ../sflphone-client-gnome/src/actions.c:234
+msgid ""
+"Unable to connect to the SFLphone server.\n"
+"Make sure the daemon is running."
 msgstr ""
+"Невозможно подключиться к SFLphone-серверу.\n"
+"Проверьте если демон работает."
 
-#: ../build/src/ui_ConfigDialog.h:1316
-msgid "&Enable ringtones"
+#: ../sflphone-client-gnome/src/actions.c:809
+#, c-format
+msgid "IP call - %s"
+msgstr "IP звонок  - %s"
+
+#: ../sflphone-client-gnome/src/actions.c:908
+#, 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>Ошибка: звуковые кодеки не найдены.\n"
+"\n"
+"</b> Звуковые кодеки SFL должны находиться в <i>%s</i> или в <b>.sflphone</"
+"b> каталоге в вашем домашнем каталоге( <i>%s</i> )"
 
-#: ../build/src/ui_ConfigDialog.h:1317
-msgid "&Codecs"
+#: ../sflphone-client-gnome/src/assistant.c:70
+msgid ""
+"You can at any time check your registration state or modify your accounts "
+"parameters in the Options/Accounts window."
+msgstr ""
+"Вы можете в любое время проверить статус регистрации или изменитьпараметры  "
+"ваших аккаунтов в меню Правка / Аккаунты."
+
+#: ../sflphone-client-gnome/src/assistant.c:190
+msgid "SFLphone account creation wizard"
+msgstr "Мастер настройки SFLphone"
+
+#: ../sflphone-client-gnome/src/assistant.c:274
+#: ../sflphone-client-gnome/src/assistant.c:370
+#: ../sflphone-client-gnome/src/config/accountwindow.c:153
+msgid "_Alias"
+msgstr "_Псевдоним"
+
+#: ../sflphone-client-gnome/src/assistant.c:282
+#: ../sflphone-client-gnome/src/assistant.c:378
+#: ../sflphone-client-gnome/src/config/accountwindow.c:189
+msgid "_Host name"
+msgstr "Имя или IP-адрес _сервера"
+
+#: ../sflphone-client-gnome/src/assistant.c:290
+#: ../sflphone-client-gnome/src/assistant.c:386
+#: ../sflphone-client-gnome/src/config/accountwindow.c:197
+msgid "_User name"
+msgstr "Имя или _номер пользователя"
+
+#: ../sflphone-client-gnome/src/assistant.c:306
+#: ../sflphone-client-gnome/src/assistant.c:401
+#: ../sflphone-client-gnome/src/config/accountwindow.c:212
+msgid "_Password"
+msgstr "Па_роль"
+
+#: ../sflphone-client-gnome/src/assistant.c:324
+#: ../sflphone-client-gnome/src/assistant.c:417
+#: ../sflphone-client-gnome/src/config/accountwindow.c:228
+msgid "_Voicemail number"
+msgstr "Номер _автоответчика #"
+
+#: ../sflphone-client-gnome/src/assistant.c:347
+msgid "_Email address"
+msgstr "_Адрес эл. почты"
+
+#: ../sflphone-client-gnome/src/assistant.c:444
+#: ../sflphone-client-gnome/src/config/configwindow.c:532
+msgid "E_nable STUN"
+msgstr "Включить STUN"
+
+#: ../sflphone-client-gnome/src/assistant.c:451
+msgid "_STUN server"
+msgstr "_STUN-сервер"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Account Registration"
+msgstr "Регистрация аккаунта"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Congratulations!"
+msgstr "Поздравляем!"
+
+#: ../sflphone-client-gnome/src/errors.c:29
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening playback device"
 msgstr ""
+"<b>ALSA-nпредупреждение</b>\n"
+"\n"
+"Ошибка во время активирования устройства проигрывания"
 
-#: ../build/src/ui_ConfigDialog.h:1321
-msgid "Active"
+#: ../sflphone-client-gnome/src/errors.c:32
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening capture device"
 msgstr ""
+"<b>ALSA-nпредупреждение</b>\n"
+"\n"
+"Ошибка во время активирования устройства входа"
+
+#: ../sflphone-client-gnome/src/errors.c:35
+msgid ""
+"Pulseaudio notification\n"
+"\n"
+"Pulseaudio is not running"
+msgstr ""
+"<b>Предупреждение Pulseaudio</b>\n"
+"\n"
+"Pulseaudio не работает"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:70
+msgid "There is one call in progress."
+msgstr "Звонок ещё не окончен."
+
+#: ../sflphone-client-gnome/src/mainwindow.c:74
+msgid "There are calls in progress."
+msgstr "Несколько звонков ещё не окончены."
+
+#: ../sflphone-client-gnome/src/mainwindow.c:83
+msgid "Do you still want to quit?"
+msgstr "Вы уверенны что хотите выйти?"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:284
+msgid "SFLphone Error"
+msgstr "Ошибка SFLphone."
+
+#: ../sflphone-client-gnome/src/menus.c:134
+msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr "SFLphone - SIP и IAX2-совместимый VoIP-клиент "
+
+#: ../sflphone-client-gnome/src/menus.c:137
+msgid "About SFLphone"
+msgstr "О SFLphone"
+
+#: ../sflphone-client-gnome/src/menus.c:161
+msgid "_Help"
+msgstr "_Помощь"
+
+#: ../sflphone-client-gnome/src/menus.c:296
+#: ../sflphone-client-gnome/src/menus.c:953
+msgid "_New call"
+msgstr "_Новый звонок"
+
+#: ../sflphone-client-gnome/src/menus.c:308
+#: ../sflphone-client-gnome/src/menus.c:785
+msgid "_Pick up"
+msgstr "_Взять трубку"
+
+#: ../sflphone-client-gnome/src/menus.c:318
+#: ../sflphone-client-gnome/src/menus.c:797
+msgid "_Hang up"
+msgstr "_Положить трубку"
+
+#: ../sflphone-client-gnome/src/menus.c:328
+#: ../sflphone-client-gnome/src/menus.c:809
+msgid "On _Hold"
+msgstr "_Удержать звонок"
+
+#: ../sflphone-client-gnome/src/menus.c:340
+#: ../sflphone-client-gnome/src/menus.c:821
+msgid "_Record"
+msgstr "Записать"
+
+#: ../sflphone-client-gnome/src/menus.c:354
+msgid "_Account creation wizard"
+msgstr "Мастер настройки SFLphone"
+
+#: ../sflphone-client-gnome/src/menus.c:384
+msgid "_Call"
+msgstr "_Звонок"
+
+#: ../sflphone-client-gnome/src/menus.c:552
+msgid "Clear _history"
+msgstr "_Стереть журнал"
+
+#: ../sflphone-client-gnome/src/menus.c:564
+msgid "_Accounts"
+msgstr "_Аккаунты"
+
+#: ../sflphone-client-gnome/src/menus.c:579
+msgid "_Edit"
+msgstr "_Правка"
+
+#: ../sflphone-client-gnome/src/menus.c:631
+msgid "_Dialpad"
+msgstr "_Клавиатура"
+
+#: ../sflphone-client-gnome/src/menus.c:643
+msgid "_Volume controls"
+msgstr "_Настройки громкости"
+
+#: ../sflphone-client-gnome/src/menus.c:661
+msgid "_View"
+msgstr "_Вид"
+
+#: ../sflphone-client-gnome/src/menus.c:881
+msgid "_Call back"
+msgstr "_Перезвонить"
+
+#: ../sflphone-client-gnome/src/menus.c:1061
+msgid "Edit phone number"
+msgstr "Мобильный телефон"
+
+#: ../sflphone-client-gnome/src/menus.c:1072
+msgid "Edit the phone number before making a call"
+msgstr "Изменить номер телефона перед звонком"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:71
+#: ../sflphone-client-gnome/src/sflnotify.c:91
+#, c-format
+msgid "%s account : %s"
+msgstr "%s аккаунт: %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:75
+#, c-format
+msgid "<i>From</i> %s"
+msgstr "<i>От:</i> %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:111
+#, c-format
+msgid "Calling with %s account <i>%s</i>"
+msgstr "Звонок с аккаунтом %s <i>%s</i>"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:115
+msgid "Current account"
+msgstr "Нынешний аккаунт"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:130
+msgid "You have no accounts set up"
+msgstr "Вы не настроили ни одного аккаунта"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:131
+#: ../sflphone-client-gnome/src/sflnotify.c:148
+msgid "Error"
+msgstr "Ошибка"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:147
+msgid "You have no registered accounts"
+msgstr "У вас нет зарегистрированных аккаунтов"
+
+#: ../sflphone-client-gnome/src/statusicon.c:91
+msgid "_Show main window"
+msgstr "_Показать главное окно"
+
+#: ../sflphone-client-gnome/src/statusicon.c:127
+#, c-format
+msgid "%i account configured"
+msgid_plural "%i accounts configured"
+msgstr[0] ""
+msgstr[1] "SFLphone - Зарегистрировано %i аккаунтов"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:113
+msgid "Account settings"
+msgstr "Настройки аккаунта"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:147
+msgid "_Enable this account"
+msgstr "_Включить"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:161
+msgid "_Protocol"
+msgstr "Пр_отокол"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:179
+msgid "Unknown"
+msgstr "Неизвестный"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:312
+msgid "_Use Evolution address books"
+msgstr "_Использовать адресную книгу Evolution"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:319
+msgid "Download limit :"
+msgstr "Ограничение скорости скачивания:"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:327
+msgid "cards"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:333
+msgid "_Display contact photo if available"
+msgstr "_Показать фотографию контакта (если имеется):"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:341
+msgid "Fields from Evolution's address books"
+msgstr "Исполоьзовать следующие поля из адресной книги Evolution:"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:345
+msgid "_Work"
+msgstr "_Рабочий"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:351
+msgid "_Home"
+msgstr "_Домашний"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:357
+msgid "_Mobile"
+msgstr "_Мобильный"
 
-#: ../build/src/ui_ConfigDialog.h:1323
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:364
+msgid "Address Books"
+msgstr "Адресная книга"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:368
+msgid "Select which Evolution address books to use"
+msgstr "Выбрать адресную книгу Evolution:"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:404
+#: ../sflphone-client-gnome/src/config/audioconf.c:576
 msgid "Name"
-msgstr ""
+msgstr "Имя"
 
-#: ../build/src/ui_ConfigDialog.h:1325
-msgid "Frequency"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/audioconf.c:741
+msgid "_Voice Activity Detection"
+msgstr "Включить детектор тишины"
 
-#: ../build/src/ui_ConfigDialog.h:1327
-msgid "Bitrate"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/audioconf.c:751
+msgid "_Noise Reduction (Narrow-Band Companding)"
+msgstr "Шумоподавление"
 
-#: ../build/src/ui_ConfigDialog.h:1329
-msgid "Bandwidth"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/audioconf.c:780
+msgid "Sound Manager"
+msgstr "Менеджер звука"
 
-#: ../build/src/ui_ConfigDialog.h:1330
-msgid "ALSA settings"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/audioconf.c:783
+msgid "_Pulseaudio"
+msgstr "_Pulseaudio"
 
-#: ../build/src/ui_ConfigDialog.h:1331
-msgid "&In"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/audioconf.c:788
+msgid "_ALSA"
+msgstr "_ALSA"
 
-#: ../build/src/ui_ConfigDialog.h:1332
-msgid "&Out"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/audioconf.c:835
+msgid "Ringtones"
+msgstr "Звонки"
 
-#: ../build/src/ui_ConfigDialog.h:1333
-msgid "ALSA &plugin"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/audioconf.c:841
+msgid "_Enable ringtones"
+msgstr "Включить звонок"
 
-#: ../build/src/ui_ConfigDialog.h:1334
-msgid "PulseAudio settings"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/audioconf.c:847
+msgid "Choose a ringtone"
+msgstr "Выберите звонок"
 
-#: ../build/src/ui_ConfigDialog.h:1335
-msgid "Mute other applications during a call"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
+msgid "Audio Files"
+msgstr "Звуковые файлы"
 
-#: ../build/src/ui_ConfigDialog.h:1336
-msgid "Configure record settings"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:589
+msgid "Desktop Notifications"
+msgstr "Извещения на рабочем столе"
 
-#: ../build/src/ui_ConfigDialog.h:1338
-msgid "Destination folder"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:593
+msgid "_Enable notifications"
+msgstr "Включить звонок"
 
-#: ../build/src/ui_ConfigDialog.h:1339
-msgid "Configure address book settings"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:599
+msgid "Enable voicemail _notifications"
+msgstr "Включить предупреждения о речевых сообщениях"
 
-#: ../build/src/ui_ConfigDialog.h:1340
-msgid "Maximum &results"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:611
+msgid "System Tray Icon"
+msgstr "System Tray Icon"
 
-#: ../build/src/ui_ConfigDialog.h:1341
-msgid "Display &photo if available"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:614
+msgid "_Popup main window on incoming call"
+msgstr "_Показать главное окно при входящем звонке"
 
-#: ../build/src/ui_ConfigDialog.h:1342
-msgid "Display phone numbers of these &types :"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:619
+msgid "Ne_ver popup main window"
+msgstr "Никогда не показывать главное окно"
 
-#: ../build/src/ui_ConfigDialog.h:1343
-msgid "&Work"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:623
+msgid "Hide SFLphone window on _startup"
+msgstr "Спрятать окно SFLphone при пуске"
 
-#: ../build/src/ui_ConfigDialog.h:1344
-msgid "&Mobile"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:629
+msgid "Calls History"
+msgstr "Журнал звонков"
 
-#: ../build/src/ui_ConfigDialog.h:1345
-msgid "&Home"
+#: ../sflphone-client-gnome/src/config/configwindow.c:632
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "_Keep my history for at least"
 msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1346
-msgid "Configure hooks settings"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:647
+msgid "PulseAudio sound server"
+msgstr "Сервер звука PulseAudio"
 
-#: ../build/src/ui_ConfigDialog.h:1347
-msgid "URL Argument"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:650
+msgid "_Mute other applications during a call"
+msgstr "Приглушать звук других програм во время звонка"
 
-#: ../build/src/ui_ConfigDialog.h:1348
-msgid "SIP Protocol"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:677
+msgid "Port"
+msgstr "Порт"
 
-#: ../build/src/ui_ConfigDialog.h:1349
-msgid "IAX2 Protocol"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:732
+msgid "Select a folder"
+msgstr "Выберите папку"
 
-#: ../build/src/ui_ConfigDialog.h:1350
-msgid "SIP Header"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:766
+msgid "Preferences"
+msgstr "Предпочтения"
 
-#: ../build/src/ui_ConfigDialog.h:1351
-msgid "Command"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:845
+msgid "Configured Accounts"
+msgstr "Нынешний аккаунт"
 
-#: ../build/src/ui_ConfigDialog.h:1352
-msgid "Phone number formatting"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/hooks-config.c:141
+msgid "Trigger on specific _SIP header"
+msgstr "Запустить при определëнном SIP-заголовке"
 
-#: ../build/src/ui_ConfigDialog.h:1353
-msgid "Add phone number prefix"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/hooks-config.c:150
+msgid "Trigger on _IAX2 URL"
+msgstr "Запустить при наличии URL _IAX2"
 
-#: ../build/src/ui_ConfigDialog.h:1354
-msgid "Prepend"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/hooks-config.c:155
+msgid "Command to _run"
+msgstr "_Выполнить команду:"
 
-#: ../build/src/ui_dlggeneralbase.h:159
-#: ../build/src/ui_sflphone_kdeview_base.h:492
-msgid "Form"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/hooks-config.c:169
+msgid "_Prefix dialed numbers with"
+msgstr "Добавить перед на набранными номерами"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:493
-msgid "&Pick up"
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+msgid "Search all"
 msgstr ""
 
-#: ../build/src/ui_sflphone_kdeview_base.h:494
-msgid "&Hang up"
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:57
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:70
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:82
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:94
+msgid "Click here to change the search type"
 msgstr ""
 
-#: ../build/src/ui_sflphone_kdeview_base.h:495
-msgid "H&old"
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+msgid "Search by missed call"
 msgstr ""
 
-#: ../build/src/ui_sflphone_kdeview_base.h:496
-msgid "&Transfer"
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+msgid "Search by incoming call"
 msgstr ""
 
-#: ../build/src/ui_sflphone_kdeview_base.h:497
-msgid "H&istory"
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+msgid "Search by outgoing call"
 msgstr ""
 
-#: ../build/src/ui_sflphone_kdeview_base.h:499
-msgid "Configure &accounts"
-msgstr ""
+#~ msgid "User"
+#~ msgstr "Пользователь"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:500
-msgid "Configure a&udio"
-msgstr ""
+#~ msgid "State"
+#~ msgstr "Статус"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:501
-msgid "&Configure SFLPhone"
-msgstr ""
+#~ msgid "Stun settings will be applied on each account"
+#~ msgstr "STUN-параметры будут эффективны для каждого созданного SIP-аккаунта"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:502
-msgid "Display &volume bars"
-msgstr ""
+#~ msgid "Audio device"
+#~ msgstr "Звуковые файлы"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:503
-msgid "&About"
-msgstr ""
+#~ msgid "&Codecs"
+#~ msgstr "Кодеки"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:504
-msgid "Display &dialpad"
-msgstr ""
+#~ msgid "Out"
+#~ msgstr "Выход"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:505
-msgid "&Record"
-msgstr ""
+#~ msgid "Custom commands with URL %s will be replaced with the passed URL."
+#~ msgstr "%s будет заменена на переданную URL"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:506
-msgid "Account creation &wizard"
-msgstr ""
+#~ msgid "Phone number formatting"
+#~ msgstr "Переписка номера телефона"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:508
-msgid "Attention:number of results exceeds max displayed."
-msgstr ""
+#~ msgid "Add phone number prefix"
+#~ msgstr "Мобильный телефон"
+
+#~ msgid "General"
+#~ msgstr "Общие настройки"
+
+#~ msgid "Hold"
+#~ msgstr "Удержать звонок"
+
+#~ msgid "Configure accounts"
+#~ msgstr "Нынешний аккаунт"
+
+#~ msgid "Configure audio"
+#~ msgstr "Нынешний аккаунт"
+
+#~ msgctxt "Action record a call"
+#~ msgid "Record"
+#~ msgstr "Записать переговор"
+
+#~ msgid "accounr state"
+#~ msgstr "Настройки аккаунта"
diff --git a/sflphone-client-kde/po/sflphone-client-kde.pot b/sflphone-client-kde/po/sflphone-client-kde.pot
deleted file mode 100644
index 3bf4ef029eed187fca57085a05532be356a43121..0000000000000000000000000000000000000000
--- a/sflphone-client-kde/po/sflphone-client-kde.pot
+++ /dev/null
@@ -1,607 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-17 15:48-0400\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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../src/AccountWizard.cpp:161 ../src/AccountWizard.cpp:275
-msgid "Account Creation Wizard"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:200
-msgid "Creation of account succeed with these parameters"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:211
-msgid "Creation of account has failed for the reason"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:217
-msgid "Register of account succeed with these parameters"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:253 ../src/AccountWizard.cpp:437
-msgid "Alias"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:254 ../src/AccountWizard.cpp:438
-msgid "Server"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:255 ../src/AccountWizard.cpp:439
-msgid "User"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:256 ../src/AccountWizard.cpp:440
-msgid "Password"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:257
-msgid "Protocol"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:258
-msgid "Mailbox"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:276
-msgid "Welcome to the Account creation wizard of SFLPhone"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:278
-msgid "This wizard will help you setting up an account."
-msgstr ""
-
-#: ../src/AccountWizard.cpp:306 ../build/src/ui_ConfigDialog.h:1259
-msgid "Accounts"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:307
-msgid "Please choose between those options :"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:309
-msgid "Create a free SIP/IAX2 account on sflphone.org"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:310
-msgid "Register an existing SIP/IAX2 account"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:349
-msgid "VoIP Protocols"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:350
-msgid "Choose the account type"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:352
-msgid "Register a SIP (Session Initiation Protocol) account"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:353
-msgid "Register a IAX2 (InterAsterisk eXchange) account"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:392
-msgid "Optionnal Email Address"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:393
-msgid "This email address will be used to send your voicemail messages."
-msgstr ""
-
-#: ../src/AccountWizard.cpp:395
-msgid "Email address"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:429
-msgid "SIP Account Settings"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:433
-msgid "IAX2 Account Settings"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:435
-msgid "Please full these settings fields."
-msgstr ""
-
-#: ../src/AccountWizard.cpp:512
-msgid "Network Address Translation (NAT)"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:513
-msgid ""
-"You should probably enable this option if you're placed under a firewall"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:515
-msgid "Enable STUN"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:516
-msgid "Stun Server"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:550
-msgid "Account Definition Finished"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:551
-msgid ""
-"After checking the settings you chose, click \"Finish\" to create the "
-"account."
-msgstr ""
-
-#: ../src/Call.cpp:116
-msgid "Transfer to : "
-msgstr ""
-
-#: ../src/ConfigDialog.cpp:131 ../src/ConfigDialog.cpp:263
-msgid "Attention : SIP port must be over 1024 !"
-msgstr ""
-
-#: ../src/ConfigDialog.cpp:136 ../src/ConfigDialog.cpp:266
-msgid "Attention : SIP port must be under 65536 !"
-msgstr ""
-
-#: ../src/main.cpp:49 ../src/main.cpp:50
-msgctxt "Your names"
-msgid "NAME OF TRANSLATORS"
-msgstr ""
-
-#: ../src/main.cpp:50 ../src/main.cpp:51
-msgctxt "Your emails"
-msgid "EMAIL OF TRANSLATORS"
-msgstr ""
-
-#: ../src/SFLPhone.cpp:55 ../src/sflphone_kdeview.cpp:1051
-#: ../src/sflphone_kdeview.cpp:1056 ../src/sflphone_kdeview.cpp:1061
-msgid "SFLPhone"
-msgstr ""
-
-#: ../src/SFLPhone.cpp:154
-msgid "You still have some calls open. Please close all calls before quitting."
-msgstr ""
-
-#: ../src/SFLPhone.cpp:182
-msgid "Incoming call"
-msgstr ""
-
-#: ../src/SFLPhone.cpp:183
-msgid "You have an incoming call from"
-msgstr ""
-
-#: ../src/SFLPhone.cpp:183
-msgid "Click to accept or refuse it."
-msgstr ""
-
-#: ../src/sflphone_kdeview.cpp:1051
-msgid "Main screen"
-msgstr ""
-
-#: ../src/sflphone_kdeview.cpp:1056 ../build/src/ui_ConfigDialog.h:1271
-#: ../build/src/ui_dlggeneralbase.h:160
-msgid "Call history"
-msgstr ""
-
-#: ../src/sflphone_kdeview.cpp:1061
-#: ../build/src/ui_sflphone_kdeview_base.h:507
-msgid "Address book"
-msgstr ""
-
-#: ../src/sflphone_kdeview.cpp:1075 ../src/sflphone_kdeview.cpp:1131
-msgid "Edit before call"
-msgstr ""
-
-#: ../src/sflphone_const.h:56
-msgid "Call"
-msgstr ""
-
-#: ../src/sflphone_const.h:57
-msgid "Hang up"
-msgstr ""
-
-#: ../src/sflphone_const.h:58
-msgid "Hold"
-msgstr ""
-
-#: ../src/sflphone_const.h:59
-msgid "Transfer"
-msgstr ""
-
-#: ../src/sflphone_const.h:60 ../build/src/ui_ConfigDialog.h:1263
-msgid "Record"
-msgstr ""
-
-#: ../src/sflphone_const.h:61
-msgid "Accept"
-msgstr ""
-
-#: ../src/sflphone_const.h:62
-msgid "Refuse"
-msgstr ""
-
-#: ../src/sflphone_const.h:63
-msgid "Unhold"
-msgstr ""
-
-#: ../src/sflphone_const.h:64
-msgid "Give up transfer"
-msgstr ""
-
-#: ../src/sflphone_const.h:65
-msgid "Call back"
-msgstr ""
-
-#: ../src/sflphone_const.h:66
-msgid "Give up search"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1249
-msgid "Configuration Dialog"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1250
-msgid "about"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1255 ../build/src/ui_ConfigDialog.h:1337
-msgid "General"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1257
-msgid "Display"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1261
-msgid "Audio"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1265
-msgid "Address Book"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1267
-msgid "Hooks"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1270
-msgid "Configure general settings"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1272 ../build/src/ui_dlggeneralbase.h:161
-msgid "&Capacity"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1273 ../build/src/ui_dlggeneralbase.h:162
-msgid "C&lear history"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1274 ../build/src/ui_dlggeneralbase.h:163
-msgid "Connection"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1275 ../build/src/ui_dlggeneralbase.h:164
-msgid "SIP &Port"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1276 ../build/src/ui_dlggeneralbase.h:165
-msgid "Attention "
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1277
-msgid "Configure display"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1278
-msgid "Enable notifications"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1279
-msgid "On incoming &calls"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1280
-msgid "On &messages"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1281
-msgid "Show main window"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1282
-msgid "On &start"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1283
-msgid "On &incoming calls"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1284
-msgid "Configure user accounts"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1286
-msgid "Remove this account"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1287
-msgid "Backspace, Return"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1288
-msgid "Add a new account"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1289
-msgid "Down"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1290
-msgid "Up"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1291
-msgid "Apply"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1292
-msgid "&Alias"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1293
-msgid "&Protocol"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1296
-msgid "SIP"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1297
-msgid "IAX"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1299
-msgid "&Server"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1300
-msgid "&User"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1301
-msgid "Pass&word"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1302
-#: ../build/src/ui_sflphone_kdeview_base.h:498
-msgid "&Mailbox"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1303
-msgid "State"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1306
-msgid "Stun settings will be applied on each account"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1307
-msgid "&Enable Stun"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1308
-msgid "Configure audio settings"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1310
-msgid "Audio &device"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1313
-msgid "ALSA"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1314
-msgid "PulseAudio"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1316
-msgid "&Enable ringtones"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1317
-msgid "&Codecs"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1321
-msgid "Active"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1323
-msgid "Name"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1325
-msgid "Frequency"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1327
-msgid "Bitrate"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1329
-msgid "Bandwidth"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1330
-msgid "ALSA settings"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1331
-msgid "&In"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1332
-msgid "&Out"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1333
-msgid "ALSA &plugin"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1334
-msgid "PulseAudio settings"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1335
-msgid "Mute other applications during a call"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1336
-msgid "Configure record settings"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1338
-msgid "Destination folder"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1339
-msgid "Configure address book settings"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1340
-msgid "Maximum &results"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1341
-msgid "Display &photo if available"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1342
-msgid "Display phone numbers of these &types :"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1343
-msgid "&Work"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1344
-msgid "&Mobile"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1345
-msgid "&Home"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1346
-msgid "Configure hooks settings"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1347
-msgid "URL Argument"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1348
-msgid "SIP Protocol"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1349
-msgid "IAX2 Protocol"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1350
-msgid "SIP Header"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1351
-msgid "Command"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1352
-msgid "Phone number formatting"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1353
-msgid "Add phone number prefix"
-msgstr ""
-
-#: ../build/src/ui_ConfigDialog.h:1354
-msgid "Prepend"
-msgstr ""
-
-#: ../build/src/ui_dlggeneralbase.h:159
-#: ../build/src/ui_sflphone_kdeview_base.h:492
-msgid "Form"
-msgstr ""
-
-#: ../build/src/ui_sflphone_kdeview_base.h:493
-msgid "&Pick up"
-msgstr ""
-
-#: ../build/src/ui_sflphone_kdeview_base.h:494
-msgid "&Hang up"
-msgstr ""
-
-#: ../build/src/ui_sflphone_kdeview_base.h:495
-msgid "H&old"
-msgstr ""
-
-#: ../build/src/ui_sflphone_kdeview_base.h:496
-msgid "&Transfer"
-msgstr ""
-
-#: ../build/src/ui_sflphone_kdeview_base.h:497
-msgid "H&istory"
-msgstr ""
-
-#: ../build/src/ui_sflphone_kdeview_base.h:499
-msgid "Configure &accounts"
-msgstr ""
-
-#: ../build/src/ui_sflphone_kdeview_base.h:500
-msgid "Configure a&udio"
-msgstr ""
-
-#: ../build/src/ui_sflphone_kdeview_base.h:501
-msgid "&Configure SFLPhone"
-msgstr ""
-
-#: ../build/src/ui_sflphone_kdeview_base.h:502
-msgid "Display &volume bars"
-msgstr ""
-
-#: ../build/src/ui_sflphone_kdeview_base.h:503
-msgid "&About"
-msgstr ""
-
-#: ../build/src/ui_sflphone_kdeview_base.h:504
-msgid "Display &dialpad"
-msgstr ""
-
-#: ../build/src/ui_sflphone_kdeview_base.h:505
-msgid "&Record"
-msgstr ""
-
-#: ../build/src/ui_sflphone_kdeview_base.h:506
-msgid "Account creation &wizard"
-msgstr ""
-
-#: ../build/src/ui_sflphone_kdeview_base.h:508
-msgid "Attention:number of results exceeds max displayed."
-msgstr ""
diff --git a/sflphone-client-kde/po/update.sh b/sflphone-client-kde/po/update.sh
deleted file mode 100755
index 3fe757660a4535a2639e9a29ef876d5e5c3a91c4..0000000000000000000000000000000000000000
--- a/sflphone-client-kde/po/update.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-xgettext --from-code=utf-8 --c++ --kde -ktr2i18n -kki18nc:1c,2 -kki18n -ki18n -ki18nc:1c,2 -o sflphone-client-kde.pot ../src/*.cpp ../src/*.h ../src/conf/*.h ../src/conf/*.cpp ../build/src/*.h ../build/src/*.cpp 
-
-for fichier in `find  .  -name *.po `
-do
-msgmerge --update $fichier sflphone-client-kde.pot
-done
\ No newline at end of file
diff --git a/sflphone-client-kde/po/zh_CN/sflphone-client-kde.po b/sflphone-client-kde/po/zh_CN/sflphone-client-kde.po
index d8af45b68bdc669a021952c89c623dfdfc4621c0..08c96f7a7251ef4bc815abeaecd578cde3645edc 100644
--- a/sflphone-client-kde/po/zh_CN/sflphone-client-kde.po
+++ b/sflphone-client-kde/po/zh_CN/sflphone-client-kde.po
@@ -1,607 +1,1522 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Chinese translation of SFLphone.
+# Copyright (C) 2008 The Free Software Foundation, Inc.
+# This file is distributed under the GNU General Public License Version 3.
+# 
+# Yun Liu <yun.liu@savoirfairelinux.com>, 2008.
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: SFLphone 0.9.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-17 15:48-0400\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"
+"POT-Creation-Date: 2009-07-17 16:14-0400\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-
-#: ../src/AccountWizard.cpp:161 ../src/AccountWizard.cpp:275
-msgid "Account Creation Wizard"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:200
-msgid "Creation of account succeed with these parameters"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:211
+"Plural-Forms: nplurals=2; plural=n>1;\n"
+
+#: ../sflphone-client-kde/src/Account.cpp:34
+#: ../sflphone-client-gnome/src/accountlist.c:175
+msgctxt "account state"
+msgid "Registered"
+msgstr "已注册"
+
+#: ../sflphone-client-kde/src/Account.cpp:36
+#: ../sflphone-client-gnome/src/accountlist.c:178
+msgctxt "account state"
+msgid "Not Registered"
+msgstr "未注册"
+
+#: ../sflphone-client-kde/src/Account.cpp:38
+#: ../sflphone-client-gnome/src/accountlist.c:181
+msgctxt "account state"
+msgid "Trying..."
+msgstr "正在连接..."
+
+#: ../sflphone-client-kde/src/Account.cpp:40
+#: ../sflphone-client-gnome/src/accountlist.c:184
+msgctxt "account state"
+msgid "Error"
+msgstr "注册失败"
+
+#: ../sflphone-client-kde/src/Account.cpp:42
+#: ../sflphone-client-gnome/src/accountlist.c:187
+msgctxt "account state"
+msgid "Authentication Failed"
+msgstr "认证错误"
+
+#: ../sflphone-client-kde/src/Account.cpp:44
+#: ../sflphone-client-gnome/src/accountlist.c:190
+msgctxt "account state"
+msgid "Network unreachable"
+msgstr "网络连接失败"
+
+#: ../sflphone-client-kde/src/Account.cpp:46
+#: ../sflphone-client-gnome/src/accountlist.c:193
+msgctxt "account state"
+msgid "Host unreachable"
+msgstr "服务器连接失败"
+
+#: ../sflphone-client-kde/src/Account.cpp:48
+#: ../sflphone-client-gnome/src/accountlist.c:196
+msgctxt "account state"
+msgid "Stun configuration error"
+msgstr "STUN配置有误"
+
+#: ../sflphone-client-kde/src/Account.cpp:50
+#: ../sflphone-client-gnome/src/accountlist.c:199
+msgctxt "account state"
+msgid "Stun server invalid"
+msgstr "STUN服务器无效"
+
+#: ../sflphone-client-kde/src/Account.cpp:51
+#: ../sflphone-client-gnome/src/accountlist.c:202
+msgctxt "account state"
+msgid "Invalid"
+msgstr "无效"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:163
+#: ../sflphone-client-kde/src/AccountWizard.cpp:278
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:393
+msgid "Account creation wizard"
+msgstr "帐户创建向导"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:199
+#: ../sflphone-client-kde/src/AccountWizard.cpp:217
+#: ../sflphone-client-kde/src/AccountWizard.cpp:561
+#: ../sflphone-client-gnome/src/assistant.c:68
+#, c-format
+msgid "This assistant is now finished."
+msgstr "配置完成."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:211
 msgid "Creation of account has failed for the reason"
 msgstr ""
 
-#: ../src/AccountWizard.cpp:217
-msgid "Register of account succeed with these parameters"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:253 ../src/AccountWizard.cpp:437
+#: ../sflphone-client-kde/src/AccountWizard.cpp:255
+#: ../sflphone-client-kde/src/AccountWizard.cpp:440
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:363
+#: ../sflphone-client-gnome/src/assistant.c:72
 msgid "Alias"
-msgstr ""
+msgstr "别名"
 
-#: ../src/AccountWizard.cpp:254 ../src/AccountWizard.cpp:438
+#: ../sflphone-client-kde/src/AccountWizard.cpp:256
+#: ../sflphone-client-kde/src/AccountWizard.cpp:441
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:370
+#: ../sflphone-client-gnome/src/assistant.c:75
 msgid "Server"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:255 ../src/AccountWizard.cpp:439
-msgid "User"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:256 ../src/AccountWizard.cpp:440
+msgstr "服务器"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:257
+#: ../sflphone-client-kde/src/AccountWizard.cpp:442
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:371
+#: ../sflphone-client-gnome/src/assistant.c:78
+msgid "Username"
+msgstr "用户名"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:258
+#: ../sflphone-client-kde/src/AccountWizard.cpp:443
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:372
 msgid "Password"
-msgstr ""
+msgstr "密码"
 
-#: ../src/AccountWizard.cpp:257
+#: ../sflphone-client-kde/src/AccountWizard.cpp:259
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:364
+#: ../sflphone-client-gnome/src/config/configwindow.c:418
 msgid "Protocol"
-msgstr ""
+msgstr "协议"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:260
+#: ../sflphone-client-kde/src/AccountWizard.cpp:444
+msgid "Voicemail number"
+msgstr "语音信箱号码"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:279
+#: ../sflphone-client-gnome/src/assistant.c:216
+msgid "Welcome to the Account creation wizard of SFLphone!"
+msgstr "欢迎使用SFLphone帐户创建向导!"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:281
+#: ../sflphone-client-gnome/src/assistant.c:217
+msgid "This installation wizard will help you configure an account."
+msgstr "安装向导将帮助您配置帐户"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:309
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Account"
+msgstr "帐户"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:310
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Please select one of the following options"
+msgstr "请选择以下选项中的一个"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:312
+#: ../sflphone-client-gnome/src/assistant.c:251
+msgid "Create a free SIP/IAX2 account on sflphone.org"
+msgstr "在sflphone.org上创建免费的SIP/IAX2帐户"
 
-#: ../src/AccountWizard.cpp:258
-msgid "Mailbox"
-msgstr ""
+#: ../sflphone-client-kde/src/AccountWizard.cpp:313
+#: ../sflphone-client-gnome/src/assistant.c:253
+msgid "Register an existing SIP or IAX2 account"
+msgstr "注册已存在的SIP或IAX2帐户"
 
-#: ../src/AccountWizard.cpp:276
-msgid "Welcome to the Account creation wizard of SFLPhone"
-msgstr ""
+#: ../sflphone-client-kde/src/AccountWizard.cpp:352
+#: ../sflphone-client-gnome/src/assistant.c:231
+msgid "VoIP Protocols"
+msgstr "VoIP协议"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:353
+#: ../sflphone-client-gnome/src/assistant.c:231
+msgid "Select an account type"
+msgstr "选择帐户类型"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:355
+#: ../sflphone-client-gnome/src/assistant.c:233
+msgid "SIP (Session Initiation Protocol)"
+msgstr "SIP(会话初始化协议)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:356
+#: ../sflphone-client-gnome/src/assistant.c:235
+msgid "IAX2 (InterAsterix Exchange)"
+msgstr "IAX2(Asterisk内部交换协议)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:395
+#: ../sflphone-client-gnome/src/assistant.c:339
+msgid "Optional email address"
+msgstr "可选邮件地址"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:396
+#: ../sflphone-client-gnome/src/assistant.c:339
+msgid "This email address will be used to send your voicemail messages."
+msgstr "这个邮件地址将被用来发送您的语音邮箱消息"
 
-#: ../src/AccountWizard.cpp:278
-msgid "This wizard will help you setting up an account."
-msgstr ""
+#: ../sflphone-client-kde/src/AccountWizard.cpp:398
+msgid "Email address"
+msgstr "邮件地址"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:432
+#: ../sflphone-client-gnome/src/assistant.c:266
+msgid "SIP account settings"
+msgstr "SIP帐户设置"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:436
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "IAX2 account settings"
+msgstr "IAX2帐户设置"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:438
+#: ../sflphone-client-gnome/src/assistant.c:266
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "Please fill the following information"
+msgstr "请填写以下信息"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:523
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:856
+msgid "Network Address Translation (NAT)"
+msgstr "网络地址解析(NAT)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:524
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:536
+msgid "You should probably enable this if you are behind a firewall."
+msgstr "如果你使用网络使用防火墙，你很有可能需要设定此项."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:526
+msgid "Enable STUN"
+msgstr "使用STUN"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:527
+msgid "Stun Server"
+msgstr "STUN服务器"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:562
+msgid ""
+"After checking the settings you chose, click \"Finish\" to create the "
+"account."
+msgstr "当您检查完选定的设置, 请点击\"结束\"来创建帐户"
+
+#: ../sflphone-client-kde/src/ActionSetAccountFirst.cpp:26
+msgid "Default account"
+msgstr "默认帐户"
+
+#: ../sflphone-client-kde/src/Call.cpp:116
+#: ../sflphone-client-gnome/src/contacts/calltree.c:322
+msgid "Transfer to : "
+msgstr "转给:"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:89
+#: ../sflphone-client-gnome/src/actions.c:816
+msgid "Codec"
+msgstr "编码"
 
-#: ../src/AccountWizard.cpp:306 ../build/src/ui_ConfigDialog.h:1259
+#: ../sflphone-client-kde/src/CodecListModel.cpp:93
+#: ../sflphone-client-gnome/src/config/audioconf.c:581
+msgid "Frequency"
+msgstr "频率"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:97
+#: ../sflphone-client-gnome/src/config/audioconf.c:586
+msgid "Bitrate"
+msgstr "比率"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:101
+#: ../sflphone-client-gnome/src/config/audioconf.c:591
+msgid "Bandwidth"
+msgstr "带宽"
+
+#: ../sflphone-client-kde/src/main.cpp:38
+msgid "SFLphone KDE Client"
+msgstr "SFLphone KDE客户端"
+
+#: ../sflphone-client-kde/src/main.cpp:42
+msgid "(C) 2009 Savoir-faire Linux"
+msgstr "(C) 2009 Savoir-faire Linux"
+
+#: ../sflphone-client-kde/src/main.cpp:46
+msgid "Jérémy Quentin"
+msgstr "Jérémy Quentin"
+
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Yun Liu"
+
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "yunliu2000@gmail.com"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:62
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-gnome/src/statusicon.c:126
+msgid "SFLphone"
+msgstr "SFLphone"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:209
+msgid "Incoming call"
+msgstr "来电"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
+msgid "You have an incoming call from"
+msgstr "您有一个电话,来自于"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
+msgid "Click to accept or refuse it."
+msgstr "请点击接听或拒绝"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:716
+msgid "Address book loading..."
+msgstr "载入地址簿......"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:901
+#: ../sflphone-client-gnome/src/actions.c:89
+msgid "No registered accounts"
+msgstr "没有已注册帐户"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:905
+#: ../sflphone-client-gnome/src/actions.c:83
+#: ../sflphone-client-gnome/src/actions.c:813
+msgid "Using account"
+msgstr "使用账户"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
+msgid "Main screen"
+msgstr "主屏幕"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:165
+msgid "Call history"
+msgstr "呼叫记录"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:394
+#: ../sflphone-client-gnome/src/toolbar.c:243
+#: ../sflphone-client-gnome/src/toolbar.c:245
+msgid "Address book"
+msgstr "地址簿"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1108
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1173
+msgid "Edit before call"
+msgstr "呼叫前进行编辑"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:41
+#: ../sflphone-client-gnome/src/toolbar.c:167
+#: ../sflphone-client-gnome/src/toolbar.c:169
+msgid "New call"
+msgstr "新电话"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:42
+#: ../sflphone-client-kde/src/sflphone_const.h:47
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:381
+#: ../sflphone-client-gnome/src/toolbar.c:186
+#: ../sflphone-client-gnome/src/toolbar.c:188
+msgid "Hang up"
+msgstr "放电话"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:43
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:382
+#: ../sflphone-client-gnome/src/toolbar.c:207
+#: ../sflphone-client-gnome/src/toolbar.c:209
+msgid "Hold on"
+msgstr "呼叫保持"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:44
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:383
+#: ../sflphone-client-gnome/src/toolbar.c:220
+#: ../sflphone-client-gnome/src/toolbar.c:222
+msgid "Transfer"
+msgstr "转接"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:45
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:392
+#: ../sflphone-client-gnome/src/toolbar.c:263
+msgid "Record"
+msgstr "记录"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:46
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:380
+#: ../sflphone-client-gnome/src/toolbar.c:176
+#: ../sflphone-client-gnome/src/toolbar.c:178
+msgid "Pick up"
+msgstr "接电话"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:48
+#: ../sflphone-client-gnome/src/toolbar.c:196
+#: ../sflphone-client-gnome/src/toolbar.c:198
+msgid "Hold off"
+msgstr "恢复通话"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:49
+msgid "Give up transfer"
+msgstr "取消转接"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:50
+msgid "Call back"
+msgstr "回叫"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:48
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:91
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
+#: ../sflphone-client-gnome/src/config/configwindow.c:722
+#: ../sflphone-client-gnome/src/config/configwindow.c:791
+msgctxt "Config section"
+msgid "General"
+msgstr "常用配置"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:49
+msgctxt "Config section"
+msgid "Display"
+msgstr "显示"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:50
+#: ../sflphone-client-gnome/src/config/configwindow.c:833
+msgctxt "Config section"
 msgid "Accounts"
-msgstr ""
+msgstr "帐户"
 
-#: ../src/AccountWizard.cpp:307
-msgid "Please choose between those options :"
-msgstr ""
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:51
+#: ../sflphone-client-gnome/src/config/configwindow.c:786
+msgctxt "Config section"
+msgid "Audio"
+msgstr "音频"
 
-#: ../src/AccountWizard.cpp:309
-msgid "Create a free SIP/IAX2 account on sflphone.org"
-msgstr ""
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:52
+#: ../sflphone-client-gnome/src/config/configwindow.c:801
+msgctxt "Config section"
+msgid "Address Book"
+msgstr "地址簿"
 
-#: ../src/AccountWizard.cpp:310
-msgid "Register an existing SIP/IAX2 account"
-msgstr ""
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:53
+#: ../sflphone-client-gnome/src/config/configwindow.c:796
+msgctxt "Config section"
+msgid "Recordings"
+msgstr "记录"
 
-#: ../src/AccountWizard.cpp:349
-msgid "VoIP Protocols"
-msgstr ""
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:54
+#: ../sflphone-client-gnome/src/config/configwindow.c:806
+msgctxt "Config section"
+msgid "Hooks"
+msgstr "钩键"
 
-#: ../src/AccountWizard.cpp:350
-msgid "Choose the account type"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:328
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows. Enable/disable them by checking/unchecking "
+"them on the left of the item. Add or remove some with \"Plus\" and \"Sub\" "
+"buttons. Edit the selected account with the form on the right."
+msgstr ""
+"在默认情况下，当你打电话时，sflphone会使用列表当中第一个已注册的帐户。使用箭"
+"头\"上\"和\"下\"可以改变账户的顺序。选择账户名称左边的方框可以启用帐户，取消"
+"选择则会禁用该账户。通过\"加\"\"减\"按钮可以添加或删除账户。点击\"编辑\"按钮"
+"可以改变账户的设置。"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:332
+msgid "Remove the selected account"
+msgstr "删除所选账户"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:335
+msgid ""
+"This button will remove the selected account in the list below. Be sure you "
+"really don't need it anymore. If you think you might use it again later, "
+"just uncheck it."
 msgstr ""
+"该按钮会删除列表中被选定的账户。请确认你的操作。如果你希望继续使用某个账户，"
+"请取消对该账户的选择"
 
-#: ../src/AccountWizard.cpp:352
-msgid "Register a SIP (Session Initiation Protocol) account"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:340
+msgid "Remove"
+msgstr "删除"
 
-#: ../src/AccountWizard.cpp:353
-msgid "Register a IAX2 (InterAsterisk eXchange) account"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:342
+msgid "Add a new account"
+msgstr "增加新帐户"
 
-#: ../src/AccountWizard.cpp:392
-msgid "Optionnal Email Address"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:345
+msgid ""
+"This button enables you to initialize a new account. You will then be able "
+"to edit it using the form on the right."
 msgstr ""
+"通过该按钮可以创建一个新账户。添加该账户之后你还可以通过编辑按钮来修改设置。"
 
-#: ../src/AccountWizard.cpp:393
-msgid "This email address will be used to send your voicemail messages."
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:347
+msgid "Add"
+msgstr "添加"
 
-#: ../src/AccountWizard.cpp:395
-msgid "Email address"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:349
+msgid "Get this account down"
+msgstr "将该账户向下移动"
 
-#: ../src/AccountWizard.cpp:429
-msgid "SIP Account Settings"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:352
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:359
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows."
 msgstr ""
+"在默认情况下，当你打电话时，sflphone会使用列表当中第一个已注册的帐户。使用箭"
+"头\"上\"和\"下\"可以改变账户的顺序。选择账户名称左边的方框可以启用帐户，取消"
+"选择则会禁用该账户。通过\"加\"\"减\"按钮可以添加或删除账户。"
 
-#: ../src/AccountWizard.cpp:433
-msgid "IAX2 Account Settings"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:354
+msgid "Down"
+msgstr "下"
 
-#: ../src/AccountWizard.cpp:435
-msgid "Please full these settings fields."
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:356
+msgid "Get this account up"
+msgstr "把该账户向上移动"
 
-#: ../src/AccountWizard.cpp:512
-msgid "Network Address Translation (NAT)"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:361
+msgid "Up"
+msgstr "上"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:362
+msgid "Apply"
+msgstr "应用"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:367
+msgid "SIP"
+msgstr "SIP"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:368
+msgid "IAX"
+msgstr "IAX"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:373
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:385
+#: ../sflphone-client-gnome/src/toolbar.c:52
+#: ../sflphone-client-gnome/src/toolbar.c:251
+#: ../sflphone-client-gnome/src/toolbar.c:255
+msgid "Voicemail"
+msgstr "语音信箱"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:374
+#: ../sflphone-client-gnome/src/config/configwindow.c:425
+msgid "Status"
+msgstr "状态"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:377
+#: ../sflphone-client-gnome/src/config/configwindow.c:528
+msgid "Stun parameters will be applied on each SIP account created."
+msgstr "STUN参数将应用于每一个注册的SIP帐户"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:378
+msgid "Enable Stun"
+msgstr "使用STUN"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:380
+#: ../sflphone-client-gnome/src/config/configwindow.c:544
+msgid "Format : name.server:port"
+msgstr "格式：名称.服务器:端口"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:382
+msgid "choose Stun server (example : stunserver.org)"
+msgstr "选择STUN服务器(例如:stunserver.org)"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:154
+msgid "Enable address book"
+msgstr "启用地址簿"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:155
+msgid "Maximum results"
+msgstr "结果最大值"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:156
+msgid "Display photo if available"
+msgstr "如果可行则显示联系人照片"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:157
+msgid "Display phone numbers of these types :"
+msgstr "显示这些格式的电话号码"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:158
+msgid "Work"
+msgstr "单位电话"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:159
+msgid "Mobile"
+msgstr "移动电话"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:160
+msgid "Home"
+msgstr "家庭电话"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:225
+msgid "Sound manager"
+msgstr "声音管理器"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:228
+msgid "ALSA"
+msgstr "ALSA"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:229
+msgid "PulseAudio"
+msgstr "PulseAudio"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:231
+msgid "Enable ringtones"
+msgstr "启用铃声"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:232
+#: ../sflphone-client-gnome/src/config/audioconf.c:812
+msgid "Codecs"
+msgstr "Codecs编码"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:233
+#: ../sflphone-client-gnome/src/config/audioconf.c:795
+msgid "ALSA settings"
+msgstr "ALSA设置"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:234
+#: ../sflphone-client-gnome/src/config/audioconf.c:662
+msgid "ALSA plugin"
+msgstr "ALSA插件"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:235
+#: ../sflphone-client-gnome/src/config/audioconf.c:706
+msgid "Input"
+msgstr "输入"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:236
+#: ../sflphone-client-gnome/src/config/audioconf.c:684
+msgid "Output"
+msgstr "输出"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:237
+msgid "PulseAudio settings"
+msgstr "PulseAudio设置"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:238
+msgid "Mute other applications during a call"
+msgstr "当有来电时静音其它应用程序"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:121
+msgid "Enable notifications"
+msgstr "启用提示"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:122
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:126
+msgid "On incoming calls"
+msgstr "有新来电"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:123
+msgid "On messages"
+msgstr "有新消息"
 
-#: ../src/AccountWizard.cpp:513
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:124
+msgid "Show main window"
+msgstr "显示主窗口"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:125
+msgid "On start"
+msgstr "正在启动"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:166
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "Keep my history for at least"
+msgstr "保存呼叫记录至少"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:167
+#: ../sflphone-client-gnome/src/config/configwindow.c:643
+msgctxt "End of 'Keep my history for at least n days.'"
+msgid "days"
+msgstr "天"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:168
+msgid "Clear history"
+msgstr "清空历史记录"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:169
+msgid "Connection"
+msgstr "连接"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:170
+#: ../sflphone-client-gnome/src/config/configwindow.c:664
+msgid "SIP Port"
+msgstr "SIP端口号"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:180
+#: ../sflphone-client-gnome/src/config/hooks-config.c:130
+msgid "URL Argument"
+msgstr "URL参数"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:181
+#: ../sflphone-client-gnome/src/config/hooks-config.c:135
+msgid "Custom commands on incoming calls with URL"
+msgstr "定制对带有URL的来电的处理"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:182
+msgid "Trigger on specific SIP header"
+msgstr "激活指定的SIP头"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:183
+msgid "Trigger on IAX2 URL"
+msgstr "激活IAX2 URL"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:184
+msgid "Command to run"
+msgstr "要运行的命令"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:185
+#: ../sflphone-client-gnome/src/config/hooks-config.c:138
+#, c-format
+msgid "%s will be replaced with the passed URL."
+msgstr "传输的URL会被替换成%s."
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:186
+#: ../sflphone-client-gnome/src/config/hooks-config.c:165
+msgid "Phone number rewriting"
+msgstr "重设电话号码"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:187
+msgid "Prefix dialed numbers with"
+msgstr "号码前缀"
+
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:92
+#: ../sflphone-client-gnome/src/config/configwindow.c:726
+msgid "Destination folder"
+msgstr "目标文件夹"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:384
+#: ../sflphone-client-gnome/src/toolbar.c:232
+#: ../sflphone-client-gnome/src/toolbar.c:234
+msgid "History"
+msgstr "历史"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:386
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:388
+msgid "Configure SFLphone"
+msgstr "配置SFLphone"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:390
+msgid "Display volume controls"
+msgstr "显示音量控制"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:391
+msgid "Display dialpad"
+msgstr "显示拨号键盘"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:396
+msgid "Attention:number of results exceeds max displayed."
+msgstr "注意:结果超过可显示的最大值"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:398
+#: ../sflphone-client-gnome/src/sliders.c:163
+msgid "Mic volume"
+msgstr "话筒音量"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:402
+#: ../sflphone-client-gnome/src/sliders.c:161
+msgid "Speakers volume"
+msgstr "扬声器音量"
+
+#: ../sflphone-client-gnome/src/actions.c:54
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] "%d 个语音信息"
+msgstr[1] "%d 个语音信息"
+
+#: ../sflphone-client-gnome/src/actions.c:234
 msgid ""
-"You should probably enable this option if you're placed under a firewall"
+"Unable to connect to the SFLphone server.\n"
+"Make sure the daemon is running."
 msgstr ""
+"连接SFLphone服务器失败.\n"
+"请检查daemon是否还在运行."
 
-#: ../src/AccountWizard.cpp:515
-msgid "Enable STUN"
-msgstr ""
+#: ../sflphone-client-gnome/src/actions.c:809
+#, c-format
+msgid "IP call - %s"
+msgstr "IP 电话 - %s"
 
-#: ../src/AccountWizard.cpp:516
-msgid "Stun Server"
+#: ../sflphone-client-gnome/src/actions.c:908
+#, 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>错误：无法找到codecs编码文件.\n"
+"\n"
+"</b> SFL声音codecs文件应位于<i>%s</i> 或 位于主目录( <i>%s</i> )的<b>."
+"sflphone</b>目录下"
 
-#: ../src/AccountWizard.cpp:550
-msgid "Account Definition Finished"
+#: ../sflphone-client-gnome/src/assistant.c:70
+msgid ""
+"You can at any time check your registration state or modify your accounts "
+"parameters in the Options/Accounts window."
+msgstr "你可以随时在 选项/帐户 窗口中查看注册状态或者修改帐户参数."
+
+#: ../sflphone-client-gnome/src/assistant.c:190
+msgid "SFLphone account creation wizard"
+msgstr "SFLphone账户创建向导"
+
+#: ../sflphone-client-gnome/src/assistant.c:274
+#: ../sflphone-client-gnome/src/assistant.c:370
+#: ../sflphone-client-gnome/src/config/accountwindow.c:153
+msgid "_Alias"
+msgstr "别名(A)"
+
+#: ../sflphone-client-gnome/src/assistant.c:282
+#: ../sflphone-client-gnome/src/assistant.c:378
+#: ../sflphone-client-gnome/src/config/accountwindow.c:189
+msgid "_Host name"
+msgstr "主机名(H)"
+
+#: ../sflphone-client-gnome/src/assistant.c:290
+#: ../sflphone-client-gnome/src/assistant.c:386
+#: ../sflphone-client-gnome/src/config/accountwindow.c:197
+msgid "_User name"
+msgstr "用户名(U)"
+
+#: ../sflphone-client-gnome/src/assistant.c:306
+#: ../sflphone-client-gnome/src/assistant.c:401
+#: ../sflphone-client-gnome/src/config/accountwindow.c:212
+msgid "_Password"
+msgstr "密码(P)"
+
+#: ../sflphone-client-gnome/src/assistant.c:324
+#: ../sflphone-client-gnome/src/assistant.c:417
+#: ../sflphone-client-gnome/src/config/accountwindow.c:228
+msgid "_Voicemail number"
+msgstr "语音信箱号码(V)"
+
+#: ../sflphone-client-gnome/src/assistant.c:347
+msgid "_Email address"
+msgstr "邮件地址(E)"
+
+#: ../sflphone-client-gnome/src/assistant.c:444
+#: ../sflphone-client-gnome/src/config/configwindow.c:532
+msgid "E_nable STUN"
+msgstr "使用STUN(n)"
+
+#: ../sflphone-client-gnome/src/assistant.c:451
+msgid "_STUN server"
+msgstr "STUN服务器(S)"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Account Registration"
+msgstr "帐户注册"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Congratulations!"
+msgstr "恭喜！"
+
+#: ../sflphone-client-gnome/src/errors.c:29
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening playback device"
 msgstr ""
+"ALSA提示\n"
+"\n"
+"打开回放设备时出错"
 
-#: ../src/AccountWizard.cpp:551
+#: ../sflphone-client-gnome/src/errors.c:32
 msgid ""
-"After checking the settings you chose, click \"Finish\" to create the "
-"account."
+"ALSA notification\n"
+"\n"
+"Error while opening capture device"
 msgstr ""
+"ALSA提示\n"
+"\n"
+"打开采集设备时出错"
 
-#: ../src/Call.cpp:116
-msgid "Transfer to : "
-msgstr ""
+#: ../sflphone-client-gnome/src/errors.c:35
+msgid ""
+"Pulseaudio notification\n"
+"\n"
+"Pulseaudio is not running"
+msgstr ""
+"Pulseaudio提示\n"
+"\n"
+"Pulseaudio未运行"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:70
+msgid "There is one call in progress."
+msgstr "有一个电话正在处理"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:74
+msgid "There are calls in progress."
+msgstr "有电话正在处理中"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:83
+msgid "Do you still want to quit?"
+msgstr "确认要退出?"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:284
+msgid "SFLphone Error"
+msgstr "SFLphone出错"
+
+#: ../sflphone-client-gnome/src/menus.c:134
+msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr "SFLphone是一个VoIP客户端，它兼容SIP和IAX2协议."
+
+#: ../sflphone-client-gnome/src/menus.c:137
+msgid "About SFLphone"
+msgstr "关于SFLphone"
+
+#: ../sflphone-client-gnome/src/menus.c:161
+msgid "_Help"
+msgstr "帮助(H)"
+
+#: ../sflphone-client-gnome/src/menus.c:296
+#: ../sflphone-client-gnome/src/menus.c:953
+msgid "_New call"
+msgstr "新电话(N)"
+
+#: ../sflphone-client-gnome/src/menus.c:308
+#: ../sflphone-client-gnome/src/menus.c:785
+msgid "_Pick up"
+msgstr "拨出(P)"
+
+#: ../sflphone-client-gnome/src/menus.c:318
+#: ../sflphone-client-gnome/src/menus.c:797
+msgid "_Hang up"
+msgstr "放下(H)"
+
+#: ../sflphone-client-gnome/src/menus.c:328
+#: ../sflphone-client-gnome/src/menus.c:809
+msgid "On _Hold"
+msgstr "保持(H)"
+
+#: ../sflphone-client-gnome/src/menus.c:340
+#: ../sflphone-client-gnome/src/menus.c:821
+msgid "_Record"
+msgstr "记录(R)"
+
+#: ../sflphone-client-gnome/src/menus.c:354
+msgid "_Account creation wizard"
+msgstr "帐户创建向导"
+
+#: ../sflphone-client-gnome/src/menus.c:384
+msgid "_Call"
+msgstr "电话"
+
+#: ../sflphone-client-gnome/src/menus.c:552
+msgid "Clear _history"
+msgstr "清空历史记录(C)"
+
+#: ../sflphone-client-gnome/src/menus.c:564
+msgid "_Accounts"
+msgstr "帐户(A)"
+
+#: ../sflphone-client-gnome/src/menus.c:579
+msgid "_Edit"
+msgstr "编辑(E)"
+
+#: ../sflphone-client-gnome/src/menus.c:631
+msgid "_Dialpad"
+msgstr "拨号面板"
+
+#: ../sflphone-client-gnome/src/menus.c:643
+msgid "_Volume controls"
+msgstr "音量控制(V)"
+
+#: ../sflphone-client-gnome/src/menus.c:661
+msgid "_View"
+msgstr "查看(V)"
+
+#: ../sflphone-client-gnome/src/menus.c:881
+msgid "_Call back"
+msgstr "回叫(C)"
+
+#: ../sflphone-client-gnome/src/menus.c:1061
+msgid "Edit phone number"
+msgstr "编辑电话号码"
+
+#: ../sflphone-client-gnome/src/menus.c:1072
+msgid "Edit the phone number before making a call"
+msgstr "拨出电话前编辑电话号码"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:71
+#: ../sflphone-client-gnome/src/sflnotify.c:91
+#, c-format
+msgid "%s account : %s"
+msgstr "%s 帐户: %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:75
+#, c-format
+msgid "<i>From</i> %s"
+msgstr "<i>拨入方</i> %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:111
+#, c-format
+msgid "Calling with %s account <i>%s</i>"
+msgstr "使用%s帐户<i>%s</i>呼叫"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:115
+msgid "Current account"
+msgstr "当前帐户"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:130
+msgid "You have no accounts set up"
+msgstr "你没有设置任何账户"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:131
+#: ../sflphone-client-gnome/src/sflnotify.c:148
+msgid "Error"
+msgstr "注册失败"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:147
+msgid "You have no registered accounts"
+msgstr "未发现已注册帐户"
+
+#: ../sflphone-client-gnome/src/statusicon.c:91
+msgid "_Show main window"
+msgstr "显示主窗口(S)"
+
+#: ../sflphone-client-gnome/src/statusicon.c:127
+#, c-format
+msgid "%i account configured"
+msgid_plural "%i accounts configured"
+msgstr[0] "已配置了%i个账户"
+msgstr[1] "已配置了%i个账户"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:113
+msgid "Account settings"
+msgstr "帐户设置"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:147
+msgid "_Enable this account"
+msgstr "启用该账户(E)"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:161
+msgid "_Protocol"
+msgstr "协议(P)"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:179
+msgid "Unknown"
+msgstr "未知"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:312
+msgid "_Use Evolution address books"
+msgstr "使用Evolution地址薄(U)"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:319
+msgid "Download limit :"
+msgstr "下载上限:"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:327
+msgid "cards"
+msgstr "卡"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:333
+msgid "_Display contact photo if available"
+msgstr "如果可行则显示联系人照片(D)"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:341
+msgid "Fields from Evolution's address books"
+msgstr "使用Evolution地址薄中的如下字段:"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:345
+msgid "_Work"
+msgstr "单位电话(W)"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:351
+msgid "_Home"
+msgstr "家庭电话(H)"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:357
+msgid "_Mobile"
+msgstr "移动电话(M)"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:364
+msgid "Address Books"
+msgstr "地址簿"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:368
+msgid "Select which Evolution address books to use"
+msgstr "选择使用如下Evolution地址薄"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:404
+#: ../sflphone-client-gnome/src/config/audioconf.c:576
+msgid "Name"
+msgstr "名称"
 
-#: ../src/ConfigDialog.cpp:131 ../src/ConfigDialog.cpp:263
-msgid "Attention : SIP port must be over 1024 !"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/audioconf.c:741
+msgid "_Voice Activity Detection"
+msgstr "声音状态检测(V)"
 
-#: ../src/ConfigDialog.cpp:136 ../src/ConfigDialog.cpp:266
-msgid "Attention : SIP port must be under 65536 !"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/audioconf.c:751
+msgid "_Noise Reduction (Narrow-Band Companding)"
+msgstr "降噪处理-窄频压缩(N)"
 
-#: ../src/main.cpp:49 ../src/main.cpp:50
-msgctxt "Your names"
-msgid "NAME OF TRANSLATORS"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/audioconf.c:780
+msgid "Sound Manager"
+msgstr "音频管理器"
 
-#: ../src/main.cpp:50 ../src/main.cpp:51
-msgctxt "Your emails"
-msgid "EMAIL OF TRANSLATORS"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/audioconf.c:783
+msgid "_Pulseaudio"
+msgstr "Pulseaudio"
 
-#: ../src/SFLPhone.cpp:55 ../src/sflphone_kdeview.cpp:1051
-#: ../src/sflphone_kdeview.cpp:1056 ../src/sflphone_kdeview.cpp:1061
-msgid "SFLPhone"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/audioconf.c:788
+msgid "_ALSA"
+msgstr "ALSA"
 
-#: ../src/SFLPhone.cpp:154
-msgid "You still have some calls open. Please close all calls before quitting."
-msgstr ""
+#: ../sflphone-client-gnome/src/config/audioconf.c:835
+msgid "Ringtones"
+msgstr "铃声"
 
-#: ../src/SFLPhone.cpp:182
-msgid "Incoming call"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/audioconf.c:841
+msgid "_Enable ringtones"
+msgstr "启用铃声(E)"
 
-#: ../src/SFLPhone.cpp:183
-msgid "You have an incoming call from"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/audioconf.c:847
+msgid "Choose a ringtone"
+msgstr "选择铃声"
 
-#: ../src/SFLPhone.cpp:183
-msgid "Click to accept or refuse it."
-msgstr ""
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
+msgid "Audio Files"
+msgstr "音频文件"
 
-#: ../src/sflphone_kdeview.cpp:1051
-msgid "Main screen"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:589
+msgid "Desktop Notifications"
+msgstr "桌面提示"
 
-#: ../src/sflphone_kdeview.cpp:1056 ../build/src/ui_ConfigDialog.h:1271
-#: ../build/src/ui_dlggeneralbase.h:160
-msgid "Call history"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:593
+msgid "_Enable notifications"
+msgstr "启用提示(E)"
 
-#: ../src/sflphone_kdeview.cpp:1061
-#: ../build/src/ui_sflphone_kdeview_base.h:507
-msgid "Address book"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:599
+msgid "Enable voicemail _notifications"
+msgstr "启用语音邮箱提示(n)"
 
-#: ../src/sflphone_kdeview.cpp:1075 ../src/sflphone_kdeview.cpp:1131
-msgid "Edit before call"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:611
+msgid "System Tray Icon"
+msgstr "系统托盘图标"
 
-#: ../src/sflphone_const.h:56
-msgid "Call"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:614
+msgid "_Popup main window on incoming call"
+msgstr "来电时弹出主窗口(P)"
 
-#: ../src/sflphone_const.h:57
-msgid "Hang up"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:619
+msgid "Ne_ver popup main window"
+msgstr "从不弹出主窗口(v)"
 
-#: ../src/sflphone_const.h:58
-msgid "Hold"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:623
+msgid "Hide SFLphone window on _startup"
+msgstr "在启动时隐藏SFLphone主窗口"
 
-#: ../src/sflphone_const.h:59
-msgid "Transfer"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:629
+msgid "Calls History"
+msgstr "拨号历史"
 
-#: ../src/sflphone_const.h:60 ../build/src/ui_ConfigDialog.h:1263
-msgid "Record"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:632
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "_Keep my history for at least"
+msgstr "保留历史记录至少(K)"
 
-#: ../src/sflphone_const.h:61
-msgid "Accept"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:647
+msgid "PulseAudio sound server"
+msgstr "PulseAudio服务器"
 
-#: ../src/sflphone_const.h:62
-msgid "Refuse"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:650
+msgid "_Mute other applications during a call"
+msgstr "当有来电时静音其它应用程序(c)"
 
-#: ../src/sflphone_const.h:63
-msgid "Unhold"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:677
+msgid "Port"
+msgstr "端口"
 
-#: ../src/sflphone_const.h:64
-msgid "Give up transfer"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:732
+msgid "Select a folder"
+msgstr "选择文件夹"
 
-#: ../src/sflphone_const.h:65
-msgid "Call back"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:766
+msgid "Preferences"
+msgstr "属性"
 
-#: ../src/sflphone_const.h:66
-msgid "Give up search"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:845
+msgid "Configured Accounts"
+msgstr "已配置帐户"
 
-#: ../build/src/ui_ConfigDialog.h:1249
-msgid "Configuration Dialog"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/hooks-config.c:141
+msgid "Trigger on specific _SIP header"
+msgstr "激活指定的SIP头(S)"
 
-#: ../build/src/ui_ConfigDialog.h:1250
-msgid "about"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/hooks-config.c:150
+msgid "Trigger on _IAX2 URL"
+msgstr "激活IAX2 URL(I)"
 
-#: ../build/src/ui_ConfigDialog.h:1255 ../build/src/ui_ConfigDialog.h:1337
-msgid "General"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/hooks-config.c:155
+msgid "Command to _run"
+msgstr "运行命令(r)"
 
-#: ../build/src/ui_ConfigDialog.h:1257
-msgid "Display"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/hooks-config.c:169
+msgid "_Prefix dialed numbers with"
+msgstr "号码前缀(P)"
 
-#: ../build/src/ui_ConfigDialog.h:1261
-msgid "Audio"
-msgstr ""
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+msgid "Search all"
+msgstr "查询所有"
 
-#: ../build/src/ui_ConfigDialog.h:1265
-msgid "Address Book"
-msgstr ""
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:57
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:70
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:82
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:94
+msgid "Click here to change the search type"
+msgstr "请点击此处改变查询方式"
 
-#: ../build/src/ui_ConfigDialog.h:1267
-msgid "Hooks"
-msgstr ""
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+msgid "Search by missed call"
+msgstr "从未接电话中查询"
 
-#: ../build/src/ui_ConfigDialog.h:1270
-msgid "Configure general settings"
-msgstr ""
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+msgid "Search by incoming call"
+msgstr "从来电中查询"
 
-#: ../build/src/ui_ConfigDialog.h:1272 ../build/src/ui_dlggeneralbase.h:161
-msgid "&Capacity"
-msgstr ""
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+msgid "Search by outgoing call"
+msgstr "从拨出电话中查询"
 
-#: ../build/src/ui_ConfigDialog.h:1273 ../build/src/ui_dlggeneralbase.h:162
-msgid "C&lear history"
-msgstr ""
+#~ msgid "User"
+#~ msgstr "用户名"
 
-#: ../build/src/ui_ConfigDialog.h:1274 ../build/src/ui_dlggeneralbase.h:163
-msgid "Connection"
-msgstr ""
+#~ msgid "Mailbox"
+#~ msgstr "语音邮件"
 
-#: ../build/src/ui_ConfigDialog.h:1275 ../build/src/ui_dlggeneralbase.h:164
-msgid "SIP &Port"
-msgstr ""
+#~ msgctxt "Action record a call"
+#~ msgid "Record"
+#~ msgstr "记录"
 
-#: ../build/src/ui_ConfigDialog.h:1276 ../build/src/ui_dlggeneralbase.h:165
-msgid "Attention "
-msgstr ""
+#~ msgid "%s - %s"
+#~ msgstr "%s - %s"
 
-#: ../build/src/ui_ConfigDialog.h:1277
-msgid "Configure display"
-msgstr ""
+#~ msgid "Registered"
+#~ msgstr "已注册"
 
-#: ../build/src/ui_ConfigDialog.h:1278
-msgid "Enable notifications"
-msgstr ""
+#~ msgid "Not Registered"
+#~ msgstr "未注册"
 
-#: ../build/src/ui_ConfigDialog.h:1279
-msgid "On incoming &calls"
-msgstr ""
+#~ msgid "Trying..."
+#~ msgstr "正在连接..."
 
-#: ../build/src/ui_ConfigDialog.h:1280
-msgid "On &messages"
-msgstr ""
+#~ msgid "Bad authentification"
+#~ msgstr "认证错误"
 
-#: ../build/src/ui_ConfigDialog.h:1281
-msgid "Show main window"
-msgstr ""
+#~ msgid "Network unreachable"
+#~ msgstr "网络连接失败"
 
-#: ../build/src/ui_ConfigDialog.h:1282
-msgid "On &start"
-msgstr ""
+#~ msgid "Host unreachable"
+#~ msgstr "服务器连接失败"
 
-#: ../build/src/ui_ConfigDialog.h:1283
-msgid "On &incoming calls"
-msgstr ""
+#~ msgid "Stun configuration error"
+#~ msgstr "Stun配置有误"
 
-#: ../build/src/ui_ConfigDialog.h:1284
-msgid "Configure user accounts"
-msgstr ""
+#~ msgid "Stun server invalid"
+#~ msgstr "Stun服务器无效"
 
-#: ../build/src/ui_ConfigDialog.h:1286
-msgid "Remove this account"
-msgstr ""
+#~ msgid "Invalid"
+#~ msgstr "无效"
 
-#: ../build/src/ui_ConfigDialog.h:1287
-msgid "Backspace, Return"
-msgstr ""
+#~ msgid "%d voice mails"
+#~ msgstr "%d 个语音信息"
 
-#: ../build/src/ui_ConfigDialog.h:1288
-msgid "Add a new account"
-msgstr ""
+#~ msgid "No registered account"
+#~ msgstr "未发现已注册帐户"
 
-#: ../build/src/ui_ConfigDialog.h:1289
-msgid "Down"
-msgstr ""
+#~ msgid ""
+#~ "This assistant is now finished.\n"
+#~ "You can at any time check your registration state or modify your accounts "
+#~ "parameters in the Options/Accounts window.\n"
+#~ "\n"
+#~ "Alias :    %s\n"
+#~ "Server :   %s\n"
+#~ "Username : %s\n"
+#~ msgstr ""
+#~ "配置完成.\n"
+#~ "你可以随时在 选项/帐户 窗口中查看注册状态或者修改帐户参数.\n"
+#~ "\n"
+#~ "别名:     %s\n"
+#~ "服务器:   %s\n"
+#~ "用户名:   %s\n"
 
-#: ../build/src/ui_ConfigDialog.h:1290
-msgid "Up"
-msgstr ""
+#~ msgid "SFLphone account configuration wizard"
+#~ msgstr "SFLphone 帐户设置向导"
 
-#: ../build/src/ui_ConfigDialog.h:1291
-msgid "Apply"
-msgstr ""
+#~ msgid "Welcome to SFLphone!"
+#~ msgstr "欢迎使用SFLphone!"
 
-#: ../build/src/ui_ConfigDialog.h:1292
-msgid "&Alias"
-msgstr ""
+#~ msgid "Select an account type:"
+#~ msgstr "选择帐户类型:"
 
-#: ../build/src/ui_ConfigDialog.h:1293
-msgid "&Protocol"
-msgstr ""
+#~ msgid "Please select one of the following option:"
+#~ msgstr "请选择以下选项中的一个:"
 
-#: ../build/src/ui_ConfigDialog.h:1296
-msgid "SIP"
-msgstr ""
+#~ msgid "SIP account configuration"
+#~ msgstr "SIP帐户配置"
 
-#: ../build/src/ui_ConfigDialog.h:1297
-msgid "IAX"
-msgstr ""
+#~ msgid "Please fill the following information:"
+#~ msgstr "请填写以下信息:"
 
-#: ../build/src/ui_ConfigDialog.h:1299
-msgid "&Server"
-msgstr ""
+#~ msgid "Optional Email Address "
+#~ msgstr "可选邮件地址 "
 
-#: ../build/src/ui_ConfigDialog.h:1300
-msgid "&User"
-msgstr ""
+#~ msgid "This email address will be use to send your voicemail messages"
+#~ msgstr "这个邮件地址将被用来发送您的语音邮箱消息"
 
-#: ../build/src/ui_ConfigDialog.h:1301
-msgid "Pass&word"
-msgstr ""
+#~ msgid "_Email"
+#~ msgstr " 邮件(E)"
 
-#: ../build/src/ui_ConfigDialog.h:1302
-#: ../build/src/ui_sflphone_kdeview_base.h:498
-msgid "&Mailbox"
-msgstr ""
+#~ msgid "IAX2 account configuration"
+#~ msgstr "IAX2帐户配置"
 
-#: ../build/src/ui_ConfigDialog.h:1303
-msgid "State"
-msgstr ""
+#~ msgid "Network Address Translation"
+#~ msgstr "网络地址解析"
 
-#: ../build/src/ui_ConfigDialog.h:1306
-msgid "Stun settings will be applied on each account"
-msgstr ""
+#~ msgid "Edit phone"
+#~ msgstr "编辑电话"
 
-#: ../build/src/ui_ConfigDialog.h:1307
-msgid "&Enable Stun"
-msgstr ""
+#~ msgid "%s account: %s"
+#~ msgstr "%s 帐户: %s"
 
-#: ../build/src/ui_ConfigDialog.h:1308
-msgid "Configure audio settings"
-msgstr ""
+#~ msgid "<i>From:</i> %s"
+#~ msgstr "<i>拨入方：</i> %s"
 
-#: ../build/src/ui_ConfigDialog.h:1310
-msgid "Audio &device"
-msgstr ""
+#~ msgid "You haven't setup any accounts"
+#~ msgstr "你没有设置任何帐户"
 
-#: ../build/src/ui_ConfigDialog.h:1313
-msgid "ALSA"
-msgstr ""
+#~ msgid "SFLphone - %i accounts configured"
+#~ msgstr "SFLphone - %i 个帐户已配置"
 
-#: ../build/src/ui_ConfigDialog.h:1314
-msgid "PulseAudio"
-msgstr ""
+#~ msgid "\"Voicemail\" <%s>"
+#~ msgstr "\"语音邮件\" <%s>"
 
-#: ../build/src/ui_ConfigDialog.h:1316
-msgid "&Enable ringtones"
-msgstr ""
+#~ msgid "Place a call"
+#~ msgstr "拨号"
 
-#: ../build/src/ui_ConfigDialog.h:1317
-msgid "&Codecs"
-msgstr ""
+#~ msgid "Off Hold"
+#~ msgstr "恢复通话"
 
-#: ../build/src/ui_ConfigDialog.h:1321
-msgid "Active"
-msgstr ""
+#~ msgid "On Hold"
+#~ msgstr "待机"
 
-#: ../build/src/ui_ConfigDialog.h:1323
-msgid "Name"
-msgstr ""
+#~ msgid "Record a call"
+#~ msgstr "记录通话"
 
-#: ../build/src/ui_ConfigDialog.h:1325
-msgid "Frequency"
-msgstr ""
+#~ msgid "Account Parameters"
+#~ msgstr "帐户相关参数"
 
-#: ../build/src/ui_ConfigDialog.h:1327
-msgid "Bitrate"
-msgstr ""
+#~ msgid "General"
+#~ msgstr "常用配置"
 
-#: ../build/src/ui_ConfigDialog.h:1329
-msgid "Bandwidth"
-msgstr ""
+#~ msgid "Download limit:"
+#~ msgstr "下载上限:"
 
-#: ../build/src/ui_ConfigDialog.h:1330
-msgid "ALSA settings"
-msgstr ""
+#~ msgid "_Business phone"
+#~ msgstr "商务电话(B)"
 
-#: ../build/src/ui_ConfigDialog.h:1331
-msgid "&In"
-msgstr ""
+#~ msgid "_Home phone"
+#~ msgstr "家庭电话(H)"
 
-#: ../build/src/ui_ConfigDialog.h:1332
-msgid "&Out"
-msgstr ""
+#~ msgid "_Mobile phone"
+#~ msgstr "移动电话(M)"
 
-#: ../build/src/ui_ConfigDialog.h:1333
-msgid "ALSA &plugin"
-msgstr ""
+#~ msgid "Select which Evolution address books to use:"
+#~ msgstr "选择使用如下Evolution地址薄:"
 
-#: ../build/src/ui_ConfigDialog.h:1334
-msgid "PulseAudio settings"
-msgstr ""
+#~ msgid "audio device index for output = %d"
+#~ msgstr "音频设备输出索引 ＝ %d"
 
-#: ../build/src/ui_ConfigDialog.h:1335
-msgid "Mute other applications during a call"
-msgstr ""
+#~ msgid "ALSA configuration"
+#~ msgstr "ALSA 配置"
 
-#: ../build/src/ui_ConfigDialog.h:1336
-msgid "Configure record settings"
-msgstr ""
+#~ msgid "Stun parameters will apply to each SIP account created."
+#~ msgstr "Stun参数将应用于每一个注册的SIP帐户"
 
-#: ../build/src/ui_ConfigDialog.h:1338
-msgid "Destination folder"
-msgstr ""
+#~ msgid "Enable it if you are behind a firewall"
+#~ msgstr "当使用防火墙时,启用该项"
 
-#: ../build/src/ui_ConfigDialog.h:1339
-msgid "Configure address book settings"
-msgstr ""
+#~ msgid "Format: name.server:port"
+#~ msgstr "格式：name.server:port"
 
-#: ../build/src/ui_ConfigDialog.h:1340
-msgid "Maximum &results"
-msgstr ""
+#~ msgid "Port:"
+#~ msgstr "端口:"
 
-#: ../build/src/ui_ConfigDialog.h:1341
-msgid "Display &photo if available"
-msgstr ""
+#~ msgid "Recordings folder"
+#~ msgstr "记录文件夹(R)"
 
-#: ../build/src/ui_ConfigDialog.h:1342
-msgid "Display phone numbers of these &types :"
-msgstr ""
+#~ msgid "General Settings"
+#~ msgstr "常用配置"
 
-#: ../build/src/ui_ConfigDialog.h:1343
-msgid "&Work"
-msgstr ""
+#~ msgid "Audio Settings"
+#~ msgstr "音频配置"
 
-#: ../build/src/ui_ConfigDialog.h:1344
-msgid "&Mobile"
-msgstr ""
+#~ msgid "Recordings"
+#~ msgstr "记录"
 
-#: ../build/src/ui_ConfigDialog.h:1345
-msgid "&Home"
-msgstr ""
+#~ msgid "Address Book"
+#~ msgstr "地址簿"
 
-#: ../build/src/ui_ConfigDialog.h:1346
-msgid "Configure hooks settings"
-msgstr ""
+#~ msgid "Hooks"
+#~ msgstr "钩键"
 
-#: ../build/src/ui_ConfigDialog.h:1347
-msgid "URL Argument"
-msgstr ""
+#~ msgid "Accounts"
+#~ msgstr "帐户"
 
-#: ../build/src/ui_ConfigDialog.h:1348
-msgid "SIP Protocol"
-msgstr ""
+#~ msgid "URL Passing"
+#~ msgstr "传输URL"
 
-#: ../build/src/ui_ConfigDialog.h:1349
-msgid "IAX2 Protocol"
-msgstr ""
 
-#: ../build/src/ui_ConfigDialog.h:1350
-msgid "SIP Header"
-msgstr ""
+#~ msgid "Phone Number Rewriting"
+#~ msgstr "重设电话号码"
 
-#: ../build/src/ui_ConfigDialog.h:1351
-msgid "Command"
-msgstr ""
+#~ msgid "_Prefix dialed numbers with:"
+#~ msgstr "号码前缀:"
 
-#: ../build/src/ui_ConfigDialog.h:1352
-msgid "Phone number formatting"
-msgstr ""
+#~ msgid "Accept"
+#~ msgstr "接受"
 
-#: ../build/src/ui_ConfigDialog.h:1353
-msgid "Add phone number prefix"
-msgstr ""
+#~ msgid "Refuse"
+#~ msgstr "拒绝"
 
-#: ../build/src/ui_ConfigDialog.h:1354
-msgid "Prepend"
-msgstr ""
+#~ msgid "Ignore"
+#~ msgstr "忽略"
 
-#: ../build/src/ui_dlggeneralbase.h:159
-#: ../build/src/ui_sflphone_kdeview_base.h:492
-msgid "Form"
-msgstr ""
+#~ msgid "<small>Missed call</small>"
+#~ msgstr "<small>未接电话</small>"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:493
-msgid "&Pick up"
-msgstr ""
+#~ msgid "<small>Duration:</small> %s"
+#~ msgstr "<small>时长:</small> %s"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:494
-msgid "&Hang up"
-msgstr ""
+#~ msgid "Fields"
+#~ msgstr "字段"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:495
-msgid "H&old"
-msgstr ""
+#~ msgid "_History size limit"
+#~ msgstr "历史记录上限(H)"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:496
-msgid "&Transfer"
-msgstr ""
+#~ msgid ""
+#~ "SFLphone can run custom commands if incoming calls come with an URL "
+#~ "attached.\n"
+#~ "In this case, %s will be replaced with the passed URL."
+#~ msgstr ""
+#~ "当来电有附加的URL时,SFLphone可运行客户命令.\n"
+#~ "在此情况下,传输的URL会被替换成%s."
 
-#: ../build/src/ui_sflphone_kdeview_base.h:497
-msgid "H&istory"
-msgstr ""
+#~ msgid "Search history"
+#~ msgstr "查找历史记录"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:499
-msgid "Configure &accounts"
-msgstr ""
+#~ msgid "Search contact"
+#~ msgstr "查找联系人(S)"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:500
-msgid "Configure a&udio"
-msgstr ""
+#~ msgid "Registered to %s (%s)"
+#~ msgstr "注册到 %s (%s)"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:501
-msgid "&Configure SFLPhone"
-msgstr ""
+#~ msgid "%s account- %s             %s"
+#~ msgstr "%s 帐户- %s             %s"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:502
-msgid "Display &volume bars"
-msgstr ""
+#~ msgid "Books"
+#~ msgstr "钩键"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:503
-msgid "&About"
-msgstr ""
+#~ msgid "_Enable"
+#~ msgstr "启用(E)"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:504
-msgid "Display &dialpad"
-msgstr ""
+#~ msgid "_Notify voice mails"
+#~ msgstr "通知语音邮件(N)"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:505
-msgid "&Record"
-msgstr ""
+#~ msgid "_Start hidden"
+#~ msgstr "启动时隐藏(S)"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:506
-msgid "Account creation &wizard"
-msgstr ""
+#~ msgid "_Maximum number of calls"
+#~ msgstr "最大拨号数(M)"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:508
-msgid "Attention:number of results exceeds max displayed."
-msgstr ""
+#~ msgid "_Control running applications volume"
+#~ msgstr "控制正在运行的应用程序的音量(C)"
+
+#~ msgid "Account previously setup"
+#~ msgstr "帐户以前设置"
+
+#~ msgid "URL argument"
+#~ msgstr "URL参数"
+
+#~ msgid "_SIP protocol"
+#~ msgstr "SIP 协议(S)"
+
+#~ msgid "_SIP Header: "
+#~ msgstr "SIP消息头(S):"
+
+#~ msgid "_IAX2 protocol"
+#~ msgstr "IAX2 协议(I)"
+
+#~ msgid "Search"
+#~ msgstr "查找"
+
+#~ msgid "_Enabled"
+#~ msgstr "启用(E)"
+
+#~ msgid "%s account- %s"
+#~ msgstr "%s 帐户- %s"
+
+#~ msgid "Noise reduction"
+#~ msgstr "降噪"
+
+#~ msgid "_Destination folder"
+#~ msgstr "目标文件夹(D)"
+
+#~ msgid "_Account Assistant"
+#~ msgstr "帐户向导(A)"
+
+#~ msgid "Setup Accounts"
+#~ msgstr "设定帐户"
+
+#~ msgid "Search Parameters"
+#~ msgstr "查找相关参数"
+
+#~ msgid "Maximum result number for a request: "
+#~ msgstr "最大拨号数"
+
+#~ msgid "Search for and display: "
+#~ msgstr "查找并显示:"
+
+#~ msgid "_STUN Server"
+#~ msgstr "STUN服务器(S)"
diff --git a/sflphone-client-kde/po/zh_HK/sflphone-client-kde.po b/sflphone-client-kde/po/zh_HK/sflphone-client-kde.po
index d8af45b68bdc669a021952c89c623dfdfc4621c0..ac82aea3bff5b3811789dbe507048c11a521c20e 100644
--- a/sflphone-client-kde/po/zh_HK/sflphone-client-kde.po
+++ b/sflphone-client-kde/po/zh_HK/sflphone-client-kde.po
@@ -1,607 +1,1523 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Chinese translation of SFLphone.
+# Copyright (C) 2008 The Free Software Foundation, Inc.
+# This file is distributed under the GNU General Public License Version 3.
+# 
+# Yun Liu <yun.liu@savoirfairelinux.com>, 2008.
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: SFLphone 0.9.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-17 15:48-0400\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"
+"POT-Creation-Date: 2009-07-17 16:14-0400\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-
-#: ../src/AccountWizard.cpp:161 ../src/AccountWizard.cpp:275
-msgid "Account Creation Wizard"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:200
-msgid "Creation of account succeed with these parameters"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:211
+"Plural-Forms: nplurals=2; plural=n>1;\n"
+
+#: ../sflphone-client-kde/src/Account.cpp:34
+#: ../sflphone-client-gnome/src/accountlist.c:175
+msgctxt "account state"
+msgid "Registered"
+msgstr "已註冊"
+
+#: ../sflphone-client-kde/src/Account.cpp:36
+#: ../sflphone-client-gnome/src/accountlist.c:178
+msgctxt "account state"
+msgid "Not Registered"
+msgstr "未註冊"
+
+#: ../sflphone-client-kde/src/Account.cpp:38
+#: ../sflphone-client-gnome/src/accountlist.c:181
+msgctxt "account state"
+msgid "Trying..."
+msgstr "正在連接..."
+
+#: ../sflphone-client-kde/src/Account.cpp:40
+#: ../sflphone-client-gnome/src/accountlist.c:184
+msgctxt "account state"
+msgid "Error"
+msgstr "註冊失敗"
+
+#: ../sflphone-client-kde/src/Account.cpp:42
+#: ../sflphone-client-gnome/src/accountlist.c:187
+msgctxt "account state"
+msgid "Authentication Failed"
+msgstr "認證錯誤"
+
+#: ../sflphone-client-kde/src/Account.cpp:44
+#: ../sflphone-client-gnome/src/accountlist.c:190
+msgctxt "account state"
+msgid "Network unreachable"
+msgstr "網路連線失敗"
+
+#: ../sflphone-client-kde/src/Account.cpp:46
+#: ../sflphone-client-gnome/src/accountlist.c:193
+msgctxt "account state"
+msgid "Host unreachable"
+msgstr "伺服器連線失敗"
+
+#: ../sflphone-client-kde/src/Account.cpp:48
+#: ../sflphone-client-gnome/src/accountlist.c:196
+msgctxt "account state"
+msgid "Stun configuration error"
+msgstr "STUN配置有誤"
+
+#: ../sflphone-client-kde/src/Account.cpp:50
+#: ../sflphone-client-gnome/src/accountlist.c:199
+msgctxt "account state"
+msgid "Stun server invalid"
+msgstr "STUN伺服器無效"
+
+#: ../sflphone-client-kde/src/Account.cpp:51
+#: ../sflphone-client-gnome/src/accountlist.c:202
+msgctxt "account state"
+msgid "Invalid"
+msgstr "無效"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:163
+#: ../sflphone-client-kde/src/AccountWizard.cpp:278
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:393
+msgid "Account creation wizard"
+msgstr "帳戶創建向導"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:199
+#: ../sflphone-client-kde/src/AccountWizard.cpp:217
+#: ../sflphone-client-kde/src/AccountWizard.cpp:561
+#: ../sflphone-client-gnome/src/assistant.c:68
+#, c-format
+msgid "This assistant is now finished."
+msgstr "配置完成."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:211
 msgid "Creation of account has failed for the reason"
 msgstr ""
 
-#: ../src/AccountWizard.cpp:217
-msgid "Register of account succeed with these parameters"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:253 ../src/AccountWizard.cpp:437
+#: ../sflphone-client-kde/src/AccountWizard.cpp:255
+#: ../sflphone-client-kde/src/AccountWizard.cpp:440
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:363
+#: ../sflphone-client-gnome/src/assistant.c:72
 msgid "Alias"
-msgstr ""
+msgstr "別稱"
 
-#: ../src/AccountWizard.cpp:254 ../src/AccountWizard.cpp:438
+#: ../sflphone-client-kde/src/AccountWizard.cpp:256
+#: ../sflphone-client-kde/src/AccountWizard.cpp:441
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:370
+#: ../sflphone-client-gnome/src/assistant.c:75
 msgid "Server"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:255 ../src/AccountWizard.cpp:439
-msgid "User"
-msgstr ""
-
-#: ../src/AccountWizard.cpp:256 ../src/AccountWizard.cpp:440
+msgstr "伺服器"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:257
+#: ../sflphone-client-kde/src/AccountWizard.cpp:442
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:371
+#: ../sflphone-client-gnome/src/assistant.c:78
+msgid "Username"
+msgstr "使用者名稱"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:258
+#: ../sflphone-client-kde/src/AccountWizard.cpp:443
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:372
 msgid "Password"
-msgstr ""
+msgstr "密碼"
 
-#: ../src/AccountWizard.cpp:257
+#: ../sflphone-client-kde/src/AccountWizard.cpp:259
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:364
+#: ../sflphone-client-gnome/src/config/configwindow.c:418
 msgid "Protocol"
-msgstr ""
+msgstr "協議"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:260
+#: ../sflphone-client-kde/src/AccountWizard.cpp:444
+msgid "Voicemail number"
+msgstr "語音郵箱"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:279
+#: ../sflphone-client-gnome/src/assistant.c:216
+msgid "Welcome to the Account creation wizard of SFLphone!"
+msgstr "歡迎使用SFLphone帳戶創建嚮導!"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:281
+#: ../sflphone-client-gnome/src/assistant.c:217
+msgid "This installation wizard will help you configure an account."
+msgstr "安裝向導將幫助您配置帳戶"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:309
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Account"
+msgstr "帳戶"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:310
+#: ../sflphone-client-gnome/src/assistant.c:249
+msgid "Please select one of the following options"
+msgstr "請選擇以下選項中的一個"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:312
+#: ../sflphone-client-gnome/src/assistant.c:251
+msgid "Create a free SIP/IAX2 account on sflphone.org"
+msgstr "在sflphone.org上創建免費的SIP/IAX2帳戶"
 
-#: ../src/AccountWizard.cpp:258
-msgid "Mailbox"
-msgstr ""
+#: ../sflphone-client-kde/src/AccountWizard.cpp:313
+#: ../sflphone-client-gnome/src/assistant.c:253
+msgid "Register an existing SIP or IAX2 account"
+msgstr "註冊已存在的SIP或IAX2帳戶"
 
-#: ../src/AccountWizard.cpp:276
-msgid "Welcome to the Account creation wizard of SFLPhone"
-msgstr ""
+#: ../sflphone-client-kde/src/AccountWizard.cpp:352
+#: ../sflphone-client-gnome/src/assistant.c:231
+msgid "VoIP Protocols"
+msgstr "VoIP協議"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:353
+#: ../sflphone-client-gnome/src/assistant.c:231
+msgid "Select an account type"
+msgstr "選擇帳戶類型"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:355
+#: ../sflphone-client-gnome/src/assistant.c:233
+msgid "SIP (Session Initiation Protocol)"
+msgstr "SIP(會話初始化協議)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:356
+#: ../sflphone-client-gnome/src/assistant.c:235
+msgid "IAX2 (InterAsterix Exchange)"
+msgstr "IAX2(Asterisk內部交換協議)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:395
+#: ../sflphone-client-gnome/src/assistant.c:339
+msgid "Optional email address"
+msgstr "可選郵件地址"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:396
+#: ../sflphone-client-gnome/src/assistant.c:339
+msgid "This email address will be used to send your voicemail messages."
+msgstr "這個郵件地址將被用來發送您的語音"
 
-#: ../src/AccountWizard.cpp:278
-msgid "This wizard will help you setting up an account."
-msgstr ""
+#: ../sflphone-client-kde/src/AccountWizard.cpp:398
+msgid "Email address"
+msgstr "郵件地址"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:432
+#: ../sflphone-client-gnome/src/assistant.c:266
+msgid "SIP account settings"
+msgstr "SIP帳戶配置"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:436
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "IAX2 account settings"
+msgstr "IAX2帳戶配置"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:438
+#: ../sflphone-client-gnome/src/assistant.c:266
+#: ../sflphone-client-gnome/src/assistant.c:362
+msgid "Please fill the following information"
+msgstr "請填寫如下信息"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:523
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:856
+msgid "Network Address Translation (NAT)"
+msgstr "网络地址解析(NAT)"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:524
+#: ../sflphone-client-gnome/src/assistant.c:435
+#: ../sflphone-client-gnome/src/config/configwindow.c:536
+msgid "You should probably enable this if you are behind a firewall."
+msgstr "如果你使用網路防火牆，你很有可能需要設定該項."
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:526
+msgid "Enable STUN"
+msgstr "啟用STUN"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:527
+msgid "Stun Server"
+msgstr "STUN伺服器"
+
+#: ../sflphone-client-kde/src/AccountWizard.cpp:562
+msgid ""
+"After checking the settings you chose, click \"Finish\" to create the "
+"account."
+msgstr "當您檢查完選定的設置,請點擊\"結束\"來創建帳戶"
+
+#: ../sflphone-client-kde/src/ActionSetAccountFirst.cpp:26
+msgid "Default account"
+msgstr "默認帳戶"
+
+#: ../sflphone-client-kde/src/Call.cpp:116
+#: ../sflphone-client-gnome/src/contacts/calltree.c:322
+msgid "Transfer to : "
+msgstr "轉給:"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:89
+#: ../sflphone-client-gnome/src/actions.c:816
+msgid "Codec"
+msgstr "編碼"
 
-#: ../src/AccountWizard.cpp:306 ../build/src/ui_ConfigDialog.h:1259
+#: ../sflphone-client-kde/src/CodecListModel.cpp:93
+#: ../sflphone-client-gnome/src/config/audioconf.c:581
+msgid "Frequency"
+msgstr "顰律"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:97
+#: ../sflphone-client-gnome/src/config/audioconf.c:586
+msgid "Bitrate"
+msgstr "比率"
+
+#: ../sflphone-client-kde/src/CodecListModel.cpp:101
+#: ../sflphone-client-gnome/src/config/audioconf.c:591
+msgid "Bandwidth"
+msgstr "顰寬"
+
+#: ../sflphone-client-kde/src/main.cpp:38
+msgid "SFLphone KDE Client"
+msgstr "SFLphone KDE客戶端"
+
+#: ../sflphone-client-kde/src/main.cpp:42
+msgid "(C) 2009 Savoir-faire Linux"
+msgstr "(C) 2009 Savoir-faire Linux"
+
+#: ../sflphone-client-kde/src/main.cpp:46
+msgid "Jérémy Quentin"
+msgstr "Jérémy Quentin"
+
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Yun Liu"
+
+#: ../sflphone-client-kde/src/main.cpp:47
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "yunliu2000@gmail.com"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:62
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-gnome/src/statusicon.c:126
+msgid "SFLphone"
+msgstr "SFLphone"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:209
+msgid "Incoming call"
+msgstr "來電"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
+msgid "You have an incoming call from"
+msgstr "您有一個電話,來自於"
+
+#: ../sflphone-client-kde/src/SFLPhone.cpp:210
+msgid "Click to accept or refuse it."
+msgstr "請點擊接聽或拒絕"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:716
+msgid "Address book loading..."
+msgstr "載入地址簿......"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:901
+#: ../sflphone-client-gnome/src/actions.c:89
+msgid "No registered accounts"
+msgstr "沒有已註冊帳戶"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:905
+#: ../sflphone-client-gnome/src/actions.c:83
+#: ../sflphone-client-gnome/src/actions.c:813
+msgid "Using account"
+msgstr "使用賬戶"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1084
+msgid "Main screen"
+msgstr "主屏幕"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1089
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:165
+msgid "Call history"
+msgstr "呼叫記錄"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1094
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:394
+#: ../sflphone-client-gnome/src/toolbar.c:243
+#: ../sflphone-client-gnome/src/toolbar.c:245
+msgid "Address book"
+msgstr "地址簿"
+
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1108
+#: ../sflphone-client-kde/src/sflphone_kdeview.cpp:1173
+msgid "Edit before call"
+msgstr "呼叫前進行編輯"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:41
+#: ../sflphone-client-gnome/src/toolbar.c:167
+#: ../sflphone-client-gnome/src/toolbar.c:169
+msgid "New call"
+msgstr "新電話"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:42
+#: ../sflphone-client-kde/src/sflphone_const.h:47
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:381
+#: ../sflphone-client-gnome/src/toolbar.c:186
+#: ../sflphone-client-gnome/src/toolbar.c:188
+msgid "Hang up"
+msgstr "放電話"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:43
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:382
+#: ../sflphone-client-gnome/src/toolbar.c:207
+#: ../sflphone-client-gnome/src/toolbar.c:209
+msgid "Hold on"
+msgstr "呼叫保持"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:44
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:383
+#: ../sflphone-client-gnome/src/toolbar.c:220
+#: ../sflphone-client-gnome/src/toolbar.c:222
+msgid "Transfer"
+msgstr "轉接"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:45
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:392
+#: ../sflphone-client-gnome/src/toolbar.c:263
+msgid "Record"
+msgstr "記錄"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:46
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:380
+#: ../sflphone-client-gnome/src/toolbar.c:176
+#: ../sflphone-client-gnome/src/toolbar.c:178
+msgid "Pick up"
+msgstr "接電話"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:48
+#: ../sflphone-client-gnome/src/toolbar.c:196
+#: ../sflphone-client-gnome/src/toolbar.c:198
+msgid "Hold off"
+msgstr "恢復通話"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:49
+msgid "Give up transfer"
+msgstr "取消轉接"
+
+#: ../sflphone-client-kde/src/sflphone_const.h:50
+msgid "Call back"
+msgstr "回叫"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:48
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:91
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
+#: ../sflphone-client-gnome/src/config/configwindow.c:722
+#: ../sflphone-client-gnome/src/config/configwindow.c:791
+msgctxt "Config section"
+msgid "General"
+msgstr "常用配置"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:49
+msgctxt "Config section"
+msgid "Display"
+msgstr "顯示"
+
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:50
+#: ../sflphone-client-gnome/src/config/configwindow.c:833
+msgctxt "Config section"
 msgid "Accounts"
-msgstr ""
+msgstr "帳戶"
 
-#: ../src/AccountWizard.cpp:307
-msgid "Please choose between those options :"
-msgstr ""
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:51
+#: ../sflphone-client-gnome/src/config/configwindow.c:786
+msgctxt "Config section"
+msgid "Audio"
+msgstr "音頻"
 
-#: ../src/AccountWizard.cpp:309
-msgid "Create a free SIP/IAX2 account on sflphone.org"
-msgstr ""
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:52
+#: ../sflphone-client-gnome/src/config/configwindow.c:801
+msgctxt "Config section"
+msgid "Address Book"
+msgstr "地址簿"
 
-#: ../src/AccountWizard.cpp:310
-msgid "Register an existing SIP/IAX2 account"
-msgstr ""
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:53
+#: ../sflphone-client-gnome/src/config/configwindow.c:796
+msgctxt "Config section"
+msgid "Recordings"
+msgstr "記錄"
 
-#: ../src/AccountWizard.cpp:349
-msgid "VoIP Protocols"
-msgstr ""
+#: ../sflphone-client-kde/src/conf/ConfigurationDialog.cpp:54
+#: ../sflphone-client-gnome/src/config/configwindow.c:806
+msgctxt "Config section"
+msgid "Hooks"
+msgstr "鉤鍵"
 
-#: ../src/AccountWizard.cpp:350
-msgid "Choose the account type"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:328
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows. Enable/disable them by checking/unchecking "
+"them on the left of the item. Add or remove some with \"Plus\" and \"Sub\" "
+"buttons. Edit the selected account with the form on the right."
+msgstr ""
+"在默認情況下，當你打電話時，sflphone會使用列表當中第一個已註冊的帳戶。使用箭"
+"頭\"上\"和\"下\"可以改變賬戶的順序。選擇賬戶名稱左邊的方框可以啟用帳戶，取消"
+"選擇則會禁用該賬戶。通過\"加\"\"減\"按鈕可以添加或刪除賬戶。點擊\"編輯\"按鈕"
+"可以改變賬戶的設置。"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:332
+msgid "Remove the selected account"
+msgstr "刪除所選賬戶"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:335
+msgid ""
+"This button will remove the selected account in the list below. Be sure you "
+"really don't need it anymore. If you think you might use it again later, "
+"just uncheck it."
 msgstr ""
+"該按鈕會刪除列表中被選定的賬戶。請確認你的操作。如果你希望繼續使用某個賬戶，"
+"請取消對該賬戶的選擇"
 
-#: ../src/AccountWizard.cpp:352
-msgid "Register a SIP (Session Initiation Protocol) account"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:340
+msgid "Remove"
+msgstr "刪除"
 
-#: ../src/AccountWizard.cpp:353
-msgid "Register a IAX2 (InterAsterisk eXchange) account"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:342
+msgid "Add a new account"
+msgstr "增加新帳戶"
 
-#: ../src/AccountWizard.cpp:392
-msgid "Optionnal Email Address"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:345
+msgid ""
+"This button enables you to initialize a new account. You will then be able "
+"to edit it using the form on the right."
 msgstr ""
+"通過該按鈕可以創建一個新賬戶。添加該賬戶之後你還可以通過編輯按鈕來修改設置。"
 
-#: ../src/AccountWizard.cpp:393
-msgid "This email address will be used to send your voicemail messages."
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:347
+msgid "Add"
+msgstr "添加"
 
-#: ../src/AccountWizard.cpp:395
-msgid "Email address"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:349
+msgid "Get this account down"
+msgstr "將該賬戶向下移動"
 
-#: ../src/AccountWizard.cpp:429
-msgid "SIP Account Settings"
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:352
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:359
+msgid ""
+"By default, when you place a call, sflphone will use the first account in "
+"this list which is \"registered\". Change the order of the accounts using "
+"the \"Up\" and \"Down\" arrows."
 msgstr ""
+"在默認情況下，當你打電話時，sflphone會使用列表當中第一個已註冊的帳戶。使用箭"
+"頭\"上\"和\"下\"可以改變賬戶的順序。選擇賬戶名稱左邊的方框可以啟用帳戶，取消"
+"選擇則會禁用該賬戶。通過\"加\"\"減\"按鈕可以添加或刪除賬戶。"
 
-#: ../src/AccountWizard.cpp:433
-msgid "IAX2 Account Settings"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:354
+msgid "Down"
+msgstr "下"
 
-#: ../src/AccountWizard.cpp:435
-msgid "Please full these settings fields."
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:356
+msgid "Get this account up"
+msgstr "把該賬戶向上移動"
 
-#: ../src/AccountWizard.cpp:512
-msgid "Network Address Translation (NAT)"
-msgstr ""
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:361
+msgid "Up"
+msgstr "上"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:362
+msgid "Apply"
+msgstr "套用"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:367
+msgid "SIP"
+msgstr "SIP"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:368
+msgid "IAX"
+msgstr "IAX"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:373
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:385
+#: ../sflphone-client-gnome/src/toolbar.c:52
+#: ../sflphone-client-gnome/src/toolbar.c:251
+#: ../sflphone-client-gnome/src/toolbar.c:255
+msgid "Voicemail"
+msgstr "語音郵件"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:374
+#: ../sflphone-client-gnome/src/config/configwindow.c:425
+msgid "Status"
+msgstr "狀態"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:377
+#: ../sflphone-client-gnome/src/config/configwindow.c:528
+msgid "Stun parameters will be applied on each SIP account created."
+msgstr "STUN參數將應用於每一個註冊的SIP帳戶"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:378
+msgid "Enable Stun"
+msgstr "啟用STUN"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:380
+#: ../sflphone-client-gnome/src/config/configwindow.c:544
+msgid "Format : name.server:port"
+msgstr "格式 : 名稱.服務器:端口"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaccountsbase.h:382
+msgid "choose Stun server (example : stunserver.org)"
+msgstr "選擇STUN服務器(例如:stunserver.org)"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:154
+msgid "Enable address book"
+msgstr "啟用地址簿"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:155
+msgid "Maximum results"
+msgstr "結果最大值"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:156
+msgid "Display photo if available"
+msgstr "如果可以則顯示聯繫人照片"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:157
+msgid "Display phone numbers of these types :"
+msgstr "顯示這些格式的電話號碼"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:158
+msgid "Work"
+msgstr "單位電話"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:159
+msgid "Mobile"
+msgstr "移動電話"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaddressbookbase.h:160
+msgid "Home"
+msgstr "家庭電話"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:225
+msgid "Sound manager"
+msgstr "聲音管理器"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:228
+msgid "ALSA"
+msgstr "ALSA"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:229
+msgid "PulseAudio"
+msgstr "PulseAudio"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:231
+msgid "Enable ringtones"
+msgstr "啟動鈴聲"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:232
+#: ../sflphone-client-gnome/src/config/audioconf.c:812
+msgid "Codecs"
+msgstr "編碼"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:233
+#: ../sflphone-client-gnome/src/config/audioconf.c:795
+msgid "ALSA settings"
+msgstr "ALSA 配置"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:234
+#: ../sflphone-client-gnome/src/config/audioconf.c:662
+msgid "ALSA plugin"
+msgstr "ALSA插件"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:235
+#: ../sflphone-client-gnome/src/config/audioconf.c:706
+msgid "Input"
+msgstr "輸入"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:236
+#: ../sflphone-client-gnome/src/config/audioconf.c:684
+msgid "Output"
+msgstr "輸出"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:237
+msgid "PulseAudio settings"
+msgstr "PulseAudio 配置"
+
+#: ../sflphone-client-kde/build/src/ui_dlgaudiobase.h:238
+msgid "Mute other applications during a call"
+msgstr "當有來電時靜音其它應用程序"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:121
+msgid "Enable notifications"
+msgstr "啟動提示"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:122
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:126
+msgid "On incoming calls"
+msgstr "有新來電"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:123
+msgid "On messages"
+msgstr "有新消息"
 
-#: ../src/AccountWizard.cpp:513
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:124
+msgid "Show main window"
+msgstr "顯示主窗口"
+
+#: ../sflphone-client-kde/build/src/ui_dlgdisplaybase.h:125
+msgid "On start"
+msgstr "正在啟動"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:166
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "Keep my history for at least"
+msgstr "保存呼叫記錄數至少"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:167
+#: ../sflphone-client-gnome/src/config/configwindow.c:643
+msgctxt "End of 'Keep my history for at least n days.'"
+msgid "days"
+msgstr "天"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:168
+msgid "Clear history"
+msgstr "清空曆史記錄"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:169
+msgid "Connection"
+msgstr "連接"
+
+#: ../sflphone-client-kde/build/src/ui_dlggeneralbase.h:170
+#: ../sflphone-client-gnome/src/config/configwindow.c:664
+msgid "SIP Port"
+msgstr "SIP端口"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:180
+#: ../sflphone-client-gnome/src/config/hooks-config.c:130
+msgid "URL Argument"
+msgstr "URL參數"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:181
+#: ../sflphone-client-gnome/src/config/hooks-config.c:135
+msgid "Custom commands on incoming calls with URL"
+msgstr "定制對帶有URL的來電的處理"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:182
+msgid "Trigger on specific SIP header"
+msgstr "激活指定的SIP頭"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:183
+msgid "Trigger on IAX2 URL"
+msgstr "激活IAX2 URL"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:184
+msgid "Command to run"
+msgstr "要運行的命令"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:185
+#: ../sflphone-client-gnome/src/config/hooks-config.c:138
+#, c-format
+msgid "%s will be replaced with the passed URL."
+msgstr "傳輸的URL會被替換成%s."
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:186
+#: ../sflphone-client-gnome/src/config/hooks-config.c:165
+msgid "Phone number rewriting"
+msgstr "重設電話號碼"
+
+#: ../sflphone-client-kde/build/src/ui_dlghooksbase.h:187
+msgid "Prefix dialed numbers with"
+msgstr "號碼前綴"
+
+#: ../sflphone-client-kde/build/src/ui_dlgrecordbase.h:92
+#: ../sflphone-client-gnome/src/config/configwindow.c:726
+msgid "Destination folder"
+msgstr "目標文件夾"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:384
+#: ../sflphone-client-gnome/src/toolbar.c:232
+#: ../sflphone-client-gnome/src/toolbar.c:234
+msgid "History"
+msgstr "歷史"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:386
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:388
+msgid "Configure SFLphone"
+msgstr "配置SFLphone"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:390
+msgid "Display volume controls"
+msgstr "顯示音量控制"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:391
+msgid "Display dialpad"
+msgstr "顯示撥號鍵盤"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:396
+msgid "Attention:number of results exceeds max displayed."
+msgstr "注意:結果超過可顯示的最大值"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:398
+#: ../sflphone-client-gnome/src/sliders.c:163
+msgid "Mic volume"
+msgstr "話筒音量"
+
+#: ../sflphone-client-kde/build/src/ui_sflphone_kdeview_base.h:402
+#: ../sflphone-client-gnome/src/sliders.c:161
+msgid "Speakers volume"
+msgstr "揚聲器音量"
+
+#: ../sflphone-client-gnome/src/actions.c:54
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] "%d 個語音郵件"
+msgstr[1] "%d 個語音郵件"
+
+#: ../sflphone-client-gnome/src/actions.c:234
 msgid ""
-"You should probably enable this option if you're placed under a firewall"
+"Unable to connect to the SFLphone server.\n"
+"Make sure the daemon is running."
 msgstr ""
+"連接SFLphone伺服器失敗.\n"
+"請核查daemon是否正在運行."
 
-#: ../src/AccountWizard.cpp:515
-msgid "Enable STUN"
-msgstr ""
+#: ../sflphone-client-gnome/src/actions.c:809
+#, c-format
+msgid "IP call - %s"
+msgstr "IP電話- %s"
 
-#: ../src/AccountWizard.cpp:516
-msgid "Stun Server"
+#: ../sflphone-client-gnome/src/actions.c:908
+#, 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>錯誤：無法找到音訊編碼檔案.\n"
+"\n"
+"</b> SFL聲音編碼檔案應該位于<i>%s</i> 或者位于主目錄( <i>%s</i> )的<b>."
+"sflphone</b>目錄下"
 
-#: ../src/AccountWizard.cpp:550
-msgid "Account Definition Finished"
+#: ../sflphone-client-gnome/src/assistant.c:70
+msgid ""
+"You can at any time check your registration state or modify your accounts "
+"parameters in the Options/Accounts window."
+msgstr "你可以隨時在 選項/帳戶 中查看註冊狀態或者修改帳戶信息."
+
+#: ../sflphone-client-gnome/src/assistant.c:190
+msgid "SFLphone account creation wizard"
+msgstr "SFLphone賬戶創建嚮導"
+
+#: ../sflphone-client-gnome/src/assistant.c:274
+#: ../sflphone-client-gnome/src/assistant.c:370
+#: ../sflphone-client-gnome/src/config/accountwindow.c:153
+msgid "_Alias"
+msgstr "別稱(A)"
+
+#: ../sflphone-client-gnome/src/assistant.c:282
+#: ../sflphone-client-gnome/src/assistant.c:378
+#: ../sflphone-client-gnome/src/config/accountwindow.c:189
+msgid "_Host name"
+msgstr "主机名稱(H)"
+
+#: ../sflphone-client-gnome/src/assistant.c:290
+#: ../sflphone-client-gnome/src/assistant.c:386
+#: ../sflphone-client-gnome/src/config/accountwindow.c:197
+msgid "_User name"
+msgstr "使用者名稱(U)"
+
+#: ../sflphone-client-gnome/src/assistant.c:306
+#: ../sflphone-client-gnome/src/assistant.c:401
+#: ../sflphone-client-gnome/src/config/accountwindow.c:212
+msgid "_Password"
+msgstr "密碼(P)"
+
+#: ../sflphone-client-gnome/src/assistant.c:324
+#: ../sflphone-client-gnome/src/assistant.c:417
+#: ../sflphone-client-gnome/src/config/accountwindow.c:228
+msgid "_Voicemail number"
+msgstr "語音郵箱(V)"
+
+#: ../sflphone-client-gnome/src/assistant.c:347
+msgid "_Email address"
+msgstr "郵件地址(E)"
+
+#: ../sflphone-client-gnome/src/assistant.c:444
+#: ../sflphone-client-gnome/src/config/configwindow.c:532
+msgid "E_nable STUN"
+msgstr "啟用STUN(n)"
+
+#: ../sflphone-client-gnome/src/assistant.c:451
+msgid "_STUN server"
+msgstr "STUN伺服器(S)"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Account Registration"
+msgstr "帳戶註冊"
+
+#: ../sflphone-client-gnome/src/assistant.c:465
+msgid "Congratulations!"
+msgstr "恭喜！"
+
+#: ../sflphone-client-gnome/src/errors.c:29
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening playback device"
 msgstr ""
+"ALSA提示\n"
+"\n"
+"打開回放設備時出錯"
 
-#: ../src/AccountWizard.cpp:551
+#: ../sflphone-client-gnome/src/errors.c:32
 msgid ""
-"After checking the settings you chose, click \"Finish\" to create the "
-"account."
+"ALSA notification\n"
+"\n"
+"Error while opening capture device"
 msgstr ""
+"ALSA提示\n"
+"\n"
+"打開采集設備時出錯"
 
-#: ../src/Call.cpp:116
-msgid "Transfer to : "
-msgstr ""
+#: ../sflphone-client-gnome/src/errors.c:35
+msgid ""
+"Pulseaudio notification\n"
+"\n"
+"Pulseaudio is not running"
+msgstr ""
+"Pulseaudio提示\n"
+"\n"
+"Pulseaudio未運行"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:70
+msgid "There is one call in progress."
+msgstr "有一個電話正在處理中."
+
+#: ../sflphone-client-gnome/src/mainwindow.c:74
+msgid "There are calls in progress."
+msgstr "有電話正在處理中."
+
+#: ../sflphone-client-gnome/src/mainwindow.c:83
+msgid "Do you still want to quit?"
+msgstr "確認要退出?"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:284
+msgid "SFLphone Error"
+msgstr "SFLphone 出錯"
+
+#: ../sflphone-client-gnome/src/menus.c:134
+msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr "SFLphone是一個VoIP客戶端，它兼容SIP和IAX2协议."
+
+#: ../sflphone-client-gnome/src/menus.c:137
+msgid "About SFLphone"
+msgstr "有關SFLphone"
+
+#: ../sflphone-client-gnome/src/menus.c:161
+msgid "_Help"
+msgstr "幫助(H)"
+
+#: ../sflphone-client-gnome/src/menus.c:296
+#: ../sflphone-client-gnome/src/menus.c:953
+msgid "_New call"
+msgstr "新電話(N)"
+
+#: ../sflphone-client-gnome/src/menus.c:308
+#: ../sflphone-client-gnome/src/menus.c:785
+msgid "_Pick up"
+msgstr "撥出(P)"
+
+#: ../sflphone-client-gnome/src/menus.c:318
+#: ../sflphone-client-gnome/src/menus.c:797
+msgid "_Hang up"
+msgstr "放下(H)"
+
+#: ../sflphone-client-gnome/src/menus.c:328
+#: ../sflphone-client-gnome/src/menus.c:809
+msgid "On _Hold"
+msgstr "待机"
+
+#: ../sflphone-client-gnome/src/menus.c:340
+#: ../sflphone-client-gnome/src/menus.c:821
+msgid "_Record"
+msgstr "記錄(R)"
+
+#: ../sflphone-client-gnome/src/menus.c:354
+msgid "_Account creation wizard"
+msgstr "帳戶創建向導(A)"
+
+#: ../sflphone-client-gnome/src/menus.c:384
+msgid "_Call"
+msgstr "電話"
+
+#: ../sflphone-client-gnome/src/menus.c:552
+msgid "Clear _history"
+msgstr "清空曆史記錄(C)"
+
+#: ../sflphone-client-gnome/src/menus.c:564
+msgid "_Accounts"
+msgstr "帳戶(A)"
+
+#: ../sflphone-client-gnome/src/menus.c:579
+msgid "_Edit"
+msgstr "編輯(E)"
+
+#: ../sflphone-client-gnome/src/menus.c:631
+msgid "_Dialpad"
+msgstr "撥號面板"
+
+#: ../sflphone-client-gnome/src/menus.c:643
+msgid "_Volume controls"
+msgstr "音量控制(V)"
+
+#: ../sflphone-client-gnome/src/menus.c:661
+msgid "_View"
+msgstr "查看(V)"
+
+#: ../sflphone-client-gnome/src/menus.c:881
+msgid "_Call back"
+msgstr "回叫(C)"
+
+#: ../sflphone-client-gnome/src/menus.c:1061
+msgid "Edit phone number"
+msgstr "編輯電話號碼"
+
+#: ../sflphone-client-gnome/src/menus.c:1072
+msgid "Edit the phone number before making a call"
+msgstr "撥出電話前編輯電話號碼"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:71
+#: ../sflphone-client-gnome/src/sflnotify.c:91
+#, c-format
+msgid "%s account : %s"
+msgstr "%s 帳戶 : %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:75
+#, c-format
+msgid "<i>From</i> %s"
+msgstr "<i>撥入方</i> %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:111
+#, c-format
+msgid "Calling with %s account <i>%s</i>"
+msgstr "使用%s帳戶<i>%s</i>呼叫"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:115
+msgid "Current account"
+msgstr "當前帳戶"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:130
+msgid "You have no accounts set up"
+msgstr "你沒有設置任何賬戶"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:131
+#: ../sflphone-client-gnome/src/sflnotify.c:148
+msgid "Error"
+msgstr "註冊失敗"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:147
+msgid "You have no registered accounts"
+msgstr "未發現已註冊帳戶"
+
+#: ../sflphone-client-gnome/src/statusicon.c:91
+msgid "_Show main window"
+msgstr "顯示主窗口(S)"
+
+#: ../sflphone-client-gnome/src/statusicon.c:127
+#, c-format
+msgid "%i account configured"
+msgid_plural "%i accounts configured"
+msgstr[0] "已配置了%i個賬戶"
+msgstr[1] "已配置了%i個賬戶"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:113
+msgid "Account settings"
+msgstr "帳戶設置"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:147
+msgid "_Enable this account"
+msgstr "啟用該賬戶(E)"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:161
+msgid "_Protocol"
+msgstr "協議(P)"
+
+#: ../sflphone-client-gnome/src/config/accountwindow.c:179
+msgid "Unknown"
+msgstr "未知"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:312
+msgid "_Use Evolution address books"
+msgstr "使用Evolution地址薄(U)"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:319
+msgid "Download limit :"
+msgstr "下載上限:"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:327
+msgid "cards"
+msgstr "卡"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:333
+msgid "_Display contact photo if available"
+msgstr "如果可以則顯示聯繫人照片(D)"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:341
+msgid "Fields from Evolution's address books"
+msgstr "使用Evolution地址薄中的如下字段:"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:345
+msgid "_Work"
+msgstr "單位電話(W)"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:351
+msgid "_Home"
+msgstr "家庭電話(H)"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:357
+msgid "_Mobile"
+msgstr "移動電話(M)"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:364
+msgid "Address Books"
+msgstr "地址簿"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:368
+msgid "Select which Evolution address books to use"
+msgstr "選擇使用如下Evolution地址薄"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:404
+#: ../sflphone-client-gnome/src/config/audioconf.c:576
+msgid "Name"
+msgstr "名稱"
 
-#: ../src/ConfigDialog.cpp:131 ../src/ConfigDialog.cpp:263
-msgid "Attention : SIP port must be over 1024 !"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/audioconf.c:741
+msgid "_Voice Activity Detection"
+msgstr "聲音狀態檢測(V)"
 
-#: ../src/ConfigDialog.cpp:136 ../src/ConfigDialog.cpp:266
-msgid "Attention : SIP port must be under 65536 !"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/audioconf.c:751
+msgid "_Noise Reduction (Narrow-Band Companding)"
+msgstr "降噪處理-窄頻壓縮(N)"
 
-#: ../src/main.cpp:49 ../src/main.cpp:50
-msgctxt "Your names"
-msgid "NAME OF TRANSLATORS"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/audioconf.c:780
+msgid "Sound Manager"
+msgstr "聲音管理器"
 
-#: ../src/main.cpp:50 ../src/main.cpp:51
-msgctxt "Your emails"
-msgid "EMAIL OF TRANSLATORS"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/audioconf.c:783
+msgid "_Pulseaudio"
+msgstr "Pulseaudio"
 
-#: ../src/SFLPhone.cpp:55 ../src/sflphone_kdeview.cpp:1051
-#: ../src/sflphone_kdeview.cpp:1056 ../src/sflphone_kdeview.cpp:1061
-msgid "SFLPhone"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/audioconf.c:788
+msgid "_ALSA"
+msgstr "ALSA"
 
-#: ../src/SFLPhone.cpp:154
-msgid "You still have some calls open. Please close all calls before quitting."
-msgstr ""
+#: ../sflphone-client-gnome/src/config/audioconf.c:835
+msgid "Ringtones"
+msgstr "鈴聲"
 
-#: ../src/SFLPhone.cpp:182
-msgid "Incoming call"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/audioconf.c:841
+msgid "_Enable ringtones"
+msgstr "啟動鈴聲(E)"
 
-#: ../src/SFLPhone.cpp:183
-msgid "You have an incoming call from"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/audioconf.c:847
+msgid "Choose a ringtone"
+msgstr "鈴聲選擇"
 
-#: ../src/SFLPhone.cpp:183
-msgid "Click to accept or refuse it."
-msgstr ""
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
+msgid "Audio Files"
+msgstr "音訊檔案"
 
-#: ../src/sflphone_kdeview.cpp:1051
-msgid "Main screen"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:589
+msgid "Desktop Notifications"
+msgstr "桌面提示"
 
-#: ../src/sflphone_kdeview.cpp:1056 ../build/src/ui_ConfigDialog.h:1271
-#: ../build/src/ui_dlggeneralbase.h:160
-msgid "Call history"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:593
+msgid "_Enable notifications"
+msgstr "啟動提示(E)"
 
-#: ../src/sflphone_kdeview.cpp:1061
-#: ../build/src/ui_sflphone_kdeview_base.h:507
-msgid "Address book"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:599
+msgid "Enable voicemail _notifications"
+msgstr "啟用語音郵箱提示(n)"
 
-#: ../src/sflphone_kdeview.cpp:1075 ../src/sflphone_kdeview.cpp:1131
-msgid "Edit before call"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:611
+msgid "System Tray Icon"
+msgstr "系統托盤圖標"
 
-#: ../src/sflphone_const.h:56
-msgid "Call"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:614
+msgid "_Popup main window on incoming call"
+msgstr "來電話時彈出主視窗(P)"
 
-#: ../src/sflphone_const.h:57
-msgid "Hang up"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:619
+msgid "Ne_ver popup main window"
+msgstr "從不彈出主視窗(v)"
 
-#: ../src/sflphone_const.h:58
-msgid "Hold"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:623
+msgid "Hide SFLphone window on _startup"
+msgstr "在啟動時隱藏SFLphone主窗口"
 
-#: ../src/sflphone_const.h:59
-msgid "Transfer"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:629
+msgid "Calls History"
+msgstr "打電話歷史"
 
-#: ../src/sflphone_const.h:60 ../build/src/ui_ConfigDialog.h:1263
-msgid "Record"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:632
+msgctxt "Beginning of 'Keep my history for at least n days.'"
+msgid "_Keep my history for at least"
+msgstr "保留歷史記錄至少(K)"
 
-#: ../src/sflphone_const.h:61
-msgid "Accept"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:647
+msgid "PulseAudio sound server"
+msgstr "PulseAudio聲音伺服器"
 
-#: ../src/sflphone_const.h:62
-msgid "Refuse"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:650
+msgid "_Mute other applications during a call"
+msgstr "當有來電時靜音其它應用程序(c)"
 
-#: ../src/sflphone_const.h:63
-msgid "Unhold"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:677
+msgid "Port"
+msgstr "端口"
 
-#: ../src/sflphone_const.h:64
-msgid "Give up transfer"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:732
+msgid "Select a folder"
+msgstr "選擇文件夾"
 
-#: ../src/sflphone_const.h:65
-msgid "Call back"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:766
+msgid "Preferences"
+msgstr "屬性"
 
-#: ../src/sflphone_const.h:66
-msgid "Give up search"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/configwindow.c:845
+msgid "Configured Accounts"
+msgstr "已配置帳戶"
 
-#: ../build/src/ui_ConfigDialog.h:1249
-msgid "Configuration Dialog"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/hooks-config.c:141
+msgid "Trigger on specific _SIP header"
+msgstr "激活指定的SIP頭(S)"
 
-#: ../build/src/ui_ConfigDialog.h:1250
-msgid "about"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/hooks-config.c:150
+msgid "Trigger on _IAX2 URL"
+msgstr "激活IAX2 URL(I)"
 
-#: ../build/src/ui_ConfigDialog.h:1255 ../build/src/ui_ConfigDialog.h:1337
-msgid "General"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/hooks-config.c:155
+msgid "Command to _run"
+msgstr "運行命令(r)"
 
-#: ../build/src/ui_ConfigDialog.h:1257
-msgid "Display"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/hooks-config.c:169
+msgid "_Prefix dialed numbers with"
+msgstr "號碼前綴(P)"
 
-#: ../build/src/ui_ConfigDialog.h:1261
-msgid "Audio"
-msgstr ""
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+msgid "Search all"
+msgstr "查詢所有"
 
-#: ../build/src/ui_ConfigDialog.h:1265
-msgid "Address Book"
-msgstr ""
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:57
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:70
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:82
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:94
+msgid "Click here to change the search type"
+msgstr "請點擊此處改變查詢方式"
 
-#: ../build/src/ui_ConfigDialog.h:1267
-msgid "Hooks"
-msgstr ""
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+msgid "Search by missed call"
+msgstr "從未接電話中查詢"
 
-#: ../build/src/ui_ConfigDialog.h:1270
-msgid "Configure general settings"
-msgstr ""
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+msgid "Search by incoming call"
+msgstr "從來電中查詢"
 
-#: ../build/src/ui_ConfigDialog.h:1272 ../build/src/ui_dlggeneralbase.h:161
-msgid "&Capacity"
-msgstr ""
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+msgid "Search by outgoing call"
+msgstr "從撥出電話中查詢"
 
-#: ../build/src/ui_ConfigDialog.h:1273 ../build/src/ui_dlggeneralbase.h:162
-msgid "C&lear history"
-msgstr ""
+#~ msgid "User"
+#~ msgstr "使用者名稱"
 
-#: ../build/src/ui_ConfigDialog.h:1274 ../build/src/ui_dlggeneralbase.h:163
-msgid "Connection"
-msgstr ""
+#~ msgid "Mailbox"
+#~ msgstr "語音郵件"
 
-#: ../build/src/ui_ConfigDialog.h:1275 ../build/src/ui_dlggeneralbase.h:164
-msgid "SIP &Port"
-msgstr ""
+#~ msgctxt "Action record a call"
+#~ msgid "Record"
+#~ msgstr "記錄"
 
-#: ../build/src/ui_ConfigDialog.h:1276 ../build/src/ui_dlggeneralbase.h:165
-msgid "Attention "
-msgstr ""
+#~ msgid "%s - %s"
+#~ msgstr "%s - %s"
 
-#: ../build/src/ui_ConfigDialog.h:1277
-msgid "Configure display"
-msgstr ""
+#~ msgid "Registered"
+#~ msgstr "已註冊"
 
-#: ../build/src/ui_ConfigDialog.h:1278
-msgid "Enable notifications"
-msgstr ""
+#~ msgid "Not Registered"
+#~ msgstr "未註冊"
 
-#: ../build/src/ui_ConfigDialog.h:1279
-msgid "On incoming &calls"
-msgstr ""
+#~ msgid "Trying..."
+#~ msgstr "正在連接..."
 
-#: ../build/src/ui_ConfigDialog.h:1280
-msgid "On &messages"
-msgstr ""
+#~ msgid "Bad authentification"
+#~ msgstr "認證錯誤"
 
-#: ../build/src/ui_ConfigDialog.h:1281
-msgid "Show main window"
-msgstr ""
+#~ msgid "Network unreachable"
+#~ msgstr "網路連線失敗"
 
-#: ../build/src/ui_ConfigDialog.h:1282
-msgid "On &start"
-msgstr ""
+#~ msgid "Host unreachable"
+#~ msgstr "伺服器連線失敗"
 
-#: ../build/src/ui_ConfigDialog.h:1283
-msgid "On &incoming calls"
-msgstr ""
+#~ msgid "Stun configuration error"
+#~ msgstr "Stun配置有誤"
 
-#: ../build/src/ui_ConfigDialog.h:1284
-msgid "Configure user accounts"
-msgstr ""
+#~ msgid "Stun server invalid"
+#~ msgstr "Stun伺服器無效"
 
-#: ../build/src/ui_ConfigDialog.h:1286
-msgid "Remove this account"
-msgstr ""
+#~ msgid "Invalid"
+#~ msgstr "無效"
 
-#: ../build/src/ui_ConfigDialog.h:1287
-msgid "Backspace, Return"
-msgstr ""
+#~ msgid "%d voice mails"
+#~ msgstr "%d 個語音郵件"
 
-#: ../build/src/ui_ConfigDialog.h:1288
-msgid "Add a new account"
-msgstr ""
+#~ msgid "No registered account"
+#~ msgstr "未發現已註冊帳戶"
 
-#: ../build/src/ui_ConfigDialog.h:1289
-msgid "Down"
-msgstr ""
+#~ msgid ""
+#~ "This assistant is now finished.\n"
+#~ "You can at any time check your registration state or modify your accounts "
+#~ "parameters in the Options/Accounts window.\n"
+#~ "\n"
+#~ "Alias :    %s\n"
+#~ "Server :   %s\n"
+#~ "Username : %s\n"
+#~ msgstr ""
+#~ "配置完成.\n"
+#~ "你可以隨時在 選項/帳戶 中查看註冊狀態或者修改帳戶信息\n"
+#~ "別稱:         %s\n"
+#~ "伺服器:       %s\n"
+#~ "使用者名稱:   %s\n"
 
-#: ../build/src/ui_ConfigDialog.h:1290
-msgid "Up"
-msgstr ""
+#~ msgid "SFLphone account configuration wizard"
+#~ msgstr "SFLphone 帳戶設置向導"
 
-#: ../build/src/ui_ConfigDialog.h:1291
-msgid "Apply"
-msgstr ""
+#~ msgid "Welcome to SFLphone!"
+#~ msgstr "歡迎使用SFLphone!"
 
-#: ../build/src/ui_ConfigDialog.h:1292
-msgid "&Alias"
-msgstr ""
+#~ msgid "Select an account type:"
+#~ msgstr "選擇帳戶類型:"
 
-#: ../build/src/ui_ConfigDialog.h:1293
-msgid "&Protocol"
-msgstr ""
+#~ msgid "Please select one of the following option:"
+#~ msgstr "請選擇以下選項中的一個:"
 
-#: ../build/src/ui_ConfigDialog.h:1296
-msgid "SIP"
-msgstr ""
+#~ msgid "SIP account configuration"
+#~ msgstr "SIP帳戶配置"
 
-#: ../build/src/ui_ConfigDialog.h:1297
-msgid "IAX"
-msgstr ""
+#~ msgid "Please fill the following information:"
+#~ msgstr "請填寫如下信息:"
 
-#: ../build/src/ui_ConfigDialog.h:1299
-msgid "&Server"
-msgstr ""
+#~ msgid "Optional Email Address "
+#~ msgstr "可選郵件地址 "
 
-#: ../build/src/ui_ConfigDialog.h:1300
-msgid "&User"
-msgstr ""
+#~ msgid "This email address will be use to send your voicemail messages"
+#~ msgstr "這個郵件地址將被用來發送您的語音郵箱消息"
 
-#: ../build/src/ui_ConfigDialog.h:1301
-msgid "Pass&word"
-msgstr ""
+#~ msgid "_Email"
+#~ msgstr "郵件(E)"
 
-#: ../build/src/ui_ConfigDialog.h:1302
-#: ../build/src/ui_sflphone_kdeview_base.h:498
-msgid "&Mailbox"
-msgstr ""
+#~ msgid "IAX2 account configuration"
+#~ msgstr "IAX2帳戶配置"
 
-#: ../build/src/ui_ConfigDialog.h:1303
-msgid "State"
-msgstr ""
+#~ msgid "Network Address Translation"
+#~ msgstr "網路地址分析"
 
-#: ../build/src/ui_ConfigDialog.h:1306
-msgid "Stun settings will be applied on each account"
-msgstr ""
+#~ msgid "Edit phone"
+#~ msgstr "編輯電話"
 
-#: ../build/src/ui_ConfigDialog.h:1307
-msgid "&Enable Stun"
-msgstr ""
+#~ msgid "%s account: %s"
+#~ msgstr "%s 帳戶: %s"
 
-#: ../build/src/ui_ConfigDialog.h:1308
-msgid "Configure audio settings"
-msgstr ""
+#~ msgid "<i>From:</i> %s"
+#~ msgstr "<i>撥入方：</i> %s"
 
-#: ../build/src/ui_ConfigDialog.h:1310
-msgid "Audio &device"
-msgstr ""
+#~ msgid "You haven't setup any accounts"
+#~ msgstr "你沒有設置任何帳戶"
 
-#: ../build/src/ui_ConfigDialog.h:1313
-msgid "ALSA"
-msgstr ""
+#~ msgid "SFLphone - %i accounts configured"
+#~ msgstr "SFLphone - %i 個帳戶已配置"
 
-#: ../build/src/ui_ConfigDialog.h:1314
-msgid "PulseAudio"
-msgstr ""
+#~ msgid "\"Voicemail\" <%s>"
+#~ msgstr "\"語音郵件\" <%s>"
 
-#: ../build/src/ui_ConfigDialog.h:1316
-msgid "&Enable ringtones"
-msgstr ""
+#~ msgid "Place a call"
+#~ msgstr "打電話"
 
-#: ../build/src/ui_ConfigDialog.h:1317
-msgid "&Codecs"
-msgstr ""
+#~ msgid "Off Hold"
+#~ msgstr "恢复通話"
 
-#: ../build/src/ui_ConfigDialog.h:1321
-msgid "Active"
-msgstr ""
+#~ msgid "On Hold"
+#~ msgstr "待机"
 
-#: ../build/src/ui_ConfigDialog.h:1323
-msgid "Name"
-msgstr ""
+#~ msgid "Record a call"
+#~ msgstr "記錄通話"
 
-#: ../build/src/ui_ConfigDialog.h:1325
-msgid "Frequency"
-msgstr ""
+#~ msgid "Account Parameters"
+#~ msgstr "帳戶相關參數"
 
-#: ../build/src/ui_ConfigDialog.h:1327
-msgid "Bitrate"
-msgstr ""
+#~ msgid "General"
+#~ msgstr "常用配置"
 
-#: ../build/src/ui_ConfigDialog.h:1329
-msgid "Bandwidth"
-msgstr ""
+#~ msgid "Download limit:"
+#~ msgstr "下載上限:"
 
-#: ../build/src/ui_ConfigDialog.h:1330
-msgid "ALSA settings"
-msgstr ""
+#~ msgid "_Business phone"
+#~ msgstr "商務電話(B)"
 
-#: ../build/src/ui_ConfigDialog.h:1331
-msgid "&In"
-msgstr ""
+#~ msgid "_Home phone"
+#~ msgstr "家庭電話(H)"
 
-#: ../build/src/ui_ConfigDialog.h:1332
-msgid "&Out"
-msgstr ""
+#~ msgid "_Mobile phone"
+#~ msgstr "移動電話(M)"
 
-#: ../build/src/ui_ConfigDialog.h:1333
-msgid "ALSA &plugin"
-msgstr ""
+#~ msgid "Select which Evolution address books to use:"
+#~ msgstr "選擇使用如下Evolution地址薄:"
 
-#: ../build/src/ui_ConfigDialog.h:1334
-msgid "PulseAudio settings"
-msgstr ""
+#~ msgid "audio device index for output = %d"
+#~ msgstr "音訊設備輸出索引 ＝ %d"
 
-#: ../build/src/ui_ConfigDialog.h:1335
-msgid "Mute other applications during a call"
-msgstr ""
+#~ msgid "ALSA configuration"
+#~ msgstr "ALSA 配置"
 
-#: ../build/src/ui_ConfigDialog.h:1336
-msgid "Configure record settings"
-msgstr ""
+#~ msgid "Stun parameters will apply to each SIP account created."
+#~ msgstr "Stun參數將應用於每一個註冊的SIP帳戶"
 
-#: ../build/src/ui_ConfigDialog.h:1338
-msgid "Destination folder"
-msgstr ""
+#~ msgid "Enable it if you are behind a firewall"
+#~ msgstr "當使用防火牆時，需要設定此項"
 
-#: ../build/src/ui_ConfigDialog.h:1339
-msgid "Configure address book settings"
-msgstr ""
+#~ msgid "Format: name.server:port"
+#~ msgstr "格式：name.server:port"
 
-#: ../build/src/ui_ConfigDialog.h:1340
-msgid "Maximum &results"
-msgstr ""
+#~ msgid "Port:"
+#~ msgstr "端口:"
 
-#: ../build/src/ui_ConfigDialog.h:1341
-msgid "Display &photo if available"
-msgstr ""
+#~ msgid "Recordings folder"
+#~ msgstr "記錄文件夾(R)"
 
-#: ../build/src/ui_ConfigDialog.h:1342
-msgid "Display phone numbers of these &types :"
-msgstr ""
+#~ msgid "General Settings"
+#~ msgstr "常用配置"
 
-#: ../build/src/ui_ConfigDialog.h:1343
-msgid "&Work"
-msgstr ""
+#~ msgid "Audio Settings"
+#~ msgstr "音訊配置"
 
-#: ../build/src/ui_ConfigDialog.h:1344
-msgid "&Mobile"
-msgstr ""
+#~ msgid "Recordings"
+#~ msgstr "記錄"
 
-#: ../build/src/ui_ConfigDialog.h:1345
-msgid "&Home"
-msgstr ""
+#~ msgid "Address Book"
+#~ msgstr "地址簿"
 
-#: ../build/src/ui_ConfigDialog.h:1346
-msgid "Configure hooks settings"
-msgstr ""
+#~ msgid "Hooks"
+#~ msgstr "鉤鍵"
 
-#: ../build/src/ui_ConfigDialog.h:1347
-msgid "URL Argument"
-msgstr ""
+#~ msgid "Accounts"
+#~ msgstr "帳戶"
 
-#: ../build/src/ui_ConfigDialog.h:1348
-msgid "SIP Protocol"
-msgstr ""
+#~ msgid "URL Passing"
+#~ msgstr "傳輸URL"
 
-#: ../build/src/ui_ConfigDialog.h:1349
-msgid "IAX2 Protocol"
-msgstr ""
+#~ msgid "Command to _run: "
+#~ msgstr "運行命令(C):"
 
-#: ../build/src/ui_ConfigDialog.h:1350
-msgid "SIP Header"
-msgstr ""
+#~ msgid "Phone Number Rewriting"
+#~ msgstr "重設電話號碼"
 
-#: ../build/src/ui_ConfigDialog.h:1351
-msgid "Command"
-msgstr ""
+#~ msgid "_Prefix dialed numbers with:"
+#~ msgstr "號碼前綴:"
 
-#: ../build/src/ui_ConfigDialog.h:1352
-msgid "Phone number formatting"
-msgstr ""
+#~ msgid "Accept"
+#~ msgstr "接受"
 
-#: ../build/src/ui_ConfigDialog.h:1353
-msgid "Add phone number prefix"
-msgstr ""
+#~ msgid "Refuse"
+#~ msgstr "拒絕"
 
-#: ../build/src/ui_ConfigDialog.h:1354
-msgid "Prepend"
-msgstr ""
+#~ msgid "Ignore"
+#~ msgstr "忽略"
 
-#: ../build/src/ui_dlggeneralbase.h:159
-#: ../build/src/ui_sflphone_kdeview_base.h:492
-msgid "Form"
-msgstr ""
+#~ msgid "<small>Missed call</small>"
+#~ msgstr "<small>未接電話</small>"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:493
-msgid "&Pick up"
-msgstr ""
+#~ msgid "<small>Duration:</small> %s"
+#~ msgstr "<small>時長:</small> %s"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:494
-msgid "&Hang up"
-msgstr ""
+#~ msgid "Fields"
+#~ msgstr "字段"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:495
-msgid "H&old"
-msgstr ""
+#~ msgid "_History size limit"
+#~ msgstr "歷史記錄上限(H)"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:496
-msgid "&Transfer"
-msgstr ""
+#~ msgid ""
+#~ "SFLphone can run custom commands if incoming calls come with an URL "
+#~ "attached.\n"
+#~ "In this case, %s will be replaced with the passed URL."
+#~ msgstr ""
+#~ "當來電有附加的URL時,SFLphone可運行客戶命令.\n"
+#~ "在此情況下,傳輸的URL會被替換成%s."
 
-#: ../build/src/ui_sflphone_kdeview_base.h:497
-msgid "H&istory"
-msgstr ""
+#~ msgid "Search history"
+#~ msgstr "搜尋歷史記錄"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:499
-msgid "Configure &accounts"
-msgstr ""
+#~ msgid "Search contact"
+#~ msgstr "搜尋聯繫人(S)"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:500
-msgid "Configure a&udio"
-msgstr ""
+#~ msgid "Registered to %s (%s)"
+#~ msgstr "註冊到 %s (%s)"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:501
-msgid "&Configure SFLPhone"
-msgstr ""
+#~ msgid "%s account- %s             %s"
+#~ msgstr "%s 帳戶- %s\t\t%s"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:502
-msgid "Display &volume bars"
-msgstr ""
+#~ msgid "Books"
+#~ msgstr "鉤鍵"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:503
-msgid "&About"
-msgstr ""
+#~ msgid "_Enable"
+#~ msgstr "啟用(E)"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:504
-msgid "Display &dialpad"
-msgstr ""
+#~ msgid "_Notify voice mails"
+#~ msgstr "語音郵件通知(N)"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:505
-msgid "&Record"
-msgstr ""
+#~ msgid "_Start hidden"
+#~ msgstr "啟動時隱藏(S)"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:506
-msgid "Account creation &wizard"
-msgstr ""
+#~ msgid "_Maximum number of calls"
+#~ msgstr "最大打出電話數目(M)"
 
-#: ../build/src/ui_sflphone_kdeview_base.h:508
-msgid "Attention:number of results exceeds max displayed."
-msgstr ""
+#~ msgid "_Control running applications volume"
+#~ msgstr "控制正在運行中的應用程式的音量(C)"
+
+#~ msgid "Account previously setup"
+#~ msgstr "帳戶以前設定"
+
+#~ msgid "URL argument"
+#~ msgstr "URL參數"
+
+#~ msgid "_SIP protocol"
+#~ msgstr "SIP 協議(S)"
+
+#~ msgid "_SIP Header: "
+#~ msgstr "SIP消息頭(S):"
+
+#~ msgid "_IAX2 protocol"
+#~ msgstr "IAX2 協議(I)"
+
+#~ msgid "Search"
+#~ msgstr "搜尋"
+
+#~ msgid "_Enabled"
+#~ msgstr "啟用(E)"
+
+#~ msgid "%s account- %s"
+#~ msgstr "%s 帳戶- %s"
+
+#~ msgid "Noise reduction"
+#~ msgstr "降噪"
+
+#~ msgid "_Destination folder"
+#~ msgstr "目標文件夾(D)"
+
+#~ msgid "_Account Assistant"
+#~ msgstr "帳戶向導(A)"
+
+#~ msgid "Setup Accounts"
+#~ msgstr "設定帳戶"
+
+#~ msgid "Search Parameters"
+#~ msgstr "搜尋相關參數"
+
+#~ msgid "Maximum result number for a request: "
+#~ msgstr "最大打出電話數目"
+
+#~ msgid "Search for and display: "
+#~ msgstr "搜尋並顯示:"
+
+#~ msgid "_STUN Server"
+#~ msgstr "STUN伺服器(S)"
diff --git a/sflphone-client-kde/src/Account.cpp b/sflphone-client-kde/src/Account.cpp
index e4cbead64c0b1c1c68c0b23bfaacdca60de756b1..138b9d4554699aab5f72a260496c22ba6a6e61f1 100644
--- a/sflphone-client-kde/src/Account.cpp
+++ b/sflphone-client-kde/src/Account.cpp
@@ -39,7 +39,7 @@ const QString account_state_name(QString & s)
 	if(s == QString(ACCOUNT_STATE_ERROR))
 		return i18nc("account state", "Error");
 	if(s == QString(ACCOUNT_STATE_ERROR_AUTH))
-		return i18nc("account state", "Bad authentification");
+		return i18nc("account state", "Authentication Failed");
 	if(s == QString(ACCOUNT_STATE_ERROR_NETWORK))
 		return i18nc("account state", "Network unreachable");
 	if(s == QString(ACCOUNT_STATE_ERROR_HOST))
@@ -53,10 +53,12 @@ const QString account_state_name(QString & s)
 
 //Constructors
 
-Account::Account():accountId(NULL), item(NULL), itemWidget(NULL){}
+Account::Account():accountId(NULL)
+{
+}
 
 
-void Account::initAccountItem()
+void Account::initItem()
 {
 	if(item != NULL)
 	{
@@ -65,10 +67,10 @@ void Account::initAccountItem()
 	item = new QListWidgetItem();
 	item->setSizeHint(QSize(140,25));
 	item->setFlags(Qt::ItemIsSelectable|Qt::ItemIsDragEnabled|Qt::ItemIsDropEnabled|Qt::ItemIsEnabled);
-	initAccountItemWidget();
+	initItemWidget();
 }
 
-void Account::initAccountItemWidget()
+void Account::initItemWidget()
 {
 	if(itemWidget != NULL)
 	{
@@ -90,6 +92,7 @@ void Account::initAccountItemWidget()
 	{
 		itemWidget->setState(AccountItemWidget::NotWorking);
 	}
+	connect(itemWidget, SIGNAL(checkStateChanged(bool)), this, SLOT(setEnabled(bool)));
 }
 
 Account * Account::buildExistingAccountFromId(QString _accountId)
@@ -99,7 +102,7 @@ Account * Account::buildExistingAccountFromId(QString _accountId)
 	a->accountId = new QString(_accountId);
 	qDebug() << "getAccountDetails 1 sent";
 	a->accountDetails = new MapStringString( configurationManager.getAccountDetails(_accountId).value() );
-	a->initAccountItem();
+	a->initItem();
 	return a;
 }
 
@@ -108,7 +111,7 @@ Account * Account::buildNewAccountFromAlias(QString alias)
 	Account * a = new Account();
 	a->accountDetails = new MapStringString();
 	a->setAccountDetail(ACCOUNT_ALIAS,alias);
-	a->initAccountItem();
+	a->initItem();
 	return a;
 }
 
@@ -131,7 +134,7 @@ bool Account::isChecked() const
 	return itemWidget->getEnabled();
 }
 
-QString & Account::getAccountId()
+const QString & Account::getAccountId() const
 {
 	if (isNew())
 	{
@@ -147,13 +150,11 @@ MapStringString & Account::getAccountDetails() const
 
 QListWidgetItem * Account::getItem()
 {
-	if(!item)  {	qDebug() << "null" ;	}
 	return item;
 }
 
 AccountItemWidget * Account::getItemWidget()
 {
-	if(itemWidget == NULL)  {	qDebug() << "null";	}
 	return itemWidget;
 }
 
@@ -186,7 +187,7 @@ QString Account::getAccountDetail(QString param) const
 	return (*accountDetails)[param];
 }
 
-QString Account::getAlias()
+QString Account::getAlias() const
 {
 	return getAccountDetail(ACCOUNT_ALIAS);
 }
@@ -214,6 +215,22 @@ void Account::setAccountId(QString id)
 	accountId = new QString(id);
 }
 
+void Account::setEnabled(bool checked)
+{
+	qDebug() << "setEnabled = " << checked;
+	setAccountDetail(ACCOUNT_ENABLED, checked ? ACCOUNT_ENABLED_TRUE : ACCOUNT_ENABLED_FALSE);
+}
+
+bool Account::isEnabled() const
+{
+	return (getAccountDetail(ACCOUNT_ENABLED) == ACCOUNT_ENABLED_TRUE);
+}
+
+bool Account::isRegistered() const
+{
+	return (getAccountDetail(ACCOUNT_STATUS) == ACCOUNT_STATE_REGISTERED);
+}
+
 void Account::updateState()
 {
 	qDebug() << "updateState";
diff --git a/sflphone-client-kde/src/Account.h b/sflphone-client-kde/src/Account.h
index e1463bb64e3b280999f25f7a14e1bc7b49392187..8760c9e6b055dff7537e591396e38329bdae9df2 100644
--- a/sflphone-client-kde/src/Account.h
+++ b/sflphone-client-kde/src/Account.h
@@ -28,17 +28,18 @@
 
 #include "typedefs.h"
 #include "AccountItemWidget.h"
+#include "Item.h"
 
 const QString account_state_name(QString & s);
 
-class Account{
-	
+class Account : public QObject, public Item<AccountItemWidget>{
+Q_OBJECT
 private:
 
 	QString * accountId;
 	MapStringString * accountDetails;
-	QListWidgetItem * item;
-	AccountItemWidget * itemWidget;
+// 	QListWidgetItem * item;
+// 	AccountItemWidget * itemWidget;
 
 	Account();
 
@@ -53,7 +54,7 @@ public:
 	//Getters
 	bool isNew() const;
 	bool isChecked() const;
-	QString & getAccountId();
+	const QString & getAccountId() const;
 	MapStringString & getAccountDetails() const;
 	QListWidgetItem * getItem();
 	AccountItemWidget * getItemWidget();
@@ -61,7 +62,9 @@ public:
 	QColor getStateColor();
 	QString getStateColorName();
 	QString getAccountDetail(QString param) const;
-	QString getAlias();
+	QString getAlias() const;
+	bool isEnabled() const;
+	bool isRegistered() const;
 	
 	//Setters
 	void setAccountId(QString id);
@@ -69,13 +72,17 @@ public:
 	void setAccountDetail(QString param, QString val);
 	
 	//Updates
-	void initAccountItem();
-	void initAccountItemWidget();
+	void initItem();
+	void initItemWidget();
 	void updateState();
 	
 	//Operators
 	bool operator==(const Account&)const;
 	
+public slots:
+	void setEnabled(bool checked);
+	
+	
 	
 };
 
diff --git a/sflphone-client-kde/src/AccountItemWidget.cpp b/sflphone-client-kde/src/AccountItemWidget.cpp
index ab841e83a60a089db27df0bae82344571972aa49..3549b5fd92f2da3398e394d35ec317e6606faebe 100644
--- a/sflphone-client-kde/src/AccountItemWidget.cpp
+++ b/sflphone-client-kde/src/AccountItemWidget.cpp
@@ -113,7 +113,8 @@ bool AccountItemWidget::getEnabled()
 	return checkBox->checkState();
 }
 
-void AccountItemWidget::on_checkBox_stateChanged()
+void AccountItemWidget::on_checkBox_stateChanged(int state)
 {
-	emit checkStateChanged();
+	qDebug() << "on_checkBox_stateChanged";
+	emit checkStateChanged(state == Qt::Checked);
 }
diff --git a/sflphone-client-kde/src/AccountItemWidget.h b/sflphone-client-kde/src/AccountItemWidget.h
index 25c1a688dc1fb7c88a753d793a1de68ce69db6f5..60055a3e5b09728a0bc886d9c152eecaee791294 100644
--- a/sflphone-client-kde/src/AccountItemWidget.h
+++ b/sflphone-client-kde/src/AccountItemWidget.h
@@ -65,11 +65,11 @@ public:
 	void updateDisplay();
 	
 private slots:	
-	void on_checkBox_stateChanged();
+	void on_checkBox_stateChanged(int state);
 	
 	
 signals:
-	void checkStateChanged();
+	void checkStateChanged(bool checked);
 
 };
 
diff --git a/sflphone-client-kde/src/AccountList.cpp b/sflphone-client-kde/src/AccountList.cpp
index 3f53f475fdb6502359b1db9726ce391bd7364772..61ddb535fd46a8052c2b823b215eb040f1a699be 100644
--- a/sflphone-client-kde/src/AccountList.cpp
+++ b/sflphone-client-kde/src/AccountList.cpp
@@ -40,7 +40,10 @@ AccountList::AccountList(bool fill)
 {
 	qDebug() << "AccountList()";
 	accounts = new QVector<Account *>();
-	updateAccounts();
+	if(fill)
+	{
+		updateAccounts();
+	}
 }
 
 void AccountList::update()
@@ -78,9 +81,9 @@ void AccountList::upAccount(int index)
 		qDebug() << "Error : index or future index out of range in upAccount.";
 		return;
 	}
-	Account & account = getAccount(index);
+	Account * account = getAccountAt(index);
 	accounts->remove(index);
-	accounts->insert(index - 1, & account);
+	accounts->insert(index - 1, account);
 }
 
 void AccountList::downAccount(int index)
@@ -90,18 +93,18 @@ void AccountList::downAccount(int index)
 		qDebug() << "Error : index or future index out of range in upAccount.";
 		return;
 	}
-	Account & account = getAccount(index);
+	Account * account = getAccountAt(index);
 	accounts->remove(index);
-	accounts->insert(index + 1, & account);
+	accounts->insert(index + 1, account);
 }
 
 
-QString AccountList::getOrderedList()
+QString AccountList::getOrderedList() const
 {
 	QString order;
 	for( int i = 0 ; i < size() ; i++)
 	{
-		order += getAccount(i).getAccountId() + "/";
+		order += getAccountAt(i)->getAccountId() + "/";
 	}
 	return order;
 }
@@ -147,14 +150,14 @@ QVector<Account *> & AccountList::getAccounts()
 	return *accounts;
 }
 
-const Account & AccountList::getAccount (int i) const
+const Account * AccountList::getAccountAt (int i) const
 {
-	return *((*accounts)[i]);
+	return (*accounts)[i];
 }
 
-Account & AccountList::getAccount (int i)
+Account * AccountList::getAccountAt (int i)
 {
-	return *((*accounts)[i]);
+	return (*accounts)[i];
 }
 
 Account * AccountList::getAccountById(const QString & id) const
@@ -191,7 +194,7 @@ Account * AccountList::getAccountByItem(QListWidgetItem * item)
 	return NULL;
 }
 
-int AccountList::size()
+int AccountList::size() const
 {
 	return accounts->size();
 }
@@ -219,12 +222,12 @@ void AccountList::removeAccount(Account * account)
 	accounts->remove(accounts->indexOf(account));
 }
 
-const Account & AccountList::operator[] (int i) const
+const Account * AccountList::operator[] (int i) const
 {
-	return *((*accounts)[i]);
+	return (*accounts)[i];
 }
 
-Account & AccountList::operator[] (int i)
+Account * AccountList::operator[] (int i)
 {
-	return *((*accounts)[i]);
+	return (*accounts)[i];
 }
diff --git a/sflphone-client-kde/src/AccountList.h b/sflphone-client-kde/src/AccountList.h
index e1b00e77bb7d62ef68a8713644f06b8608e43f22..48032d89a3b3d5253ee7917fac7fdd0dc0abe705 100644
--- a/sflphone-client-kde/src/AccountList.h
+++ b/sflphone-client-kde/src/AccountList.h
@@ -49,14 +49,14 @@ public:
 	
 	//Getters
 	QVector<Account *> & getAccounts();
-	Account & getAccount (int i);
-	const Account & getAccount (int i) const;
+	Account * getAccountAt (int i);
+	const Account * getAccountAt (int i) const;
 	Account * getAccountById(const QString & id) const;
 	QVector<Account *>  getAccountByState(QString & state);
 	Account * getAccountByItem(QListWidgetItem * item);
-	int size();
+	int size() const;
 	Account * firstRegisteredAccount() const;
-	QString getOrderedList();
+	QString getOrderedList() const;
 	
 	//Setters
 	Account * addAccount(QString & alias);
@@ -66,8 +66,8 @@ public:
 	void downAccount(int index);
 
 	//Operators
-	Account & operator[] (int i);
-	const Account & operator[] (int i) const;
+	Account * operator[] (int i);
+	const Account * operator[] (int i) const;
 	QVector<Account *> registeredAccounts() const;
 	
 public slots:	
diff --git a/sflphone-client-kde/src/AccountListModel.cpp b/sflphone-client-kde/src/AccountListModel.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..7dcb09a39c246584527fed46d328fe9f78eaf9bb
--- /dev/null
+++ b/sflphone-client-kde/src/AccountListModel.cpp
@@ -0,0 +1,139 @@
+/***************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                              *
+ *   Author : Jérémy Quentin                                               *
+ *   jeremy.quentin@savoirfairelinux.com                                   *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 3 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#include "AccountListModel.h"
+
+#include "sflphone_const.h"
+#include <QDebug>
+
+AccountListModel::AccountListModel(QObject *parent)
+ : QAbstractListModel(parent)
+{
+	this->accounts = new AccountList();
+}
+
+
+AccountListModel::~AccountListModel()
+{
+}
+
+QVariant AccountListModel::data ( const QModelIndex & index, int role) const
+{
+	if (!index.isValid() || index.row() < 0 || index.row() >= rowCount())
+		return QVariant();
+
+	const Account * account = (*accounts)[index.row()];
+	if(index.column() == 0 && role == Qt::DisplayRole)
+	{
+		return QVariant(account->getAlias());
+	}
+	else if(index.column() == 0 && role == Qt::CheckStateRole)
+	{
+		return QVariant(account->isEnabled() ? Qt::Checked : Qt::Unchecked);
+	}
+	else if(index.column() == 0 && role == Qt::DecorationRole)
+	{
+		if(! account->isEnabled())
+		{
+			return QVariant(QIcon(ICON_ACCOUNT_LED_GRAY));
+		}
+		else if(account->isRegistered())
+		{
+			return QVariant(QIcon(ICON_ACCOUNT_LED_GREEN));
+		}
+		else
+		{
+			return QVariant(QIcon(ICON_ACCOUNT_LED_RED));
+		}
+	}
+	return QVariant();
+}
+
+Qt::ItemFlags AccountListModel::flags(const QModelIndex & index) const
+{
+	if (index.column() == 0)
+	{
+		return QAbstractItemModel::flags(index) | Qt::ItemIsUserCheckable;
+	}
+	return QAbstractItemModel::flags(index);
+}
+
+bool AccountListModel::setData ( const QModelIndex & index, const QVariant &value, int role)
+{
+	qDebug() << "setData";
+	if (index.isValid() && index.column() == 0 && role == Qt::CheckStateRole) {
+		(*accounts)[index.row()]->setEnabled(value.toBool());
+		emit dataChanged(index, index);
+		return true;
+	}
+	return false;
+}
+
+bool AccountListModel::accountUp( int index )
+{
+	if(index > 0 && index <= rowCount())
+	{
+		accounts->upAccount(index);
+		emit dataChanged(this->index(index - 1, 0, QModelIndex()), this->index(index, 0, QModelIndex()));
+		return true;
+	}
+	return false;
+}
+
+bool AccountListModel::accountDown( int index )
+{
+	if(index >= 0 && index < rowCount())
+	{
+		accounts->downAccount(index);
+		emit dataChanged(this->index(index, 0, QModelIndex()), this->index(index + 1, 0, QModelIndex()));
+		return true;
+	}
+	return false;
+}
+
+
+bool AccountListModel::removeAccount( int index )
+{
+	if(index >= 0 && index < rowCount())
+	{
+		accounts->removeAccount(accounts->getAccountAt(index));
+		emit dataChanged(this->index(index, 0, QModelIndex()), this->index(rowCount(), 0, QModelIndex()));
+		return true;
+	}
+	return false;
+}
+
+bool AccountListModel::addAccount( QString alias )
+{
+	accounts->addAccount(alias);
+	emit dataChanged(this->index(0, 0, QModelIndex()), this->index(rowCount(), 0, QModelIndex()));
+	return true;
+}
+
+int AccountListModel::rowCount(const QModelIndex & parent) const
+{
+	return accounts->size();
+}
+
+QString AccountListModel::getOrderedList() const
+{
+	return accounts->getOrderedList();
+}
+
diff --git a/sflphone-client-kde/src/AccountListModel.h b/sflphone-client-kde/src/AccountListModel.h
new file mode 100644
index 0000000000000000000000000000000000000000..dc4a9b40e6267b35b0cedf08db76b0df5a62e780
--- /dev/null
+++ b/sflphone-client-kde/src/AccountListModel.h
@@ -0,0 +1,60 @@
+/***************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                              *
+ *   Author : Jérémy Quentin                                               *
+ *   jeremy.quentin@savoirfairelinux.com                                   *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 3 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef ACCOUNTLISTMODEL_H
+#define ACCOUNTLISTMODEL_H
+
+#include <QAbstractListModel>
+
+#include "AccountList.h"
+
+/**
+	@author Jérémy Quentin <jeremy.quentin@gmail.com>
+*/
+class AccountListModel : public QAbstractListModel
+{
+Q_OBJECT
+private:
+	AccountList * accounts;
+
+public:
+	AccountListModel(QObject *parent = 0);
+
+	~AccountListModel();
+	
+	QVariant data ( const QModelIndex & index, int role = Qt::DisplayRole ) const;
+	int rowCount(const QModelIndex & parent = QModelIndex()) const;
+// 	int columnCount(const QModelIndex & parent = QModelIndex()) const;
+// 	QVariant headerData(int section , Qt::Orientation orientation, int role) const;
+	Qt::ItemFlags flags(const QModelIndex & index) const;
+	virtual bool setData ( const QModelIndex & index, const QVariant &value, int role);
+	
+	bool accountUp( int index );
+	bool accountDown( int index );
+	bool removeAccount( int index );
+	bool addAccount( QString alias );
+	
+	QString getOrderedList() const;
+// 	QStringList getActiveCodecList() const ;
+// 	void setActiveCodecList(const QStringList & activeCodecListToSet);
+
+};
+
+#endif
diff --git a/sflphone-client-kde/src/AccountWizard.cpp b/sflphone-client-kde/src/AccountWizard.cpp
index ad55bc97dff472c0f7638209e76b9a0a77866fcf..0b81f3c15a780a643c25dee34ee4f43787873d7e 100644
--- a/sflphone-client-kde/src/AccountWizard.cpp
+++ b/sflphone-client-kde/src/AccountWizard.cpp
@@ -40,10 +40,12 @@
 #define FIELD_SIP_SERVER         "SIP_SERVER"
 #define FIELD_SIP_USER           "SIP_USER"
 #define FIELD_SIP_PASSWORD       "SIP_PASSWORD"
+#define FIELD_SIP_VOICEMAIL      "SIP_VOICEMAIL"
 #define FIELD_IAX_ALIAS          "IAX_ALIAS"
 #define FIELD_IAX_SERVER         "IAX_SERVER"
 #define FIELD_IAX_USER           "IAX_USER"
 #define FIELD_IAX_PASSWORD       "IAX_PASSWORD"
+#define FIELD_IAX_VOICEMAIL      "IAX_VOICEMAIL"
 
 
 #define SFL_ACCOUNT_HOST         "sip.sflphone.org"
@@ -158,13 +160,10 @@ AccountWizard::AccountWizard(QWidget * parent)
 	setPage(Page_Conclusion, new WizardAccountConclusionPage);
 	
 	setStartId(Page_Intro);
-	setWindowTitle(i18n("Account Creation Wizard"));
+	setWindowTitle(i18n("Account creation wizard"));
 	setWindowIcon(QIcon(ICON_SFLPHONE));
 	setMinimumHeight(350);
-// 	setPixmap(QWizard::LogoPixmap, QPixmap(ICON_SFLPHONE));
 	setPixmap(QWizard::WatermarkPixmap, QPixmap(ICON_SFLPHONE));
-// 	setPixmap(QWizard::BannerPixmap, QPixmap(ICON_SFLPHONE));
-// 	setPixmap(QWizard::BackgroundPixmap, QPixmap(ICON_SFLPHONE));
 }
 
 
@@ -197,11 +196,12 @@ void AccountWizard::accept()
 		rest_account acc = get_rest_account(SFL_ACCOUNT_HOST, charEmailAddress);
 		if(acc.success)
 		{
-			ret += i18n("Creation of account succeed with these parameters") + " :\n";
+			ret += i18n("This assistant is now finished.") + "\n";
 			alias = QString(acc.user) + "@" + SFL_ACCOUNT_HOST;
 			server = QString(SFL_ACCOUNT_HOST);
 			user = QString(acc.user);
 			password = QString(acc.passwd);
+			mailbox = QString();
 			protocol = QString(ACCOUNT_TYPE_SIP);
 			createAccount = true;
 			sip = true;
@@ -214,7 +214,7 @@ void AccountWizard::accept()
 	}
 	else
 	{
-		ret += i18n("Register of account succeed with these parameters") + " :\n";
+		ret += i18n("This assistant is now finished.") + "\n";
 		bool SIPAccount = field(FIELD_SIP_ACCOUNT).toBool();
 		if(SIPAccount)
 		{
@@ -222,6 +222,7 @@ void AccountWizard::accept()
 			server = field(FIELD_SIP_SERVER).toString();
 			user = field(FIELD_SIP_USER).toString();
 			password = field(FIELD_SIP_PASSWORD).toString();
+			mailbox = field(FIELD_SIP_VOICEMAIL).toString();
 			protocol = QString(ACCOUNT_TYPE_SIP);
 			sip = true;
 			
@@ -232,6 +233,7 @@ void AccountWizard::accept()
 			server = field(FIELD_IAX_SERVER).toString();
 			user = field(FIELD_IAX_USER).toString();
 			password = field(FIELD_IAX_PASSWORD).toString();
+			mailbox = field(FIELD_IAX_VOICEMAIL).toString();
 			protocol = QString(ACCOUNT_TYPE_IAX);
 		}
 		createAccount = true;
@@ -252,13 +254,14 @@ void AccountWizard::accept()
 		}
 		ret += i18n("Alias") + " : " + alias + "\n";
 		ret += i18n("Server") + " : " + server + "\n";
-		ret += i18n("User") + " : " + user + "\n";
+		ret += i18n("Username") + " : " + user + "\n";
 		ret += i18n("Password") + " : " + password + "\n";
 		ret += i18n("Protocol") + " : " + protocol + "\n";
-		ret += i18n("Mailbox") + " : " + mailbox + "\n";
+		ret += i18n("Voicemail number") + " : " + mailbox + "\n";
 	}
 	qDebug() << ret;
 	QDialog::accept();
+	restart();
 }
  
 
@@ -272,10 +275,10 @@ void AccountWizard::accept()
 WizardIntroPage::WizardIntroPage(QWidget *parent)
      : QWizardPage(parent)
 {
-	setTitle(i18n("Account Creation Wizard"));
-	setSubTitle(i18n("Welcome to the Account creation wizard of SFLPhone"));
+	setTitle(i18n("Account creation wizard"));
+	setSubTitle(i18n("Welcome to the Account creation wizard of SFLphone!"));
 
-	introLabel = new QLabel(i18n("This wizard will help you setting up an account."));
+	introLabel = new QLabel(i18n("This installation wizard will help you configure an account."));
 	introLabel->setWordWrap(true);
 
 	QVBoxLayout *layout = new QVBoxLayout;
@@ -303,11 +306,11 @@ int WizardIntroPage::nextId() const
 WizardAccountAutoManualPage::WizardAccountAutoManualPage(QWidget *parent)
      : QWizardPage(parent)
 {
-	setTitle(i18n("Accounts"));
-	setSubTitle(i18n("Please choose between those options :"));
+	setTitle(i18n("Account"));
+	setSubTitle(i18n("Please select one of the following options"));
 
 	radioButton_SFL = new QRadioButton(i18n("Create a free SIP/IAX2 account on sflphone.org"));
-	radioButton_manual = new QRadioButton(i18n("Register an existing SIP/IAX2 account"));
+	radioButton_manual = new QRadioButton(i18n("Register an existing SIP or IAX2 account"));
 	radioButton_SFL->setChecked(true);
 
 	registerField(FIELD_SFL_ACCOUNT, radioButton_SFL);
@@ -347,10 +350,10 @@ WizardAccountTypePage::WizardAccountTypePage(QWidget *parent)
      : QWizardPage(parent)
 {
 	setTitle(i18n("VoIP Protocols"));
-	setSubTitle(i18n("Choose the account type") + " :");
+	setSubTitle(i18n("Select an account type"));
 
-	radioButton_SIP = new QRadioButton(i18n("Register a SIP (Session Initiation Protocol) account"));
-	radioButton_IAX = new QRadioButton(i18n("Register a IAX2 (InterAsterisk eXchange) account"));
+	radioButton_SIP = new QRadioButton(i18n("SIP (Session Initiation Protocol)"));
+	radioButton_IAX = new QRadioButton(i18n("IAX2 (InterAsterix Exchange)"));
 	radioButton_SIP->setChecked(true);
 	
 	registerField(FIELD_SIP_ACCOUNT, radioButton_SIP);
@@ -389,7 +392,7 @@ int WizardAccountTypePage::nextId() const
 WizardAccountEmailAddressPage::WizardAccountEmailAddressPage(QWidget *parent)
      : QWizardPage(parent)
 {
-	setTitle(i18n("Optionnal Email Address"));
+	setTitle(i18n("Optional email address"));
 	setSubTitle(i18n("This email address will be used to send your voicemail messages."));
 
 	label_emailAddress = new QLabel(i18n("Email address"));
@@ -426,23 +429,25 @@ WizardAccountFormPage::WizardAccountFormPage(int type, QWidget *parent)
 	this->type = type;
 	if(type == SIP)
 	{
-		setTitle(i18n("SIP Account Settings"));
+		setTitle(i18n("SIP account settings"));
 	}
 	else
 	{
-		setTitle(i18n("IAX2 Account Settings"));
+		setTitle(i18n("IAX2 account settings"));
 	}
-	setSubTitle(i18n("Please full these settings fields."));
+	setSubTitle(i18n("Please fill the following information"));
 
 	label_alias = new QLabel(i18n("Alias") + " *");
 	label_server = new QLabel(i18n("Server") + " *");
-	label_user = new QLabel(i18n("User") + " *");
+	label_user = new QLabel(i18n("Username") + " *");
 	label_password = new QLabel(i18n("Password") + " *");
+	label_voicemail = new QLabel(i18n("Voicemail number"));
 	
 	lineEdit_alias = new QLineEdit;
 	lineEdit_server = new QLineEdit;
 	lineEdit_user = new QLineEdit;
 	lineEdit_password = new QLineEdit;
+	lineEdit_voicemail = new QLineEdit;
 
 	lineEdit_password->setEchoMode(QLineEdit::Password);
 	
@@ -452,6 +457,7 @@ WizardAccountFormPage::WizardAccountFormPage(int type, QWidget *parent)
 		registerField(QString(FIELD_SIP_SERVER) + "*", lineEdit_server);
 		registerField(QString(FIELD_SIP_USER) + "*", lineEdit_user);
 		registerField(QString(FIELD_SIP_PASSWORD) + "*", lineEdit_password);
+		registerField(QString(FIELD_SIP_VOICEMAIL), lineEdit_voicemail);
 	}
 	else
 	{
@@ -459,6 +465,7 @@ WizardAccountFormPage::WizardAccountFormPage(int type, QWidget *parent)
 		registerField(QString(FIELD_IAX_SERVER) + "*", lineEdit_server);
 		registerField(QString(FIELD_IAX_USER) + "*", lineEdit_user);
 		registerField(QString(FIELD_IAX_PASSWORD) + "*", lineEdit_password);
+		registerField(QString(FIELD_IAX_VOICEMAIL), lineEdit_voicemail);
 	}
 	
 	QFormLayout *layout = new QFormLayout;
@@ -472,6 +479,8 @@ WizardAccountFormPage::WizardAccountFormPage(int type, QWidget *parent)
 	layout->setWidget(2, QFormLayout::FieldRole, lineEdit_user);
    layout->setWidget(3, QFormLayout::LabelRole, label_password);
 	layout->setWidget(3, QFormLayout::FieldRole, lineEdit_password);
+   layout->setWidget(4, QFormLayout::LabelRole, label_voicemail);
+	layout->setWidget(4, QFormLayout::FieldRole, lineEdit_voicemail);
 	
 	setLayout(layout);
 }
@@ -483,10 +492,12 @@ WizardAccountFormPage::~WizardAccountFormPage()
 	delete label_server;
 	delete label_user;
 	delete label_password;
+	delete label_voicemail;
 	delete lineEdit_alias;
 	delete lineEdit_server;
 	delete lineEdit_user;
 	delete lineEdit_password;
+	delete lineEdit_voicemail;
 }
 
 int WizardAccountFormPage::nextId() const
@@ -510,7 +521,7 @@ WizardAccountStunPage::WizardAccountStunPage(QWidget *parent)
      : QWizardPage(parent)
 {
 	setTitle(i18n("Network Address Translation (NAT)"));
-	setSubTitle(i18n("You should probably enable this option if you're placed under a firewall"));
+	setSubTitle(i18n("You should probably enable this if you are behind a firewall."));
 
 	checkBox_enableStun = new QCheckBox(i18n("Enable STUN"));
 	label_StunServer = new QLabel(i18n("Stun Server"));
@@ -547,7 +558,7 @@ int WizardAccountStunPage::nextId() const
 WizardAccountConclusionPage::WizardAccountConclusionPage(QWidget *parent)
      : QWizardPage(parent)
 {
-	setTitle(i18n("Account Definition Finished"));
+	setTitle(i18n("This assistant is now finished."));
 	setSubTitle(i18n("After checking the settings you chose, click \"Finish\" to create the account."));
 
 	QVBoxLayout *layout = new QVBoxLayout;
diff --git a/sflphone-client-kde/src/AccountWizard.h b/sflphone-client-kde/src/AccountWizard.h
index afa7588db0ceaa37c9fa5adc890c2db37ca9a523..e0791ada5ce78cd677793f16ab6f285ce136b068 100644
--- a/sflphone-client-kde/src/AccountWizard.h
+++ b/sflphone-client-kde/src/AccountWizard.h
@@ -143,11 +143,13 @@ private:
 	QLabel * label_server;
 	QLabel * label_user;
 	QLabel * label_password;
+	QLabel * label_voicemail;
 	
 	QLineEdit * lineEdit_alias;
 	QLineEdit * lineEdit_server;
 	QLineEdit * lineEdit_user;
 	QLineEdit * lineEdit_password;
+	QLineEdit * lineEdit_voicemail;
 };
 
 /***************************************************************************
diff --git a/sflphone-client-kde/src/CMakeLists.txt b/sflphone-client-kde/src/CMakeLists.txt
index 32540e27410f48052ba8ab62a9999a14b5ae47a6..778aabb808e79ecc36e232dbdefa9530e5747700 100644
--- a/sflphone-client-kde/src/CMakeLists.txt
+++ b/sflphone-client-kde/src/CMakeLists.txt
@@ -54,6 +54,11 @@ SET(	   sflphone_client_kde_SRCS
 	conf/dlghooks.cpp
 	conf/ConfigurationSkeleton.cpp
 	Dialpad.cpp
+	Codec.cpp
+	CodecListModel.cpp
+	SortableCodecListWidget.cpp
+	Item.cpp
+	AccountListModel.cpp
 )
  
 
diff --git a/sflphone-client-kde/src/Call.cpp b/sflphone-client-kde/src/Call.cpp
index e5f2e94c1f6cad8eee3ad25a3f2a25f44867b283..efb34db0da9ab6b59166ceb24edb7f62736ac8c4 100644
--- a/sflphone-client-kde/src/Call.cpp
+++ b/sflphone-client-kde/src/Call.cpp
@@ -54,7 +54,7 @@ const function Call::actionPerformedFunctionMap[11][5] =
 /*INCOMING       */  {&Call::accept     , &Call::refuse   , &Call::acceptTransf   , &Call::acceptHold  ,  &Call::setRecord     },
 /*RINGING        */  {&Call::nothing    , &Call::hangUp   , &Call::nothing        , &Call::nothing     ,  &Call::setRecord     },
 /*CURRENT        */  {&Call::nothing    , &Call::hangUp   , &Call::nothing        , &Call::hold        ,  &Call::setRecord     },
-/*DIALING        */  {&Call::call       , &Call::nothing  , &Call::nothing        , &Call::nothing     ,  &Call::nothing       },
+/*DIALING        */  {&Call::call       , &Call::cancel  , &Call::nothing        , &Call::nothing     ,  &Call::nothing       },
 /*HOLD           */  {&Call::nothing    , &Call::hangUp   , &Call::nothing        , &Call::unhold      ,  &Call::setRecord     },
 /*FAILURE        */  {&Call::nothing    , &Call::hangUp   , &Call::nothing        , &Call::nothing     ,  &Call::nothing       },
 /*BUSY           */  {&Call::nothing    , &Call::hangUp   , &Call::nothing        , &Call::nothing     ,  &Call::nothing       },
@@ -164,24 +164,20 @@ Call::Call(call_state startState, QString callId, QString peerName, QString peer
 	this->stopTime = NULL;
 }
 
-Call::Call(QString callId)
+Call * Call::buildExistingCall(QString callId)
 {
 	CallManagerInterface & callManager = CallManagerInterfaceSingleton::getInstance();
 	MapStringString details = callManager.getCallDetails(callId).value();
 	qDebug() << "Constructing existing call with details : " << details;
-	this->callId = callId;
-	this->peerPhoneNumber = details[CALL_PEER_NUMBER];
-	this->peerName = details[CALL_PEER_NAME];
-	initCallItem();
+	QString peerNumber = details[CALL_PEER_NUMBER];
+	QString peerName = details[CALL_PEER_NAME];
 	call_state startState = getStartStateFromDaemonCallState(details[CALL_STATE], details[CALL_TYPE]);
-	changeCurrentState(startState);
-	this->historyState = getHistoryStateFromDaemonCallState(details[CALL_STATE], details[CALL_TYPE]);
-	this->account = details[CALL_ACCOUNTID];
-	this->recording = false;
-	this->startTime = new QDateTime(QDateTime::currentDateTime());
-	this->stopTime = NULL;
-	this->historyItem = NULL;
-	this->historyItemWidget = NULL;
+	QString account = details[CALL_ACCOUNTID];
+	Call * call = new Call(startState, callId, peerName, peerNumber, account);
+	call->startTime = new QDateTime(QDateTime::currentDateTime());
+	call->recording = callManager.getIsRecording(callId);
+	call->historyState = getHistoryStateFromDaemonCallState(details[CALL_STATE], details[CALL_TYPE]);
+	return call;
 }
 
 Call::~Call()
@@ -251,6 +247,7 @@ history_state Call::getHistoryStateFromType(QString type)
 	{
 		return INCOMING;
 	}
+	return NONE;
 }
 
 call_state Call::getStartStateFromDaemonCallState(QString daemonCallState, QString daemonCallType)
@@ -275,6 +272,14 @@ call_state Call::getStartStateFromDaemonCallState(QString daemonCallState, QStri
 	{
 		return CALL_STATE_RINGING;
 	}
+	else if(daemonCallState == DAEMON_CALL_STATE_INIT_INCOMING)
+	{
+		return CALL_STATE_INCOMING;
+	}
+	else if(daemonCallState == DAEMON_CALL_STATE_INIT_RINGING)
+	{
+		return CALL_STATE_RINGING;
+	}
 	else
 	{
 		return CALL_STATE_FAILURE;
@@ -353,7 +358,7 @@ Contact * Call::findContactForNumberInKAddressBook(QString number)
 	ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
 	MapStringInt addressBookSettings = configurationManager.getAddressbookSettings().value();
 	bool displayPhoto = addressBookSettings[ADDRESSBOOK_DISPLAY_CONTACT_PHOTO];
-	AddressBook * ab = KABC::StdAddressBook::self();
+	AddressBook * ab = KABC::StdAddressBook::self(true);
 	QVector<Contact *> results = QVector<Contact *>();
 	AddressBook::Iterator it;
 	for ( it = ab->begin(); it != ab->end(); ++it ) {	
@@ -558,6 +563,13 @@ void Call::hangUp()
 	callManager.hangUp(callId);
 }
 
+void Call::cancel()
+{
+	CallManagerInterface & callManager = CallManagerInterfaceSingleton::getInstance();
+	qDebug() << "Canceling call. callId : " << callId;
+	callManager.hangUp(callId);
+}
+
 void Call::hold()
 {
 	CallManagerInterface & callManager = CallManagerInterfaceSingleton::getInstance();
@@ -572,8 +584,8 @@ void Call::call()
 	qDebug() << "account = " << account;
 	if(account.isEmpty())
 	{
-		qDebug() << "account is empty"; 
-		this->account = sflphone_kdeView::firstRegisteredAccount()->getAccountId();
+		qDebug() << "account is empty, taking the first registered.";
+		this->account = sflphone_kdeView::firstRegisteredAccountId();
 	}
 	if(!account.isEmpty())
 	{
@@ -581,8 +593,8 @@ void Call::call()
 		callManager.placeCall(account, callId, number);
 		this->account = account;
 		this->peerPhoneNumber = number;
-		Contact * contact = findContactForNumberInKAddressBook(peerPhoneNumber);
-		if(contact) this->peerName = contact->getNickName();
+// 		Contact * contact = findContactForNumberInKAddressBook(peerPhoneNumber);
+// 		if(contact) this->peerName = contact->getNickName();
 		this->startTime = new QDateTime(QDateTime::currentDateTime());
 		this->historyState = OUTGOING;
 	}
@@ -647,7 +659,6 @@ void Call::warning()
 
 void Call::appendItemText(QString text)
 {
-	ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
 	QLabel * editNumber;
 	switch(currentState)
 	{
diff --git a/sflphone-client-kde/src/Call.h b/sflphone-client-kde/src/Call.h
index 143c0cb4ebfa5075e9cedeb6951bffe468a832ef..3d3ae20fc7de786f9c040bd9c78f0309f115dc63 100644
--- a/sflphone-client-kde/src/Call.h
+++ b/sflphone-client-kde/src/Call.h
@@ -113,6 +113,31 @@ class Call;
 
 typedef  void (Call::*function)();
 
+
+/**
+ *  This class represents a call either actual (in the call list
+ *  displayed in main window), either past (in the call history).
+ *  A call is represented by an automate, with a list of states
+ *  (enum call_state) and 2 lists of transition signals
+ *  (call_action when the user performs an action on the UI and 
+ *  daemon_call_state when the daemon sends a stateChanged signal)
+ *  When a transition signal is received, the automate calls a
+ *  function then go to a new state according to the previous state
+ *  of the call and the signal received.
+ *  The functions to call and the new states to go to are placed in
+ *  the maps actionPerformedStateMap, actionPerformedFunctionMap, 
+ *  stateChangedStateMap and stateChangedFunctionMap.
+ *  Those maps are used by actionPerformed and stateChanged functions
+ *  to handle the behavior of the automate.
+ *  When an actual call goes to the state OVER, it becomes part of
+ *  the call history.
+ *
+ *  It may be better to handle call list and call history separately,
+ *  and to use the class Item to handle their display, or a model/view
+ *  way. For this it needs to handle the becoming of a call to a past call
+ *  keeping the information gathered by the call and needed by the history
+ *  call (history state, start time...).
+**/
 class Call
 {
 private:
@@ -144,9 +169,34 @@ private:
 	
 	
 	//Automate attributes
+	/**
+	 *  actionPerformedStateMap[orig_state][action]
+	 *  Map of the states to go to when the action action is 
+	 *  performed on a call in state orig_state.
+	**/
 	static const call_state actionPerformedStateMap [11][5];
+	
+	/**
+	 *  actionPerformedFunctionMap[orig_state][action]
+	 *  Map of the functions to call when the action action is 
+	 *  performed on a call in state orig_state.
+	**/
 	static const function actionPerformedFunctionMap [11][5];
+	
+	/**
+	 *  stateChangedStateMap[orig_state][daemon_new_state]
+	 *  Map of the states to go to when the daemon sends the signal 
+	 *  callStateChanged with arg daemon_new_state
+	 *  on a call in state orig_state.
+	**/
 	static const call_state stateChangedStateMap [11][6];
+	
+	/**
+	 *  stateChangedFunctionMap[orig_state][daemon_new_state]
+	 *  Map of the functions to call when the daemon sends the signal 
+	 *  callStateChanged with arg daemon_new_state
+	 *  on a call in state orig_state.
+	**/
 	static const function stateChangedFunctionMap [11][6];
 	
 	static const char * historyIcons[3];
@@ -161,12 +211,15 @@ private:
 	static daemon_call_state toDaemonCallState(const QString & stateName);
 	
 	//Automate functions
+	// See actionPerformedFunctionMap and stateChangedFunctionMap
+	// to know when it is called.
 	void nothing();
 	void accept();
 	void refuse();
 	void acceptTransf();
 	void acceptHold();
 	void hangUp();
+	void cancel();
 	void hold();
 	void call();
 	void transfer();
@@ -180,13 +233,14 @@ private:
 public:
 	
 	//Constructors & Destructors
-	Call(QString callId);
 	~Call();
 	void initCallItem();
 	static Call * buildDialingCall(QString callId, const QString & peerName, QString account = "");
-	static Call * buildIncomingCall(const QString & callId/*, const QString & from, const QString & account*/);
+	static Call * buildIncomingCall(const QString & callId);
 	static Call * buildRingingCall(const QString & callId);
 	static Call * buildHistoryCall(const QString & callId, uint startTimeStamp, uint stopTimeStamp, QString account, QString name, QString number, QString type);
+	static Call * buildExistingCall(QString callId);
+	
 	static history_state getHistoryStateFromType(QString type);
 	static call_state getStartStateFromDaemonCallState(QString daemonCallState, QString daemonCallType);
 	static history_state getHistoryStateFromDaemonCallState(QString daemonCallState, QString daemonCallType);
diff --git a/sflphone-client-kde/src/CallList.cpp b/sflphone-client-kde/src/CallList.cpp
index ca189dee7763918ddb9e57d6b23890d990d74bab..9f2cb774456cb3f812375a2e78fd720d19bb9e64 100644
--- a/sflphone-client-kde/src/CallList.cpp
+++ b/sflphone-client-kde/src/CallList.cpp
@@ -31,11 +31,10 @@ CallList::CallList()
 	ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
 	QStringList callList = callManager.getCallList();
 	qDebug() << "Call List = " << callList;
-	callIdCpt = 0;
 	calls = new QVector<Call *>();
 	for(int i = 0 ; i < callList.size() ; i++)
 	{
-		calls->append(new Call(callList[i]));
+		calls->append(Call::buildExistingCall(callList[i]));
 	}
 	MapStringString historyMap = configurationManager.getHistory().value();
 	qDebug() << "Call History = " << historyMap;
@@ -49,7 +48,7 @@ CallList::CallList()
 		QString name = param[2];
 		uint stopTimeStamp = param[3].toUInt();
 		QString account = param[4];
-		calls->append(Call::buildHistoryCall(getAndIncCallId(), startTimeStamp, stopTimeStamp, account, name, number, type));
+		calls->append(Call::buildHistoryCall(generateCallId(), startTimeStamp, stopTimeStamp, account, name, number, type));
 	}
 }
 
@@ -127,10 +126,11 @@ Call * CallList::operator[](int ind)
 	return (*calls)[ind];
 }
 
-QString CallList::getAndIncCallId()
+
+QString CallList::generateCallId()
 {
-	QString res = QString::number(callIdCpt++);
-	
+	int id = qrand();
+	QString res = QString::number(id);
 	return res;
 }
 
@@ -141,7 +141,7 @@ int CallList::size()
 
 Call * CallList::addDialingCall(const QString & peerName, QString account)
 {
-	Call * call = Call::buildDialingCall(getAndIncCallId(), peerName, account);
+	Call * call = Call::buildDialingCall(generateCallId(), peerName, account);
 	calls->append(call);
 	return call;
 }
diff --git a/sflphone-client-kde/src/CallList.h b/sflphone-client-kde/src/CallList.h
index 2ca3dd10b1f0d304b276bbc1db4df9c7acdda67a..e9ff5341b32a19a4822620b7e63886495eb733c7 100644
--- a/sflphone-client-kde/src/CallList.h
+++ b/sflphone-client-kde/src/CallList.h
@@ -35,7 +35,6 @@ Q_OBJECT
 private:
 
 	QVector<Call *> * calls;
-	int callIdCpt;
 
 public:
 
@@ -58,7 +57,7 @@ public:
 	Call * addRingingCall(const QString & callId);
 
 	//GSetter
-	QString getAndIncCallId();
+	QString generateCallId();
 	
 public slots:
 	void clearHistory();
diff --git a/sflphone-client-kde/src/Codec.cpp b/sflphone-client-kde/src/Codec.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..3e94070c0de39b524cf2153406c0ac2d1a2cefa9
--- /dev/null
+++ b/sflphone-client-kde/src/Codec.cpp
@@ -0,0 +1,64 @@
+/***************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                              *
+ *   Author : Jérémy Quentin                                               *
+ *   jeremy.quentin@savoirfairelinux.com                                   *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 3 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#include "Codec.h"
+
+#include "configurationmanager_interface_singleton.h"
+#include "sflphone_const.h"
+
+Codec::Codec(int payload, bool enabled)
+{
+	ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
+	QStringList details = configurationManager.getCodecDetails(payload);
+	this->payload = QString::number(payload);
+	this->enabled = enabled;
+	this->name = details[CODEC_NAME];
+	this->frequency = details[CODEC_SAMPLE_RATE];
+	this->bitrate = details[CODEC_BIT_RATE];
+	this->bandwidth = details[CODEC_BANDWIDTH];
+}
+
+QString Codec::getPayload() const
+{	return payload;	}
+QString Codec::getName() const
+{	return name;	}
+QString Codec::getFrequency() const
+{	return frequency;	}
+QString Codec::getBitrate() const
+{	return bitrate;	}
+QString Codec::getBandwidth() const
+{	return bandwidth;	}
+bool Codec::isEnabled() const
+{	return enabled;	}
+
+void Codec::setPayload(QString payload)
+{	this->payload = payload;	}
+void Codec::setName(QString name)
+{	this->name = name;	}
+void Codec::setFrequency(QString frequency)
+{	this->frequency = frequency;	}
+void Codec::setBitrate(QString bitrate)
+{	this->bitrate = bitrate;	}
+void Codec::setBandwidth(QString bandwidth)
+{	this->bandwidth = bandwidth;	}
+void Codec::setEnabled(bool enabled)
+{	this->enabled = enabled;	}
+
+
diff --git a/sflphone-client-kde/src/Codec.h b/sflphone-client-kde/src/Codec.h
new file mode 100644
index 0000000000000000000000000000000000000000..9a86d604d5a9a293cf7a1e9b2a9b59cd463d86e8
--- /dev/null
+++ b/sflphone-client-kde/src/Codec.h
@@ -0,0 +1,66 @@
+/***************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                              *
+ *   Author : Jérémy Quentin                                               *
+ *   jeremy.quentin@savoirfairelinux.com                                   *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 3 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef CODEC_H
+#define CODEC_H
+
+#include <QObject>
+#include <QtCore/QString>
+
+/**
+	@author Jérémy Quentin <jeremy.quentin@gmail.com>
+*/
+class Codec : public QObject
+{
+Q_OBJECT
+private:
+	QString payload;
+	QString name;
+	QString frequency;
+	QString bitrate;
+	QString bandwidth;
+	bool enabled;
+
+public:
+	Codec(int payload, bool enabled);
+// 	Codec(const Codec & codec);
+
+// 	~Codec();
+    
+	QString getPayload() const;
+	QString getName() const;
+	QString getFrequency() const;
+	QString getBitrate() const;
+	QString getBandwidth() const;
+	bool isEnabled() const;
+	
+	void setPayload(QString payload);
+	void setName(QString name);
+	void setFrequency(QString frequency);
+	void setBitrate(QString bitrate);
+	void setBandwidth(QString bandwidth);
+	void setEnabled(bool enabled);
+	
+	Codec & operator=(const Codec&);
+
+	
+};
+
+#endif
diff --git a/sflphone-client-kde/src/CodecListModel.cpp b/sflphone-client-kde/src/CodecListModel.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..4acf8a05662df40dc63f3ac612ac74a21952db4f
--- /dev/null
+++ b/sflphone-client-kde/src/CodecListModel.cpp
@@ -0,0 +1,201 @@
+/***************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                              *
+ *   Author : Jérémy Quentin                                               *
+ *   jeremy.quentin@savoirfairelinux.com                                   *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 3 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#include "CodecListModel.h"
+
+#include <QtCore/QSize>
+#include <QtCore/QDebug>
+#include <KLocale>
+#include "configurationmanager_interface_singleton.h"
+
+CodecListModel::CodecListModel(QObject *parent)
+ : QAbstractTableModel(parent)
+{
+	this->codecs = QList<Codec *>();
+	ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
+	QStringList activeCodecList = configurationManager.getActiveCodecList();
+	setActiveCodecList(activeCodecList);
+}
+
+
+CodecListModel::~CodecListModel()
+{
+}
+
+
+QVariant CodecListModel::data ( const QModelIndex & index, int role) const
+{
+	if (!index.isValid())
+		return QVariant();
+
+	const Codec * codec = codecs[index.row()];
+	if(index.column() == 0 && role == Qt::DisplayRole)
+	{
+		return QVariant(codec->getName());
+	}
+	else if(index.column() == 0 && role == Qt::CheckStateRole)
+	{
+		return QVariant(codec->isEnabled() ? Qt::Checked : Qt::Unchecked);
+	}
+	else if(index.column() == 1 && role == Qt::DisplayRole)
+	{
+		return QVariant(codec->getFrequency());
+	}
+	else if(index.column() == 2 && role == Qt::DisplayRole)
+	{
+		return QVariant(codec->getBitrate());
+	}
+	else if(index.column() == 3 && role == Qt::DisplayRole)
+	{
+		return QVariant(codec->getBandwidth());
+	}
+	
+	return QVariant();
+}
+
+
+int CodecListModel::rowCount(const QModelIndex & parent) const
+{
+	return codecs.count();
+}
+
+int CodecListModel::columnCount(const QModelIndex & parent) const
+{
+	return 4;
+}
+
+
+QVariant CodecListModel::headerData(int section , Qt::Orientation orientation, int role) const
+{
+	if (section == 0 && orientation == Qt::Horizontal && role == Qt::DisplayRole)
+	{
+		return QVariant(i18n("Codec"));
+	}
+	else if (section == 1 && orientation == Qt::Horizontal && role == Qt::DisplayRole)
+	{
+		return QVariant(i18n("Frequency"));
+	}
+	else if (section == 2 && orientation == Qt::Horizontal && role == Qt::DisplayRole)
+	{
+		return QVariant(i18n("Bitrate"));
+	}
+	else if (section == 3 && orientation == Qt::Horizontal && role == Qt::DisplayRole)
+	{
+		return QVariant(i18n("Bandwidth"));
+	}
+	return QVariant();
+}
+
+Qt::ItemFlags CodecListModel::flags(const QModelIndex & index) const
+{
+	if (index.column() == 0)
+	{
+		return QAbstractItemModel::flags(index) | Qt::ItemIsUserCheckable;
+	}
+	return QAbstractItemModel::flags(index);
+}
+
+bool CodecListModel::setData ( const QModelIndex & index, const QVariant &value, int role)
+{
+	qDebug() << "setData";
+	if (index.isValid() && index.column() == 0 && role == Qt::CheckStateRole) {
+		codecs[index.row()]->setEnabled(value.toBool());
+		emit dataChanged(index, index);
+		return true;
+	}
+	return false;
+}
+
+bool CodecListModel::codecUp( int index )
+{
+	if(index > 0 && index <= rowCount())
+	{
+		codecs.swap(index - 1, index);
+		emit dataChanged(this->index(index - 1, 0, QModelIndex()), this->index(index, columnCount(), QModelIndex()));
+		return true;
+	}
+	return false;
+}
+
+bool CodecListModel::codecDown( int index )
+{
+	if(index >= 0 && index < rowCount())
+	{
+		codecs.swap(index + 1, index);
+		emit dataChanged(this->index(index, 0, QModelIndex()), this->index(index + 1, columnCount(), QModelIndex()));
+		return true;
+	}
+	return false;
+}
+
+QStringList CodecListModel::getActiveCodecList() const
+{
+	QStringList codecList;
+	for(int i = 0 ; i < rowCount() ; i++)
+	{
+		if(codecs[i]->isEnabled())
+			codecList.append(codecs[i]->getPayload());
+	}
+	return codecList;
+}
+
+void CodecListModel::setActiveCodecList(const QStringList & activeCodecListToSet)
+{
+	this->codecs = QList<Codec *>();
+	ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
+	QStringList codecList = configurationManager.getCodecList();
+	QStringList activeCodecList = activeCodecListToSet;
+	#if QT_VERSION >= 0x040500
+		activeCodecList.removeDuplicates();
+	#else
+   	for (int i = 0 ; i < activeCodecList.size() ; i++)
+		{
+			if(activeCodecList.lastIndexOf(activeCodecList[i]) != i || ! codecList.contains(activeCodecList[i]))
+			{
+				activeCodecList.removeAt(i);
+				i--;
+			}
+		}
+	#endif
+
+	QStringList codecListToDisplay = activeCodecList;
+	for (int i=0 ; i<codecList.size() ; i++)
+	{
+		if(! activeCodecList.contains(codecList[i]))
+		{
+			codecListToDisplay << codecList[i];
+		}
+	}
+	for(int i=0 ; i<codecListToDisplay.size() ; i++)
+	{
+		bool ok;
+		qDebug() << codecListToDisplay[i];
+		QString payloadStr = QString(codecListToDisplay[i]);
+		int payload = payloadStr.toInt(&ok);
+		if(!ok)	
+			qDebug() << "The codec's payload sent by the configurationManager is not a number : " << codecListToDisplay[i];
+		else
+		{
+			codecs << new Codec(payload, activeCodecList.contains(codecListToDisplay[i]));
+		}
+	}
+	
+	emit dataChanged(this->index(0, 0, QModelIndex()), this->index(rowCount(), columnCount(), QModelIndex()));
+}
diff --git a/sflphone-client-kde/src/CodecListModel.h b/sflphone-client-kde/src/CodecListModel.h
new file mode 100644
index 0000000000000000000000000000000000000000..bf2082c443cf4407c61129b7a152192feae46708
--- /dev/null
+++ b/sflphone-client-kde/src/CodecListModel.h
@@ -0,0 +1,57 @@
+/***************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                              *
+ *   Author : Jérémy Quentin                                               *
+ *   jeremy.quentin@savoirfairelinux.com                                   *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 3 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef CODECLISTMODEL_H
+#define CODECLISTMODEL_H
+
+#include <QAbstractItemModel>
+#include "Codec.h"
+
+/**
+	@author Jérémy Quentin <jeremy.quentin@gmail.com>
+*/
+class CodecListModel : public QAbstractTableModel
+{
+Q_OBJECT
+private:
+	QList<Codec *> codecs;
+
+public:
+	CodecListModel(QObject *parent = 0);
+
+	~CodecListModel();
+
+	QVariant data ( const QModelIndex & index, int role = Qt::DisplayRole ) const;
+	int rowCount(const QModelIndex & parent = QModelIndex()) const;
+	int columnCount(const QModelIndex & parent = QModelIndex()) const;
+	QVariant headerData(int section , Qt::Orientation orientation, int role) const;
+	Qt::ItemFlags flags(const QModelIndex & index) const;
+	virtual bool setData ( const QModelIndex & index, const QVariant &value, int role);
+	
+	bool codecUp( int index );
+	bool codecDown( int index );
+	QStringList getActiveCodecList() const ;
+	void setActiveCodecList(const QStringList & activeCodecListToSet);
+
+signals:
+// 	void dataChanged(const QModelIndex &, const QModelIndex &);
+};
+
+#endif
diff --git a/sflphone-client-kde/src/Contact.cpp b/sflphone-client-kde/src/Contact.cpp
index 60d32f21a85e7232ac29269f0578b54b70588665..af3ee5ea9644a29387c583e63c4d65456de471b5 100644
--- a/sflphone-client-kde/src/Contact.cpp
+++ b/sflphone-client-kde/src/Contact.cpp
@@ -33,6 +33,7 @@ Contact::Contact(Addressee addressee, const PhoneNumber & number, bool displayPh
 	this->nickName = addressee.nickName();
 	this->phoneNumber = number.number();
 	this->type = number.type();
+	this->displayPhoto = displayPhoto;
 	if(displayPhoto)
 	{
 		this->photo = new Picture(addressee.photo());
@@ -42,7 +43,7 @@ Contact::Contact(Addressee addressee, const PhoneNumber & number, bool displayPh
 		this->photo = NULL;
 	}
 	
-	initItem(displayPhoto);
+	initItem();
 }
 
 
@@ -53,10 +54,15 @@ Contact::~Contact()
 	delete photo;
 }
 
-void Contact::initItem(bool displayPhoto)
+void Contact::initItem()
 {
 	this->item = new QListWidgetItem();
 	this->item->setSizeHint(QSize(140,CONTACT_ITEM_HEIGHT));
+	initItemWidget();
+}
+
+void Contact::initItemWidget()
+{
 	this->itemWidget = new ContactItemWidget(this, displayPhoto);
 }
 
@@ -90,13 +96,4 @@ PhoneNumber::Type Contact::getType() const
 	return type;
 }
 
-QListWidgetItem * Contact::getItem()
-{
-	return item;
-}
-    
-QWidget * Contact::getItemWidget()
-{
-	return itemWidget;
-}
 
diff --git a/sflphone-client-kde/src/Contact.h b/sflphone-client-kde/src/Contact.h
index 383aaa688e72391c83621a22d4e5573f85fe39b4..bf4f4f987ca885bf41ebd3fcf4960b76ea49a7be 100644
--- a/sflphone-client-kde/src/Contact.h
+++ b/sflphone-client-kde/src/Contact.h
@@ -28,25 +28,26 @@
 #include <kabc/picture.h>
 #include <kabc/phonenumber.h>
 
+#include "Item.h"
+#include "ContactItemWidget.h"
+
 using namespace KABC;
 
+class ContactItemWidget;
+
 /**
 	@author Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>
 */
-class Contact{
+class Contact : public QObject, public Item<ContactItemWidget>{
 private:
-	QListWidgetItem * item;
-	QWidget * itemWidget;
 	QString firstName;
 	QString secondName;
 	QString nickName;
 	QString phoneNumber;
 	Picture * photo;
 	PhoneNumber::Type type;
+	bool displayPhoto;
 	
-private:
-	void initItem(bool displayPhoto);
-
 public:
 
 	//Constructors & Destructors
@@ -60,8 +61,10 @@ public:
 	QString getSecondName() const;
 	const Picture * getPhoto() const;
 	PhoneNumber::Type getType() const;
-	QListWidgetItem * getItem();
-	QWidget * getItemWidget();
+	void initItem();
+	
+protected:
+	void initItemWidget();
 
 };
 
diff --git a/sflphone-client-kde/src/ContactItemWidget.h b/sflphone-client-kde/src/ContactItemWidget.h
index a3d4e3d41ea41fb45b28ffc8bc27b69af78bc093..517d0a78dc169411fd1e1be48584c6d53cfb3a8c 100644
--- a/sflphone-client-kde/src/ContactItemWidget.h
+++ b/sflphone-client-kde/src/ContactItemWidget.h
@@ -25,6 +25,8 @@
 #include <QtGui/QLabel>
 #include "Contact.h"
 
+class Contact;
+
 /**
 	@author Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>
 */
diff --git a/sflphone-client-kde/src/Item.cpp b/sflphone-client-kde/src/Item.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..705cb2948c4eefbf44912f1b598ed4c4cf23c8d9
--- /dev/null
+++ b/sflphone-client-kde/src/Item.cpp
@@ -0,0 +1,22 @@
+/***************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                              *
+ *   Author : Jérémy Quentin                                               *
+ *   jeremy.quentin@savoirfairelinux.com                                   *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 3 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#include "Item.h"
+
diff --git a/sflphone-client-kde/src/Item.h b/sflphone-client-kde/src/Item.h
new file mode 100644
index 0000000000000000000000000000000000000000..c859375c07cfbabc6091b52b67b13745106e99e9
--- /dev/null
+++ b/sflphone-client-kde/src/Item.h
@@ -0,0 +1,92 @@
+/***************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                              *
+ *   Author : Jérémy Quentin                                               *
+ *   jeremy.quentin@savoirfairelinux.com                                   *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 3 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef ITEM_H
+#define ITEM_H
+
+#include <QObject>
+#include <QListWidgetItem>
+#include <QWidget>
+
+/**
+	@author Jérémy Quentin <jeremy.quentin@gmail.com>
+	Represents an item of a list, that is displayed
+	by an QListWidgetItem with a QWidget inside.
+	The two objects are contained in this class, but their
+	initializations are pure virtual.
+	The template class WIDGET_TYPE should be derived from
+	QWidget.
+	The implementation of initItem should call initItemWidget
+*/
+template<class WIDGET_TYPE>class Item
+{
+protected:
+	QListWidgetItem * item;
+	WIDGET_TYPE * itemWidget;
+	
+
+public:
+	Item(QListWidget *list=0)
+	{
+		item = NULL;
+		itemWidget = NULL;
+	}
+	
+	/**
+	 *   Be careful that it is not already deleted by QObject
+	 *   Commented for safety reasons...
+	 */
+	virtual ~Item()
+	{
+// 		delete item;
+// 		delete itemWidget;
+	}
+	
+	QListWidgetItem * getItem()
+	{
+		return item;
+	}
+	WIDGET_TYPE * getItemWidget()
+	{
+		return itemWidget;
+	}
+	
+	const QListWidgetItem * getItem() const
+	{
+		return item;
+	}
+	const WIDGET_TYPE * getItemWidget() const
+	{
+		return itemWidget;
+	}
+	
+	/**
+	 *   Initializes the item and widget
+	 *   Implementation should call initItemWidget!
+	 */
+	virtual void initItem() = 0;
+	
+protected:
+	virtual void initItemWidget() = 0;
+	
+	
+};
+
+#endif
diff --git a/sflphone-client-kde/src/SFLPhone.cpp b/sflphone-client-kde/src/SFLPhone.cpp
index 179023b5c74953fd0762ea37dd06c412a24c10cf..48ebe899897630020606eff4d75aa7ee27e9c22e 100644
--- a/sflphone-client-kde/src/SFLPhone.cpp
+++ b/sflphone-client-kde/src/SFLPhone.cpp
@@ -52,34 +52,17 @@ SFLPhone::SFLPhone(QWidget *parent)
 
     // tell the KXmlGuiWindow that this is indeed the main widget
 		setCentralWidget(view);
-   
-
-    // add a status bar
-//    statusBar()->show();
-
 
 		setWindowIcon(QIcon(ICON_SFLPHONE));
-		setWindowTitle(i18n("SFLPhone"));
+		setWindowTitle(i18n("SFLphone"));
 		
 		setupActions();
 		
-		qDebug() << "currentPath = " << QDir::currentPath() ;
-		
-		
-		
-		QString rcFilePath = QString(DATA_INSTALL_DIR) + "/sflphone-client-kde/sflphone-client-kdeui.rc";
-		if(! QFile::exists(rcFilePath))
-		{
-			QDir dir;
-			dir.cdUp();
-			dir.cd("data");
-			rcFilePath = dir.filePath("sflphone-client-kdeui.rc");
-		}
-		qDebug() << "rcFilePath = " << rcFilePath ;
-		createGUI(rcFilePath);
 		setObjectNames();
-      QMetaObject::connectSlotsByName(this);
-	   view->updateStatusMessage();
+		QMetaObject::connectSlotsByName(this);
+	   view->on_stackedWidget_screen_currentChanged(SCREEN_MAIN);
+	   view->loadWindow();
+	   
 	   
 		move(QCursor::pos().x() - geometry().width()/2, QCursor::pos().y() - geometry().height()/2);
 	   if( ! configurationManager.isStartHidden())
@@ -90,8 +73,7 @@ SFLPhone::SFLPhone(QWidget *parent)
 	   if(configurationManager.getAccountList().value().isEmpty())
 		{
 			(new AccountWizard())->show();
-		}
-	   
+		}   
 } 
 
 SFLPhone::~SFLPhone()
@@ -108,46 +90,75 @@ void SFLPhone::setObjectNames()
 void SFLPhone::setupActions()
 {
 	qDebug() << "setupActions";
+	ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
+	
+	action_accept = new KAction(this);
+	action_refuse = new KAction(this);
+	action_hold = new KAction(this);
+	action_transfer = new KAction(this);
+	action_record = new KAction(this);
+	action_mailBox = new KAction(this);
+	
+	action_screen = new QActionGroup(this);
+	action_screen->setExclusive(true);
+	action_main = new KAction(KIcon(QIcon(ICON_SCREEN_MAIN)), i18n("Main screen"), action_screen);
+	action_history = new KAction(KIcon(QIcon(ICON_SCREEN_HISTORY)), i18n("Call history"), action_screen);
+	action_addressBook = new KAction(KIcon(QIcon(ICON_SCREEN_ADDRESS)), i18n("Address book"), action_screen);
+	action_main->setCheckable(true);
+	action_history->setCheckable(true);
+	action_addressBook->setCheckable(true);
+	action_main->setChecked(true);
+	action_screen->addAction(action_main);
+	action_screen->addAction(action_history);
+	action_screen->addAction(action_addressBook);
+	
+	action_close = KStandardAction::close(this, SLOT(close()), this);
+	action_quit = KStandardAction::quit(this, SLOT(quitButton()), this);
+	
+	action_configureSflPhone = KStandardAction::preferences(view, SLOT(configureSflPhone()), this);
+	action_configureSflPhone->setText(i18n("Configure SFLphone"));
+	
+	action_displayVolumeControls = new KAction(KIcon(QIcon(ICON_DISPLAY_VOLUME_CONSTROLS)), i18n("Display volume controls"), this);
+	action_displayDialpad = new KAction(KIcon(QIcon(ICON_DISPLAY_DIALPAD)), i18n("Display dialpad"), this);
+	action_displayVolumeControls->setChecked(configurationManager.getVolumeControls());
+	action_displayDialpad->setChecked(configurationManager.getDialpad());
+	action_accountCreationWizard = new KAction(i18n("Account creation wizard"), this);
+	
+	connect(action_accept,                SIGNAL(triggered()),          view, SLOT(accept()));
+	connect(action_refuse,                SIGNAL(triggered()),          view, SLOT(refuse()));
+	connect(action_hold,                  SIGNAL(triggered()),          view, SLOT(hold()));
+	connect(action_transfer,              SIGNAL(triggered()),          view, SLOT(transfer()));
+	connect(action_record,                SIGNAL(triggered()),          view, SLOT(record()));
+	connect(action_screen,                SIGNAL(triggered(QAction *)), this, SLOT(updateScreen(QAction *)));
+	connect(action_mailBox,               SIGNAL(triggered()),          view, SLOT(mailBox()));
+	connect(action_displayVolumeControls, SIGNAL(triggered()),          view, SLOT(displayVolumeControls()));
+	connect(action_displayDialpad,        SIGNAL(triggered()),          view, SLOT(displayDialpad()));
+	connect(action_accountCreationWizard, SIGNAL(triggered()),          view, SLOT(accountCreationWizard()));
 	
-	actionCollection()->addAction("action_accept", view->action_accept);
-	actionCollection()->addAction("action_refuse", view->action_refuse);
-	actionCollection()->addAction("action_hold", view->action_hold);
-	actionCollection()->addAction("action_transfer", view->action_transfer);
-	actionCollection()->addAction("action_record", view->action_record);
-	actionCollection()->addAction("action_history", view->action_history);
-	actionCollection()->addAction("action_addressBook", view->action_addressBook);
-	actionCollection()->addAction("action_mailBox", view->action_mailBox);
-	KAction * action_close = KStandardAction::close(this, SLOT(close()), 0);
+	action_screen->addAction(action_main);
+	action_screen->addAction(action_history);
+	action_screen->addAction(action_addressBook);
+	
+	actionCollection()->addAction("action_accept", action_accept);
+	actionCollection()->addAction("action_refuse", action_refuse);
+	actionCollection()->addAction("action_hold", action_hold);
+	actionCollection()->addAction("action_transfer", action_transfer);
+	actionCollection()->addAction("action_record", action_record);
+	actionCollection()->addAction("action_main", action_main);
+	actionCollection()->addAction("action_history", action_history);
+	actionCollection()->addAction("action_addressBook", action_addressBook);
+	actionCollection()->addAction("action_mailBox", action_mailBox);
 	actionCollection()->addAction("action_close", action_close);
-	KAction * action_quit = KStandardAction::quit(this, SLOT(quitButton()), 0);
 	actionCollection()->addAction("action_quit", action_quit);
 	
-	
-	actionCollection()->addAction("action_displayVolumeControls", view->action_displayVolumeControls);
-	actionCollection()->addAction("action_displayDialpad", view->action_displayDialpad);
-	actionCollection()->addAction("action_configureSflPhone", view->action_configureSflPhone);
-	actionCollection()->addAction("action_configureAccounts", view->action_configureAccounts);
-	actionCollection()->addAction("action_configureAudio", view->action_configureAudio);
-	actionCollection()->addAction("action_accountCreationWizard", view->action_accountCreationWizard);
+	actionCollection()->addAction("action_displayVolumeControls", action_displayVolumeControls);
+	actionCollection()->addAction("action_displayDialpad", action_displayDialpad);
+	actionCollection()->addAction("action_configureSflPhone", action_configureSflPhone);
+	actionCollection()->addAction("action_accountCreationWizard", action_accountCreationWizard);
 	
 	statusBarWidget = new QLabel();
 	statusBar()->addWidget(statusBarWidget);
 	
-	QToolBar * toolbar = new QToolBar(this);
-	this->addToolBar(Qt::TopToolBarArea, toolbar);
-	toolbar->addAction(view->action_accept);
-	toolbar->addAction(view->action_refuse);
-	toolbar->addAction(view->action_hold);
-	toolbar->addAction(view->action_transfer);
-	toolbar->addAction(view->action_record);
-	toolbar->addSeparator();
-	toolbar->addAction(view->action_history);
-	toolbar->addAction(view->action_addressBook);
-	toolbar->addSeparator();
-	toolbar->addAction(view->action_mailBox);
-	toolbar->setIconSize(QSize(TOOLBAR_SIZE,TOOLBAR_SIZE));
-	
-	
  	trayIconMenu = new QMenu(this);
  	trayIconMenu->addAction(action_quit);
 
@@ -156,6 +167,17 @@ void SFLPhone::setupActions()
 	trayIcon->show();
 	
 	iconChanged = false;
+	
+	QString rcFilePath = QString(DATA_INSTALL_DIR) + "/sflphone-client-kde/sflphone-client-kdeui.rc";
+	if(! QFile::exists(rcFilePath))
+	{
+		QDir dir;
+		dir.cdUp();
+		dir.cd("data");
+		rcFilePath = dir.filePath("sflphone-client-kdeui.rc");
+	}
+	qDebug() << "rcFilePath = " << rcFilePath ;
+	createGUI(rcFilePath);
 
 }
 
@@ -178,7 +200,7 @@ void SFLPhone::quitButton()
 	if(view->listWidget_callList->count() > 0 && instance.getRegistrationCount() <= 1)
 	{
 		qDebug() << "Attempting to quit when still having some calls open.";
-		view->getErrorWindow()->showMessage(i18n("You still have some calls open. Please close all calls before quitting."));
+// 		view->getErrorWindow()->showMessage(i18n("You still have some calls open. Please close all calls before quitting."));
 	}
 	instance.Unregister(getpid());
 	qApp->quit();
@@ -252,9 +274,102 @@ void SFLPhone::on_trayIcon_activated(QSystemTrayIcon::ActivationReason reason)
 }
 
 
-void SFLPhone::on_view_statusMessageChanged(const QString & message)
+void SFLPhone::on_view_statusMessageChangeAsked(const QString & message)
 {
-	qDebug() << "on_view_statusMessageChanged : " + message;
+	qDebug() << "on_view_statusMessageChangeAsked : " + message;
 	statusBarWidget->setText(message);
 }
 
+void SFLPhone::on_view_windowTitleChangeAsked(const QString & message)
+{
+	qDebug() << "on_view_windowTitleChangeAsked : " + message;
+	setWindowTitle(message);
+}
+
+void SFLPhone::on_view_enabledActionsChangeAsked(const bool * enabledActions)
+{
+	qDebug() << "on_view_enabledActionsChangeAsked";
+	action_accept->setEnabled(enabledActions[SFLPhone::Accept]);
+	action_refuse->setEnabled(enabledActions[SFLPhone::Refuse]);
+	action_hold->setEnabled(enabledActions[SFLPhone::Hold]);
+	action_transfer->setEnabled(enabledActions[SFLPhone::Transfer]);
+	action_record->setEnabled(enabledActions[SFLPhone::Record]);
+	action_mailBox->setEnabled(enabledActions[SFLPhone::Mailbox]);
+}
+
+void SFLPhone::on_view_actionIconsChangeAsked(const QString * actionIcons)
+{
+	qDebug() << "on_view_actionIconsChangeAsked";
+	action_accept->setIcon(QIcon(actionIcons[SFLPhone::Accept]));
+	action_refuse->setIcon(QIcon(actionIcons[SFLPhone::Refuse]));
+	action_hold->setIcon(QIcon(actionIcons[SFLPhone::Hold]));
+	action_transfer->setIcon(QIcon(actionIcons[SFLPhone::Transfer]));
+	action_record->setIcon(QIcon(actionIcons[SFLPhone::Record]));
+	action_mailBox->setIcon(QIcon(actionIcons[SFLPhone::Mailbox]));
+}
+
+void SFLPhone::on_view_actionTextsChangeAsked(const QString * actionTexts)
+{
+	qDebug() << "on_view_actionTextsChangeAsked";
+	action_accept->setText(actionTexts[SFLPhone::Accept]);
+	action_refuse->setText(actionTexts[SFLPhone::Refuse]);
+	action_hold->setText(actionTexts[SFLPhone::Hold]);
+	action_transfer->setText(actionTexts[SFLPhone::Transfer]);
+	action_record->setText(actionTexts[SFLPhone::Record]);
+	action_mailBox->setText(actionTexts[SFLPhone::Mailbox]);
+}
+
+
+void SFLPhone::on_view_transferCheckStateChangeAsked(bool transferCheckState)
+{
+	qDebug() << "Changing transfer action checkState";
+	action_transfer->setChecked(transferCheckState);
+}
+
+void SFLPhone::on_view_recordCheckStateChangeAsked(bool recordCheckState)
+{
+	qDebug() << "Changing record action checkState";
+	action_record->setChecked(recordCheckState);
+}
+
+void SFLPhone::updateScreen(QAction * action)
+{
+	if(action == action_main)	view->changeScreen(SCREEN_MAIN);
+	else if(action == action_history)	view->changeScreen(SCREEN_HISTORY);
+	else if(action == action_addressBook)	view->changeScreen(SCREEN_ADDRESS);
+}
+
+void SFLPhone::on_view_screenChanged(int screen)
+{
+	qDebug() << "on_view_screenChanged";
+	if(screen == SCREEN_MAIN)	action_main->setChecked(true);
+	else if(screen == SCREEN_HISTORY)	action_history->setChecked(true);
+	else if(screen == SCREEN_ADDRESS)	action_addressBook->setChecked(true);
+}
+
+QList <QAction *> SFLPhone::getCallActions()
+{
+	QList<QAction *> callActions = QList<QAction *>();
+	callActions.insert((int) Accept, action_accept);
+	callActions.insert((int) Refuse, action_refuse);
+	callActions.insert((int) Hold, action_hold);
+	callActions.insert((int)Transfer, action_transfer);
+	callActions.insert((int) Record, action_record);
+	callActions.insert((int) Mailbox, action_mailBox);
+	return callActions;
+}
+
+void SFLPhone::on_view_incomingCall(const Call * call)
+{
+	ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
+	trayIconSignal();
+	if(configurationManager.popupMode())
+	{
+		putForeground();
+	}
+	if(configurationManager.getNotify())
+	{
+		sendNotif(call->getPeerName().isEmpty() ? call->getPeerPhoneNumber() : call->getPeerName());
+	}
+}
+
diff --git a/sflphone-client-kde/src/SFLPhone.h b/sflphone-client-kde/src/SFLPhone.h
index c85f58c1e6435db64338482a4e310e4b240ec4a0..f0b3992b3bf54f39dd4e112b2dfcedd5cd250931 100644
--- a/sflphone-client-kde/src/SFLPhone.h
+++ b/sflphone-client-kde/src/SFLPhone.h
@@ -30,6 +30,8 @@
 #include <QSystemTrayIcon>
 
 #include <KXmlGuiWindow>
+#include <KAction>
+#include <QActionGroup>
 
 #include "ui_sflphone_kdeview_base.h"
 #include "CallList.h"
@@ -42,10 +44,36 @@ class sflphone_kdeView;
 
 class SFLPhone : public KXmlGuiWindow
 {
-
 Q_OBJECT
 
+public:
+enum CallAction {
+        Accept,
+        Refuse,
+        Hold,
+        Transfer,
+        Record,
+        Mailbox,
+        NumberOfCallActions};
+
 private:
+	KAction * action_accept;
+	KAction * action_refuse;
+	KAction * action_hold;
+	KAction * action_transfer;
+	KAction * action_record;
+	QActionGroup * action_screen;
+	KAction * action_main;
+	KAction * action_history;
+	KAction * action_addressBook;
+	KAction * action_mailBox;
+	KAction * action_close;
+	KAction * action_quit;
+	KAction * action_displayVolumeControls;
+	KAction * action_displayDialpad;
+	KAction * action_configureSflPhone;
+	KAction * action_accountCreationWizard;
+
 	sflphone_kdeView * view;
 	QMenu *trayIconMenu;
 	bool iconChanged;
@@ -68,12 +96,22 @@ public:
 	void putForeground();
 	void trayIconSignal();
 	sflphone_kdeView * getView();
+	QList<QAction *> getCallActions();
 	
 	
 private slots:
 	void on_trayIcon_activated(QSystemTrayIcon::ActivationReason reason);
 	void on_trayIcon_messageClicked();
-	void on_view_statusMessageChanged(const QString & message);
+	void on_view_statusMessageChangeAsked(const QString & message);
+	void on_view_windowTitleChangeAsked(const QString & message);
+	void on_view_enabledActionsChangeAsked(const bool * enabledActions);
+	void on_view_actionIconsChangeAsked(const QString * actionIcons);
+	void on_view_actionTextsChangeAsked(const QString * actionTexts);
+	void on_view_transferCheckStateChangeAsked(bool transferCheckState);
+	void on_view_recordCheckStateChangeAsked(bool recordCheckState);
+	void updateScreen(QAction * action);
+	void on_view_screenChanged(int screen);
+	void on_view_incomingCall(const Call * call);
 
 	void quitButton();
 
diff --git a/sflphone-client-kde/src/SortableCodecListWidget.cpp b/sflphone-client-kde/src/SortableCodecListWidget.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..27587446b7b735b6c972b8e07a930009d13fe343
--- /dev/null
+++ b/sflphone-client-kde/src/SortableCodecListWidget.cpp
@@ -0,0 +1,145 @@
+/***************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                              *
+ *   Author : Jérémy Quentin                                               *
+ *   jeremy.quentin@savoirfairelinux.com                                   *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 3 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#include "SortableCodecListWidget.h"
+
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+#include <QDebug>
+
+SortableCodecListWidget::SortableCodecListWidget(QWidget *parent)
+ : QWidget(parent)
+{
+	codecTable = new QTableView(this);
+	codecTable->setObjectName("codecTable");
+// 	CodecListModel * model = new CodecListModel();
+// 	codecTable->setModel(model);
+// 	codecTable->resizeColumnsToContents();
+// 	codecTable->resizeRowsToContents();
+	codecTable->setSelectionBehavior(QAbstractItemView::SelectRows);
+	
+	codecUpButton = new KPushButton(this);
+	codecUpButton->setObjectName("codecUpButton");
+	codecUpButton->setIcon(KIcon("go-up"));
+	
+	codecDownButton = new KPushButton(this);
+	codecDownButton->setObjectName("codecDownButton");
+	codecDownButton->setIcon(KIcon("go-down"));
+	
+	QHBoxLayout * mainLayout = new QHBoxLayout(this);
+	QVBoxLayout * buttonsLayout = new QVBoxLayout();
+	
+	buttonsLayout->addWidget(codecUpButton);
+	buttonsLayout->addWidget(codecDownButton);
+	
+	mainLayout->addWidget(codecTable);
+	mainLayout->addLayout(buttonsLayout);
+	
+	QMetaObject::connectSlotsByName(this);
+}
+
+void SortableCodecListWidget::setModel(CodecListModel * model)
+{
+	codecTable->setModel(model);
+	codecTable->resizeColumnsToContents();
+	codecTable->resizeRowsToContents();	
+	connect(codecTable->selectionModel(), SIGNAL(selectionChanged(const QItemSelection &, const QItemSelection &)),
+	        this,                         SLOT(updateCommands()));
+	connect(codecTable->model(),          SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)),
+	        this,                         SIGNAL(dataChanged()));
+}
+
+CodecListModel * SortableCodecListWidget::model()
+{
+	return (CodecListModel *) codecTable->model();
+}
+
+void SortableCodecListWidget::on_codecUpButton_clicked()
+{
+	qDebug() << "on_toolButton_codecUpButton_clicked";
+	CodecListModel * model = (CodecListModel *) codecTable->model();
+	int currentRow = selectedRow();
+	model->codecUp(currentRow);
+	setSelectedRow(currentRow - 1);
+}
+
+void SortableCodecListWidget::on_codecDownButton_clicked()
+{
+	qDebug() << "on_codecDownButton_clicked";
+	CodecListModel * model = (CodecListModel *) codecTable->model();
+	int currentRow = selectedRow();
+	model->codecDown(currentRow);
+	setSelectedRow(currentRow + 1);
+}
+
+void SortableCodecListWidget::updateCommands()
+{
+	qDebug() << "SortableCodecListWidget::updateCommands";
+	bool buttonsEnabled[2] = {true,true};
+	if(selectedRow() == -1)
+	{
+		buttonsEnabled[0] = false;
+		buttonsEnabled[1] = false;
+	}
+	else
+	{
+		if(selectedRow() == 0)
+		{
+			buttonsEnabled[0] = false;
+		}
+		if(selectedRow() == codecTable->model()->rowCount() - 1)
+		{
+			buttonsEnabled[1] = false;
+		}
+	}
+	codecUpButton->setEnabled(buttonsEnabled[0]);
+	codecDownButton->setEnabled(buttonsEnabled[1]);
+}
+
+QModelIndex SortableCodecListWidget::selectedIndex()
+{
+	QItemSelectionModel *selection = codecTable->selectionModel();
+	const QModelIndexList selectedIndexes = selection->selectedIndexes();
+	if ( !selectedIndexes.isEmpty() && selectedIndexes[0].isValid() )
+		return selectedIndexes[0];
+	else
+		return QModelIndex();
+ }
+
+int SortableCodecListWidget::selectedRow()
+{
+	QModelIndex index = selectedIndex();
+	if(index.isValid())
+		return index.row();
+	else
+		return -1;
+}
+ 
+void SortableCodecListWidget::setSelectedRow(int row)
+{
+	QItemSelectionModel * selection = codecTable->selectionModel();
+	QAbstractItemModel * model = codecTable->model();
+	QItemSelection newSelection = QItemSelection(model->index(row, 0, QModelIndex()), model->index(row +1 , model->columnCount(), QModelIndex()));
+	selection->clear();
+	for(int i = 0 ; i < model->columnCount() ; i++)
+	{
+		selection->select(model->index(row, i, QModelIndex()) , QItemSelectionModel::Select);
+	}
+} 
\ No newline at end of file
diff --git a/sflphone-client-kde/src/SortableCodecListWidget.h b/sflphone-client-kde/src/SortableCodecListWidget.h
new file mode 100644
index 0000000000000000000000000000000000000000..0ea9eae8fecad5859968f56d28585be317e81f66
--- /dev/null
+++ b/sflphone-client-kde/src/SortableCodecListWidget.h
@@ -0,0 +1,64 @@
+/***************************************************************************
+ *   Copyright (C) 2009 by Savoir-Faire Linux                              *
+ *   Author : Jérémy Quentin                                               *
+ *   jeremy.quentin@savoirfairelinux.com                                   *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 3 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef SORTABLECODECLISTWIDGET_H
+#define SORTABLECODECLISTWIDGET_H
+
+#include <QWidget>
+#include <KPushButton>
+#include <QTableView>
+#include "CodecListModel.h"
+
+/**
+	@author Jérémy Quentin <jeremy.quentin@gmail.com>
+*/
+class SortableCodecListWidget : public QWidget
+{
+Q_OBJECT
+private:
+	KPushButton * codecUpButton;
+	KPushButton * codecDownButton;
+	QTableView * codecTable;
+
+public:
+	SortableCodecListWidget(QWidget *parent = 0);
+	
+	virtual void setModel(CodecListModel * model);
+	virtual CodecListModel * model();
+	
+private slots:
+	void on_codecUpButton_clicked();
+	void on_codecDownButton_clicked();
+	
+public slots:
+	void updateCommands();
+	
+private:
+	QModelIndex selectedIndex();
+	int selectedRow();
+
+	void setSelectedRow(int row);
+	
+signals:
+	void dataChanged();
+
+};
+
+#endif
diff --git a/sflphone-client-kde/src/conf/ConfigurationDialog.cpp b/sflphone-client-kde/src/conf/ConfigurationDialog.cpp
index 1aef5e9cd3b1f6603e4bca6477ba1fcb1f799ca9..f8620c6afce1f006068e3e7df24dbad9132b30bd 100644
--- a/sflphone-client-kde/src/conf/ConfigurationDialog.cpp
+++ b/sflphone-client-kde/src/conf/ConfigurationDialog.cpp
@@ -45,13 +45,13 @@ ConfigurationDialogKDE::ConfigurationDialogKDE(sflphone_kdeView *parent)
 	dlgRecord      = new DlgRecord(this);
 	dlgHooks       = new DlgHooks(this);
 	
-	addPage( dlgGeneral      , i18n("General")      , "sflphone-client-kde" ); 
-	addPage( dlgDisplay      , i18n("Display")      , "applications-graphics" ); 
-	addPage( dlgAccounts     , i18n("Accounts")     , "personal" ); 
-	addPage( dlgAudio        , i18n("Audio")        , "voicecall" ); 
-	addPage( dlgAddressBook  , i18n("Address Book") , "x-office-address-book" ); 
-	addPage( dlgRecord       , i18n("Record")       , "media-record" ); 
-	addPage( dlgHooks        , i18n("Hooks")        , "insert-link" ); 
+	addPage( dlgGeneral      , i18nc("Config section", "General")      , "sflphone-client-kde" ); 
+	addPage( dlgDisplay      , i18nc("Config section", "Display")      , "applications-graphics" ); 
+	addPage( dlgAccounts     , i18nc("Config section", "Accounts")     , "personal" ); 
+	addPage( dlgAudio        , i18nc("Config section", "Audio")        , "voicecall" ); 
+	addPage( dlgAddressBook  , i18nc("Config section", "Address Book") , "x-office-address-book" ); 
+	addPage( dlgRecord       , i18nc("Config section", "Recordings")       , "media-record" ); 
+	addPage( dlgHooks        , i18nc("Config section", "Hooks")        , "insert-link" ); 
 	connect(this, SIGNAL(applyClicked()), dlgAudio, SLOT(updateAlsaSettings()));
 	connect(this, SIGNAL(okClicked()),    dlgAudio, SLOT(updateAlsaSettings()));
 	connect(this, SIGNAL(applyClicked()), this,     SLOT(applyCustomSettings()));
@@ -89,7 +89,7 @@ void ConfigurationDialogKDE::updateSettings()
 
 bool ConfigurationDialogKDE::hasChanged()
 {
-	qDebug() << "hasChanged";
+	qDebug() << "hasChanged" << dlgAudio->hasChanged() << dlgAccounts->hasChanged();
 	return dlgAudio->hasChanged() || dlgAccounts->hasChanged();
 }
 
@@ -102,12 +102,14 @@ void ConfigurationDialogKDE::updateButtons()
 void ConfigurationDialogKDE::applyCustomSettings()
 {
 	qDebug() << "applyCustomSettings";
-	dlgAccounts->applyCustomSettings();
 // 	if(hasChanged())
 // 	{
 		ConfigurationSkeleton::self()->writeConfig();
 // 	}
+	dlgAccounts->applyCustomSettings();
+	dlgAudio->applyCustomSettings();
 	updateButtons();
+	emit changesApplied();
 }
 
 void ConfigurationDialogKDE::reload()
@@ -115,4 +117,6 @@ void ConfigurationDialogKDE::reload()
 	qDebug() << "reload";
 	ConfigurationSkeleton::self()->readConfig();
 	updateWidgets();
+	applyCustomSettings();
+	updateButtons();
 }
diff --git a/sflphone-client-kde/src/conf/ConfigurationDialog.h b/sflphone-client-kde/src/conf/ConfigurationDialog.h
index 02ac0fe0dc4b1477a9675a0651c708e21b883f6c..4c3b1c26b9610f1391fe7d34be6f33423ce9916b 100644
--- a/sflphone-client-kde/src/conf/ConfigurationDialog.h
+++ b/sflphone-client-kde/src/conf/ConfigurationDialog.h
@@ -42,6 +42,14 @@ class sflphone_kdeView;
 
 /**
 	@author Jérémy Quentin <jeremy.quentin@gmail.com>
+	This class represents the config dialog for sflphone.
+	It uses the ConfigurationSkeleton class to handle most of the settings.
+	It inherits KConfigDialog with the pages defined in dlg... files.
+	A few complicated settings are handled directly by its pages.
+	Some custom behaviors have been added to handle specific cases,
+	as this config dialog is not the usual kind.
+	A few things might be done a cleaner way by passing the handling 
+	to the skeleton like it has been done with codecs.
 */
 class ConfigurationDialogKDE : public KConfigDialog
 {
@@ -103,6 +111,7 @@ private slots:
 
 signals:
 	void clearCallHistoryAsked();
+	void changesApplied();
 	
 };
 
diff --git a/sflphone-client-kde/src/conf/ConfigurationSkeleton.cpp b/sflphone-client-kde/src/conf/ConfigurationSkeleton.cpp
index e6f89cdd33ebc64d95def2231e93725d69c011fe..e29869eaff2f627cc0ba8244afed2be026911441 100644
--- a/sflphone-client-kde/src/conf/ConfigurationSkeleton.cpp
+++ b/sflphone-client-kde/src/conf/ConfigurationSkeleton.cpp
@@ -26,9 +26,10 @@
 ConfigurationSkeleton::ConfigurationSkeleton()
  : ConfigurationSkeletonBase()
 {
-	qDebug() << "Yoooooooouuuuupppppppiiiiii";
+	qDebug() << "Building ConfigurationSkeleton";
+	codecListModel = new CodecListModel();
+	accountListModel = new AccountListModel();
 	readConfig();
-	isImmutable( QString::fromLatin1 ( "alsaPlugin" ) );
 }
 
 ConfigurationSkeleton * ConfigurationSkeleton::instance = NULL;
@@ -45,6 +46,11 @@ ConfigurationSkeleton::~ConfigurationSkeleton()
 {
 }
 
+CodecListModel * ConfigurationSkeleton::getCodecListModel()
+{
+	return codecListModel;
+}
+
 void ConfigurationSkeleton::readConfig()
 {
 	qDebug() << "\nReading config";
@@ -151,6 +157,7 @@ void ConfigurationSkeleton::readConfig()
 	
 	MapStringInt addressBookSettings = configurationManager.getAddressbookSettings().value();
 	qDebug() << "getAddressbookSettings() : " << addressBookSettings;
+	setEnableAddressBook(addressBookSettings[ADDRESSBOOK_ENABLE]);
 	setMaxResults(addressBookSettings[ADDRESSBOOK_MAX_RESULTS]);
 	setDisplayPhoto(addressBookSettings[ADDRESSBOOK_DISPLAY_CONTACT_PHOTO]);
 	setBusiness(addressBookSettings[ADDRESSBOOK_DISPLAY_BUSINESS]);
@@ -181,6 +188,8 @@ void ConfigurationSkeleton::writeConfig()
 	////General settings////
 	////////////////////////
 	
+	qDebug() << "Writing General settings";
+	
 	//Call history settings
 	if(enableHistory() != configurationManager.getHistoryEnabled()) configurationManager.setHistoryEnabled();
 	configurationManager.setHistoryLimit(historyMax());
@@ -192,6 +201,8 @@ void ConfigurationSkeleton::writeConfig()
 	////Display settings////
 	////////////////////////
 	
+	qDebug() << "Writing Display settings";
+	
 	//Notification settings
 	if(notifOnCalls() != configurationManager.getNotify()) configurationManager.setNotify();
 	if(notifOnMessages() != configurationManager.getMailNotify()) configurationManager.setMailNotify();
@@ -205,6 +216,8 @@ void ConfigurationSkeleton::writeConfig()
 	////Accounts settings////
 	/////////////////////////
 	
+	qDebug() << "Writing Accounts settings";
+	
 // 	saveAccountList();
 
 
@@ -216,6 +229,8 @@ void ConfigurationSkeleton::writeConfig()
 	////Audio settings////
 	//////////////////////
 	
+	qDebug() << "Writing Audio settings";
+	
 	//Audio Interface settings
 	int prevManager = configurationManager.getAudioManager();
 	int newManager = interface();
@@ -229,6 +244,7 @@ void ConfigurationSkeleton::writeConfig()
 	configurationManager.setRingtoneChoice(ringtone());
 
 	//codecs settings
+	qDebug() << "activeCodecList = " << activeCodecList();
 	configurationManager.setActiveCodecList(activeCodecList());
 	
 
@@ -252,6 +268,8 @@ void ConfigurationSkeleton::writeConfig()
 	////Record settings////
 	///////////////////////
 	
+	qDebug() << "Writing Record settings";
+	
 	QString destination = destinationFolder();
 	qDebug() << destination ;
 	configurationManager.setRecordPath(destination);
@@ -261,7 +279,10 @@ void ConfigurationSkeleton::writeConfig()
 	////Address Book settings////
 	/////////////////////////////
 	
+	qDebug() << "Writing Address Book settings";
+	
 	MapStringInt addressBookSettings = MapStringInt();
+	addressBookSettings[ADDRESSBOOK_ENABLE] = enableAddressBook();
 	addressBookSettings[ADDRESSBOOK_MAX_RESULTS] = maxResults();
 	addressBookSettings[ADDRESSBOOK_DISPLAY_CONTACT_PHOTO] = displayPhoto();
 	addressBookSettings[ADDRESSBOOK_DISPLAY_BUSINESS] = business();
@@ -273,6 +294,8 @@ void ConfigurationSkeleton::writeConfig()
 	///////Hooks settings////////
 	/////////////////////////////
 	
+	qDebug() << "Writing Hooks settings";
+	
 	MapStringString hooksSettings = MapStringString();
 	hooksSettings[HOOKS_ENABLED] = addPrefix() ? "1" : "0";
 	hooksSettings[HOOKS_ADD_PREFIX] = prepend();
@@ -285,4 +308,12 @@ void ConfigurationSkeleton::writeConfig()
 	readConfig();
 }
 
+QStringList ConfigurationSkeleton::activeCodecList() const
+{
+	return codecListModel->getActiveCodecList();
+}
 
+void ConfigurationSkeleton::setActiveCodecList(const QStringList & v)
+{
+	codecListModel->setActiveCodecList(v);
+}
diff --git a/sflphone-client-kde/src/conf/ConfigurationSkeleton.h b/sflphone-client-kde/src/conf/ConfigurationSkeleton.h
index a7f31d68b405aac9198aba9312aa939291bebc32..05f20e579ad11bb14b99a4344342d8cda330f248 100644
--- a/sflphone-client-kde/src/conf/ConfigurationSkeleton.h
+++ b/sflphone-client-kde/src/conf/ConfigurationSkeleton.h
@@ -24,9 +24,19 @@
 #include <QWidget>
 
 #include "kcfg_settings.h"
+#include "CodecListModel.h"
+#include "AccountListModel.h"
 
 /**
 	@author Jérémy Quentin <jeremy.quentin@gmail.com>
+	This class represents the config skeleton for the config dialog.
+	It inherits the KConfigSkeleton "ConfigurationSkeletonBase"generated 
+	by sflphone-client-kde.kcfg which handles most of the settings.
+	This class handles the codec list. 
+	A few complicated settings are handled directly by the config dialog 
+	and its pages (accounts, sound managers).
+	This class reimplements the writeConfig and readConfig functions to ask the
+	daemon instead of the normal behavior (read and write in a kconfig file).
 */
 class ConfigurationSkeleton : public ConfigurationSkeletonBase
 {
@@ -34,6 +44,10 @@ Q_OBJECT
 
 private:
 	static ConfigurationSkeleton * instance;
+	
+	CodecListModel * codecListModel;
+	
+	AccountListModel * accountListModel;
 
 public:
 	ConfigurationSkeleton();
@@ -47,12 +61,10 @@ public:
 	
 	static ConfigurationSkeleton * self();
 	
+	QStringList activeCodecList() const;
+	void setActiveCodecList(const QStringList & v);
 	
-// protected:
-
-// 	virtual void usrReadConfig();
-
-
+	CodecListModel * getCodecListModel();
 
 };
 
diff --git a/sflphone-client-kde/src/conf/dlgaccounts.cpp b/sflphone-client-kde/src/conf/dlgaccounts.cpp
index 09bd4a645069e5ac764e459949c1cf14328e5cbf..9653ad01b1210ac6bf01e0578ae717c18f89ff39 100644
--- a/sflphone-client-kde/src/conf/dlgaccounts.cpp
+++ b/sflphone-client-kde/src/conf/dlgaccounts.cpp
@@ -33,7 +33,6 @@ DlgAccounts::DlgAccounts(KConfigDialog *parent)
 	setupUi(this);
 	
 	ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
-	QStyle * style = QApplication::style();
 	button_accountUp->setIcon(KIcon("go-up"));
 	button_accountDown->setIcon(KIcon("go-down"));
 	button_accountAdd->setIcon(KIcon("list-add"));
@@ -86,30 +85,29 @@ void DlgAccounts::saveAccountList()
 	QStringList accountIds= QStringList(configurationManager.getAccountList().value());
 	//create or update each account from accountList
 	for (int i = 0; i < accountList->size(); i++){
-		Account & current = (*accountList)[i];
+		Account * current = (*accountList)[i];
 		QString currentId;
 		//if the account has no instanciated id, it has just been created in the client
-		if(current.isNew())
+		if(current->isNew())
 		{
-			MapStringString details = current.getAccountDetails();
+			MapStringString details = current->getAccountDetails();
 			currentId = configurationManager.addAccount(details);
-			current.setAccountId(currentId);
+			current->setAccountId(currentId);
 		}
 		//if the account has an instanciated id but it's not in configurationManager
 		else{
-			if(! accountIds.contains(current.getAccountId()))
+			if(! accountIds.contains(current->getAccountId()))
 			{
-				qDebug() << "The account with id " << current.getAccountId() << " doesn't exist. It might have been removed by another SFLPhone client.";
+				qDebug() << "The account with id " << current->getAccountId() << " doesn't exist. It might have been removed by another SFLphone client.";
 				currentId = QString();
 			}
 			else
 			{
-				configurationManager.setAccountDetails(current.getAccountId(), current.getAccountDetails());
-				currentId = QString(current.getAccountId());
+				configurationManager.setAccountDetails(current->getAccountId(), current->getAccountDetails());
+				currentId = QString(current->getAccountId());
 			}
 		}
-		qDebug() << currentId << " : " << current.isChecked();
-		configurationManager.sendRegister(currentId, current.isChecked() ? 1 : 0 );
+		qDebug() << currentId << " : " << current->isChecked();
 	}
 	//remove accounts that are in the configurationManager but not in the client
 	for (int i = 0; i < accountIds.size(); i++)
@@ -182,7 +180,7 @@ void DlgAccounts::loadAccount(QListWidgetItem * item)
 	edit6_mailbox->setText( account->getAccountDetail(ACCOUNT_MAILBOX));
 	QString status = account->getAccountDetail(ACCOUNT_STATUS);
 	edit7_state->setText( "<FONT COLOR=\"" + account->getStateColorName() + "\">" + status + "</FONT>" );
-
+	frame2_editAccounts->setEnabled(true);
 }
 
 void DlgAccounts::loadAccountList()
@@ -192,7 +190,7 @@ void DlgAccounts::loadAccountList()
 	//initialize the QListWidget object with the AccountList
 	listWidget_accountList->clear();
 	for (int i = 0; i < accountList->size(); ++i){
-		addAccountToAccountList(&(*accountList)[i]);
+		addAccountToAccountList((*accountList)[i]);
 	}
 	if (listWidget_accountList->count() > 0 && listWidget_accountList->currentItem() == NULL) 
 		listWidget_accountList->setCurrentRow(0);
@@ -205,7 +203,7 @@ void DlgAccounts::addAccountToAccountList(Account * account)
 	qDebug() << "addAccountToAccountList";
 	QListWidgetItem * item = account->getItem();
 	QWidget * widget = account->getItemWidget();
-	connect(widget, SIGNAL(checkStateChanged()),
+	connect(widget, SIGNAL(checkStateChanged(bool)),
 	        this,   SLOT(changedAccountList()));
 	qDebug() << "item->isHidden()" << item->isHidden();
 	listWidget_accountList->addItem(item);
@@ -215,8 +213,8 @@ void DlgAccounts::addAccountToAccountList(Account * account)
 
 void DlgAccounts::changedAccountList()
 {
+	qDebug() << "changedAccountList";
 	accountListHasChanged = true;
-// 	((ConfigurationDialogKDE *)parent())->updateButtons();
 	emit updateButtons();
 	toolButton_accountsApply->setEnabled(hasChanged());
 }
@@ -225,11 +223,9 @@ void DlgAccounts::changedAccountList()
 
 void DlgAccounts::on_listWidget_accountList_currentItemChanged ( QListWidgetItem * current, QListWidgetItem * previous )
 {
-	qDebug() << "on_listWidget_accountList_currentItemChanged"; 
-	if(previous)
-		saveAccount(previous);
-	if(current)
-		loadAccount(current);
+	qDebug() << "on_listWidget_accountList_currentItemChanged";
+	saveAccount(previous);
+	loadAccount(current);
 	updateAccountListCommands();
 }
 
@@ -240,7 +236,7 @@ void DlgAccounts::on_button_accountUp_clicked()
 	QListWidgetItem * prevItem = listWidget_accountList->takeItem(currentRow);
 	Account * account = accountList->getAccountByItem(prevItem);
 	//we need to build a new item to set the itemWidget back
-	account->initAccountItem();
+	account->initItem();
 	QListWidgetItem * item = account->getItem();
 	AccountItemWidget * widget = account->getItemWidget();
 	accountList->upAccount(currentRow);
@@ -257,7 +253,7 @@ void DlgAccounts::on_button_accountDown_clicked()
 	QListWidgetItem * prevItem = listWidget_accountList->takeItem(currentRow);
 	Account * account = accountList->getAccountByItem(prevItem);
 	//we need to build a new item to set the itemWidget back
-	account->initAccountItem();
+	account->initItem();
 	QListWidgetItem * item = account->getItem();
 	AccountItemWidget * widget = account->getItemWidget();
 	accountList->downAccount(currentRow);
@@ -300,7 +296,7 @@ void DlgAccounts::on_toolButton_accountsApply_clicked()
 
 void DlgAccounts::applyCustomSettings()
 {
-	qDebug() << "applyCustomSettings";
+	qDebug() << "DlgAccounts::applyCustomSettings";
 	if(hasChanged())
 	{
 		toolButton_accountsApply->setEnabled(false);
@@ -319,6 +315,7 @@ void DlgAccounts::on_edit1_alias_textChanged(const QString & text)
 
 void DlgAccounts::updateAccountListCommands()
 {
+	qDebug() << "updateAccountListCommands";
 	bool buttonsEnabled[4] = {true,true,true,true};
 	if(! listWidget_accountList->currentItem())
 	{
@@ -330,7 +327,7 @@ void DlgAccounts::updateAccountListCommands()
 	{
 		buttonsEnabled[0] = false;
 	}
-	else if(listWidget_accountList->currentRow() == listWidget_accountList->count() - 1)
+	if(listWidget_accountList->currentRow() == listWidget_accountList->count() - 1)
 	{
 		buttonsEnabled[1] = false;
 	}
@@ -346,8 +343,8 @@ void DlgAccounts::updateAccountStates()
 	qDebug() << accountList->size();
 	for (int i = 0; i < accountList->size(); i++)
 	{
-		Account & current = accountList->getAccount(i);
-		current.updateState();
+		Account * current = accountList->getAccountAt(i);
+		current->updateState();
 	}
 	qDebug() << accountList->size();
 }
@@ -367,5 +364,6 @@ void DlgAccounts::updateSettings()
 void DlgAccounts::updateWidgets()
 {
 	loadAccountList();
+	accountListHasChanged = false;
 }
 
diff --git a/sflphone-client-kde/src/conf/dlgaccountsbase.ui b/sflphone-client-kde/src/conf/dlgaccountsbase.ui
index dea0e59dbb1b77cd6d01b5df963e961765ec8594..3b15ea53af7cf7a22c129f7cd8e98a48696fa207 100644
--- a/sflphone-client-kde/src/conf/dlgaccountsbase.ui
+++ b/sflphone-client-kde/src/conf/dlgaccountsbase.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
@@ -73,6 +73,9 @@
              <height>16777215</height>
             </size>
            </property>
+           <property name="whatsThis">
+            <string>By default, when you place a call, sflphone will use the first account in this list which is &quot;registered&quot;. Change the order of the accounts using the &quot;Up&quot; and &quot;Down&quot; arrows. Enable/disable them by checking/unchecking them on the left of the item. Add or remove some with &quot;Plus&quot; and &quot;Sub&quot; buttons. Edit the selected account with the form on the right.</string>
+           </property>
            <property name="dragEnabled">
             <bool>true</bool>
            </property>
@@ -120,10 +123,10 @@
                </sizepolicy>
               </property>
               <property name="toolTip">
-               <string>This button will remove the selected account in the list below. Be sure you really don't need it anymore. If you think you might use it again later, just uncheck it.</string>
+               <string>Remove the selected account</string>
               </property>
               <property name="whatsThis">
-               <string>Remove the selected account</string>
+               <string>This button will remove the selected account in the list below. Be sure you really don't need it anymore. If you think you might use it again later, just uncheck it.</string>
               </property>
               <property name="accessibleDescription">
                <string/>
@@ -132,7 +135,7 @@
                <string>Remove</string>
               </property>
               <property name="shortcut">
-               <string>Backspace, Return</string>
+               <string notr="true">-, Del, Backspace</string>
               </property>
              </widget>
             </item>
@@ -151,14 +154,17 @@
                </size>
               </property>
               <property name="toolTip">
-               <string>This button enables you to initialize a new account. You will then be able to edit it using the form on the right.</string>
+               <string>Add a new account</string>
               </property>
               <property name="whatsThis">
-               <string>Add a new account</string>
+               <string>This button enables you to initialize a new account. You will then be able to edit it using the form on the right.</string>
               </property>
               <property name="text">
                <string>Add</string>
               </property>
+              <property name="shortcut">
+               <string notr="true">+</string>
+              </property>
              </widget>
             </item>
             <item>
@@ -172,6 +178,9 @@
               <property name="text">
                <string>Down</string>
               </property>
+              <property name="shortcut">
+               <string notr="true">Down, PgDown</string>
+              </property>
              </widget>
             </item>
             <item>
@@ -185,6 +194,9 @@
               <property name="text">
                <string>Up</string>
               </property>
+              <property name="shortcut">
+               <string notr="true">Up, PgUp</string>
+              </property>
              </widget>
             </item>
             <item>
@@ -237,7 +249,7 @@
          <item row="0" column="0">
           <widget class="QLabel" name="label1_alias">
            <property name="text">
-            <string>&amp;Alias</string>
+            <string>Alias</string>
            </property>
            <property name="buddy">
             <cstring>edit1_alias</cstring>
@@ -263,7 +275,7 @@
          <item row="1" column="0">
           <widget class="QLabel" name="label2_protocol">
            <property name="text">
-            <string>&amp;Protocol</string>
+            <string>Protocol</string>
            </property>
            <property name="buddy">
             <cstring>edit2_protocol</cstring>
@@ -287,7 +299,7 @@
          <item row="2" column="0">
           <widget class="QLabel" name="label3_server">
            <property name="text">
-            <string>&amp;Server</string>
+            <string>Server</string>
            </property>
            <property name="buddy">
             <cstring>edit3_server</cstring>
@@ -307,7 +319,7 @@
          <item row="3" column="0">
           <widget class="QLabel" name="label4_user">
            <property name="text">
-            <string>&amp;User</string>
+            <string>Username</string>
            </property>
            <property name="buddy">
             <cstring>edit4_user</cstring>
@@ -320,7 +332,7 @@
          <item row="4" column="0">
           <widget class="QLabel" name="label5_password">
            <property name="text">
-            <string>Pass&amp;word</string>
+            <string>Password</string>
            </property>
            <property name="buddy">
             <cstring>edit5_password</cstring>
@@ -337,7 +349,7 @@
          <item row="5" column="0">
           <widget class="QLabel" name="label6_mailbox">
            <property name="text">
-            <string>&amp;Mailbox</string>
+            <string>Voicemail</string>
            </property>
            <property name="buddy">
             <cstring>edit6_mailbox</cstring>
@@ -350,7 +362,7 @@
          <item row="6" column="0">
           <widget class="QLabel" name="label7_state">
            <property name="text">
-            <string>State</string>
+            <string>Status</string>
            </property>
           </widget>
          </item>
@@ -376,7 +388,10 @@
       <item>
        <widget class="QLabel" name="label_commonSettings">
         <property name="text">
-         <string>Stun settings will be applied on each account</string>
+         <string>Stun parameters will be applied on each SIP account created.</string>
+        </property>
+        <property name="wordWrap">
+         <bool>true</bool>
         </property>
        </widget>
       </item>
@@ -397,6 +412,9 @@
           <property name="enabled">
            <bool>false</bool>
           </property>
+          <property name="toolTip">
+           <string>Format : name.server:port</string>
+          </property>
           <property name="squeezedTextEnabled">
            <bool>false</bool>
           </property>
diff --git a/sflphone-client-kde/src/conf/dlgaddressbookbase.ui b/sflphone-client-kde/src/conf/dlgaddressbookbase.ui
index 0048b161954c45f5831794baff6ecf528c610c0f..e7f4964bf3500761158f832f10a800c4d9d4ba7e 100644
--- a/sflphone-client-kde/src/conf/dlgaddressbookbase.ui
+++ b/sflphone-client-kde/src/conf/dlgaddressbookbase.ui
@@ -11,25 +11,47 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QCheckBox" name="kcfg_enableAddressBook">
+     <property name="text">
+      <string>Enable address book</string>
+     </property>
+    </widget>
+   </item>
    <item>
     <widget class="QWidget" name="widget_configAddressBookGeneral" native="true">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
       <item>
        <widget class="QWidget" name="widget_maxResults" native="true">
         <layout class="QHBoxLayout" name="horizontalLayout_4">
          <property name="spacing">
           <number>-1</number>
          </property>
-         <property name="margin">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>5</number>
+         </property>
+         <property name="rightMargin">
+          <number>5</number>
+         </property>
+         <property name="bottomMargin">
           <number>5</number>
          </property>
          <item>
           <widget class="QLabel" name="label_maxResults">
            <property name="text">
-            <string>Maximum &amp;results</string>
+            <string>Maximum results</string>
            </property>
            <property name="buddy">
             <cstring>horizontalSlider_maxResults</cstring>
@@ -64,38 +86,38 @@
       <item>
        <widget class="QCheckBox" name="kcfg_displayPhoto">
         <property name="text">
-         <string>Display &amp;photo if available</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="groupBox_displayTypes">
-     <property name="title">
-      <string>Display phone numbers of these &amp;types :</string>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_7">
-      <item>
-       <widget class="QCheckBox" name="kcfg_business">
-        <property name="text">
-         <string>&amp;Work</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="kcfg_mobile">
-        <property name="text">
-         <string>&amp;Mobile</string>
+         <string>Display photo if available</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QCheckBox" name="kcfg_home">
-        <property name="text">
-         <string>&amp;Home</string>
+       <widget class="QGroupBox" name="groupBox_displayTypes">
+        <property name="title">
+         <string>Display phone numbers of these types :</string>
         </property>
+        <layout class="QHBoxLayout" name="horizontalLayout_7">
+         <item>
+          <widget class="QCheckBox" name="kcfg_business">
+           <property name="text">
+            <string>Work</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QCheckBox" name="kcfg_mobile">
+           <property name="text">
+            <string>Mobile</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QCheckBox" name="kcfg_home">
+           <property name="text">
+            <string>Home</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </widget>
       </item>
      </layout>
@@ -132,12 +154,12 @@
    <slot>setValue(int)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>223</x>
-     <y>35</y>
+     <x>265</x>
+     <y>67</y>
     </hint>
     <hint type="destinationlabel">
-     <x>301</x>
-     <y>33</y>
+     <x>326</x>
+     <y>70</y>
     </hint>
    </hints>
   </connection>
@@ -148,12 +170,28 @@
    <slot>setValue(int)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>294</x>
-     <y>36</y>
+     <x>326</x>
+     <y>70</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>265</x>
+     <y>67</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>kcfg_enableAddressBook</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>widget_configAddressBookGeneral</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>92</x>
+     <y>25</y>
     </hint>
     <hint type="destinationlabel">
-     <x>215</x>
-     <y>33</y>
+     <x>91</x>
+     <y>39</y>
     </hint>
    </hints>
   </connection>
diff --git a/sflphone-client-kde/src/conf/dlgaudio.cpp b/sflphone-client-kde/src/conf/dlgaudio.cpp
index 6d5e85f26169c0edeed16d65166db2a3547b98d6..8a29233bca28d592ca06d1e65b27886a9e6aa10d 100644
--- a/sflphone-client-kde/src/conf/dlgaudio.cpp
+++ b/sflphone-client-kde/src/conf/dlgaudio.cpp
@@ -24,6 +24,7 @@
 #include "configurationmanager_interface_singleton.h"
 #include "conf/ConfigurationSkeleton.h"
 #include "conf/ConfigurationDialog.h"
+#include <QtGui/QHeaderView>
 
 #include "sflphone_const.h"
 
@@ -32,27 +33,38 @@ DlgAudio::DlgAudio(KConfigDialog *parent)
 {
 	setupUi(this);
 	
-	ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
-	QStyle * style = QApplication::style();
-	
-	KUrl url = KUrl(SHARE_INSTALL_PREFIX);
-	url.cd("sflphone/ringtones");
-	KUrlRequester_ringtone->setUrl(url);
+	KUrlRequester_ringtone->setMode(KFile::File | KFile::ExistingOnly);
 	KUrlRequester_ringtone->lineEdit()->setObjectName("kcfg_ringtone"); 
+	KUrlRequester_ringtone->lineEdit()->setReadOnly(true); 
 	
 	codecTableHasChanged = false;
-	toolButton_codecUp->setIcon(KIcon("go-up"));
-	toolButton_codecDown->setIcon(KIcon("go-down"));
-	tableWidget_codecs->verticalHeader()->hide();
-	tableWidget_codecs->setSelectionBehavior(QAbstractItemView::SelectRows);
+// 	toolButton_codecUp->setIcon(KIcon("go-up"));
+// 	toolButton_codecDown->setIcon(KIcon("go-down"));
+// 	tableWidget_codecs->verticalHeader()->hide();
+// 	tableWidget_codecs->setSelectionBehavior(QAbstractItemView::SelectRows);
+	
+	ConfigurationSkeleton * skeleton = ConfigurationSkeleton::self();
+	CodecListModel * model = skeleton->getCodecListModel();
+	sortableCodecList->setModel(model);
 	
 	updateAlsaSettings();
-	connect(box_alsaPlugin,        SIGNAL(currentIndexChanged(int)),        parent, SLOT(updateButtons()));
-	connect(tableWidget_codecs,    SIGNAL(itemChanged(QTableWidgetItem *)), this,   SLOT(codecTableChanged()));
-	connect(toolButton_codecUp,    SIGNAL(clicked()),                       this,   SLOT(codecTableChanged()));
-	connect(toolButton_codecDown,  SIGNAL(clicked()),                       this,   SLOT(codecTableChanged()));
+	connect(box_alsaPlugin,        SIGNAL(currentIndexChanged(int)),   
+	        parent,                SLOT(updateButtons()));
+// 	connect(tableWidget_codecs,    SIGNAL(itemChanged(QTableWidgetItem *)),
+// 	        this,                  SLOT(codecTableChanged()));
+// 	connect(tableWidget_codecs,    SIGNAL(currentCellChanged(int, int, int, int)),
+// 	        this,                  SLOT(updateCodecListCommands()));
+// 	connect(toolButton_codecUp,    SIGNAL(clicked()),
+// 	        this,                  SLOT(codecTableChanged()));
+// 	connect(toolButton_codecDown,  SIGNAL(clicked()),
+// 	        this,                  SLOT(codecTableChanged()));
+	
+	connect(this,                  SIGNAL(updateButtons()),
+	        parent,                SLOT(updateButtons()));
 	
-	connect(this,                  SIGNAL(updateButtons()),                 parent, SLOT(updateButtons()));
+	connect(sortableCodecList,     SIGNAL(dataChanged()),
+	        this,                  SLOT(codecTableChanged()));
+	        
 }
 
 
@@ -68,96 +80,108 @@ void DlgAudio::updateWidgets()
 	box_alsaPlugin->setCurrentIndex(box_alsaPlugin->findText(skeleton->alsaPlugin()));
 	
 	//codecList
-	qDebug() << "loadCodecs";
-	ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
-	QStringList codecList = configurationManager.getCodecList();
-	QStringList activeCodecList = skeleton->activeCodecList();
-	#if QT_VERSION >= 0x040500
-		activeCodecList.removeDuplicates();
-	#else
-   	for (int i = 0 ; i < activeCodecList.size() ; i++)
-		{
-			if(activeCodecList.lastIndexOf(activeCodecList[i]) != i)
-			{
-				activeCodecList.removeAt(i);
-				i--;
-			}
-		}
-	#endif
-
-	for (int i=0 ; i<activeCodecList.size() ; i++)
-	{
-		if(! codecList.contains(activeCodecList[i]))
-		{
-			activeCodecList.removeAt(i);
-			i--;
-		}
-	}
-	QStringList codecListToDisplay = activeCodecList;
-	for (int i=0 ; i<codecList.size() ; i++)
-	{
-		if(! activeCodecList.contains(codecList[i]))
-		{
-			codecListToDisplay << codecList[i];
-		}
-	}
-	qDebug() << "codecList = " << codecList;
-	qDebug() << "activeCodecList" << activeCodecList;
-	qDebug() << "codecListToDisplay" << codecListToDisplay;
-	tableWidget_codecs->setRowCount(0);
-	for(int i=0 ; i<codecListToDisplay.size() ; i++)
-	{
-		bool ok;
-		qDebug() << codecListToDisplay[i];
-		QString payloadStr = QString(codecListToDisplay[i]);
-		int payload = payloadStr.toInt(&ok);
-		if(!ok)	
-			qDebug() << "The codec's payload sent by the configurationManager is not a number : " << codecListToDisplay[i];
-		else
-		{
-			QStringList details = configurationManager.getCodecDetails(payload);
-			tableWidget_codecs->insertRow(i);
-			tableWidget_codecs->setVerticalHeaderItem (i, new QTableWidgetItem());
-			tableWidget_codecs->verticalHeaderItem (i)->setText(payloadStr);
-			tableWidget_codecs->setItem(i,0,new QTableWidgetItem(""));
-			tableWidget_codecs->setItem(i,1,new QTableWidgetItem(details[CODEC_NAME]));
-			tableWidget_codecs->setItem(i,2,new QTableWidgetItem(details[CODEC_SAMPLE_RATE]));
-			tableWidget_codecs->setItem(i,3,new QTableWidgetItem(details[CODEC_BIT_RATE]));
-			tableWidget_codecs->setItem(i,4,new QTableWidgetItem(details[CODEC_BANDWIDTH]));
-			tableWidget_codecs->item(i,0)->setFlags(Qt::ItemIsSelectable|Qt::ItemIsUserCheckable|Qt::ItemIsEnabled);
-			tableWidget_codecs->item(i,0)->setCheckState(activeCodecList.contains(codecListToDisplay[i]) ? Qt::Checked : Qt::Unchecked);
-			tableWidget_codecs->item(i,1)->setFlags(Qt::ItemIsSelectable|Qt::ItemIsEnabled);
-			tableWidget_codecs->item(i,2)->setFlags(Qt::ItemIsSelectable|Qt::ItemIsEnabled);
-			tableWidget_codecs->item(i,3)->setFlags(Qt::ItemIsSelectable|Qt::ItemIsEnabled);
-			tableWidget_codecs->item(i,4)->setFlags(Qt::ItemIsSelectable|Qt::ItemIsEnabled);
-
-			qDebug() << "Added to codecs : " << payloadStr << " , " << details[CODEC_NAME];
-		}
-	}
-	tableWidget_codecs->resizeColumnsToContents();
-	tableWidget_codecs->resizeRowsToContents();
+// 	qDebug() << "loadCodecs";
+// 	ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
+// 	QStringList codecList = configurationManager.getCodecList();
+// 	QStringList activeCodecList = skeleton->activeCodecList();
+// 	
+// 	qDebug() << "loadCodecs1";
+// 	#if QT_VERSION >= 0x040500
+// 	qDebug() << "loadCodecs1b";
+// 		activeCodecList.removeDuplicates();
+// 		
+// 	qDebug() << "loadCodecs1c";
+// 	#else
+// 	
+// 	qDebug() << "loadCodecs1d";
+//    	for (int i = 0 ; i < activeCodecList.size() ; i++)
+// 		{
+// 			if(activeCodecList.lastIndexOf(activeCodecList[i]) != i || ! codecList.contains(activeCodecList[i]))
+// 			{
+// 				activeCodecList.removeAt(i);
+// 				i--;
+// 			}
+// 		}
+// 		
+// 	qDebug() << "loadCodecs1e";
+// 	#endif
+// 	
+// 	qDebug() << "loadCodecs2";
+// 	QStringList codecListToDisplay = activeCodecList;
+// 	qDebug() << "loadCodecs2b";
+// 	codecList.size();
+// 	
+// 	qDebug() << "loadCodecs2c";
+// 	for (int i=0 ; i<codecList.size() ; i++)
+// 	{
+// 		
+// 	qDebug() << "loadCodecs3";
+// 		if(! activeCodecList.contains(codecList[i]))
+// 		{
+// 			
+// 	qDebug() << "loadCodecs4";
+// 			codecListToDisplay << codecList[i];
+// 		}
+// 	}
+// 	
+// 	qDebug() << "loadCodecs5";
+// 	qDebug() << "codecList = " << codecList;
+// 	qDebug() << "activeCodecList" << activeCodecList;
+// 	qDebug() << "codecListToDisplay" << codecListToDisplay;
+// 	tableWidget_codecs->setRowCount(0);
+// 	for(int i=0 ; i<codecListToDisplay.size() ; i++)
+// 	{
+// 		bool ok;
+// 		qDebug() << codecListToDisplay[i];
+// 		QString payloadStr = QString(codecListToDisplay[i]);
+// 		int payload = payloadStr.toInt(&ok);
+// 		if(!ok)	
+// 			qDebug() << "The codec's payload sent by the configurationManager is not a number : " << codecListToDisplay[i];
+// 		else
+// 		{
+// 			QStringList details = configurationManager.getCodecDetails(payload);
+// 			tableWidget_codecs->insertRow(i);
+// 			tableWidget_codecs->setVerticalHeaderItem (i, new QTableWidgetItem());
+// 			tableWidget_codecs->verticalHeaderItem (i)->setText(payloadStr);
+// 			tableWidget_codecs->setItem(i,0,new QTableWidgetItem(""));
+// 			tableWidget_codecs->setItem(i,1,new QTableWidgetItem(details[CODEC_NAME]));
+// 			tableWidget_codecs->setItem(i,2,new QTableWidgetItem(details[CODEC_SAMPLE_RATE]));
+// 			tableWidget_codecs->setItem(i,3,new QTableWidgetItem(details[CODEC_BIT_RATE]));
+// 			tableWidget_codecs->setItem(i,4,new QTableWidgetItem(details[CODEC_BANDWIDTH]));
+// 			tableWidget_codecs->item(i,0)->setFlags(Qt::ItemIsSelectable|Qt::ItemIsUserCheckable|Qt::ItemIsEnabled);
+// 			tableWidget_codecs->item(i,0)->setCheckState(activeCodecList.contains(codecListToDisplay[i]) ? Qt::Checked : Qt::Unchecked);
+// 			tableWidget_codecs->item(i,1)->setFlags(Qt::ItemIsSelectable|Qt::ItemIsEnabled);
+// 			tableWidget_codecs->item(i,2)->setFlags(Qt::ItemIsSelectable|Qt::ItemIsEnabled);
+// 			tableWidget_codecs->item(i,3)->setFlags(Qt::ItemIsSelectable|Qt::ItemIsEnabled);
+// 			tableWidget_codecs->item(i,4)->setFlags(Qt::ItemIsSelectable|Qt::ItemIsEnabled);
+// 
+// 			qDebug() << "Added to codecs : " << payloadStr << " , " << details[CODEC_NAME];
+// 		}
+// 	}
+// 	tableWidget_codecs->resizeColumnsToContents();
+// 	tableWidget_codecs->resizeRowsToContents();
 	codecTableHasChanged = false;
 }
 
 
 void DlgAudio::updateSettings()
 {
-// 	qDebug() << "DlgAudio::updateSettings";
+	qDebug() << "DlgAudio::updateSettings";
 	//alsaPlugin
 	ConfigurationSkeleton * skeleton = ConfigurationSkeleton::self();
 	skeleton->setAlsaPlugin(box_alsaPlugin->currentText());
 	
 	//codecList
-	QStringList activeCodecs;
-	for(int i = 0 ; i < tableWidget_codecs->rowCount() ; i++)
-	{
-		if(tableWidget_codecs->item(i,0)->checkState() == Qt::Checked)
-		{
-			activeCodecs << tableWidget_codecs->verticalHeaderItem(i)->text();
-		}
-	}
-	qDebug() << "Calling setActiveCodecList with list : " << activeCodecs ;
-	skeleton->setActiveCodecList(activeCodecs);
+// 	QStringList activeCodecs;
+// 	for(int i = 0 ; i < tableWidget_codecs->rowCount() ; i++)
+// 	{
+// 		if(tableWidget_codecs->item(i,0)->checkState() == Qt::Checked)
+// 		{
+// 			activeCodecs << tableWidget_codecs->verticalHeaderItem(i)->text();
+// 		}
+// 	}
+// 	qDebug() << "Calling setActiveCodecList with list : " << activeCodecs ;
+// 	skeleton->setActiveCodecList(activeCodecs);
 	codecTableHasChanged = false;
 }
 
@@ -170,6 +194,7 @@ bool DlgAudio::hasChanged()
 	bool alsaPluginHasChanged = 
 	           skeleton->interface() == ConfigurationSkeleton::EnumInterface::ALSA 
 	       &&  skeleton->alsaPlugin() != box_alsaPlugin->currentText();
+	qDebug() << alsaPluginHasChanged << codecTableHasChanged;
 	return alsaPluginHasChanged || codecTableHasChanged;
 }
 
@@ -208,75 +233,75 @@ void DlgAudio::updateAlsaSettings()
 	}
 }
 
-void DlgAudio::updateCodecListCommands()
-{
-	bool buttonsEnabled[2] = {true,true};
-	if(! tableWidget_codecs->currentItem())
-	{
-		buttonsEnabled[0] = false;
-		buttonsEnabled[1] = false;
-	}
-	else if(tableWidget_codecs->currentRow() == 0)
-	{
-		buttonsEnabled[0] = false;
-	}
-	else if(tableWidget_codecs->currentRow() == tableWidget_codecs->rowCount() - 1)
-	{
-		buttonsEnabled[1] = false;
-	}
-	toolButton_codecUp->setEnabled(buttonsEnabled[0]);
-	toolButton_codecDown->setEnabled(buttonsEnabled[1]);
-}
+// void DlgAudio::updateCodecListCommands()
+// {
+// 	qDebug() << "updateCodecListCommands";
+// 	bool buttonsEnabled[2] = {true,true};
+// 	if(! tableWidget_codecs->currentItem())
+// 	{
+// 		buttonsEnabled[0] = false;
+// 		buttonsEnabled[1] = false;
+// 	}
+// 	else
+// 	{
+// 		if(tableWidget_codecs->currentRow() == 0)
+// 		{
+// 			buttonsEnabled[0] = false;
+// 		}
+// 		if(tableWidget_codecs->currentRow() == tableWidget_codecs->rowCount() - 1)
+// 		{
+// 			buttonsEnabled[1] = false;
+// 		}
+// 	}
+// 	toolButton_codecUp->setEnabled(buttonsEnabled[0]);
+// 	toolButton_codecDown->setEnabled(buttonsEnabled[1]);
+// }
 
-void DlgAudio::on_tableWidget_codecs_currentCellChanged(int currentRow)
-{
-	qDebug() << "on_tableWidget_codecs_currentCellChanged";
-	int nbCol = tableWidget_codecs->columnCount();
-	for(int i = 0 ; i < nbCol ; i++)
-	{
-		tableWidget_codecs->setRangeSelected(QTableWidgetSelectionRange(currentRow, 0, currentRow, nbCol - 1), true);
-	}
-	updateCodecListCommands();
-}
 
-void DlgAudio::on_toolButton_codecUp_clicked()
-{
-	qDebug() << "on_toolButton_codecUp_clicked";
-	int currentCol = tableWidget_codecs->currentColumn();
-	int currentRow = tableWidget_codecs->currentRow();
-	int nbCol = tableWidget_codecs->columnCount();
-	for(int i = 0 ; i < nbCol ; i++)
-	{
-		QTableWidgetItem * item1 = tableWidget_codecs->takeItem(currentRow, i);
-		QTableWidgetItem * item2 = tableWidget_codecs->takeItem(currentRow - 1, i);
-		tableWidget_codecs->setItem(currentRow - 1, i , item1);
-		tableWidget_codecs->setItem(currentRow, i , item2);
-	}
-	QTableWidgetItem * item1 = tableWidget_codecs->takeVerticalHeaderItem(currentRow);
-	QTableWidgetItem * item2 = tableWidget_codecs->takeVerticalHeaderItem(currentRow - 1);
-	tableWidget_codecs->setVerticalHeaderItem(currentRow - 1, item1);
-	tableWidget_codecs->setVerticalHeaderItem(currentRow, item2);
-	tableWidget_codecs->setCurrentCell(currentRow - 1, currentCol);
-}
+// void DlgAudio::on_toolButton_codecUp_clicked()
+// {
+// 	qDebug() << "on_toolButton_codecUp_clicked";
+// 	int currentCol = tableWidget_codecs->currentColumn();
+// 	int currentRow = tableWidget_codecs->currentRow();
+// 	int nbCol = tableWidget_codecs->columnCount();
+// 	for(int i = 0 ; i < nbCol ; i++)
+// 	{
+// 		QTableWidgetItem * item1 = tableWidget_codecs->takeItem(currentRow, i);
+// 		QTableWidgetItem * item2 = tableWidget_codecs->takeItem(currentRow - 1, i);
+// 		tableWidget_codecs->setItem(currentRow - 1, i , item1);
+// 		tableWidget_codecs->setItem(currentRow, i , item2);
+// 	}
+// 	QTableWidgetItem * item1 = tableWidget_codecs->takeVerticalHeaderItem(currentRow);
+// 	QTableWidgetItem * item2 = tableWidget_codecs->takeVerticalHeaderItem(currentRow - 1);
+// 	tableWidget_codecs->setVerticalHeaderItem(currentRow - 1, item1);
+// 	tableWidget_codecs->setVerticalHeaderItem(currentRow, item2);
+// 	tableWidget_codecs->setCurrentCell(currentRow - 1, currentCol);
+// }
+// 
+// void DlgAudio::on_toolButton_codecDown_clicked()
+// {
+// 	qDebug() << "on_toolButton_codecDown_clicked";
+// 	int currentCol = tableWidget_codecs->currentColumn();
+// 	int currentRow = tableWidget_codecs->currentRow();
+// 	int nbCol = tableWidget_codecs->columnCount();
+// 	for(int i = 0 ; i < nbCol ; i++)
+// 	{
+// 		QTableWidgetItem * item1 = tableWidget_codecs->takeItem(currentRow, i);
+// 		QTableWidgetItem * item2 = tableWidget_codecs->takeItem(currentRow + 1, i);
+// 		tableWidget_codecs->setItem(currentRow + 1, i , item1);
+// 		tableWidget_codecs->setItem(currentRow, i , item2);
+// 	}
+// 	QTableWidgetItem * item1 = tableWidget_codecs->takeVerticalHeaderItem(currentRow);
+// 	QTableWidgetItem * item2 = tableWidget_codecs->takeVerticalHeaderItem(currentRow + 1);
+// 	tableWidget_codecs->setVerticalHeaderItem(currentRow + 1, item1);
+// 	tableWidget_codecs->setVerticalHeaderItem(currentRow, item2);
+// 	tableWidget_codecs->setCurrentCell(currentRow + 1, currentCol);
+// }
 
-void DlgAudio::on_toolButton_codecDown_clicked()
+
+void DlgAudio::applyCustomSettings()
 {
-	qDebug() << "on_toolButton_codecDown_clicked";
-	int currentCol = tableWidget_codecs->currentColumn();
-	int currentRow = tableWidget_codecs->currentRow();
-	int nbCol = tableWidget_codecs->columnCount();
-	for(int i = 0 ; i < nbCol ; i++)
-	{
-		QTableWidgetItem * item1 = tableWidget_codecs->takeItem(currentRow, i);
-		QTableWidgetItem * item2 = tableWidget_codecs->takeItem(currentRow + 1, i);
-		tableWidget_codecs->setItem(currentRow + 1, i , item1);
-		tableWidget_codecs->setItem(currentRow, i , item2);
-	}
-	QTableWidgetItem * item1 = tableWidget_codecs->takeVerticalHeaderItem(currentRow);
-	QTableWidgetItem * item2 = tableWidget_codecs->takeVerticalHeaderItem(currentRow + 1);
-	tableWidget_codecs->setVerticalHeaderItem(currentRow + 1, item1);
-	tableWidget_codecs->setVerticalHeaderItem(currentRow, item2);
-	tableWidget_codecs->setCurrentCell(currentRow + 1, currentCol);
+	codecTableHasChanged = false;
 }
 
 
diff --git a/sflphone-client-kde/src/conf/dlgaudio.h b/sflphone-client-kde/src/conf/dlgaudio.h
index 15c1f8f70b26d0d6dbaf22772282e9ccd9d651b8..74fe3db72b88cd2f02fb7eaf9c7a51167b539d09 100644
--- a/sflphone-client-kde/src/conf/dlgaudio.h
+++ b/sflphone-client-kde/src/conf/dlgaudio.h
@@ -46,12 +46,12 @@ public slots:
 	void updateSettings();
 	bool hasChanged();
 	void updateAlsaSettings();
+	void applyCustomSettings();
 	
 private slots:
-	void updateCodecListCommands();
-	void on_tableWidget_codecs_currentCellChanged(int currentRow);
-	void on_toolButton_codecUp_clicked();
-	void on_toolButton_codecDown_clicked();
+// 	void updateCodecListCommands();
+// 	void on_toolButton_codecUp_clicked();
+// 	void on_toolButton_codecDown_clicked();
 	void codecTableChanged();
 	
 signals:
diff --git a/sflphone-client-kde/src/conf/dlgaudiobase.ui b/sflphone-client-kde/src/conf/dlgaudiobase.ui
index 38b5e1f64046d4e4796dda6fa6b61b7df5fc4d34..4bf98bd830afaf61c8ece5445240f0192305621e 100644
--- a/sflphone-client-kde/src/conf/dlgaudiobase.ui
+++ b/sflphone-client-kde/src/conf/dlgaudiobase.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
@@ -29,7 +29,7 @@
       <item row="0" column="0">
        <widget class="QLabel" name="label_interface">
         <property name="text">
-         <string>Audio device</string>
+         <string>Sound manager</string>
         </property>
         <property name="buddy">
          <cstring>kcfg_interface</cstring>
@@ -58,7 +58,11 @@
        </widget>
       </item>
       <item row="2" column="1">
-       <widget class="KUrlRequester" name="KUrlRequester_ringtone"/>
+       <widget class="KUrlRequester" name="KUrlRequester_ringtone">
+        <property name="filter">
+         <string notr="true">*.ul *.au *.wav</string>
+        </property>
+       </widget>
       </item>
      </layout>
     </widget>
@@ -72,7 +76,7 @@
       </sizepolicy>
      </property>
      <property name="title">
-      <string>&amp;Codecs</string>
+      <string>Codecs</string>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout">
       <property name="spacing">
@@ -91,87 +95,7 @@
        <number>2</number>
       </property>
       <item>
-       <widget class="QTableWidget" name="tableWidget_codecs">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>100</height>
-         </size>
-        </property>
-        <property name="frameShape">
-         <enum>QFrame::StyledPanel</enum>
-        </property>
-        <property name="frameShadow">
-         <enum>QFrame::Sunken</enum>
-        </property>
-        <property name="verticalScrollBarPolicy">
-         <enum>Qt::ScrollBarAsNeeded</enum>
-        </property>
-        <property name="textElideMode">
-         <enum>Qt::ElideRight</enum>
-        </property>
-        <property name="verticalScrollMode">
-         <enum>QAbstractItemView::ScrollPerPixel</enum>
-        </property>
-        <property name="horizontalScrollMode">
-         <enum>QAbstractItemView::ScrollPerPixel</enum>
-        </property>
-        <column>
-         <property name="text">
-          <string>Active</string>
-         </property>
-        </column>
-        <column>
-         <property name="text">
-          <string>Name</string>
-         </property>
-        </column>
-        <column>
-         <property name="text">
-          <string>Frequency</string>
-         </property>
-        </column>
-        <column>
-         <property name="text">
-          <string>Bitrate</string>
-         </property>
-        </column>
-        <column>
-         <property name="text">
-          <string>Bandwidth</string>
-         </property>
-        </column>
-       </widget>
-      </item>
-      <item>
-       <layout class="QVBoxLayout" name="verticalLayout_codecsOrder">
-        <property name="leftMargin">
-         <number>0</number>
-        </property>
-        <property name="rightMargin">
-         <number>0</number>
-        </property>
-        <item>
-         <widget class="QToolButton" name="toolButton_codecUp">
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QToolButton" name="toolButton_codecDown">
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
-       </layout>
+       <widget class="SortableCodecListWidget" name="sortableCodecList" native="true"/>
       </item>
      </layout>
     </widget>
@@ -198,30 +122,22 @@
           <string>ALSA settings</string>
          </property>
          <layout class="QFormLayout" name="formLayout_4">
+          <property name="fieldGrowthPolicy">
+           <enum>QFormLayout::ExpandingFieldsGrow</enum>
+          </property>
           <property name="verticalSpacing">
            <number>5</number>
           </property>
           <property name="leftMargin">
            <number>9</number>
           </property>
-          <item row="3" column="0">
-           <widget class="QLabel" name="label2_in">
-            <property name="text">
-             <string>&amp;In</string>
-            </property>
-           </widget>
-          </item>
-          <item row="5" column="0">
-           <widget class="QLabel" name="label3_out">
-            <property name="text">
-             <string>&amp;Out</string>
-            </property>
-           </widget>
-          </item>
           <item row="0" column="0">
            <widget class="QLabel" name="label1_alsaPugin">
             <property name="text">
-             <string>ALSA &amp;plugin</string>
+             <string>ALSA plugin</string>
+            </property>
+            <property name="buddy">
+             <cstring>box_alsaPlugin</cstring>
             </property>
            </widget>
           </item>
@@ -232,14 +148,34 @@
             </property>
            </widget>
           </item>
-          <item row="3" column="1">
+          <item row="2" column="0">
+           <widget class="QLabel" name="label2_in">
+            <property name="text">
+             <string>Input</string>
+            </property>
+            <property name="buddy">
+             <cstring>kcfg_alsaInputDevice</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
            <widget class="KComboBox" name="kcfg_alsaInputDevice">
             <property name="sizeAdjustPolicy">
              <enum>QComboBox::AdjustToContents</enum>
             </property>
            </widget>
           </item>
-          <item row="5" column="1">
+          <item row="4" column="0">
+           <widget class="QLabel" name="label3_out">
+            <property name="text">
+             <string>Output</string>
+            </property>
+            <property name="buddy">
+             <cstring>kcfg_alsaOutputDevice</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1">
            <widget class="KComboBox" name="kcfg_alsaOutputDevice">
             <property name="sizeAdjustPolicy">
              <enum>QComboBox::AdjustToContents</enum>
@@ -295,6 +231,12 @@
    <extends>QFrame</extends>
    <header>kurlrequester.h</header>
   </customwidget>
+  <customwidget>
+   <class>SortableCodecListWidget</class>
+   <extends>QWidget</extends>
+   <header>SortableCodecListWidget.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections>
diff --git a/sflphone-client-kde/src/conf/dlgdisplaybase.ui b/sflphone-client-kde/src/conf/dlgdisplaybase.ui
index ef8cd7ed9f56816af22f11d42b5a1eee76e85a6c..2d91e764f5eeaef3c2c4ffacd8add2dd9ac3a477 100644
--- a/sflphone-client-kde/src/conf/dlgdisplaybase.ui
+++ b/sflphone-client-kde/src/conf/dlgdisplaybase.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
@@ -39,14 +39,14 @@
       <item>
        <widget class="QCheckBox" name="kcfg_notifOnCalls">
         <property name="text">
-         <string>On incoming &amp;calls</string>
+         <string>On incoming calls</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QCheckBox" name="kcfg_notifOnMessages">
         <property name="text">
-         <string>On &amp;messages</string>
+         <string>On messages</string>
         </property>
        </widget>
       </item>
@@ -78,14 +78,14 @@
       <item>
        <widget class="QCheckBox" name="kcfg_displayOnStart">
         <property name="text">
-         <string>On &amp;start</string>
+         <string>On start</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QCheckBox" name="kcfg_displayOnCalls">
         <property name="text">
-         <string>On &amp;incoming calls</string>
+         <string>On incoming calls</string>
         </property>
        </widget>
       </item>
diff --git a/sflphone-client-kde/src/conf/dlggeneralbase.ui b/sflphone-client-kde/src/conf/dlggeneralbase.ui
index 6e723bf6b0c82427e6892d6f9902267a3dfbcee4..859decb52e04e124e2be7bdfb2b4a3d9d5746194 100644
--- a/sflphone-client-kde/src/conf/dlggeneralbase.ui
+++ b/sflphone-client-kde/src/conf/dlggeneralbase.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
@@ -32,7 +32,7 @@
          <item>
           <widget class="QCheckBox" name="kcfg_enableHistory">
            <property name="text">
-            <string extracomment="beginning of &quot;..for at least n days.&quot;">Keep my history for at least</string>
+            <string comment="Beginning of 'Keep my history for at least n days.'">Keep my history for at least</string>
            </property>
           </widget>
          </item>
@@ -58,7 +58,7 @@
             </sizepolicy>
            </property>
            <property name="text">
-            <string extracomment="End of &quot;Keep my history for at least n days&quot;">days</string>
+            <string comment="End of 'Keep my history for at least n days.'">days</string>
            </property>
           </widget>
          </item>
@@ -81,7 +81,7 @@
       <item>
        <widget class="QToolButton" name="toolButton_historyClear">
         <property name="text">
-         <string>C&amp;lear history</string>
+         <string>Clear history</string>
         </property>
        </widget>
       </item>
@@ -106,7 +106,7 @@
       <item row="0" column="0">
        <widget class="QLabel" name="label_SIPPort_2">
         <property name="text">
-         <string>SIP &amp;Port</string>
+         <string>SIP Port</string>
         </property>
         <property name="buddy">
          <cstring>kcfg_SIPPort</cstring>
@@ -129,12 +129,12 @@
           <widget class="KIntSpinBox" name="kcfg_SIPPort"/>
          </item>
          <item>
-          <widget class="QLabel" name="label_WarningSIP_2">
+          <widget class="QLabel" name="label_WarningSIPPort">
            <property name="enabled">
             <bool>false</bool>
            </property>
            <property name="text">
-            <string>Attention </string>
+            <string/>
            </property>
           </widget>
          </item>
diff --git a/sflphone-client-kde/src/conf/dlghooksbase.ui b/sflphone-client-kde/src/conf/dlghooksbase.ui
index 964153369b7afed02eb8c52e5e91df5abd0d0e8f..558daf4440807d13d931c66f38be21f4327b536c 100644
--- a/sflphone-client-kde/src/conf/dlghooksbase.ui
+++ b/sflphone-client-kde/src/conf/dlghooksbase.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
@@ -23,7 +23,7 @@
       <item>
        <widget class="QLabel" name="label">
         <property name="text">
-         <string>Custom commands with URL %s will be replaced with the passed URL.</string>
+         <string>Custom commands on incoming calls with URL</string>
         </property>
         <property name="wordWrap">
          <bool>true</bool>
@@ -122,13 +122,20 @@
         </layout>
        </widget>
       </item>
+      <item>
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>%s will be replaced with the passed URL.</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox_phoneNumberFormatting">
      <property name="title">
-      <string>Phone number formatting</string>
+      <string>Phone number rewriting</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_13">
       <item>
@@ -149,7 +156,7 @@
          <item>
           <widget class="QCheckBox" name="kcfg_addPrefix">
            <property name="text">
-            <string>Add phone number prefix</string>
+            <string>Prefix dialed numbers with</string>
            </property>
           </widget>
          </item>
diff --git a/sflphone-client-kde/src/conf/dlgrecord.cpp b/sflphone-client-kde/src/conf/dlgrecord.cpp
index 3c97898f5cd30bd11aca1a278a9a2bd93482cfff..49181a1b632ff31dbce54d14ac9a6a4802810001 100644
--- a/sflphone-client-kde/src/conf/dlgrecord.cpp
+++ b/sflphone-client-kde/src/conf/dlgrecord.cpp
@@ -29,6 +29,7 @@ DlgRecord::DlgRecord(QWidget *parent)
 	KUrlRequester_destinationFolder->setMode(KFile::Directory|KFile::ExistingOnly|KFile::LocalOnly);
 	KUrlRequester_destinationFolder->setUrl(KUrl(QDir::home().path()));
 	KUrlRequester_destinationFolder->lineEdit()->setObjectName("kcfg_destinationFolder"); 
+	KUrlRequester_destinationFolder->lineEdit()->setReadOnly(true); 
 }
 
 
diff --git a/sflphone-client-kde/src/conf/dlgrecordbase.ui b/sflphone-client-kde/src/conf/dlgrecordbase.ui
index 916071e7dfe909492c0ee7a8e47543cc3a08b89e..a570793e22f230774ccfdc3b78c85622a0945c31 100644
--- a/sflphone-client-kde/src/conf/dlgrecordbase.ui
+++ b/sflphone-client-kde/src/conf/dlgrecordbase.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
@@ -23,7 +23,7 @@
       </sizepolicy>
      </property>
      <property name="title">
-      <string>General</string>
+      <string comment="Config section">General</string>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout">
       <item>
diff --git a/sflphone-client-kde/src/conf/sflphone-client-kde.kcfg b/sflphone-client-kde/src/conf/sflphone-client-kde.kcfg
index c90d937a82b9467862627d82d0798fc2287ed8e0..11d1fc817d6c834d4286b09c288411a43e6fcd07 100644
--- a/sflphone-client-kde/src/conf/sflphone-client-kde.kcfg
+++ b/sflphone-client-kde/src/conf/sflphone-client-kde.kcfg
@@ -2,7 +2,10 @@
 <!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.dtd">
 <kcfg> 
   <kcfgfile name="ConfigDialogKDE" /> 
-  <group name="main"> 
+  <group name="main">
+
+    <!-- General Settings -->
+       
     <entry name="SIPPort" type="Int"> 
       <label>Defines the port that will be used for SIP communication.</label> 
       <min> 1025 </min>
@@ -18,6 +21,9 @@
       <max> 99 </max>
       <default> 30 </default> 
     </entry> 
+    
+    <!-- Display Settings -->
+    
     <entry name="notifOnCalls" type="Bool">
     	<label>Defines whether user should be notified when receiving a call.</label>
     </entry>
@@ -30,6 +36,9 @@
     <entry name="displayOnCalls" type="Bool">
     	<label>Defines whether the main window should be displayed when receiving a message.</label>
     </entry>
+    
+    <!-- Accounts Settings -->
+    
     <!--
     <entry name="accountList" type="StringList">
     	<label>Defines the list of accounts to register, in order of preference (first registered used by default).</label>
@@ -41,6 +50,9 @@
     <entry name="stunServer" type="String">
     	<label>Defines the Stun server to use.</label>
     </entry> 
+    
+    <!-- Audio Settings -->
+    
     <entry name="interface" type="Enum">
     	<label>Defines the Stun server to use.</label>
     	<choices>
@@ -54,9 +66,11 @@
     <entry name="ringtone" type="Path">
     	<label>Defines which ringtone is used.</label>
     </entry>
+    <!-- 
     <entry name="activeCodecList" type="StringList">
     	<label>Defines which ALSA plugin to use.</label>
     </entry>
+    -->
     <entry name="alsaPlugin" type="String">
     	<label>Defines which ALSA plugin to use.</label>
     </entry>
@@ -69,6 +83,12 @@
     <entry name="pulseAudioVolumeAlter" type="Bool">
     	<label>Defines whether pulse audio can mute other applications during a call.</label>
     </entry>
+    
+    <!-- Address Book Settings -->
+    
+    <entry name="enableAddressBook" type="Bool">
+    	<label>Defines whether the search in KDE Address Book is enabled</label>
+    </entry>
     <entry name="maxResults" type="Int">
     	<label>Defines the max number of contacts to display during a search in address book.</label>
     </entry>
@@ -84,9 +104,15 @@
     <entry name="home" type="Bool">
     	<label>Defines whether to display personnal phone numbers.</label>
     </entry>
+    
+    <!-- Record Settings -->
+    
     <entry name="destinationFolder" type="Path">
     	<label>Defines the destination directory for call recordings.</label>
     </entry>
+    
+    <!-- Hooks Settings -->
+    
     <entry name="enableHooksSIP" type="Bool">
     	<label>Defines whether to enable hooks for SIP accounts.</label>
     </entry>
diff --git a/sflphone-client-kde/src/main.cpp b/sflphone-client-kde/src/main.cpp
index 7e7ca8a42c091acc6e1a5ba21f8c524b6985a086..2096d1fc7672fa96a02ff3928930e9df773c8b5e 100644
--- a/sflphone-client-kde/src/main.cpp
+++ b/sflphone-client-kde/src/main.cpp
@@ -16,10 +16,14 @@
 
 #include "conf/ConfigurationDialog.h"
 
+#include <QTableView>
+#include <QListView>
+#include "AccountListModel.h"
+
 
 static const char description[] = "A KDE 4 Client for SFLphone";
 
-static const char version[] = "0.9.5";
+static const char version[] = "0.9.6";
 
 int main(int argc, char **argv)
 {
@@ -30,7 +34,7 @@ int main(int argc, char **argv)
 		
 		KAboutData about(
 		   "sflphone-client-kde", 
-		   0, 
+		   "sflphone-client-kde", 
 		   ki18n("SFLphone KDE Client"), 
 		   version, 
 		   ki18n(description),
@@ -39,9 +43,7 @@ int main(int argc, char **argv)
 		   KLocalizedString(), 
 		   "http://www.sflphone.org.", 
 		   "sflphone@lists.savoirfairelinux.net");
-		
 		about.addAuthor( ki18n("Jérémy Quentin"), KLocalizedString(), "jeremy.quentin@savoirfairelinux.com" );
-		about.setProgramIconName(ICON_SFLPHONE);
 		about.setTranslator( ki18nc("NAME OF TRANSLATORS","Your names"), ki18nc("EMAIL OF TRANSLATORS","Your emails") );
 		KCmdLineArgs::init(argc, argv, &about);
 		KCmdLineOptions options;
@@ -52,11 +54,18 @@ int main(int argc, char **argv)
 		
 		//configuration dbus
 		registerCommTypes();
-		
 		SFLPhone * fenetre = new SFLPhone();
 
 		InstanceInterface & instance = InstanceInterfaceSingleton::getInstance();
 		instance.Register(getpid(), APP_NAME);
+		
+// 		SortableCodecListWidget * cl = new SortableCodecListWidget();
+// 		cl->show();
+
+// 		QListView * v = new QListView();
+// 		v->setFlow(QListView::TopToBottom);
+// 		v->setModel(new AccountListModel());
+// 		v->show();
 	
 		return app.exec();
 	}
diff --git a/sflphone-client-kde/src/sflphone_const.h b/sflphone-client-kde/src/sflphone_const.h
index 339613bea710f93b9dfe095464a067fa7660ffa8..834209c1cbf9dcbc818580ddb435261be157cf04 100644
--- a/sflphone-client-kde/src/sflphone_const.h
+++ b/sflphone-client-kde/src/sflphone_const.h
@@ -27,44 +27,32 @@
  * @brief Contains the global variables for the client code
  */
  
-#define APP_NAME                          "SFLPhone KDE Client"
-
-/** Locale */
-// #define _(STRING)                         gettext( STRING )   
-
-/** Warnings unused variables **/
-// #define UNUSED_VAR(var)                   (void*)var
-
-// #define UNUSED                            __attribute__((__unused__))
-
-
+#define APP_NAME                          "SFLphone KDE Client"
 
 #define SIP                               0
 #define IAX                               1
 
-#define PAGE_GENERAL                      0
-#define PAGE_DISPLAY                      1
-#define PAGE_ACCOUNTS                     2
-#define PAGE_AUDIO                        3
-
 #define TOOLBAR_SIZE                      22
 
 #define CONTACT_ITEM_HEIGHT               40
 
 #define CONFIG_FILE_PATH                  "/.sflphone/sflphonedrc"
 
-#define ACTION_LABEL_CALL                 i18n("Call")
+#define ACTION_LABEL_CALL                 i18n("New call")
 #define ACTION_LABEL_HANG_UP              i18n("Hang up")
-#define ACTION_LABEL_HOLD                 i18n("Hold")
+#define ACTION_LABEL_HOLD                 i18n("Hold on")
 #define ACTION_LABEL_TRANSFER             i18n("Transfer")
 #define ACTION_LABEL_RECORD               i18n("Record")
-#define ACTION_LABEL_ACCEPT               i18n("Accept")
-#define ACTION_LABEL_REFUSE               i18n("Refuse")
-#define ACTION_LABEL_UNHOLD               i18n("Unhold")
+#define ACTION_LABEL_ACCEPT               i18n("Pick up")
+#define ACTION_LABEL_REFUSE               i18n("Hang up")
+#define ACTION_LABEL_UNHOLD               i18n("Hold off")
 #define ACTION_LABEL_GIVE_UP_TRANSF       i18n("Give up transfer")
 #define ACTION_LABEL_CALL_BACK            i18n("Call back")
-#define ACTION_LABEL_GIVE_UP_SEARCH       i18n("Give up search")
+#define ACTION_LABEL_MAILBOX              i18n("Voicemail")
 
+#define SCREEN_MAIN                       0
+#define SCREEN_HISTORY                    1
+#define SCREEN_ADDRESS                    2
 
 #define ICON_INCOMING                     ":/images/icons/ring.svg"
 #define ICON_RINGING                      ":/images/icons/ring.svg"
@@ -85,6 +73,7 @@
 #define ICON_EXEC_TRANSF                  ":/images/icons/call.svg"
 #define ICON_REC_DEL_OFF                  ":/images/icons/record_disabled.svg"
 #define ICON_REC_DEL_ON                   ":/images/icons/record.svg"
+#define ICON_MAILBOX                      ":/images/icons/mailbox.svg"
 
 #define ICON_REC_VOL_0                    ":/images/icons/mic.svg"
 #define ICON_REC_VOL_1                    ":/images/icons/mic_25.svg"
@@ -96,6 +85,13 @@
 #define ICON_SND_VOL_2                    ":/images/icons/speaker_50.svg"
 #define ICON_SND_VOL_3                    ":/images/icons/speaker_75.svg"
 
+#define ICON_SCREEN_MAIN                  ":/images/icons/sflphone.svg"
+#define ICON_SCREEN_HISTORY               ":/images/icons/history2.svg"
+#define ICON_SCREEN_ADDRESS               ":/images/icons/x-office-address-book.png"
+
+#define ICON_DISPLAY_VOLUME_CONSTROLS     ":/images/icons/icon_volume_off.svg"
+#define ICON_DISPLAY_DIALPAD              ":/images/icons/icon_dialpad.svg"
+
 #define ICON_HISTORY_INCOMING             ":/images/icons/incoming.svg"
 #define ICON_HISTORY_OUTGOING             ":/images/icons/outgoing.svg"
 #define ICON_HISTORY_MISSED               ":/images/icons/missed.svg"
@@ -167,6 +163,8 @@
 #define DAEMON_CALL_STATE_INIT_CURRENT    "CURRENT"
 #define DAEMON_CALL_STATE_INIT_HOLD       "HOLD"
 #define DAEMON_CALL_STATE_INIT_BUSY       "BUSY"
+#define DAEMON_CALL_STATE_INIT_INCOMING       "INCOMING"
+#define DAEMON_CALL_STATE_INIT_RINGING       "RINGING"
 #define DAEMON_CALL_STATE_INIT_INACTIVE   "INACTIVE"
 
 #define DAEMON_CALL_TYPE_INCOMING         "0"
@@ -182,6 +180,7 @@
 #define ADDRESSBOOK_DISPLAY_BUSINESS      "ADDRESSBOOK_DISPLAY_PHONE_BUSINESS"
 #define ADDRESSBOOK_DISPLAY_HOME          "ADDRESSBOOK_DISPLAY_PHONE_HOME"
 #define ADDRESSBOOK_DISPLAY_MOBILE        "ADDRESSBOOK_DISPLAY_PHONE_MOBILE"
+#define ADDRESSBOOK_ENABLE                "ADDRESSBOOK_ENABLE"
 
 /** Hooks settings */
 #define HOOKS_ADD_PREFIX                  "PHONE_NUMBER_HOOK_ADD_PREFIX"
@@ -206,38 +205,4 @@
 
 
 
-/** Error while opening capture device */
-#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
-/** Tone to play when voice mails */
-#define TONE_WITH_MESSAGE                 1
-
-
-/** Notification levels */
-#define __NOTIF_LEVEL_MIN                 0
-#define __NOTIF_LEVEL_MED                 1
-#define __NOTIF_LEVEL_HIGH                2
-
-/** Messages ID for the status bar - Incoming calls */
-#define __MSG_INCOMING_CALL               0
-/** Messages ID for the status bar - Calling */
-#define __MSG_CALLING	                  1
-/** Messages ID for the status bar - Voice mails  notification */
-#define __MSG_VOICE_MAILS                 2
-/** Messages ID for the status bar - Current account */
-#define __MSG_ACCOUNT_DEFAULT             3
-
-/** Desktop notifications - Time before to close the notification*/
-#define __TIMEOUT_MODE                    "default"
-/** Desktop notifications - Time before to close the notification*/
-#define __TIMEOUT_TIME                    18000       // 30 secondes
-
-
-
 #endif
diff --git a/sflphone-client-kde/src/sflphone_kdeview.cpp b/sflphone-client-kde/src/sflphone_kdeview.cpp
index c0366da604435618090f9ec2f19663a57ee543d3..f0f2518a7a8f14a2c8261b0252c44cde1da2a4cc 100644
--- a/sflphone-client-kde/src/sflphone_kdeview.cpp
+++ b/sflphone-client-kde/src/sflphone_kdeview.cpp
@@ -59,7 +59,6 @@ sflphone_kdeView::sflphone_kdeView(QWidget *parent)
 {
 	setupUi(this);
 	
-	action_configureSflPhone->setIcon(KIcon("preferences-other"));
 	
 	ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
 	CallManagerInterface & callManager = CallManagerInterfaceSingleton::getInstance();
@@ -105,20 +104,23 @@ sflphone_kdeView::sflphone_kdeView(QWidget *parent)
 	connect(configDialog, SIGNAL(clearCallHistoryAsked()),
 	        callList,     SLOT(clearHistory()));
 	        
+	connect(configDialog, SIGNAL(changesApplied()),
+	        this,         SLOT(loadWindow()));
+	        
+	connect(accountList, SIGNAL(accountListUpdated()),
+	        this,        SLOT(updateStatusMessage()));
 	connect(accountList, SIGNAL(accountListUpdated()),
-	        this,     SLOT(updateStatusMessage()));
+	        this,        SLOT(updateWindowCallState()));
 	        
 	accountList->updateAccounts();
-	        
+	
 	QPalette pal = QPalette(palette());
 	pal.setColor(QPalette::AlternateBase, Qt::lightGray);
 	setPalette(pal);
 	
 	stackedWidget_screen->setCurrentWidget(page_callList);
 	
-	loadWindow();
-	
-	emit statusMessageChanged("youhou");
+// 	loadWindow();
 	
 } 
 
@@ -129,15 +131,11 @@ sflphone_kdeView::~sflphone_kdeView()
 	delete configDialog;
 	delete wizard;
 	delete callList;
-	delete errorWindow;
 }
 
 void sflphone_kdeView::loadWindow()
 {
 	qDebug() << "loadWindow";
-	ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
-	action_displayVolumeControls->setChecked(configurationManager.getVolumeControls());
-	action_displayDialpad->setChecked(configurationManager.getDialpad());
 	updateWindowCallState();
 	updateRecordButton();
 	updateVolumeButton();
@@ -146,6 +144,9 @@ void sflphone_kdeView::loadWindow()
 	updateVolumeControls();
 	updateDialpad();
 	updateSearchHistory();
+	updateAddressBookEnabled();
+	updateAddressBook();
+	updateStatusMessage();
 }
 
 
@@ -163,6 +164,19 @@ Account * sflphone_kdeView::firstRegisteredAccount()
 	}
 }
 
+QString sflphone_kdeView::firstRegisteredAccountId()
+{
+	Account * firstRegistered = firstRegisteredAccount();
+	if(firstRegistered == NULL)
+	{
+		return QString();
+	}
+	else
+	{
+		return firstRegistered->getAccountId();
+	}
+}
+
 AccountList * sflphone_kdeView::getAccountList()
 {
 	return accountList;
@@ -263,24 +277,6 @@ void sflphone_kdeView::backspace()
 			}
 		}
 	}
-	if(stackedWidget_screen->currentWidget() == page_callHistory)
-	{
-		qDebug() << "In call history.";
-		int textSize = lineEdit_searchHistory->text().size();
-		if(textSize > 0)
-		{
-			lineEdit_searchHistory->setText(lineEdit_searchHistory->text().remove(textSize-1, 1));
-		}
-	}
-	if(stackedWidget_screen->currentWidget() == page_addressBook)
-	{
-		qDebug() << "In address book.";
-		int textSize = lineEdit_addressBook->text().size();
-		if(textSize > 0)
-		{
-			lineEdit_addressBook->setText(lineEdit_addressBook->text().remove(textSize-1, 1));
-		}
-	}
 }
 
 void sflphone_kdeView::escape()
@@ -369,8 +365,9 @@ void sflphone_kdeView::enter()
 		}
 		else
 		{
-			action_history->setChecked(false);
-			stackedWidget_screen->setCurrentWidget(page_callList);
+// 			action_history->setChecked(false);
+// 			stackedWidget_screen->setCurrentWidget(page_callList);
+			changeScreen(SCREEN_MAIN);
 			
 			Call * pastCall = callList->findCallByHistoryItem(item);
 			if (!pastCall)
@@ -394,8 +391,9 @@ void sflphone_kdeView::enter()
 		}
 		else
 		{
-			action_addressBook->setChecked(false);
-			stackedWidget_screen->setCurrentWidget(page_callList);
+// 			action_addressBook->setChecked(false);
+// 			stackedWidget_screen->setCurrentWidget(page_callList);
+			changeScreen(SCREEN_MAIN);
 			ContactItemWidget * w = (ContactItemWidget *) (listWidget_addressBook->itemWidget(item));
 			Call * call = callList->addDialingCall(w->getContactName());
 			call->appendItemText(w->getContactNumber());
@@ -447,93 +445,92 @@ void sflphone_kdeView::updateCallItem(Call * call)
 void sflphone_kdeView::updateWindowCallState()
 {
 	qDebug() << "updateWindowCallState";
-	QListWidgetItem * item;
 	
 	bool enabledActions[6]= {true,true,true,true,true,true};
-	QString buttonIconFiles[3] = {ICON_CALL, ICON_HANGUP, ICON_HOLD};
-	QString actionTexts[5] = {ACTION_LABEL_CALL, ACTION_LABEL_HANG_UP, ACTION_LABEL_HOLD, ACTION_LABEL_TRANSFER, ACTION_LABEL_RECORD};
+	QString buttonIconFiles[6] = {ICON_CALL, ICON_HANGUP, ICON_HOLD, ICON_TRANSFER, ICON_REC_DEL_OFF, ICON_MAILBOX};
+	QString actionTexts[6] = {ACTION_LABEL_CALL, ACTION_LABEL_HANG_UP, ACTION_LABEL_HOLD, ACTION_LABEL_TRANSFER, ACTION_LABEL_RECORD, ACTION_LABEL_MAILBOX};
+	
+	QListWidgetItem * item;
+	
 	bool transfer = false;
 	//tells whether the call is in recording position
 	bool recordActivated = false;
-	//tells whether the call can be recorded in the state it is right now
-	bool recordEnabled = false;
-	enabledActions[5] = firstRegisteredAccount() && ! firstRegisteredAccount()->getAccountDetail(ACCOUNT_MAILBOX).isEmpty();
+	enabledActions[SFLPhone::Mailbox] = firstRegisteredAccount() && ! firstRegisteredAccount()->getAccountDetail(ACCOUNT_MAILBOX).isEmpty();
 	if(stackedWidget_screen->currentWidget() == page_callList)
 	{
 		item = listWidget_callList->currentItem();
 		if (!item)
 		{
-			qDebug() << "No item selected. Updating window.";
-			enabledActions[1] = false;
-			enabledActions[2] = false;
-			enabledActions[3] = false;
-			enabledActions[4] = false;
+			qDebug() << "No item selected.";
+			enabledActions[SFLPhone::Refuse] = false;
+			enabledActions[SFLPhone::Hold] = false;
+			enabledActions[SFLPhone::Transfer] = false;
+			enabledActions[SFLPhone::Record] = false;
 		}
 		else
 		{
 			Call * call = (*callList)[item];
 			call_state state = call->getState();
-			//qDebug() << "calling getIsRecording on " << call->getCallId();
-			//recordActivated = callManager.getIsRecording(call->getCallId());
 			recordActivated = call->getRecording();
 			switch (state)
 			{
 				case CALL_STATE_INCOMING:
-					qDebug() << "Reached CALL_STATE_INCOMING with call " << (*callList)[item]->getCallId() << ". Updating window.";
-					buttonIconFiles[0] = ICON_ACCEPT;
-					buttonIconFiles[1] = ICON_REFUSE;
-					actionTexts[0] = ACTION_LABEL_ACCEPT;
-					actionTexts[0] = ACTION_LABEL_REFUSE;
+					qDebug() << "Reached CALL_STATE_INCOMING with call " << (*callList)[item]->getCallId();
+					buttonIconFiles[SFLPhone::Accept] = ICON_ACCEPT;
+					buttonIconFiles[SFLPhone::Refuse] = ICON_REFUSE;
+					actionTexts[SFLPhone::Accept] = ACTION_LABEL_ACCEPT;
+					actionTexts[SFLPhone::Refuse] = ACTION_LABEL_REFUSE;
 					break;
 				case CALL_STATE_RINGING:
-					qDebug() << "Reached CALL_STATE_RINGING with call " << (*callList)[item]->getCallId() << ". Updating window.";
-					enabledActions[2] = false;
-					enabledActions[3] = false;
+					qDebug() << "Reached CALL_STATE_RINGING with call " << (*callList)[item]->getCallId();
+					enabledActions[SFLPhone::Hold] = false;
+					enabledActions[SFLPhone::Transfer] = false;
 					break;
 				case CALL_STATE_CURRENT:
 					qDebug() << "details = " << CallManagerInterfaceSingleton::getInstance().getCallDetails(call->getCallId()).value();
-					qDebug() << "Reached CALL_STATE_CURRENT with call " << (*callList)[item]->getCallId() << ". Updating window.";
-					recordEnabled = true;
+					qDebug() << "Reached CALL_STATE_CURRENT with call " << (*callList)[item]->getCallId();
+					buttonIconFiles[SFLPhone::Record] = ICON_REC_DEL_ON;
 					break;
 				case CALL_STATE_DIALING:
-					qDebug() << "Reached CALL_STATE_DIALING with call " << (*callList)[item]->getCallId() << ". Updating window.";
-					enabledActions[2] = false;
-					enabledActions[3] = false;
-					enabledActions[4] = false;
-					buttonIconFiles[0] = ICON_ACCEPT;
+					qDebug() << "Reached CALL_STATE_DIALING with call " << (*callList)[item]->getCallId();
+					enabledActions[SFLPhone::Hold] = false;
+					enabledActions[SFLPhone::Transfer] = false;
+					enabledActions[SFLPhone::Record] = false;
+					actionTexts[SFLPhone::Accept] = ACTION_LABEL_ACCEPT;
+					buttonIconFiles[SFLPhone::Accept] = ICON_ACCEPT;
 					break;
 				case CALL_STATE_HOLD:
-					qDebug() << "Reached CALL_STATE_HOLD with call " << (*callList)[item]->getCallId() << ". Updating window.";
-					buttonIconFiles[2] = ICON_UNHOLD;
-					actionTexts[2] = ACTION_LABEL_UNHOLD;
+					qDebug() << "Reached CALL_STATE_HOLD with call " << (*callList)[item]->getCallId();
+					buttonIconFiles[SFLPhone::Hold] = ICON_UNHOLD;
+					actionTexts[SFLPhone::Hold] = ACTION_LABEL_UNHOLD;
 					break;		
 				case CALL_STATE_FAILURE:
-					qDebug() << "Reached CALL_STATE_FAILURE with call " << (*callList)[item]->getCallId() << ". Updating window.";
-					enabledActions[0] = false;
-					enabledActions[2] = false;
-					enabledActions[3] = false;
-					enabledActions[4] = false;
+					qDebug() << "Reached CALL_STATE_FAILURE with call " << (*callList)[item]->getCallId();
+					enabledActions[SFLPhone::Accept] = false;
+					enabledActions[SFLPhone::Hold] = false;
+					enabledActions[SFLPhone::Transfer] = false;
+					enabledActions[SFLPhone::Record] = false;
 					break;
 				case CALL_STATE_BUSY:
-					qDebug() << "Reached CALL_STATE_BUSY with call " << (*callList)[item]->getCallId() << ". Updating window.";
-					enabledActions[0] = false;
-					enabledActions[2] = false;
-					enabledActions[3] = false;
-					enabledActions[4] = false;
+					qDebug() << "Reached CALL_STATE_BUSY with call " << (*callList)[item]->getCallId();
+					enabledActions[SFLPhone::Accept] = false;
+					enabledActions[SFLPhone::Hold] = false;
+					enabledActions[SFLPhone::Transfer] = false;
+					enabledActions[SFLPhone::Record] = false;
 				break;
 				case CALL_STATE_TRANSFER:
-					qDebug() << "Reached CALL_STATE_TRANSFER with call " << (*callList)[item]->getCallId() << ". Updating window.";
-					buttonIconFiles[0] = ICON_EXEC_TRANSF;
-					actionTexts[3] = ACTION_LABEL_GIVE_UP_TRANSF;
+					qDebug() << "Reached CALL_STATE_TRANSFER with call " << (*callList)[item]->getCallId();
+					buttonIconFiles[SFLPhone::Accept] = ICON_EXEC_TRANSF;
+					actionTexts[SFLPhone::Transfer] = ACTION_LABEL_GIVE_UP_TRANSF;
 					transfer = true;
-					recordEnabled = true;
+					buttonIconFiles[SFLPhone::Record] = ICON_REC_DEL_ON;
 					break;
 				case CALL_STATE_TRANSF_HOLD:
-					qDebug() << "Reached CALL_STATE_TRANSF_HOLD with call " << (*callList)[item]->getCallId() << ". Updating window.";
-					buttonIconFiles[0] = ICON_EXEC_TRANSF;
-					buttonIconFiles[2] = ICON_UNHOLD;
-					actionTexts[3] = ACTION_LABEL_GIVE_UP_TRANSF;
-					actionTexts[2] = ACTION_LABEL_UNHOLD;
+					qDebug() << "Reached CALL_STATE_TRANSF_HOLD with call " << (*callList)[item]->getCallId();
+					buttonIconFiles[SFLPhone::Accept] = ICON_EXEC_TRANSF;
+					buttonIconFiles[SFLPhone::Hold] = ICON_UNHOLD;
+					actionTexts[SFLPhone::Transfer] = ACTION_LABEL_GIVE_UP_TRANSF;
+					actionTexts[SFLPhone::Hold] = ACTION_LABEL_UNHOLD;
 					transfer = true;
 					break;
 				case CALL_STATE_OVER:
@@ -551,77 +548,56 @@ void sflphone_kdeView::updateWindowCallState()
 	if(stackedWidget_screen->currentWidget() == page_callHistory)
 	{
 		item = listWidget_callHistory->currentItem();
-		buttonIconFiles[0] = ICON_ACCEPT;
-		actionTexts[0] = ACTION_LABEL_CALL_BACK;
-		actionTexts[1] = ACTION_LABEL_GIVE_UP_SEARCH;
+		buttonIconFiles[SFLPhone::Accept] = ICON_ACCEPT;
+		actionTexts[SFLPhone::Accept] = ACTION_LABEL_CALL_BACK;
 		if (!item)
 		{
-			qDebug() << "No item selected. Updating window.";
-			enabledActions[0] = false;
-			enabledActions[1] = false;
-			enabledActions[2] = false;
-			enabledActions[3] = false;
-			enabledActions[4] = false;
+			qDebug() << "No item selected.";
+			enabledActions[SFLPhone::Accept] = false;
+			enabledActions[SFLPhone::Refuse] = false;
+			enabledActions[SFLPhone::Hold] = false;
+			enabledActions[SFLPhone::Transfer] = false;
+			enabledActions[SFLPhone::Record] = false;
 		}
 		else
 		{
-			enabledActions[1] = false;
-			enabledActions[2] = false;
-			enabledActions[3] = false;
-			enabledActions[4] = false;
-		}
-		if(!lineEdit_searchHistory->text().isEmpty())
-		{
-			enabledActions[1] = true;
+			enabledActions[SFLPhone::Refuse] = false;
+			enabledActions[SFLPhone::Hold] = false;
+			enabledActions[SFLPhone::Transfer] = false;
+			enabledActions[SFLPhone::Record] = false;
 		}
 	}
 	if(stackedWidget_screen->currentWidget() == page_addressBook)
 	{
 		item = listWidget_addressBook->currentItem();
-		buttonIconFiles[0] = ICON_ACCEPT;
-		actionTexts[1] = ACTION_LABEL_GIVE_UP_SEARCH;
+		buttonIconFiles[SFLPhone::Accept] = ICON_ACCEPT;
 		if (!item)
 		{
-			qDebug() << "No item selected. Updating window.";
-			enabledActions[0] = false;
-			enabledActions[1] = false;
-			enabledActions[2] = false;
-			enabledActions[3] = false;
-			enabledActions[4] = false;
+			qDebug() << "No item selected.";
+			enabledActions[SFLPhone::Accept] = false;
+			enabledActions[SFLPhone::Refuse] = false;
+			enabledActions[SFLPhone::Hold] = false;
+			enabledActions[SFLPhone::Transfer] = false;
+			enabledActions[SFLPhone::Record] = false;
 		}
 		else
 		{
-			enabledActions[1] = false;
-			enabledActions[2] = false;
-			enabledActions[3] = false;
-			enabledActions[4] = false;
-		}
-		if(!lineEdit_addressBook->text().isEmpty())
-		{
-			enabledActions[1] = true;
+			enabledActions[SFLPhone::Refuse] = false;
+			enabledActions[SFLPhone::Hold] = false;
+			enabledActions[SFLPhone::Transfer] = false;
+			enabledActions[SFLPhone::Record] = false;
 		}
 	}
 	
-	action_accept->setEnabled(enabledActions[0]);
-	action_refuse->setEnabled(enabledActions[1]);
-	action_hold->setEnabled(enabledActions[2]);
-	action_transfer->setEnabled(enabledActions[3]);
-	action_record->setEnabled(enabledActions[4]);
-	action_mailBox->setEnabled(enabledActions[5]);
-	
-	action_record->setIcon(QIcon(recordEnabled ? ICON_REC_DEL_ON : ICON_REC_DEL_OFF));
-	action_accept->setIcon(QIcon(buttonIconFiles[0]));
-	action_refuse->setIcon(QIcon(buttonIconFiles[1]));
-	action_hold->setIcon(QIcon(buttonIconFiles[2]));
-	
-	action_accept->setText(actionTexts[0]);
-	action_refuse->setText(actionTexts[1]);
-	action_hold->setText(actionTexts[2]);
-	action_transfer->setText(actionTexts[3]);
-	action_record->setText(actionTexts[4]);
+	qDebug() << "Updating Window.";
 	
-	action_transfer->setChecked(transfer);
-	action_record->setChecked(recordActivated);
+	emit enabledActionsChangeAsked(enabledActions);
+	emit actionIconsChangeAsked(buttonIconFiles);
+	emit actionTextsChangeAsked(actionTexts);
+	emit transferCheckStateChangeAsked(transfer);
+	emit recordCheckStateChangeAsked(recordActivated);
+
+	qDebug() << "Window updated.";
 }
 
 void sflphone_kdeView::updateSearchHistory()
@@ -664,23 +640,37 @@ void sflphone_kdeView::updateAddressBook()
 	{
 		QListWidgetItem * item = listWidget_addressBook->takeItem(0);
 		qDebug() << "take item " << item->text();
+		delete item;
 	}
-	QString textSearched = lineEdit_addressBook->text();
-	if(textSearched.isEmpty())
-	{
-		label_addressBookFull->setVisible(false);
-		return;
-	}
-	bool full = false;
-	QVector<Contact *> contactsFound = findContactsInKAddressBook(textSearched, full);
-	qDebug() << "Full : " << full;
-	label_addressBookFull->setVisible(full);
-	for(int i = 0 ; i < contactsFound.size() ; i++)
+	if(isAddressBookEnabled())
 	{
-		Contact * contact = contactsFound[i];
-		addContactToContactList(contact);
+		if(loadAddressBook())
+		{
+			QString textSearched = lineEdit_addressBook->text();
+			if(textSearched.isEmpty())
+			{
+				label_addressBookFull->setVisible(false);
+				return;
+			}
+			bool full = false;
+			QVector<Contact *> contactsFound = findContactsInKAddressBook(textSearched, full);
+			qDebug() << "Full : " << full;
+			label_addressBookFull->setVisible(full);
+			for(int i = 0 ; i < contactsFound.size() ; i++)
+			{
+				Contact * contact = contactsFound[i];
+				addContactToContactList(contact);
+			}
+			alternateColors(listWidget_addressBook);
+		}
+		else
+		{
+			lineEdit_addressBook->setText(i18n("Address book loading..."));
+			lineEdit_addressBook->setEnabled(false);
+			label_addressBookFull->setVisible(false);
+		}
 	}
-	alternateColors(listWidget_addressBook);
+	
 }
 
 void sflphone_kdeView::alternateColors(QListWidget * listWidget)
@@ -703,8 +693,7 @@ QVector<Contact *> sflphone_kdeView::findContactsInKAddressBook(QString textSear
 	int maxResults = addressBookSettings[ADDRESSBOOK_MAX_RESULTS];
 	int typesDisplayed = phoneNumberTypesDisplayed();
 	bool displayPhoto = addressBookSettings[ADDRESSBOOK_DISPLAY_CONTACT_PHOTO];
-	
-	AddressBook * ab = KABC::StdAddressBook::self();
+	AddressBook * ab = KABC::StdAddressBook::self(true);
 	QVector<Contact *> results = QVector<Contact *>();
 	AddressBook::Iterator it;
 	full = false;
@@ -861,11 +850,11 @@ void sflphone_kdeView::updateStatusMessage()
 	Account * account = firstRegisteredAccount();
 	if(account == NULL)
 	{
-		emit statusMessageChanged(i18n("No account registered"));
+		emit statusMessageChangeAsked(i18n("No registered accounts"));
 	}
 	else
 	{
-		emit statusMessageChanged(i18n("Using account") + " \'" + account->getAlias() + "\' (" + account->getAccountDetail(ACCOUNT_TYPE) + ")") ;
+		emit statusMessageChangeAsked(i18n("Using account") + " \'" + account->getAlias() + "\' (" + account->getAccountDetail(ACCOUNT_TYPE) + ")") ;
 	}
 }
 
@@ -875,14 +864,14 @@ void sflphone_kdeView::updateStatusMessage()
 ************            Autoconnect             *************
 ************************************************************/
 
-void sflphone_kdeView::on_action_displayVolumeControls_triggered()
+void sflphone_kdeView::displayVolumeControls()
 {
 	ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
 	configurationManager.setVolumeControls();
 	updateVolumeControls();
 }
 
-void sflphone_kdeView::on_action_displayDialpad_triggered()
+void sflphone_kdeView::displayDialpad()
 {
 	ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
 	configurationManager.setDialpad();
@@ -1012,8 +1001,9 @@ void sflphone_kdeView::on_listWidget_callList_itemDoubleClicked(QListWidgetItem
 void sflphone_kdeView::on_listWidget_callHistory_itemDoubleClicked(QListWidgetItem * item)
 {
 	qDebug() << "on_listWidget_callHistory_itemDoubleClicked";
-	action_history->setChecked(false);
-	stackedWidget_screen->setCurrentWidget(page_callList);
+// 	action_history->setChecked(false);
+// 	stackedWidget_screen->setCurrentWidget(page_callList);
+	changeScreen(SCREEN_MAIN);
 	Call * pastCall = callList->findCallByHistoryItem(item);
 	Call * call = callList->addDialingCall(pastCall->getPeerName(), pastCall->getAccountId());
 	call->appendItemText(pastCall->getPeerPhoneNumber());
@@ -1026,8 +1016,9 @@ void sflphone_kdeView::on_listWidget_callHistory_itemDoubleClicked(QListWidgetIt
 void sflphone_kdeView::on_listWidget_addressBook_itemDoubleClicked(QListWidgetItem * item)
 {
 	qDebug() << "on_listWidget_addressBook_itemDoubleClicked";
-	action_addressBook->setChecked(false);
-	stackedWidget_screen->setCurrentWidget(page_callList);
+// 	action_addressBook->setChecked(false);
+// 	stackedWidget_screen->setCurrentWidget(page_callList);
+	changeScreen(SCREEN_MAIN);
 	ContactItemWidget * w = (ContactItemWidget *) (listWidget_addressBook->itemWidget(item));
 	Call * call = callList->addDialingCall(w->getContactName());
 	call->appendItemText(w->getContactNumber());
@@ -1039,22 +1030,21 @@ void sflphone_kdeView::on_listWidget_addressBook_itemDoubleClicked(QListWidgetIt
 void sflphone_kdeView::on_stackedWidget_screen_currentChanged(int index)
 {
 	qDebug() << "on_stackedWidget_screen_currentChanged";
-	KXmlGuiWindow * window = (KXmlGuiWindow * ) this->parent();
 	switch(index)
 	{
-		case 0:
+		case SCREEN_MAIN:
 			qDebug() << "Switched to call list screen.";
-			window->setWindowTitle(i18n("SFLPhone") + " - " + i18n("Main screen"));
+			emit windowTitleChangeAsked(i18n("SFLphone") + " - " + i18n("Main screen"));
 			break;
-		case 1:
+		case SCREEN_HISTORY:
 			qDebug() << "Switched to call history screen.";
 			updateCallHistory();
-			window->setWindowTitle(i18n("SFLPhone") + " - " + i18n("Call history"));
+			emit windowTitleChangeAsked(i18n("SFLphone") + " - " + i18n("Call history"));
 			break;
-		case 2:
+		case SCREEN_ADDRESS:
 			qDebug() << "Switched to address book screen.";
 			updateAddressBook();
-			window->setWindowTitle(i18n("SFLPhone") + " - " + i18n("Address book"));
+			emit windowTitleChangeAsked(i18n("SFLphone") + " - " + i18n("Address book"));
 			break;
 		default:
 			qDebug() << "Error : reached an unknown index \"" << index << "\" with stackedWidget_screen.";
@@ -1073,12 +1063,13 @@ void sflphone_kdeView::contextMenuEvent(QContextMenuEvent *event)
 		        this  , SLOT(editBeforeCall()));
 		menu.addAction(action_edit);
 	}
-	
-	menu.addAction(action_accept);
-	menu.addAction(action_refuse);
-	menu.addAction(action_hold);
-	menu.addAction(action_transfer);
-	menu.addAction(action_record);
+	SFLPhone * window = (SFLPhone * ) this->parent();
+	QList<QAction *> callActions = window->getCallActions();
+	menu.addAction(callActions.at((int) SFLPhone::Accept));
+	menu.addAction(callActions[SFLPhone::Refuse]);
+	menu.addAction(callActions[SFLPhone::Hold]);
+	menu.addAction(callActions[SFLPhone::Transfer]);
+	menu.addAction(callActions[SFLPhone::Record]);
 	menu.addSeparator();
 	
 	QAction * action = new ActionSetAccountFirst(NULL, &menu);
@@ -1099,7 +1090,6 @@ void sflphone_kdeView::contextMenuEvent(QContextMenuEvent *event)
 		menu.addAction(action);
 	}
 	menu.exec(event->globalPos());
-	
 }
 
 void sflphone_kdeView::editBeforeCall()
@@ -1113,11 +1103,14 @@ void sflphone_kdeView::editBeforeCall()
 		if(item)
 		{
 			Call * call = callList->findCallByHistoryItem(item);
-			name = call->getPeerName();
-			number = call->getPeerPhoneNumber();
+			if(call)
+			{
+				name = call->getPeerName();
+				number = call->getPeerPhoneNumber();
+			}
 		}
 	}
-	if(stackedWidget_screen->currentWidget() == page_addressBook)
+	else if(stackedWidget_screen->currentWidget() == page_addressBook)
 	{
 		QListWidgetItem * item = listWidget_addressBook->currentItem();
 		if(item)
@@ -1129,22 +1122,25 @@ void sflphone_kdeView::editBeforeCall()
 	}
 	else
 	{	return;	}
-	QString newNumber = QInputDialog::getText(this, i18n("Edit before call"), QString(), QLineEdit::Normal, number);
-	
-	action_history->setChecked(false);
-	action_addressBook->setChecked(false);
-	stackedWidget_screen->setCurrentWidget(page_callList);
-	Call * call = callList->addDialingCall(name);
-	call->appendItemText(newNumber);
-	addCallToCallList(call);
-	listWidget_callList->setCurrentRow(listWidget_callList->count() - 1);
-	action(call, CALL_ACTION_ACCEPT);
+	bool ok;
+	QString newNumber = QInputDialog::getText(this, i18n("Edit before call"), QString(), QLineEdit::Normal, number, &ok);
+	if(ok)
+	{
+// 		action_history->setChecked(false);
+// 		action_addressBook->setChecked(false);
+// 		stackedWidget_screen->setCurrentWidget(page_callList);
+		changeScreen(SCREEN_MAIN);
+		Call * call = callList->addDialingCall(name);
+		call->appendItemText(newNumber);
+		addCallToCallList(call);
+		listWidget_callList->setCurrentRow(listWidget_callList->count() - 1);
+		action(call, CALL_ACTION_ACCEPT);
+	}
 }
 
 void sflphone_kdeView::setAccountFirst(Account * account)
 {
 	qDebug() << "setAccountFirst : " << (account ? account->getAlias() : QString());
-// 	getAccountList()->setAccountFirst(account);
 	if(account)
 	{
 		priorAccountId = account->getAccountId();
@@ -1169,19 +1165,19 @@ void sflphone_kdeView::on_listWidget_addressBook_currentItemChanged()
 }
 
 
-void sflphone_kdeView::on_action_configureSflPhone_triggered()
+void sflphone_kdeView::configureSflPhone()
 {
 	configDialog->reload();
 	configDialog->show();
 }
 
-void sflphone_kdeView::on_action_accountCreationWizard_triggered()
+void sflphone_kdeView::accountCreationWizard()
 {
 	wizard->show();
 }
 	
 
-void sflphone_kdeView::on_action_accept_triggered()
+void sflphone_kdeView::accept()
 {
 	if(stackedWidget_screen->currentWidget() == page_callList)
 	{
@@ -1219,9 +1215,9 @@ void sflphone_kdeView::on_action_accept_triggered()
 	}
 	if(stackedWidget_screen->currentWidget() == page_callHistory)
 	{
-		action_history->setChecked(false);
-		stackedWidget_screen->setCurrentWidget(page_callList);
-		
+// 		action_history->setChecked(false);
+// 		stackedWidget_screen->setCurrentWidget(page_callList);
+		changeScreen(SCREEN_MAIN);
 		Call * pastCall = callList->findCallByHistoryItem(listWidget_callHistory->currentItem());
 		Call * call = callList->addDialingCall(pastCall->getPeerName());
 		call->appendItemText(pastCall->getPeerPhoneNumber());
@@ -1231,8 +1227,9 @@ void sflphone_kdeView::on_action_accept_triggered()
 	}
 	if(stackedWidget_screen->currentWidget() == page_addressBook)
 	{
-		action_addressBook->setChecked(false);
-		stackedWidget_screen->setCurrentWidget(page_callList);
+// 		action_addressBook->setChecked(false);
+// 		stackedWidget_screen->setCurrentWidget(page_callList);
+		changeScreen(SCREEN_MAIN);
 		ContactItemWidget * w = (ContactItemWidget *) (listWidget_addressBook->itemWidget(listWidget_addressBook->currentItem()));
 		Call * call = callList->addDialingCall(w->getContactName());
 		call->appendItemText(w->getContactNumber());
@@ -1242,7 +1239,7 @@ void sflphone_kdeView::on_action_accept_triggered()
 	}
 }
 
-void sflphone_kdeView::on_action_refuse_triggered()
+void sflphone_kdeView::refuse()
 {
 	if(stackedWidget_screen->currentWidget() == page_callList)
 	{
@@ -1266,7 +1263,7 @@ void sflphone_kdeView::on_action_refuse_triggered()
 	}
 }
 
-void sflphone_kdeView::on_action_hold_triggered()
+void sflphone_kdeView::hold()
 {
 	QListWidgetItem * item = listWidget_callList->currentItem();
 	if(!item)
@@ -1279,7 +1276,7 @@ void sflphone_kdeView::on_action_hold_triggered()
 	}
 }
 
-void sflphone_kdeView::on_action_transfer_triggered()
+void sflphone_kdeView::transfer()
 {
 	QListWidgetItem * item = listWidget_callList->currentItem();
 	if(!item)
@@ -1292,7 +1289,7 @@ void sflphone_kdeView::on_action_transfer_triggered()
 	}
 }
 
-void sflphone_kdeView::on_action_record_triggered()
+void sflphone_kdeView::record()
 {
 	QListWidgetItem * item = listWidget_callList->currentItem();
 	if(!item)
@@ -1305,39 +1302,8 @@ void sflphone_kdeView::on_action_record_triggered()
 	}
 }
 
-void sflphone_kdeView::on_action_history_triggered(bool checked)
-{
-	if(checked == true)
-	{
- 		action_addressBook->setChecked(false);
-		stackedWidget_screen->setCurrentWidget(page_callHistory);
-	}
-	else
-	{
-		stackedWidget_screen->setCurrentWidget(page_callList);
-	}
-	updateWindowCallState();
-}
-
-void sflphone_kdeView::on_action_addressBook_triggered(bool checked)
-{
-	if(checked == true)
-	{
-		action_history->setChecked(false);
-		stackedWidget_screen->setCurrentWidget(page_addressBook);
-		if(lineEdit_addressBook->text().isEmpty())
-		{	lineEdit_addressBook->setFocus(Qt::OtherFocusReason);	}
-	}
-	else
-	{
-		stackedWidget_screen->setCurrentWidget(page_callList);
-	}
-	updateWindowCallState();
-}
-
-void sflphone_kdeView::on_action_mailBox_triggered()
+void sflphone_kdeView::mailBox()
 {
-	ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
 	Account * account = firstRegisteredAccount();
 	QString mailBoxNumber = account->getAccountDetail(ACCOUNT_MAILBOX);
 	Call * call = callList->addDialingCall();
@@ -1384,16 +1350,7 @@ void sflphone_kdeView::on1_incomingCall(const QString &accountID, const QString
 	Call * call = callList->addIncomingCall(callID);
 	addCallToCallList(call);
 	listWidget_callList->setCurrentRow(listWidget_callList->count() - 1);
-	SFLPhone * window = (SFLPhone * ) this->parent();
-	window->trayIconSignal();
-	if(configurationManager.popupMode())
-	{
-		window->putForeground();
-	}
-	if(configurationManager.getNotify())
-	{
-		window->sendNotif(call->getPeerName().isEmpty() ? call->getPeerPhoneNumber() : call->getPeerName());
-	}
+	emit incomingCall(call);
 }
 
 void sflphone_kdeView::on1_incomingMessage(const QString &accountID, const QString &message)
@@ -1415,6 +1372,68 @@ void sflphone_kdeView::on1_volumeChanged(const QString &device, double value)
 		updateVolumeBar();
 }
 
+void sflphone_kdeView::enableAddressBook()
+{
+	qDebug() << "\nenableAddressBook\n";
+	lineEdit_addressBook->clear();
+	lineEdit_addressBook->setEnabled(true);
+	AddressBook * ab = StdAddressBook::self(true);
+	disconnect(ab,         SIGNAL(addressBookChanged(AddressBook *)),
+	           this,       SLOT(enableAddressBook()));
+}
+
+bool sflphone_kdeView::loadAddressBook()
+{
+	qDebug() << "loadAddressBook";
+	AddressBook * ab = StdAddressBook::self(true);
+	if(ab->loadingHasFinished())
+	{
+		return true;
+	}
+	else
+	{
+		connect(ab,         SIGNAL(addressBookChanged(AddressBook *)),
+		        this,       SLOT(enableAddressBook()));
+		return false;
+	}
+}
+
+
+void sflphone_kdeView::updateAddressBookEnabled()
+{
+	emit addressBookEnableAsked(isAddressBookEnabled());
+	if(! isAddressBookEnabled() && stackedWidget_screen->currentWidget() == page_addressBook)
+	{
+		changeScreen(SCREEN_MAIN);
+	}
+}
+
 
+bool sflphone_kdeView::isAddressBookEnabled()
+{
+	ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
+	MapStringInt addressBookSettings = configurationManager.getAddressbookSettings().value();
+	return addressBookSettings[ADDRESSBOOK_ENABLE];
+}
+
+void sflphone_kdeView::changeScreen(int screen)
+{
+	switch(screen)
+	{
+		case SCREEN_MAIN:
+			stackedWidget_screen->setCurrentWidget(page_callList);
+			break;
+		case SCREEN_HISTORY:
+			stackedWidget_screen->setCurrentWidget(page_callHistory);
+			break;
+		case SCREEN_ADDRESS:
+			stackedWidget_screen->setCurrentWidget(page_addressBook);
+			break;
+		default:
+			break;
+	}
+	updateWindowCallState();
+	emit screenChanged(screen);
+}
 
 #include "sflphone_kdeview.moc"
diff --git a/sflphone-client-kde/src/sflphone_kdeview.h b/sflphone-client-kde/src/sflphone_kdeview.h
index 8accc3dc82f81890c91b8932a8aafc26a957f230..9387fbab46df291f94c2047e6cd486fc6ef54936 100644
--- a/sflphone-client-kde/src/sflphone_kdeview.h
+++ b/sflphone-client-kde/src/sflphone_kdeview.h
@@ -79,13 +79,17 @@ protected:
 
 public:
 	//Constructors & Destructors
-	sflphone_kdeView(QWidget *parent);
-	virtual ~sflphone_kdeView();
 	/**
-	 * Called at construction. Updates all the display
-	 * according to the settings.
+	 *   This constructor does not load the window as it would
+	 *   better wait for the parent window to connect to the signals
+	 *   for updating it (statusMessageChangeAsked...).
+	 *   You should call the loadWindow() method once
+	 *   you have constructed the object and connected the
+	 *   expected signals.
+	 * @param parent 
 	 */
-	void loadWindow();
+	sflphone_kdeView(QWidget *parent);
+	virtual ~sflphone_kdeView();
 	
 	//Getters
 	/**
@@ -97,6 +101,15 @@ public:
 	 * @return the account to use if an outgoing call is placed.
 	 */
 	static Account * firstRegisteredAccount();
+	/**
+	 *   Seeks the ID of the account to use.
+	 *   If priorAccountId is defined and the corresponding
+	 *   account exists and is registered, uses this one, else,
+	 *   asks the first registered of accountList.
+	 *   If there is no account registered, returns an empty string.
+	 * @return the ID of the account to use if an outgoing call is placed.
+	 */
+	static QString firstRegisteredAccountId();
 	
 	static AccountList * getAccountList();
 	QErrorMessage * getErrorWindow();
@@ -105,10 +118,16 @@ public:
 	/**
 	* Used to sort contacts according to their types with Kabc.
 	* @return the integer resulting to the flags of the types 
-	* chosen to be displayed in SFLPhone configuration.
+	* chosen to be displayed in SFLphone configuration.
 	*/
 	int phoneNumberTypesDisplayed();
 	
+	/**
+	 * 
+	 * @return true if the address book is enabled in config
+	 */
+	bool isAddressBookEnabled();
+	
 	//Updates
 	QVector<Contact *> findContactsInKAddressBook(QString textSearched, bool & full);
 	
@@ -218,8 +237,37 @@ private slots:
 	void updateDialpad();
 	
 public slots:
+	/**
+	 * Updates all the display
+	 * according to the settings.
+	 */
+	void loadWindow();
+	
+	
 	void updateStatusMessage();
 	
+	/**
+	 *   Enable the address book search line edit.
+	 *   To be called once the address book loading has finished.
+	 */
+	void enableAddressBook();
+	
+	/**
+	 *   Loads the address book asynchronously.
+	 *   Calls enableAddressBook() once the address book
+	 *   loading has finished if it is not allready loaded.
+	 * @return true if address book has finished loading
+	 */
+	bool loadAddressBook();
+	
+	/**
+	 *   Chooses to enable/disable (show/hide) the address book 
+	 *   button according to the configuration's setting, and 
+	 *   returns to the main window if is in address book
+	 *   whereas it is disabled.
+	 */
+	void updateAddressBookEnabled();
+	
 	
 	virtual void keyPressEvent(QKeyEvent *event)
 	{
@@ -240,20 +288,16 @@ public slots:
 		}
 	}
 
-	void on_action_displayVolumeControls_triggered();
-	void on_action_displayDialpad_triggered();
-// 	void on_action_configureAccounts_triggered();
-// 	void on_action_configureAudio_triggered();
-	void on_action_configureSflPhone_triggered();
-	void on_action_accountCreationWizard_triggered();
-	void on_action_accept_triggered();
-	void on_action_refuse_triggered();
-	void on_action_hold_triggered();
-	void on_action_transfer_triggered();
-	void on_action_record_triggered();
-	void on_action_history_triggered(bool checked);
-	void on_action_addressBook_triggered(bool checked);
-	void on_action_mailBox_triggered();
+	void displayVolumeControls();
+	void displayDialpad();
+	void configureSflPhone();
+	void accountCreationWizard();
+	void accept();
+	void refuse();
+	void hold();
+	void transfer();
+	void record();
+	void mailBox();
 	
 	void on_widget_dialpad_typed(QString text);
 	
@@ -283,8 +327,20 @@ public slots:
 	void on1_voiceMailNotify(const QString &accountID, int count);
 	void on1_volumeChanged(const QString &device, double value);
 	
+	void changeScreen(int screen);
+	
 signals:
-	void statusMessageChanged(const QString & message);
+	void statusMessageChangeAsked(const QString & message);
+	void windowTitleChangeAsked(const QString & title);
+	void enabledActionsChangeAsked(const bool * enabledActions);
+	void actionIconsChangeAsked(const QString * actionIcons);
+	void actionTextsChangeAsked(const QString * actionTexts);
+	void transferCheckStateChangeAsked(bool transferCheckState);
+	void recordCheckStateChangeAsked(bool recordCheckState);
+	void addressBookEnableAsked(bool enableAddressBook);
+	void screenChanged(int screen);
+	void incomingCall(const Call * call);
+	
 
 };
 
diff --git a/sflphone-client-kde/src/ui/sflphone_kdeview_base.ui b/sflphone-client-kde/src/ui/sflphone_kdeview_base.ui
index 02ef5f252555b89cb6bd43fd0ba81c2725a39cc0..4d026f13ed56e6cefb2062bc11e6594094f0e1a0 100644
--- a/sflphone-client-kde/src/ui/sflphone_kdeview_base.ui
+++ b/sflphone-client-kde/src/ui/sflphone_kdeview_base.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
@@ -66,6 +66,12 @@
        </item>
        <item>
         <widget class="KLineEdit" name="lineEdit_addressBook">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
          <property name="showClearButton" stdset="0">
           <bool>true</bool>
          </property>
@@ -132,6 +138,9 @@
              <height>50</height>
             </size>
            </property>
+           <property name="toolTip">
+            <string>Mic volume</string>
+           </property>
            <property name="layoutDirection">
             <enum>Qt::RightToLeft</enum>
            </property>
@@ -205,6 +214,9 @@
              <height>50</height>
             </size>
            </property>
+           <property name="toolTip">
+            <string>Speakers volume</string>
+           </property>
            <property name="layoutDirection">
             <enum>Qt::LeftToRight</enum>
            </property>
@@ -315,153 +327,6 @@
     </widget>
    </item>
   </layout>
-  <action name="action_accept">
-   <property name="icon">
-    <iconset resource="../qrc/resources.qrc">
-     <normaloff>:/images/icons/call.svg</normaloff>:/images/icons/call.svg</iconset>
-   </property>
-   <property name="text">
-    <string>&amp;Pick up</string>
-   </property>
-  </action>
-  <action name="action_refuse">
-   <property name="icon">
-    <iconset resource="../qrc/resources.qrc">
-     <normaloff>:/images/icons/hang_up.svg</normaloff>:/images/icons/hang_up.svg</iconset>
-   </property>
-   <property name="text">
-    <string>&amp;Hang up</string>
-   </property>
-  </action>
-  <action name="action_hold">
-   <property name="icon">
-    <iconset resource="../qrc/resources.qrc">
-     <normaloff>:/images/icons/hold.svg</normaloff>:/images/icons/hold.svg</iconset>
-   </property>
-   <property name="text">
-    <string>H&amp;old</string>
-   </property>
-  </action>
-  <action name="action_transfer">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="icon">
-    <iconset resource="../qrc/resources.qrc">
-     <normaloff>:/images/icons/transfert.svg</normaloff>:/images/icons/transfert.svg</iconset>
-   </property>
-   <property name="text">
-    <string>&amp;Transfer</string>
-   </property>
-  </action>
-  <action name="action_history">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="icon">
-    <iconset resource="../qrc/resources.qrc">
-     <normaloff>:/images/icons/history2.svg</normaloff>:/images/icons/history2.svg</iconset>
-   </property>
-   <property name="text">
-    <string>H&amp;istory</string>
-   </property>
-  </action>
-  <action name="action_mailBox">
-   <property name="icon">
-    <iconset resource="../qrc/resources.qrc">
-     <normaloff>:/images/icons/mailbox.svg</normaloff>:/images/icons/mailbox.svg</iconset>
-   </property>
-   <property name="text">
-    <string>&amp;Mailbox</string>
-   </property>
-  </action>
-  <action name="action_configureAccounts">
-   <property name="icon">
-    <iconset resource="../qrc/resources.qrc">
-     <normaloff>:/images/icons/stock_person.svg</normaloff>:/images/icons/stock_person.svg</iconset>
-   </property>
-   <property name="text">
-    <string>Configure &amp;accounts</string>
-   </property>
-  </action>
-  <action name="action_configureAudio">
-   <property name="icon">
-    <iconset resource="../qrc/resources.qrc">
-     <normaloff>:/images/icons/icon_volume.svg</normaloff>:/images/icons/icon_volume.svg</iconset>
-   </property>
-   <property name="text">
-    <string>Configure a&amp;udio</string>
-   </property>
-  </action>
-  <action name="action_configureSflPhone">
-   <property name="text">
-    <string>&amp;Configure SFLPhone</string>
-   </property>
-  </action>
-  <action name="action_displayVolumeControls">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="checked">
-    <bool>true</bool>
-   </property>
-   <property name="icon">
-    <iconset resource="../qrc/resources.qrc">
-     <normaloff>:/images/icons/icon_volume_off.svg</normaloff>:/images/icons/icon_volume_off.svg</iconset>
-   </property>
-   <property name="text">
-    <string>Display &amp;volume bars</string>
-   </property>
-  </action>
-  <action name="action_About">
-   <property name="text">
-    <string>&amp;About</string>
-   </property>
-  </action>
-  <action name="action_displayDialpad">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="checked">
-    <bool>true</bool>
-   </property>
-   <property name="icon">
-    <iconset resource="../qrc/resources.qrc">
-     <normaloff>:/images/icons/icon_dialpad.svg</normaloff>:/images/icons/icon_dialpad.svg</iconset>
-   </property>
-   <property name="text">
-    <string>Display &amp;dialpad</string>
-   </property>
-  </action>
-  <action name="action_record">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="icon">
-    <iconset>
-     <normaloff>:/images/icons/del_off.png</normaloff>:/images/icons/del_off.png</iconset>
-   </property>
-   <property name="text">
-    <string>&amp;Record</string>
-   </property>
-  </action>
-  <action name="action_accountCreationWizard">
-   <property name="text">
-    <string>Account creation &amp;wizard</string>
-   </property>
-  </action>
-  <action name="action_addressBook">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="icon">
-    <iconset resource="../qrc/resources.qrc">
-     <normaloff>:/images/icons/x-office-address-book.png</normaloff>:/images/icons/x-office-address-book.png</iconset>
-   </property>
-   <property name="text">
-    <string>Address book</string>
-   </property>
-  </action>
  </widget>
  <customwidgets>
   <customwidget>
diff --git a/sflphone-common/Makefile.am b/sflphone-common/Makefile.am
index 64ee4c390b9880aeb7b94b418517466407f6ad30..6d464df1bf37e8d39e06d4e3e91f6ecc220143b6 100644
--- a/sflphone-common/Makefile.am
+++ b/sflphone-common/Makefile.am
@@ -26,6 +26,6 @@ indent:
 
 
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libs src ringtones po man $(TESTS_DIR)
+SUBDIRS = libs src ringtones man $(TESTS_DIR)
 EXTRA_DIST = m4/*.m4 tools/*.sh platform/* images/* README.gentoo
 
diff --git a/sflphone-common/VERSION b/sflphone-common/VERSION
index 517317e95fb23bda5f1c305dfaa84bfa8021a824..bc440692c3b559a2d3fe749ce99f8993b879252f 100644
--- a/sflphone-common/VERSION
+++ b/sflphone-common/VERSION
@@ -1 +1 @@
-0.9.6~beta
+0.9.6~rc1
diff --git a/sflphone-common/configure.ac b/sflphone-common/configure.ac
index 103fb42273dd4687dee9341089e4ed8c0752aacd..5e03439ee4d38b98b31e9784ec91c4106c258304 100644
--- a/sflphone-common/configure.ac
+++ b/sflphone-common/configure.ac
@@ -1,354 +1,356 @@
 dnl SFLPhone - configure.ac for automake 1.9 and autoconf 2.59
 dnl
-dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)
-AC_INIT([SFLphone],[0.9.6~beta],[sflphoneteam@savoirfairelinux.com],[sflphone])
-AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004-2009]])
+	dnl Process this file with autoconf to produce a configure script.
+	AC_PREREQ(2.59)
+	AC_INIT([SFLphone],[0.9.6~rc1],[sflphoneteam@savoirfairelinux.com],[sflphone])
+	AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004-2009]])
 AC_REVISION([$Revision$])
 
-AC_CANONICAL_SYSTEM
+	AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+	AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AM_CONFIG_HEADER([config.h])
 
-dnl Use this variable in the program
+	dnl Use this variable in the program
 AC_SUBST(PACKAGE_VERSION)
 
-AM_PROG_LIBTOOL
+	AM_PROG_LIBTOOL
 
 
-dnl Rewrite name of programs to be installed
-dnl AC_ARG_PROGRAM
+	dnl Rewrite name of programs to be installed
+	dnl AC_ARG_PROGRAM
 
-dnl Compute canonical system name
-dnl AC_CANONICAL_TARGET
+	dnl Compute canonical system name
+	dnl AC_CANONICAL_TARGET
 
-dnl Improve make variable MAKE
-AC_PROG_MAKE_SET
+	dnl Improve make variable MAKE
+	AC_PROG_MAKE_SET
 
-dnl Where to find configure files
-dnl AC_CONFIG_SRCDIR([config.h.in])
+	dnl Where to find configure files
+	dnl AC_CONFIG_SRCDIR([config.h.in])
 AC_CONFIG_MACRO_DIR([m4])
 
-dnl What to generate
-dnl AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
+	dnl What to generate
+	dnl AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
 AC_CONFIG_FILES([Makefile])
-AC_CONFIG_FILES([libs/Makefile \
-  libs/stund/Makefile \
-  libs/utilspp/Makefile \
-  libs/utilspp/functor/Makefile \
-  libs/utilspp/singleton/Makefile \
-  libs/dbus-c++/Makefile \
-  libs/dbus-c++/src/Makefile \
-  libs/dbus-c++/tools/Makefile \
-  libs/dbus-c++/data/Makefile \
-  libs/iax2/Makefile])
-  
-AC_CONFIG_FILES([src/Makefile \
-  src/audio/Makefile \
-  src/audio/codecs/Makefile \
-  src/config/Makefile \
-  src/dbus/Makefile \
-  src/plug-in/audiorecorder/Makefile \
-  src/plug-in/Makefile \
-  src/plug-in/test/Makefile \
-  src/hooks/Makefile \
-  src/history/Makefile]) 
-  
-  dnl Unitary test section
+	AC_CONFIG_FILES([libs/Makefile \
+			libs/stund/Makefile \
+			libs/utilspp/Makefile \
+			libs/utilspp/functor/Makefile \
+			libs/utilspp/singleton/Makefile \
+			libs/dbus-c++/Makefile \
+			libs/dbus-c++/src/Makefile \
+			libs/dbus-c++/tools/Makefile \
+			libs/dbus-c++/data/Makefile \
+			libs/iax2/Makefile])
+
+	AC_CONFIG_FILES([src/Makefile \
+			src/audio/Makefile \
+			src/audio/codecs/Makefile \
+			src/config/Makefile \
+			src/dbus/Makefile \
+			src/plug-in/audiorecorder/Makefile \
+			src/plug-in/Makefile \
+			src/plug-in/test/Makefile \
+			src/hooks/Makefile \
+			src/history/Makefile]) 
+
+	dnl Unitary test section
 AC_CONFIG_FILES([test/Makefile])
 
 
-AC_CONFIG_FILES([po/Makefile \
-  ringtones/Makefile])
+AC_CONFIG_FILES([ringtones/Makefile])
 
 AC_CONFIG_FILES([man/Makefile])
 
-AC_CONFIG_FILES([doc/Makefile \
-  doc/doxygen/Makefile])
-  
-dnl the file stamp-h.in should be there before (instead of AC_CONFIG_HEADERS(config.h))
+	AC_CONFIG_FILES([doc/Makefile \
+			doc/doxygen/Makefile])
+
+	dnl the file stamp-h.in should be there before (instead of AC_CONFIG_HEADERS(config.h))
 dnl AM_CONFIG_HEADER(config.h)
 
-dnl Settings need Standard C++ Library
-LIBS="$LIBS -lstdc++"
+	dnl Settings need Standard C++ Library
+	LIBS="$LIBS -lstdc++"
 
-dnl Solaris pkgadd support definitions
-PKGADD_PKG="SFLphone"
-PKGADD_NAME="SFLphone - a SIP client and daemon"
-PKGADD_VENDOR="http://www.sflphone.org/"
-AC_SUBST(PKGADD_PKG)
-AC_SUBST(PKGADD_NAME)
+	dnl Solaris pkgadd support definitions
+	PKGADD_PKG="SFLphone"
+	PKGADD_NAME="SFLphone - a SIP client and daemon"
+	PKGADD_VENDOR="http://www.sflphone.org/"
+	AC_SUBST(PKGADD_PKG)
+	AC_SUBST(PKGADD_NAME)
 AC_SUBST(PKGADD_VENDOR)
 
-dnl Check for programs
-AC_PROG_CC
-SFL_CXX_WITH_DEBUG
-AC_PROG_CXX
-AC_PROG_CPP
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-dnl will have to remove this
-AC_PROG_LIBTOOL
-
-dnl Define C++ as default language
+	dnl Check for programs
+	AC_PROG_CC
+	SFL_CXX_WITH_DEBUG
+	AC_PROG_CXX
+	AC_PROG_CPP
+	AC_PROG_INSTALL
+	AC_PROG_LN_S
+	AC_PROG_MAKE_SET
+	dnl will have to remove this
+	AC_PROG_LIBTOOL
+
+	dnl Define C++ as default language
 AC_LANG(C++)
 
-dnl Setup C++ compiler flags
-CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS $USER_INCLUDES -O0 -g -Wno-return-type"
-
-dnl Check for header files
-AC_FUNC_ALLOCA
-AC_HEADER_STDC
-AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h malloc.h \
-  memory.h netdb.h netinet/in.h stdlib.h string.h strings.h \
-  sys/ioctl.h sys/socket.h sys/time.h unistd.h utime.h ostream])
-
-dnl Check for typedefs, structures, and compiler characteristics
-AC_HEADER_STAT
-AC_HEADER_STDBOOL
-AC_C_CONST
-AC_C_INLINE
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-AC_HEADER_TIME
-AC_C_VOLATILE
+	dnl Setup C++ compiler flags
+	CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS $USER_INCLUDES -g -Wno-return-type"
+	dnl CXXFLAGS="$USE_EXCEPTIONS $USER_INCLUDES -O0 -g -Wno-return-type"
+
+	dnl Check for header files
+	AC_FUNC_ALLOCA
+	AC_HEADER_STDC
+	AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h malloc.h \
+			memory.h netdb.h netinet/in.h stdlib.h string.h strings.h \
+			sys/ioctl.h sys/socket.h sys/time.h unistd.h utime.h ostream])
+
+	dnl Check for typedefs, structures, and compiler characteristics
+	AC_HEADER_STAT
+	AC_HEADER_STDBOOL
+	AC_C_CONST
+	AC_C_INLINE
+	AC_TYPE_PID_T
+	AC_TYPE_SIZE_T
+	AC_HEADER_TIME
+	AC_C_VOLATILE
 AC_CHECK_TYPES([ptrdiff_t])
 
-dnl ********************************
-dnl Check for needed functions
-dnl ********************************
-AC_FUNC_CHOWN
-AC_FUNC_ERROR_AT_LINE
-AC_FUNC_FORK
-AC_PROG_GCC_TRADITIONAL
-AC_FUNC_MALLOC
-AC_FUNC_MEMCMP
-AC_FUNC_REALLOC
-AC_FUNC_SELECT_ARGTYPES
-AC_TYPE_SIGNAL
-AC_FUNC_STAT
-AC_FUNC_UTIME_NULL
-AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([bzero floor gethostbyname gethrtime gettimeofday \
-  inet_ntoa memset mkdir pathconf pow regcomp select setlocale socket \
-  strchr strdup strerror strrchr strstr strtol utime])
-
-dnl *****************************************
-dnl Check for header files
-dnl *****************************************
-SFLPHONE_LIBS="$SFLPHONE_LIBS"
-
-dnl Check for GNU ccRTP
-PKG_PROG_PKG_CONFIG
+	dnl ********************************
+	dnl Check for needed functions
+	dnl ********************************
+	AC_FUNC_CHOWN
+	AC_FUNC_ERROR_AT_LINE
+	AC_FUNC_FORK
+	AC_PROG_GCC_TRADITIONAL
+	AC_FUNC_MALLOC
+	AC_FUNC_MEMCMP
+	AC_FUNC_REALLOC
+	AC_FUNC_SELECT_ARGTYPES
+	AC_TYPE_SIGNAL
+	AC_FUNC_STAT
+	AC_FUNC_UTIME_NULL
+	AC_FUNC_VPRINTF
+	AC_CHECK_FUNCS([bzero floor gethostbyname gethrtime gettimeofday \
+			inet_ntoa memset mkdir pathconf pow regcomp select setlocale socket \
+			strchr strdup strerror strrchr strstr strtol utime])
+
+	dnl *****************************************
+	dnl Check for header files
+	dnl *****************************************
+	SFLPHONE_LIBS="$SFLPHONE_LIBS"
+
+	dnl Check for GNU ccRTP
+	PKG_PROG_PKG_CONFIG
 
 #Trying to set PJSIP using pkg-config
 #PKG_CHECK_MODULES(SIP, libpj-sfl, have_libpj=true, have_libpj=false)
 #if test "x${have_libpj}" = "xfalse" ; then
- #   AC_MSG_ERROR([PJSIP not found. http://www.pjsip.org/download.htm])
+#   AC_MSG_ERROR([PJSIP not found. http://www.pjsip.org/download.htm])
 #fi
 #AC_SUBST(SIP_CFLAGS)
 
-dnl Check for uuid development package - name: uuid-dev 
-UUID_MIN_VERSION=1.0
-PKG_CHECK_MODULES(UUID, uuid >= ${UUID_MIN_VERSION})
-AC_SUBST(UUID_CFLAGS)
+	dnl Check for uuid development package - name: uuid-dev 
+	UUID_MIN_VERSION=1.0
+	PKG_CHECK_MODULES(UUID, uuid >= ${UUID_MIN_VERSION})
+	AC_SUBST(UUID_CFLAGS)
 AC_SUBST(UUID_LIBS)
 
-dnl Check for alsa development package - name: libasound2-dev 
-LIBASOUND2_MIN_VERSION=1.0
-PKG_CHECK_MODULES(ALSA, alsa >= ${LIBASOUND2_MIN_VERSION})
-AC_SUBST(ALSA_CFLAGS)
+	dnl Check for alsa development package - name: libasound2-dev 
+	LIBASOUND2_MIN_VERSION=1.0
+	PKG_CHECK_MODULES(ALSA, alsa >= ${LIBASOUND2_MIN_VERSION})
+	AC_SUBST(ALSA_CFLAGS)
 AC_SUBST(ALSA_LIBS)
 
-dnl Check for pulseaudio development package - name: libpulse-dev 
-LIBPULSE_MIN_VERSION=0.9.6
-PKG_CHECK_MODULES(PULSEAUDIO, libpulse >= ${LIBPULSE_MIN_VERSION})
-AC_SUBST(PULSEAUDIO_LIBS)
+	dnl Check for pulseaudio development package - name: libpulse-dev 
+	LIBPULSE_MIN_VERSION=0.9.6
+	PKG_CHECK_MODULES(PULSEAUDIO, libpulse >= ${LIBPULSE_MIN_VERSION})
+	AC_SUBST(PULSEAUDIO_LIBS)
 AC_SUBST(PULSEAUDIO_CFLAGS)
 
-dnl Check for the samplerate development package - name: libsamplerate0-dev
-LIBSAMPLERATE_MIN_VERSION=0.1.2
-PKG_CHECK_MODULES(SAMPLERATE, samplerate >= ${LIBSAMPLERATE_MIN_VERSION})
-AC_SUBST(SAMPLERATE_LIBS)
+	dnl Check for the samplerate development package - name: libsamplerate0-dev
+	LIBSAMPLERATE_MIN_VERSION=0.1.2
+	PKG_CHECK_MODULES(SAMPLERATE, samplerate >= ${LIBSAMPLERATE_MIN_VERSION})
+	AC_SUBST(SAMPLERATE_LIBS)
 AC_SUBST(SAMPLERATE_CFLAGS)
 
-LIBCCGNU2_MIN_VERSION=1.3.1
-PKG_CHECK_MODULES(CCGNU2, libccgnu2 >= ${LIBCCGNU2_MIN_VERSION})
-AC_SUBST(CCGNU2_LIBS)
+	LIBCCGNU2_MIN_VERSION=1.3.1
+	PKG_CHECK_MODULES(CCGNU2, libccgnu2 >= ${LIBCCGNU2_MIN_VERSION})
+	AC_SUBST(CCGNU2_LIBS)
 AC_SUBST(CCGNU2_FLAGS)
 
-LIBCCEXT2_MIN_VERSION=1.3.1
-PKG_CHECK_MODULES(CCEXT2, libccext2 >= ${LIBCCEXT2_MIN_VERSION})
-AC_SUBST(CCEXT2_LIBS)
+	LIBCCEXT2_MIN_VERSION=1.3.1
+	PKG_CHECK_MODULES(CCEXT2, libccext2 >= ${LIBCCEXT2_MIN_VERSION})
+	AC_SUBST(CCEXT2_LIBS)
 AC_SUBST(CCEXT2_CFLAGS)
 
-LIBCCRT_MIN_VERSION=1.3.0
-PKG_CHECK_MODULES(CCRTP, libccrtp1 >= ${LIBCCRT_MIN_VERSION})
-AC_SUBST(CCRTP_LIBS)
+	LIBCCRT_MIN_VERSION=1.3.0
+	PKG_CHECK_MODULES(CCRTP, libccrtp1 >= ${LIBCCRT_MIN_VERSION})
+	AC_SUBST(CCRTP_LIBS)
 AC_SUBST(CCRTP_CFLAGS)
 
 dnl DBus-C++ detection (used to be in library own build system)
-DBUS_REQUIRED_VERSION=0.60
-PKG_CHECK_MODULES(dbus, [dbus-1 >= $DBUS_REQUIRED_VERSION],,
-	AC_MSG_ERROR([You need the DBus libraries (version 0.6 or better)]
-	[http://gitorious.org/dbus-cplusplus])
-)
-AC_SUBST(dbus_CFLAGS)
+	DBUS_REQUIRED_VERSION=0.60
+	PKG_CHECK_MODULES(dbus, [dbus-1 >= $DBUS_REQUIRED_VERSION],,
+			AC_MSG_ERROR([You need the DBus libraries (version 0.6 or better)]
+				[http://gitorious.org/dbus-cplusplus])
+			)
+	AC_SUBST(dbus_CFLAGS)
 AC_SUBST(dbus_LIBS)
 
-DBUS_API_STABLE_VERSION=1.0.0
-PKG_CHECK_EXISTS([dbus-1 < $DBUS_API_STABLE_VERSION],
-	[AC_DEFINE(DBUS_API_SUBJECT_TO_CHANGE, , [unstable DBus])]
-)
-
-DBUS_THREADS_INIT_DEFAULT_VERSION=0.93
-PKG_CHECK_EXISTS([dbus-1 >= $DBUS_THREADS_INIT_DEFAULT_VERSION],
-	[AC_DEFINE(DBUS_HAS_THREADS_INIT_DEFAULT, , [dbus_threads_init_default (needs DBus >= 0.93)])]
-)
-
-DBUS_RECURSIVE_MUTEX_VERSION=0.95
-PKG_CHECK_EXISTS([dbus-1 >= $DBUS_RECURSIVE_MUTEX_VERSION],
-	[AC_DEFINE(DBUS_HAS_RECURSIVE_MUTEX, , [DBus supports recursive mutexes (needs DBus >= 0.95)])]
-)
-
-#AC_ARG_ENABLE(dbus-debug,
-#	AS_HELP_STRING([--enable-dbus-debug],
-#		[enable debugging support]),
-#	[enable_debug=$enableval],
-#	[enable_debug=no]
-#)
-
-#if test "$enable_debug" = "yes" ; then
-#	CXXFLAGS="$CXXFLAGS -Wall -ggdb -O0"
-#	AC_DEFINE(DEBUG, 1, [Define to enable debug build])
-#else
-#	CXXFLAGS="$CXXFLAGS -Wall -O3"
-#fi
-
-
-if test "$enable_glib" = "yes" ; then
-PKG_CHECK_MODULES([glib], glib-2.0)
-AC_SUBST(glib_CFLAGS)
-AC_SUBST(glib_LIBS)
-AM_CONDITIONAL(ENABLE_GLIB, test 1 = 1)
+	DBUS_API_STABLE_VERSION=1.0.0
+	PKG_CHECK_EXISTS([dbus-1 < $DBUS_API_STABLE_VERSION],
+			[AC_DEFINE(DBUS_API_SUBJECT_TO_CHANGE, , [unstable DBus])]
+			)
+
+	DBUS_THREADS_INIT_DEFAULT_VERSION=0.93
+	PKG_CHECK_EXISTS([dbus-1 >= $DBUS_THREADS_INIT_DEFAULT_VERSION],
+			[AC_DEFINE(DBUS_HAS_THREADS_INIT_DEFAULT, , [dbus_threads_init_default (needs DBus >= 0.93)])]
+			)
+
+	DBUS_RECURSIVE_MUTEX_VERSION=0.95
+	PKG_CHECK_EXISTS([dbus-1 >= $DBUS_RECURSIVE_MUTEX_VERSION],
+			[AC_DEFINE(DBUS_HAS_RECURSIVE_MUTEX, , [DBus supports recursive mutexes (needs DBus >= 0.95)])]
+			)
+
+
+	AC_ARG_WITH(debug,
+			AS_HELP_STRING(
+				[--with-debug],
+				[Set 'full' to enable debugging information @<:@default=no@:>@]
+				),
+			[with_debug=${withval}],
+			[with_debug=no]
+			)
+	if test "x$with_debug" = "xfull" -o "x$with_debug" = "xyes"; then
+	CXXFLAGS="$USE_EXCEPTIONS $USER_INCLUDES -g -O0 -Wno-return-type"
+	else
+	CXXFLAGS="-g -Wall -O2"
+	fi
+
+
+
+	if test "$enable_glib" = "yes" ; then
+	PKG_CHECK_MODULES([glib], glib-2.0)
+	AC_SUBST(glib_CFLAGS)
+	AC_SUBST(glib_LIBS)
+	AM_CONDITIONAL(ENABLE_GLIB, test 1 = 1)
 PKG_CHECK_MODULES([gtkmm], gtkmm-2.4,
-	AM_CONDITIONAL(HAVE_GTKMM, test 1 = 1),
-	AM_CONDITIONAL(HAVE_GTKMM, test 0 = 1)
-)
-AC_SUBST(gtkmm_CFLAGS)
+		AM_CONDITIONAL(HAVE_GTKMM, test 1 = 1),
+		AM_CONDITIONAL(HAVE_GTKMM, test 0 = 1)
+		)
+	AC_SUBST(gtkmm_CFLAGS)
 AC_SUBST(gtkmm_LIBS)
-else
-AM_CONDITIONAL(ENABLE_GLIB, test 0 = 1)
+	else
+	AM_CONDITIONAL(ENABLE_GLIB, test 0 = 1)
 AM_CONDITIONAL(HAVE_GTKMM, test 0 = 1)
-fi
+	fi
 
 AC_CHECK_LIB([expat], XML_ParserCreate_MM,
-   	[AC_CHECK_HEADERS(expat.h, have_expat=true, have_expat=false)],
-	have_expat=false)
+		[AC_CHECK_HEADERS(expat.h, have_expat=true, have_expat=false)],
+		have_expat=false)
 
 if ! $have_expat; then
-	AC_MSG_ERROR([You need the eXpat xml parser]
+AC_MSG_ERROR([You need the eXpat xml parser]
 		[http://expat.sourceforge.net/])
 fi
 
 xml_CFLAGS=
 xml_LIBS=-lexpat
 
-AC_SUBST(xml_CFLAGS)
+	AC_SUBST(xml_CFLAGS)
 AC_SUBST(xml_LIBS)
 
 AC_CHECK_LIB([pthread], pthread_create,
-	[AC_CHECK_HEADERS(pthread.h, have_pthread=true, have_pthread=false)],
-	have_pthread=false)
+		[AC_CHECK_HEADERS(pthread.h, have_pthread=true, have_pthread=false)],
+		have_pthread=false)
 
-if test "$have_pthread" = "false"; then
-	AC_MSG_ERROR([You need the POSIX Thread library (pthreads)])	
-fi
+	if test "$have_pthread" = "false"; then
+AC_MSG_ERROR([You need the POSIX Thread library (pthreads)])	
+	fi
 
 # For the tools/, we need libdbus-c++ for the "build" architecture as well
 
-AM_CONDITIONAL(CROSS_COMPILING, test "$cross_compiling" = "yes")
+	AM_CONDITIONAL(CROSS_COMPILING, test "$cross_compiling" = "yes")
 
-AC_ARG_WITH(build-libdbus-cxx,
-	AS_HELP_STRING([--with-build-libdbus-cxx],
-	[For cross compilation: path to libdbus-cxx which was compiled for the 'build' system.]),
-	[ BUILD_LIBDBUS_CXX_DIR=${withval} ],
-	[ BUILD_LIBDBUS_CXX_DIR="\$(top_builddir)" ]
-)
+	AC_ARG_WITH(build-libdbus-cxx,
+			AS_HELP_STRING([--with-build-libdbus-cxx],
+				[For cross compilation: path to libdbus-cxx which was compiled for the 'build' system.]),
+			[ BUILD_LIBDBUS_CXX_DIR=${withval} ],
+			[ BUILD_LIBDBUS_CXX_DIR="\$(top_builddir)" ]
+			)
 AC_SUBST(BUILD_LIBDBUS_CXX_DIR)
 
-dnl Check for libcppunit-dev
-CPPUNIT_MIN_VERSION=1.12
-PKG_CHECK_MODULES(CPPUNIT, cppunit >= ${CPPUNIT_MIN_VERSION}, AM_CONDITIONAL(BUILD_TEST, test 1 = 1 ), AM_CONDITIONAL(BUILD_TEST, test 0 = 1 ))
+	dnl Check for libcppunit-dev
+	CPPUNIT_MIN_VERSION=1.12
+	PKG_CHECK_MODULES(CPPUNIT, cppunit >= ${CPPUNIT_MIN_VERSION}, AM_CONDITIONAL(BUILD_TEST, test 1 = 1 ), AM_CONDITIONAL(BUILD_TEST, test 0 = 1 ))
 AC_SUBST(CPPUNIT_LIBS)
 
 # check for libgsm1 (doesn't use pkg-config)
-dnl Check for libgsm
+	dnl Check for libgsm
 AC_ARG_WITH([gsm],
-  [AS_HELP_STRING([--without-gsm],
-    [disable support for gsm codec])],
-  [],
-  [with_gsm=yes])
+		[AS_HELP_STRING([--without-gsm],
+			[disable support for gsm codec])],
+		[],
+		[with_gsm=yes])
 
 LIBGSM=
 AS_IF([test "x$with_gsm" != xno],
-  [AC_CHECK_HEADER([gsm/gsm.h], , AC_MSG_FAILURE([Unable to find the libgsm1 headers (you may need to install the dev package).  You may use --without-gsm to compile without gsm codec support.]))]
-  [AC_CHECK_LIB([gsm], [gsm_decode],
-    [],
-    [AC_MSG_FAILURE(
-       [libgsm link test failed.   You may use --without-gsm to compile without gsm codec support.])]
-       )
-   ]
-   )
-    
+		[AC_CHECK_HEADER([gsm/gsm.h], , AC_MSG_FAILURE([Unable to find the libgsm1 headers (you may need to install the dev package).  You may use --without-gsm to compile without gsm codec support.]))]
+		[AC_CHECK_LIB([gsm], [gsm_decode],
+			[],
+			[AC_MSG_FAILURE(
+				[libgsm link test failed.   You may use --without-gsm to compile without gsm codec support.])]
+			)
+		]
+	 )
+
 AC_DEFINE([HAVE_GSM], test "x$with_gsm" = "xyes", [Define if you have libgsm])
 AM_CONDITIONAL(BUILD_GSM, test "x$with_gsm" = "xyes" )
 
-dnl Check for libspeex
+	dnl Check for libspeex
 AC_ARG_WITH([speex],
-  [AS_HELP_STRING([--without-speex],
-    [disable support for speex codec])],
-  [],
-  [with_speex=yes])
+		[AS_HELP_STRING([--without-speex],
+			[disable support for speex codec])],
+		[],
+		[with_speex=yes])
 
 AS_IF([test "x$with_speex" != xno],
-  [AC_CHECK_HEADER([speex/speex.h], , AC_MSG_FAILURE([Unable to find the libspeex headers (you may need to install the dev package).  You may use --without-speex to compile without speex codec support.]))]
-  [AC_CHECK_HEADER([speex/speex_preprocess.h], , AC_MSG_FAILURE([Unable to find the libspeexdsp headers (you may need to install the libspeexdsp-dev package).  You may use --without-speex to compile without speex codec support.]))]
-  [AC_CHECK_LIB([speex], [speex_decode_int],
-    [],
-    [AC_MSG_FAILURE(
-       [libspeex link test failed.   You may use --without-speex to compile without speex codec support.])]
-       )
-  ]
-dnl More advanced check in case the libspeexdsp is not installed
-AC_SEARCH_LIBS(speex_preprocess_run, speexdsp, HAVE_SPEEXDSP="yes", HAVE_SPEEXDSP="no", [])
-)
+		[AC_CHECK_HEADER([speex/speex.h], , AC_MSG_FAILURE([Unable to find the libspeex headers (you may need to install the dev package).  You may use --without-speex to compile without speex codec support.]))]
+		[AC_CHECK_HEADER([speex/speex_preprocess.h], , AC_MSG_FAILURE([Unable to find the libspeexdsp headers (you may need to install the libspeexdsp-dev package).  You may use --without-speex to compile without speex codec support.]))]
+		[AC_CHECK_LIB([speex], [speex_decode_int],
+			[],
+			[AC_MSG_FAILURE(
+				[libspeex link test failed.   You may use --without-speex to compile without speex codec support.])]
+			)
+		]
+		dnl More advanced check in case the libspeexdsp is not installed
+		AC_SEARCH_LIBS(speex_preprocess_run, speexdsp, HAVE_SPEEXDSP="yes", HAVE_SPEEXDSP="no", [])
+	 )
 
 AC_DEFINE([HAVE_SPEEX], test "x$with_speex" = "xyes", [Define if you have libspeex])
-AM_CONDITIONAL(BUILD_SPEEX, test "x$with_speex" = "xyes" )
+	AM_CONDITIONAL(BUILD_SPEEX, test "x$with_speex" = "xyes" )
 AM_CONDITIONAL(ENABLE_SPEEXDSP, test  $HAVE_SPEEXDSP = yes)
 
-dnl Check for celt. Compile it only if a recent enough version is found
-LIBCELT_MIN_VERSION=0.5.1
+	dnl Check for celt. Compile it only if a recent enough version is found
+	LIBCELT_MIN_VERSION=0.5.1
 PKG_CHECK_MODULES(CELT, celt >= ${LIBCELT_MIN_VERSION}, AM_CONDITIONAL(BUILD_CELT, test 1 = 1 ), AM_CONDITIONAL(BUILD_CELT, test 0 = 1 ))
-    
-dnl Check for ilbc support
+
+	dnl Check for ilbc support
 AC_ARG_WITH([ilbc],
-  [AS_HELP_STRING([--without-ilbc],
-    [disable support for the ilbc codec])],
-  [],
-  [with_ilbc=no])
+		[AS_HELP_STRING([--without-ilbc],
+			[disable support for the ilbc codec])],
+		[],
+		[with_ilbc=no])
 
 AM_CONDITIONAL(BUILD_ILBC, test "x$with_ilbc" = "xyes" )
 
-dnl Check for IAX
+	dnl Check for IAX
 AC_ARG_WITH([iax2],
-  [AS_HELP_STRING([--without-iax2],
-    [disable support for the iax2 protocol])],
-  [],
-  [with_iax2=yes])
+		[AS_HELP_STRING([--without-iax2],
+			[disable support for the iax2 protocol])],
+		[],
+		[with_iax2=yes])
 
 AC_DEFINE([HAVE_IAX], test "x$with_iax2" = "xyes", [Define if you have libiax2])
 AM_CONDITIONAL(USE_IAX, test "x$with_iax2" = "xyes" )
@@ -356,56 +358,56 @@ AM_CONDITIONAL(USE_IAX, test "x$with_iax2" = "xyes" )
 # check for doxygen, mostly stolen from http://log4cpp.sourceforge.net/
 # ----------------------------------------------------------------------------
 AC_DEFUN([BB_ENABLE_DOXYGEN],
-[
-AC_ARG_ENABLE(doxygen, [  --enable-doxygen        enable documentation generation with doxygen (auto)])
-AC_ARG_ENABLE(dot, [  --enable-dot            use 'dot' to generate graphs in doxygen (auto)])              
-AC_ARG_ENABLE(html-docs, [  --enable-html-docs      enable HTML generation with doxygen (yes)], [], [ enable_html_docs=yes])              
-AC_ARG_ENABLE(latex-docs, [  --enable-latex-docs     enable LaTeX documentation generation with doxygen (no)], [], [ enable_latex_docs=no])              
-if test "x$enable_doxygen" = xno; then
-        enable_doc=no
-else 
-        AC_PATH_PROG(DOXYGEN, doxygen, , $PATH)
-        if test x$DOXYGEN = x; then
-                if test "x$enable_doxygen" = xyes; then
-                        AC_MSG_ERROR([could not find doxygen])
-                fi
-                enable_doc=no
-        else
-                enable_doc=yes
-                AC_PATH_PROG(DOT, dot, , $PATH)
-        fi
-fi
-AM_CONDITIONAL(DOC, test x$enable_doc = xyes)
-
-if test x$DOT = x; then
-        if test "x$enable_dot" = xyes; then
-                AC_MSG_ERROR([could not find dot])
-        fi
-        enable_dot=no
-else
-        enable_dot=yes
-fi
-AM_CONDITIONAL(ENABLE_DOXYGEN, test x$enable_doc = xtrue)
-AC_SUBST(enable_dot)
-AC_SUBST(enable_html_docs)
+		[
+		AC_ARG_ENABLE(doxygen, [  --enable-doxygen        enable documentation generation with doxygen (auto)])
+		AC_ARG_ENABLE(dot, [  --enable-dot            use 'dot' to generate graphs in doxygen (auto)])              
+		AC_ARG_ENABLE(html-docs, [  --enable-html-docs      enable HTML generation with doxygen (yes)], [], [ enable_html_docs=yes])              
+		AC_ARG_ENABLE(latex-docs, [  --enable-latex-docs     enable LaTeX documentation generation with doxygen (no)], [], [ enable_latex_docs=no])              
+		if test "x$enable_doxygen" = xno; then
+		enable_doc=no
+		else 
+		AC_PATH_PROG(DOXYGEN, doxygen, , $PATH)
+		if test x$DOXYGEN = x; then
+		if test "x$enable_doxygen" = xyes; then
+		AC_MSG_ERROR([could not find doxygen])
+		fi
+		enable_doc=no
+		else
+		enable_doc=yes
+		AC_PATH_PROG(DOT, dot, , $PATH)
+		fi
+		fi
+		AM_CONDITIONAL(DOC, test x$enable_doc = xyes)
+
+	if test x$DOT = x; then
+	if test "x$enable_dot" = xyes; then
+AC_MSG_ERROR([could not find dot])
+	fi
+	enable_dot=no
+	else
+	enable_dot=yes
+	fi
+	AM_CONDITIONAL(ENABLE_DOXYGEN, test x$enable_doc = xtrue)
+	AC_SUBST(enable_dot)
+	AC_SUBST(enable_html_docs)
 AC_SUBST(enable_latex_docs)
-])
+	])
 # Acutally perform the doxygen check
-BB_ENABLE_DOXYGEN
+	BB_ENABLE_DOXYGEN
 
-dnl Datadir directory
-sflphone_datadir=$datadir/sflphone
+	dnl Datadir directory
+	sflphone_datadir=$datadir/sflphone
 AC_SUBST(sflphone_datadir)
 
-dnl Dbus Service activation part
-DBUS_SERVICES_DIR="$datadir/dbus-1/services"
+	dnl Dbus Service activation part
+	DBUS_SERVICES_DIR="$datadir/dbus-1/services"
 AC_SUBST(DBUS_SERVICES_DIR)
-AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services dir for DBUS is])
+	AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services dir for DBUS is])
 
 # Go!
-AC_SUBST(SFLPHONE_CFLAGS)
+	AC_SUBST(SFLPHONE_CFLAGS)
 AC_SUBST(SFLPHONE_LIBS)
-AC_OUTPUT
-AC_MSG_NOTICE([[Configuration done! Please make sure that pjsip library (libs/pjproject-1.0.2) has already been compiled. Run `make' to build the software.]])
+	AC_OUTPUT
+	AC_MSG_NOTICE([[Configuration done! Please make sure that pjsip library (libs/pjproject-1.0.3) has already been compiled. Run `make' to build the software.]])
 
 
diff --git a/sflphone-common/globals.mak b/sflphone-common/globals.mak
index e6f165a1ac990f1dd0872e18d732a3e84afa8448..51fe32ac486c133abdf074e4ff5312dd3df4602a 100644
--- a/sflphone-common/globals.mak
+++ b/sflphone-common/globals.mak
@@ -6,7 +6,7 @@ sflplugindir=$(DESTDIR)$(libdir)/sflphone/plugins
 ASTYLERC="../astylerc"
 indent="/usr/bin/astyle"
 
-PJSIP_VERSION="1.0.2"
+PJSIP_VERSION="1.0.3"
 
 # for pjsip
 PJSIP_LIBS= \
diff --git a/sflphone-common/libs/dbus-c++/include/dbus-c++/eventloop.h b/sflphone-common/libs/dbus-c++/include/dbus-c++/eventloop.h
index f7d0f6d8c654033ababf55bdddc57e9a45b2d8e5..cb3382beaa1cf0356dc8798a10c035c02b4e1004 100644
--- a/sflphone-common/libs/dbus-c++/include/dbus-c++/eventloop.h
+++ b/sflphone-common/libs/dbus-c++/include/dbus-c++/eventloop.h
@@ -30,6 +30,7 @@
 
 #include "api.h"
 #include "util.h"
+#include "error.h"
 
 namespace DBus {
 
@@ -149,6 +150,8 @@ public:
 
 	virtual void dispatch();
 
+    virtual void terminate();
+    
 private:
 
 	DefaultMutex _mutex_t;
@@ -156,6 +159,8 @@ private:
 
 	DefaultMutex _mutex_w;
 	DefaultWatches _watches;
+	
+	int _terminateFd[2];
 
 friend class DefaultTimeout;
 friend class DefaultWatch;
diff --git a/sflphone-common/libs/dbus-c++/src/eventloop-integration.cpp b/sflphone-common/libs/dbus-c++/src/eventloop-integration.cpp
index ec82dd22bd2ea97e34cfe55c0c2f25f083c5bb73..6947f28130fa5d27e4b83038246626c0a1b1ba9a 100644
--- a/sflphone-common/libs/dbus-c++/src/eventloop-integration.cpp
+++ b/sflphone-common/libs/dbus-c++/src/eventloop-integration.cpp
@@ -86,6 +86,7 @@ void BusDispatcher::enter()
 void BusDispatcher::leave()
 {
     _running = false;
+    terminate();
 }
 
 void BusDispatcher::do_iteration()
diff --git a/sflphone-common/libs/dbus-c++/src/eventloop.cpp b/sflphone-common/libs/dbus-c++/src/eventloop.cpp
index 656885aa1059595043af199bcf1adb103b6623d2..30a5d6b8c37fce1e6e80d4aa99faa430a2ecc612 100644
--- a/sflphone-common/libs/dbus-c++/src/eventloop.cpp
+++ b/sflphone-common/libs/dbus-c++/src/eventloop.cpp
@@ -30,6 +30,7 @@
 
 #include <sys/poll.h>
 #include <sys/time.h>
+#include <unistd.h> 
 
 #include <dbus/dbus.h>
 
@@ -97,6 +98,9 @@ void DefaultMutex::unlock()
 
 DefaultMainLoop::DefaultMainLoop()
 {
+    if(pipe(_terminateFd) < 0) {
+        throw ErrorFailed ("unable to create unamed pipe");
+    }  
 }
 
 DefaultMainLoop::~DefaultMainLoop()
@@ -129,15 +133,23 @@ DefaultMainLoop::~DefaultMainLoop()
         ti = tmp;
     }
 
+    close(_terminateFd[0]);
+    close(_terminateFd[1]);
+    
     _mutex_t.unlock();
 }
 
-void DefaultMainLoop::dispatch()
+void DefaultMainLoop::terminate() 
 {
-    _mutex_w.lock();
+    write(_terminateFd[1], " ", 1);
+}
 
-    int nfd = _watches.size();
+void DefaultMainLoop::dispatch()
+{    
+    _mutex_w.lock();
 
+    int nfd = _watches.size() + 1;
+    
     pollfd fds[nfd];
 
     DefaultWatches::iterator wi = _watches.begin();
@@ -152,6 +164,10 @@ void DefaultMainLoop::dispatch()
         }
     }
 
+    fds[nfd].fd = _terminateFd[0];
+    fds[nfd].events = POLLIN;
+    fds[nfd].revents = 0;
+        
     _mutex_w.unlock();
 
     int wait_min = 10000;
@@ -167,7 +183,7 @@ void DefaultMainLoop::dispatch()
 
     _mutex_t.unlock();
 
-    poll (fds, nfd, wait_min);
+    poll (fds, nfd+1, wait_min);
 
     timeval now;
     gettimeofday (&now, NULL);
diff --git a/sflphone-common/libs/pjproject-1.0.2/build/os-auto.mak b/sflphone-common/libs/pjproject-1.0.2/build/os-auto.mak
deleted file mode 100644
index f88de8f7e39bf8bb66fbe8975178b957c9e01ed1..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject-1.0.2/build/os-auto.mak
+++ /dev/null
@@ -1,11 +0,0 @@
-# build/os-auto.mak.  Generated from os-auto.mak.in by configure.
-
-export OS_CFLAGS   := $(CC_DEF)PJ_AUTOCONF=1 -O2
-
-export OS_CXXFLAGS := $(CC_DEF)PJ_AUTOCONF=1 -O2 
-
-export OS_LDFLAGS  :=  -lm -luuid -lnsl -lrt -lpthread  -lasound
-
-export OS_SOURCES  := 
-
-
diff --git a/sflphone-common/libs/pjproject-1.0.2/config.log b/sflphone-common/libs/pjproject-1.0.2/config.log
deleted file mode 100644
index dc4f10f2c3fed3bb85071163efb239158e1b3ec2..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject-1.0.2/config.log
+++ /dev/null
@@ -1,2905 +0,0 @@
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by pjproject aconfigure 1.0, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  $ ./aconfigure 
-
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = emilou-desktop
-uname -m = x86_64
-uname -r = 2.6.28-11-generic
-uname -s = Linux
-uname -v = #42-Ubuntu SMP Fri Apr 17 01:58:03 UTC 2009
-
-/usr/bin/uname -p = unknown
-/bin/uname -X     = unknown
-
-/bin/arch              = unknown
-/usr/bin/arch -k       = unknown
-/usr/convex/getsysinfo = unknown
-hostinfo               = unknown
-/bin/machine           = unknown
-/usr/bin/oslevel       = unknown
-/bin/universe          = unknown
-
-PATH: /usr/local/sbin
-PATH: /usr/local/bin
-PATH: /usr/sbin
-PATH: /usr/bin
-PATH: /sbin
-PATH: /bin
-PATH: /usr/games
-PATH: /usr/local/share/OpenSceneGraph/bin
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-aconfigure:1377: checking build system type
-aconfigure:1395: result: x86_64-unknown-linux-gnu
-aconfigure:1403: checking host system type
-aconfigure:1417: result: x86_64-unknown-linux-gnu
-aconfigure:1425: checking target system type
-aconfigure:1439: result: x86_64-unknown-linux-gnu
-aconfigure:1513: checking for gcc
-aconfigure:1529: found /usr/bin/gcc
-aconfigure:1539: result: gcc
-aconfigure:1783: checking for C compiler version
-aconfigure:1786: gcc --version </dev/null >&5
-gcc (Ubuntu 4.3.3-5ubuntu4) 4.3.3
-Copyright (C) 2008 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-aconfigure:1789: $? = 0
-aconfigure:1791: gcc -v </dev/null >&5
-Using built-in specs.
-Target: x86_64-linux-gnu
-Configured with: ../src/configure -v --with-pkgversion='Ubuntu 4.3.3-5ubuntu4' --with-bugurl=file:///usr/share/doc/gcc-4.3/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --with-gxx-include-dir=/usr/include/c++/4.3 --program-suffix=-4.3 --enable-clocale=gnu --enable-libstdcxx-debug --enable-objc-gc --enable-mpfr --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu
-Thread model: posix
-gcc version 4.3.3 (Ubuntu 4.3.3-5ubuntu4) 
-aconfigure:1794: $? = 0
-aconfigure:1796: gcc -V </dev/null >&5
-gcc: '-V' option must have argument
-aconfigure:1799: $? = 1
-aconfigure:1822: checking for C compiler default output file name
-aconfigure:1825: gcc -O2   conftest.c  >&5
-aconfigure:1828: $? = 0
-aconfigure:1874: result: a.out
-aconfigure:1879: checking whether the C compiler works
-aconfigure:1885: ./a.out
-aconfigure:1888: $? = 0
-aconfigure:1905: result: yes
-aconfigure:1912: checking whether we are cross compiling
-aconfigure:1914: result: no
-aconfigure:1917: checking for suffix of executables
-aconfigure:1919: gcc -o conftest -O2   conftest.c  >&5
-aconfigure:1922: $? = 0
-aconfigure:1947: result: 
-aconfigure:1953: checking for suffix of object files
-aconfigure:1974: gcc -c -O2  conftest.c >&5
-aconfigure:1977: $? = 0
-aconfigure:1999: result: o
-aconfigure:2003: checking whether we are using the GNU C compiler
-aconfigure:2027: gcc -c -O2  conftest.c >&5
-aconfigure:2033: $? = 0
-aconfigure:2037: test -z 
-			 || test ! -s conftest.err
-aconfigure:2040: $? = 0
-aconfigure:2043: test -s conftest.o
-aconfigure:2046: $? = 0
-aconfigure:2059: result: yes
-aconfigure:2065: checking whether gcc accepts -g
-aconfigure:2086: gcc -c -g  conftest.c >&5
-aconfigure:2092: $? = 0
-aconfigure:2096: test -z 
-			 || test ! -s conftest.err
-aconfigure:2099: $? = 0
-aconfigure:2102: test -s conftest.o
-aconfigure:2105: $? = 0
-aconfigure:2116: result: yes
-aconfigure:2133: checking for gcc option to accept ANSI C
-aconfigure:2203: gcc  -c -O2  conftest.c >&5
-aconfigure:2209: $? = 0
-aconfigure:2213: test -z 
-			 || test ! -s conftest.err
-aconfigure:2216: $? = 0
-aconfigure:2219: test -s conftest.o
-aconfigure:2222: $? = 0
-aconfigure:2240: result: none needed
-aconfigure:2258: gcc -c -O2  conftest.c >&5
-conftest.c:2: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'me'
-aconfigure:2264: $? = 1
-aconfigure: failed program was:
-| #ifndef __cplusplus
-|   choke me
-| #endif
-aconfigure:2449: checking for g++
-aconfigure:2465: found /usr/bin/g++
-aconfigure:2475: result: g++
-aconfigure:2491: checking for C++ compiler version
-aconfigure:2494: g++ --version </dev/null >&5
-g++ (Ubuntu 4.3.3-5ubuntu4) 4.3.3
-Copyright (C) 2008 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-aconfigure:2497: $? = 0
-aconfigure:2499: g++ -v </dev/null >&5
-Using built-in specs.
-Target: x86_64-linux-gnu
-Configured with: ../src/configure -v --with-pkgversion='Ubuntu 4.3.3-5ubuntu4' --with-bugurl=file:///usr/share/doc/gcc-4.3/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --with-gxx-include-dir=/usr/include/c++/4.3 --program-suffix=-4.3 --enable-clocale=gnu --enable-libstdcxx-debug --enable-objc-gc --enable-mpfr --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu
-Thread model: posix
-gcc version 4.3.3 (Ubuntu 4.3.3-5ubuntu4) 
-aconfigure:2502: $? = 0
-aconfigure:2504: g++ -V </dev/null >&5
-g++: '-V' option must have argument
-aconfigure:2507: $? = 1
-aconfigure:2510: checking whether we are using the GNU C++ compiler
-aconfigure:2534: g++ -c -O2   conftest.cc >&5
-aconfigure:2540: $? = 0
-aconfigure:2544: test -z 
-			 || test ! -s conftest.err
-aconfigure:2547: $? = 0
-aconfigure:2550: test -s conftest.o
-aconfigure:2553: $? = 0
-aconfigure:2566: result: yes
-aconfigure:2572: checking whether g++ accepts -g
-aconfigure:2593: g++ -c -g  conftest.cc >&5
-aconfigure:2599: $? = 0
-aconfigure:2603: test -z 
-			 || test ! -s conftest.err
-aconfigure:2606: $? = 0
-aconfigure:2609: test -s conftest.o
-aconfigure:2612: $? = 0
-aconfigure:2623: result: yes
-aconfigure:2665: g++ -c -O2   conftest.cc >&5
-aconfigure:2671: $? = 0
-aconfigure:2675: test -z 
-			 || test ! -s conftest.err
-aconfigure:2678: $? = 0
-aconfigure:2681: test -s conftest.o
-aconfigure:2684: $? = 0
-aconfigure:2710: g++ -c -O2   conftest.cc >&5
-conftest.cc: In function 'int main()':
-conftest.cc:13: error: 'exit' was not declared in this scope
-aconfigure:2716: $? = 1
-aconfigure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "pjproject"
-| #define PACKAGE_TARNAME "pjproject"
-| #define PACKAGE_VERSION "1.0"
-| #define PACKAGE_STRING "pjproject 1.0"
-| #define PACKAGE_BUGREPORT ""
-| /* end confdefs.h.  */
-| 
-| int
-| main ()
-| {
-| exit (42);
-|   ;
-|   return 0;
-| }
-aconfigure:2665: g++ -c -O2   conftest.cc >&5
-conftest.cc:9: error: 'void std::exit(int)' should have been declared inside 'std'
-aconfigure:2671: $? = 1
-aconfigure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "pjproject"
-| #define PACKAGE_TARNAME "pjproject"
-| #define PACKAGE_VERSION "1.0"
-| #define PACKAGE_STRING "pjproject 1.0"
-| #define PACKAGE_BUGREPORT ""
-| /* end confdefs.h.  */
-| extern "C" void std::exit (int) throw (); using std::exit;
-| #include <stdlib.h>
-| int
-| main ()
-| {
-| exit (42);
-|   ;
-|   return 0;
-| }
-aconfigure:2665: g++ -c -O2   conftest.cc >&5
-conftest.cc:9: error: 'void std::exit(int)' should have been declared inside 'std'
-In file included from conftest.cc:10:
-/usr/include/stdlib.h:531: error: declaration of 'void std::exit(int) throw ()' throws different exceptions
-conftest.cc:9: error: from previous declaration 'void std::exit(int)'
-aconfigure:2671: $? = 1
-aconfigure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "pjproject"
-| #define PACKAGE_TARNAME "pjproject"
-| #define PACKAGE_VERSION "1.0"
-| #define PACKAGE_STRING "pjproject 1.0"
-| #define PACKAGE_BUGREPORT ""
-| /* end confdefs.h.  */
-| extern "C" void std::exit (int); using std::exit;
-| #include <stdlib.h>
-| int
-| main ()
-| {
-| exit (42);
-|   ;
-|   return 0;
-| }
-aconfigure:2665: g++ -c -O2   conftest.cc >&5
-aconfigure:2671: $? = 0
-aconfigure:2675: test -z 
-			 || test ! -s conftest.err
-aconfigure:2678: $? = 0
-aconfigure:2681: test -s conftest.o
-aconfigure:2684: $? = 0
-aconfigure:2710: g++ -c -O2   conftest.cc >&5
-aconfigure:2716: $? = 0
-aconfigure:2720: test -z 
-			 || test ! -s conftest.err
-aconfigure:2723: $? = 0
-aconfigure:2726: test -s conftest.o
-aconfigure:2729: $? = 0
-aconfigure:2772: checking for pthread_create in -lpthread
-aconfigure:2802: gcc -o conftest -O2   conftest.c -lpthread   >&5
-aconfigure:2808: $? = 0
-aconfigure:2812: test -z 
-			 || test ! -s conftest.err
-aconfigure:2815: $? = 0
-aconfigure:2818: test -s conftest
-aconfigure:2821: $? = 0
-aconfigure:2834: result: yes
-aconfigure:2846: checking for puts in -lwsock32
-aconfigure:2876: gcc -o conftest -O2   conftest.c -lwsock32  -lpthread  >&5
-conftest.c:20: warning: conflicting types for built-in function 'puts'
-/usr/bin/ld: cannot find -lwsock32
-collect2: ld returned 1 exit status
-aconfigure:2882: $? = 1
-aconfigure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "pjproject"
-| #define PACKAGE_TARNAME "pjproject"
-| #define PACKAGE_VERSION "1.0"
-| #define PACKAGE_STRING "pjproject 1.0"
-| #define PACKAGE_BUGREPORT ""
-| #ifdef __cplusplus
-| extern "C" void exit (int) throw ();
-| #endif
-| #define HAVE_LIBPTHREAD 1
-| /* end confdefs.h.  */
-| 
-| /* Override any gcc2 internal prototype to avoid an error.  */
-| #ifdef __cplusplus
-| extern "C"
-| #endif
-| /* We use char because int might match the return type of a gcc2
-|    builtin and then its argument prototype would still apply.  */
-| char puts ();
-| int
-| main ()
-| {
-| puts ();
-|   ;
-|   return 0;
-| }
-aconfigure:2908: result: no
-aconfigure:2920: checking for puts in -lws2_32
-aconfigure:2950: gcc -o conftest -O2   conftest.c -lws2_32  -lpthread  >&5
-conftest.c:20: warning: conflicting types for built-in function 'puts'
-/usr/bin/ld: cannot find -lws2_32
-collect2: ld returned 1 exit status
-aconfigure:2956: $? = 1
-aconfigure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "pjproject"
-| #define PACKAGE_TARNAME "pjproject"
-| #define PACKAGE_VERSION "1.0"
-| #define PACKAGE_STRING "pjproject 1.0"
-| #define PACKAGE_BUGREPORT ""
-| #ifdef __cplusplus
-| extern "C" void exit (int) throw ();
-| #endif
-| #define HAVE_LIBPTHREAD 1
-| /* end confdefs.h.  */
-| 
-| /* Override any gcc2 internal prototype to avoid an error.  */
-| #ifdef __cplusplus
-| extern "C"
-| #endif
-| /* We use char because int might match the return type of a gcc2
-|    builtin and then its argument prototype would still apply.  */
-| char puts ();
-| int
-| main ()
-| {
-| puts ();
-|   ;
-|   return 0;
-| }
-aconfigure:2982: result: no
-aconfigure:2994: checking for puts in -lole32
-aconfigure:3024: gcc -o conftest -O2   conftest.c -lole32  -lpthread  >&5
-conftest.c:20: warning: conflicting types for built-in function 'puts'
-/usr/bin/ld: cannot find -lole32
-collect2: ld returned 1 exit status
-aconfigure:3030: $? = 1
-aconfigure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "pjproject"
-| #define PACKAGE_TARNAME "pjproject"
-| #define PACKAGE_VERSION "1.0"
-| #define PACKAGE_STRING "pjproject 1.0"
-| #define PACKAGE_BUGREPORT ""
-| #ifdef __cplusplus
-| extern "C" void exit (int) throw ();
-| #endif
-| #define HAVE_LIBPTHREAD 1
-| /* end confdefs.h.  */
-| 
-| /* Override any gcc2 internal prototype to avoid an error.  */
-| #ifdef __cplusplus
-| extern "C"
-| #endif
-| /* We use char because int might match the return type of a gcc2
-|    builtin and then its argument prototype would still apply.  */
-| char puts ();
-| int
-| main ()
-| {
-| puts ();
-|   ;
-|   return 0;
-| }
-aconfigure:3056: result: no
-aconfigure:3068: checking for puts in -lwinmm
-aconfigure:3098: gcc -o conftest -O2   conftest.c -lwinmm  -lpthread  >&5
-conftest.c:20: warning: conflicting types for built-in function 'puts'
-/usr/bin/ld: cannot find -lwinmm
-collect2: ld returned 1 exit status
-aconfigure:3104: $? = 1
-aconfigure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "pjproject"
-| #define PACKAGE_TARNAME "pjproject"
-| #define PACKAGE_VERSION "1.0"
-| #define PACKAGE_STRING "pjproject 1.0"
-| #define PACKAGE_BUGREPORT ""
-| #ifdef __cplusplus
-| extern "C" void exit (int) throw ();
-| #endif
-| #define HAVE_LIBPTHREAD 1
-| /* end confdefs.h.  */
-| 
-| /* Override any gcc2 internal prototype to avoid an error.  */
-| #ifdef __cplusplus
-| extern "C"
-| #endif
-| /* We use char because int might match the return type of a gcc2
-|    builtin and then its argument prototype would still apply.  */
-| char puts ();
-| int
-| main ()
-| {
-| puts ();
-|   ;
-|   return 0;
-| }
-aconfigure:3130: result: no
-aconfigure:3142: checking for puts in -lsocket
-aconfigure:3172: gcc -o conftest -O2   conftest.c -lsocket  -lpthread  >&5
-conftest.c:20: warning: conflicting types for built-in function 'puts'
-/usr/bin/ld: cannot find -lsocket
-collect2: ld returned 1 exit status
-aconfigure:3178: $? = 1
-aconfigure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "pjproject"
-| #define PACKAGE_TARNAME "pjproject"
-| #define PACKAGE_VERSION "1.0"
-| #define PACKAGE_STRING "pjproject 1.0"
-| #define PACKAGE_BUGREPORT ""
-| #ifdef __cplusplus
-| extern "C" void exit (int) throw ();
-| #endif
-| #define HAVE_LIBPTHREAD 1
-| /* end confdefs.h.  */
-| 
-| /* Override any gcc2 internal prototype to avoid an error.  */
-| #ifdef __cplusplus
-| extern "C"
-| #endif
-| /* We use char because int might match the return type of a gcc2
-|    builtin and then its argument prototype would still apply.  */
-| char puts ();
-| int
-| main ()
-| {
-| puts ();
-|   ;
-|   return 0;
-| }
-aconfigure:3204: result: no
-aconfigure:3216: checking for puts in -lrt
-aconfigure:3246: gcc -o conftest -O2   conftest.c -lrt  -lpthread  >&5
-conftest.c:20: warning: conflicting types for built-in function 'puts'
-aconfigure:3252: $? = 0
-aconfigure:3256: test -z 
-			 || test ! -s conftest.err
-aconfigure:3259: $? = 0
-aconfigure:3262: test -s conftest
-aconfigure:3265: $? = 0
-aconfigure:3278: result: yes
-aconfigure:3290: checking for puts in -lnsl
-aconfigure:3320: gcc -o conftest -O2   conftest.c -lnsl  -lrt -lpthread  >&5
-conftest.c:21: warning: conflicting types for built-in function 'puts'
-aconfigure:3326: $? = 0
-aconfigure:3330: test -z 
-			 || test ! -s conftest.err
-aconfigure:3333: $? = 0
-aconfigure:3336: test -s conftest
-aconfigure:3339: $? = 0
-aconfigure:3352: result: yes
-aconfigure:3364: checking for uuid_generate in -luuid
-aconfigure:3394: gcc -o conftest -O2   conftest.c -luuid  -lnsl -lrt -lpthread  >&5
-aconfigure:3400: $? = 0
-aconfigure:3404: test -z 
-			 || test ! -s conftest.err
-aconfigure:3407: $? = 0
-aconfigure:3410: test -s conftest
-aconfigure:3413: $? = 0
-aconfigure:3426: result: yes
-aconfigure:3437: checking for uuid_generate in -luuid
-aconfigure:3499: result: yes
-aconfigure:3506: result: Setting PJ_M_NAME to x86_64
-aconfigure:3513: checking memory alignment
-aconfigure:3521: result: 8 bytes
-aconfigure:3535: checking whether byte ordering is bigendian
-aconfigure:3562: gcc -c -O2  conftest.c >&5
-aconfigure:3568: $? = 0
-aconfigure:3572: test -z 
-			 || test ! -s conftest.err
-aconfigure:3575: $? = 0
-aconfigure:3578: test -s conftest.o
-aconfigure:3581: $? = 0
-aconfigure:3605: gcc -c -O2  conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:25: error: 'not' undeclared (first use in this function)
-conftest.c:25: error: (Each undeclared identifier is reported only once
-conftest.c:25: error: for each function it appears in.)
-conftest.c:25: error: expected ';' before 'big'
-aconfigure:3611: $? = 1
-aconfigure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "pjproject"
-| #define PACKAGE_TARNAME "pjproject"
-| #define PACKAGE_VERSION "1.0"
-| #define PACKAGE_STRING "pjproject 1.0"
-| #define PACKAGE_BUGREPORT ""
-| #ifdef __cplusplus
-| extern "C" void exit (int) throw ();
-| #endif
-| #define HAVE_LIBPTHREAD 1
-| #define HAVE_LIBRT 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_LIBUUID 1
-| #define PJ_M_NAME "x86_64"
-| #define PJ_POOL_ALIGNMENT 8
-| /* end confdefs.h.  */
-| #include <sys/types.h>
-| #include <sys/param.h>
-| 
-| int
-| main ()
-| {
-| #if BYTE_ORDER != BIG_ENDIAN
-|  not big endian
-| #endif
-| 
-|   ;
-|   return 0;
-| }
-aconfigure:3746: result: no
-aconfigure:3829: result: Checking if floating point is disabled... no
-aconfigure:3832: checking for fmod in -lm
-aconfigure:3862: gcc -o conftest -O2   conftest.c -lm  -luuid -lnsl -lrt -lpthread  >&5
-conftest.c:27: warning: conflicting types for built-in function 'fmod'
-aconfigure:3868: $? = 0
-aconfigure:3872: test -z 
-			 || test ! -s conftest.err
-aconfigure:3875: $? = 0
-aconfigure:3878: test -s conftest
-aconfigure:3881: $? = 0
-aconfigure:3894: result: yes
-aconfigure:3914: checking how to run the C preprocessor
-aconfigure:3949: gcc -E  conftest.c
-aconfigure:3955: $? = 0
-aconfigure:3987: gcc -E  conftest.c
-conftest.c:21:28: error: ac_nonexistent.h: No such file or directory
-aconfigure:3993: $? = 1
-aconfigure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "pjproject"
-| #define PACKAGE_TARNAME "pjproject"
-| #define PACKAGE_VERSION "1.0"
-| #define PACKAGE_STRING "pjproject 1.0"
-| #define PACKAGE_BUGREPORT ""
-| #ifdef __cplusplus
-| extern "C" void exit (int) throw ();
-| #endif
-| #define HAVE_LIBPTHREAD 1
-| #define HAVE_LIBRT 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_LIBUUID 1
-| #define PJ_M_NAME "x86_64"
-| #define PJ_POOL_ALIGNMENT 8
-| #define PJ_LINUX 1
-| #define PJ_HAS_FLOATING_POINT 1
-| #define HAVE_LIBM 1
-| /* end confdefs.h.  */
-| #include <ac_nonexistent.h>
-aconfigure:4032: result: gcc -E
-aconfigure:4056: gcc -E  conftest.c
-aconfigure:4062: $? = 0
-aconfigure:4094: gcc -E  conftest.c
-conftest.c:21:28: error: ac_nonexistent.h: No such file or directory
-aconfigure:4100: $? = 1
-aconfigure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "pjproject"
-| #define PACKAGE_TARNAME "pjproject"
-| #define PACKAGE_VERSION "1.0"
-| #define PACKAGE_STRING "pjproject 1.0"
-| #define PACKAGE_BUGREPORT ""
-| #ifdef __cplusplus
-| extern "C" void exit (int) throw ();
-| #endif
-| #define HAVE_LIBPTHREAD 1
-| #define HAVE_LIBRT 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_LIBUUID 1
-| #define PJ_M_NAME "x86_64"
-| #define PJ_POOL_ALIGNMENT 8
-| #define PJ_LINUX 1
-| #define PJ_HAS_FLOATING_POINT 1
-| #define HAVE_LIBM 1
-| /* end confdefs.h.  */
-| #include <ac_nonexistent.h>
-aconfigure:4144: checking for egrep
-aconfigure:4154: result: grep -E
-aconfigure:4159: checking for ANSI C header files
-aconfigure:4184: gcc -c -O2  conftest.c >&5
-aconfigure:4190: $? = 0
-aconfigure:4194: test -z 
-			 || test ! -s conftest.err
-aconfigure:4197: $? = 0
-aconfigure:4200: test -s conftest.o
-aconfigure:4203: $? = 0
-aconfigure:4292: gcc -o conftest -O2   conftest.c -lm -luuid -lnsl -lrt -lpthread  >&5
-conftest.c: In function 'main':
-conftest.c:38: warning: incompatible implicit declaration of built-in function 'exit'
-aconfigure:4295: $? = 0
-aconfigure:4297: ./conftest
-aconfigure:4300: $? = 0
-aconfigure:4315: result: yes
-aconfigure:4339: checking for sys/types.h
-aconfigure:4355: gcc -c -O2  conftest.c >&5
-aconfigure:4361: $? = 0
-aconfigure:4365: test -z 
-			 || test ! -s conftest.err
-aconfigure:4368: $? = 0
-aconfigure:4371: test -s conftest.o
-aconfigure:4374: $? = 0
-aconfigure:4385: result: yes
-aconfigure:4339: checking for sys/stat.h
-aconfigure:4355: gcc -c -O2  conftest.c >&5
-aconfigure:4361: $? = 0
-aconfigure:4365: test -z 
-			 || test ! -s conftest.err
-aconfigure:4368: $? = 0
-aconfigure:4371: test -s conftest.o
-aconfigure:4374: $? = 0
-aconfigure:4385: result: yes
-aconfigure:4339: checking for stdlib.h
-aconfigure:4355: gcc -c -O2  conftest.c >&5
-aconfigure:4361: $? = 0
-aconfigure:4365: test -z 
-			 || test ! -s conftest.err
-aconfigure:4368: $? = 0
-aconfigure:4371: test -s conftest.o
-aconfigure:4374: $? = 0
-aconfigure:4385: result: yes
-aconfigure:4339: checking for string.h
-aconfigure:4355: gcc -c -O2  conftest.c >&5
-aconfigure:4361: $? = 0
-aconfigure:4365: test -z 
-			 || test ! -s conftest.err
-aconfigure:4368: $? = 0
-aconfigure:4371: test -s conftest.o
-aconfigure:4374: $? = 0
-aconfigure:4385: result: yes
-aconfigure:4339: checking for memory.h
-aconfigure:4355: gcc -c -O2  conftest.c >&5
-aconfigure:4361: $? = 0
-aconfigure:4365: test -z 
-			 || test ! -s conftest.err
-aconfigure:4368: $? = 0
-aconfigure:4371: test -s conftest.o
-aconfigure:4374: $? = 0
-aconfigure:4385: result: yes
-aconfigure:4339: checking for strings.h
-aconfigure:4355: gcc -c -O2  conftest.c >&5
-aconfigure:4361: $? = 0
-aconfigure:4365: test -z 
-			 || test ! -s conftest.err
-aconfigure:4368: $? = 0
-aconfigure:4371: test -s conftest.o
-aconfigure:4374: $? = 0
-aconfigure:4385: result: yes
-aconfigure:4339: checking for inttypes.h
-aconfigure:4355: gcc -c -O2  conftest.c >&5
-aconfigure:4361: $? = 0
-aconfigure:4365: test -z 
-			 || test ! -s conftest.err
-aconfigure:4368: $? = 0
-aconfigure:4371: test -s conftest.o
-aconfigure:4374: $? = 0
-aconfigure:4385: result: yes
-aconfigure:4339: checking for stdint.h
-aconfigure:4355: gcc -c -O2  conftest.c >&5
-aconfigure:4361: $? = 0
-aconfigure:4365: test -z 
-			 || test ! -s conftest.err
-aconfigure:4368: $? = 0
-aconfigure:4371: test -s conftest.o
-aconfigure:4374: $? = 0
-aconfigure:4385: result: yes
-aconfigure:4339: checking for unistd.h
-aconfigure:4355: gcc -c -O2  conftest.c >&5
-aconfigure:4361: $? = 0
-aconfigure:4365: test -z 
-			 || test ! -s conftest.err
-aconfigure:4368: $? = 0
-aconfigure:4371: test -s conftest.o
-aconfigure:4374: $? = 0
-aconfigure:4385: result: yes
-aconfigure:4407: checking arpa/inet.h usability
-aconfigure:4419: gcc -c -O2  conftest.c >&5
-aconfigure:4425: $? = 0
-aconfigure:4429: test -z 
-			 || test ! -s conftest.err
-aconfigure:4432: $? = 0
-aconfigure:4435: test -s conftest.o
-aconfigure:4438: $? = 0
-aconfigure:4448: result: yes
-aconfigure:4452: checking arpa/inet.h presence
-aconfigure:4462: gcc -E  conftest.c
-aconfigure:4468: $? = 0
-aconfigure:4488: result: yes
-aconfigure:4523: checking for arpa/inet.h
-aconfigure:4530: result: yes
-aconfigure:4552: checking assert.h usability
-aconfigure:4564: gcc -c -O2  conftest.c >&5
-aconfigure:4570: $? = 0
-aconfigure:4574: test -z 
-			 || test ! -s conftest.err
-aconfigure:4577: $? = 0
-aconfigure:4580: test -s conftest.o
-aconfigure:4583: $? = 0
-aconfigure:4593: result: yes
-aconfigure:4597: checking assert.h presence
-aconfigure:4607: gcc -E  conftest.c
-aconfigure:4613: $? = 0
-aconfigure:4633: result: yes
-aconfigure:4668: checking for assert.h
-aconfigure:4675: result: yes
-aconfigure:4697: checking ctype.h usability
-aconfigure:4709: gcc -c -O2  conftest.c >&5
-aconfigure:4715: $? = 0
-aconfigure:4719: test -z 
-			 || test ! -s conftest.err
-aconfigure:4722: $? = 0
-aconfigure:4725: test -s conftest.o
-aconfigure:4728: $? = 0
-aconfigure:4738: result: yes
-aconfigure:4742: checking ctype.h presence
-aconfigure:4752: gcc -E  conftest.c
-aconfigure:4758: $? = 0
-aconfigure:4778: result: yes
-aconfigure:4813: checking for ctype.h
-aconfigure:4820: result: yes
-aconfigure:4851: checking errno.h usability
-aconfigure:4863: gcc -c -O2  conftest.c >&5
-aconfigure:4869: $? = 0
-aconfigure:4873: test -z 
-			 || test ! -s conftest.err
-aconfigure:4876: $? = 0
-aconfigure:4879: test -s conftest.o
-aconfigure:4882: $? = 0
-aconfigure:4892: result: yes
-aconfigure:4896: checking errno.h presence
-aconfigure:4906: gcc -E  conftest.c
-aconfigure:4912: $? = 0
-aconfigure:4932: result: yes
-aconfigure:4967: checking for errno.h
-aconfigure:4974: result: yes
-aconfigure:4999: checking fcntl.h usability
-aconfigure:5011: gcc -c -O2  conftest.c >&5
-aconfigure:5017: $? = 0
-aconfigure:5021: test -z 
-			 || test ! -s conftest.err
-aconfigure:5024: $? = 0
-aconfigure:5027: test -s conftest.o
-aconfigure:5030: $? = 0
-aconfigure:5040: result: yes
-aconfigure:5044: checking fcntl.h presence
-aconfigure:5054: gcc -E  conftest.c
-aconfigure:5060: $? = 0
-aconfigure:5080: result: yes
-aconfigure:5115: checking for fcntl.h
-aconfigure:5122: result: yes
-aconfigure:5144: checking linux/socket.h usability
-aconfigure:5156: gcc -c -O2  conftest.c >&5
-aconfigure:5162: $? = 0
-aconfigure:5166: test -z 
-			 || test ! -s conftest.err
-aconfigure:5169: $? = 0
-aconfigure:5172: test -s conftest.o
-aconfigure:5175: $? = 0
-aconfigure:5185: result: yes
-aconfigure:5189: checking linux/socket.h presence
-aconfigure:5199: gcc -E  conftest.c
-aconfigure:5205: $? = 0
-aconfigure:5225: result: yes
-aconfigure:5260: checking for linux/socket.h
-aconfigure:5267: result: yes
-aconfigure:5289: checking malloc.h usability
-aconfigure:5301: gcc -c -O2  conftest.c >&5
-aconfigure:5307: $? = 0
-aconfigure:5311: test -z 
-			 || test ! -s conftest.err
-aconfigure:5314: $? = 0
-aconfigure:5317: test -s conftest.o
-aconfigure:5320: $? = 0
-aconfigure:5330: result: yes
-aconfigure:5334: checking malloc.h presence
-aconfigure:5344: gcc -E  conftest.c
-aconfigure:5350: $? = 0
-aconfigure:5370: result: yes
-aconfigure:5405: checking for malloc.h
-aconfigure:5412: result: yes
-aconfigure:5434: checking netdb.h usability
-aconfigure:5446: gcc -c -O2  conftest.c >&5
-aconfigure:5452: $? = 0
-aconfigure:5456: test -z 
-			 || test ! -s conftest.err
-aconfigure:5459: $? = 0
-aconfigure:5462: test -s conftest.o
-aconfigure:5465: $? = 0
-aconfigure:5475: result: yes
-aconfigure:5479: checking netdb.h presence
-aconfigure:5489: gcc -E  conftest.c
-aconfigure:5495: $? = 0
-aconfigure:5515: result: yes
-aconfigure:5550: checking for netdb.h
-aconfigure:5557: result: yes
-aconfigure:5579: checking netinet/in_systm.h usability
-aconfigure:5591: gcc -c -O2  conftest.c >&5
-aconfigure:5597: $? = 0
-aconfigure:5601: test -z 
-			 || test ! -s conftest.err
-aconfigure:5604: $? = 0
-aconfigure:5607: test -s conftest.o
-aconfigure:5610: $? = 0
-aconfigure:5620: result: yes
-aconfigure:5624: checking netinet/in_systm.h presence
-aconfigure:5634: gcc -E  conftest.c
-aconfigure:5640: $? = 0
-aconfigure:5660: result: yes
-aconfigure:5695: checking for netinet/in_systm.h
-aconfigure:5702: result: yes
-aconfigure:5724: checking netinet/in.h usability
-aconfigure:5736: gcc -c -O2  conftest.c >&5
-aconfigure:5742: $? = 0
-aconfigure:5746: test -z 
-			 || test ! -s conftest.err
-aconfigure:5749: $? = 0
-aconfigure:5752: test -s conftest.o
-aconfigure:5755: $? = 0
-aconfigure:5765: result: yes
-aconfigure:5769: checking netinet/in.h presence
-aconfigure:5779: gcc -E  conftest.c
-aconfigure:5785: $? = 0
-aconfigure:5805: result: yes
-aconfigure:5840: checking for netinet/in.h
-aconfigure:5847: result: yes
-aconfigure:5859: checking for netinet/ip.h
-aconfigure:5878: gcc -c -O2  conftest.c >&5
-aconfigure:5884: $? = 0
-aconfigure:5888: test -z 
-			 || test ! -s conftest.err
-aconfigure:5891: $? = 0
-aconfigure:5894: test -s conftest.o
-aconfigure:5897: $? = 0
-aconfigure:5908: result: yes
-aconfigure:5928: checking ifaddrs.h usability
-aconfigure:5940: gcc -c -O2  conftest.c >&5
-aconfigure:5946: $? = 0
-aconfigure:5950: test -z 
-			 || test ! -s conftest.err
-aconfigure:5953: $? = 0
-aconfigure:5956: test -s conftest.o
-aconfigure:5959: $? = 0
-aconfigure:5969: result: yes
-aconfigure:5973: checking ifaddrs.h presence
-aconfigure:5983: gcc -E  conftest.c
-aconfigure:5989: $? = 0
-aconfigure:6009: result: yes
-aconfigure:6044: checking for ifaddrs.h
-aconfigure:6051: result: yes
-aconfigure:6073: checking semaphore.h usability
-aconfigure:6085: gcc -c -O2  conftest.c >&5
-aconfigure:6091: $? = 0
-aconfigure:6095: test -z 
-			 || test ! -s conftest.err
-aconfigure:6098: $? = 0
-aconfigure:6101: test -s conftest.o
-aconfigure:6104: $? = 0
-aconfigure:6114: result: yes
-aconfigure:6118: checking semaphore.h presence
-aconfigure:6128: gcc -E  conftest.c
-aconfigure:6134: $? = 0
-aconfigure:6154: result: yes
-aconfigure:6189: checking for semaphore.h
-aconfigure:6196: result: yes
-aconfigure:6218: checking setjmp.h usability
-aconfigure:6230: gcc -c -O2  conftest.c >&5
-aconfigure:6236: $? = 0
-aconfigure:6240: test -z 
-			 || test ! -s conftest.err
-aconfigure:6243: $? = 0
-aconfigure:6246: test -s conftest.o
-aconfigure:6249: $? = 0
-aconfigure:6259: result: yes
-aconfigure:6263: checking setjmp.h presence
-aconfigure:6273: gcc -E  conftest.c
-aconfigure:6279: $? = 0
-aconfigure:6299: result: yes
-aconfigure:6334: checking for setjmp.h
-aconfigure:6341: result: yes
-aconfigure:6363: checking stdarg.h usability
-aconfigure:6375: gcc -c -O2  conftest.c >&5
-aconfigure:6381: $? = 0
-aconfigure:6385: test -z 
-			 || test ! -s conftest.err
-aconfigure:6388: $? = 0
-aconfigure:6391: test -s conftest.o
-aconfigure:6394: $? = 0
-aconfigure:6404: result: yes
-aconfigure:6408: checking stdarg.h presence
-aconfigure:6418: gcc -E  conftest.c
-aconfigure:6424: $? = 0
-aconfigure:6444: result: yes
-aconfigure:6479: checking for stdarg.h
-aconfigure:6486: result: yes
-aconfigure:6508: checking stddef.h usability
-aconfigure:6520: gcc -c -O2  conftest.c >&5
-aconfigure:6526: $? = 0
-aconfigure:6530: test -z 
-			 || test ! -s conftest.err
-aconfigure:6533: $? = 0
-aconfigure:6536: test -s conftest.o
-aconfigure:6539: $? = 0
-aconfigure:6549: result: yes
-aconfigure:6553: checking stddef.h presence
-aconfigure:6563: gcc -E  conftest.c
-aconfigure:6569: $? = 0
-aconfigure:6589: result: yes
-aconfigure:6624: checking for stddef.h
-aconfigure:6631: result: yes
-aconfigure:6653: checking stdio.h usability
-aconfigure:6665: gcc -c -O2  conftest.c >&5
-aconfigure:6671: $? = 0
-aconfigure:6675: test -z 
-			 || test ! -s conftest.err
-aconfigure:6678: $? = 0
-aconfigure:6681: test -s conftest.o
-aconfigure:6684: $? = 0
-aconfigure:6694: result: yes
-aconfigure:6698: checking stdio.h presence
-aconfigure:6708: gcc -E  conftest.c
-aconfigure:6714: $? = 0
-aconfigure:6734: result: yes
-aconfigure:6769: checking for stdio.h
-aconfigure:6776: result: yes
-aconfigure:6789: checking for stdint.h
-aconfigure:6794: result: yes
-aconfigure:6934: checking for stdlib.h
-aconfigure:6939: result: yes
-aconfigure:7079: checking for string.h
-aconfigure:7084: result: yes
-aconfigure:7233: checking sys/ioctl.h usability
-aconfigure:7245: gcc -c -O2  conftest.c >&5
-aconfigure:7251: $? = 0
-aconfigure:7255: test -z 
-			 || test ! -s conftest.err
-aconfigure:7258: $? = 0
-aconfigure:7261: test -s conftest.o
-aconfigure:7264: $? = 0
-aconfigure:7274: result: yes
-aconfigure:7278: checking sys/ioctl.h presence
-aconfigure:7288: gcc -E  conftest.c
-aconfigure:7294: $? = 0
-aconfigure:7314: result: yes
-aconfigure:7349: checking for sys/ioctl.h
-aconfigure:7356: result: yes
-aconfigure:7378: checking sys/select.h usability
-aconfigure:7390: gcc -c -O2  conftest.c >&5
-aconfigure:7396: $? = 0
-aconfigure:7400: test -z 
-			 || test ! -s conftest.err
-aconfigure:7403: $? = 0
-aconfigure:7406: test -s conftest.o
-aconfigure:7409: $? = 0
-aconfigure:7419: result: yes
-aconfigure:7423: checking sys/select.h presence
-aconfigure:7433: gcc -E  conftest.c
-aconfigure:7439: $? = 0
-aconfigure:7459: result: yes
-aconfigure:7494: checking for sys/select.h
-aconfigure:7501: result: yes
-aconfigure:7523: checking sys/socket.h usability
-aconfigure:7535: gcc -c -O2  conftest.c >&5
-aconfigure:7541: $? = 0
-aconfigure:7545: test -z 
-			 || test ! -s conftest.err
-aconfigure:7548: $? = 0
-aconfigure:7551: test -s conftest.o
-aconfigure:7554: $? = 0
-aconfigure:7564: result: yes
-aconfigure:7568: checking sys/socket.h presence
-aconfigure:7578: gcc -E  conftest.c
-aconfigure:7584: $? = 0
-aconfigure:7604: result: yes
-aconfigure:7639: checking for sys/socket.h
-aconfigure:7646: result: yes
-aconfigure:7668: checking sys/time.h usability
-aconfigure:7680: gcc -c -O2  conftest.c >&5
-aconfigure:7686: $? = 0
-aconfigure:7690: test -z 
-			 || test ! -s conftest.err
-aconfigure:7693: $? = 0
-aconfigure:7696: test -s conftest.o
-aconfigure:7699: $? = 0
-aconfigure:7709: result: yes
-aconfigure:7713: checking sys/time.h presence
-aconfigure:7723: gcc -E  conftest.c
-aconfigure:7729: $? = 0
-aconfigure:7749: result: yes
-aconfigure:7784: checking for sys/time.h
-aconfigure:7791: result: yes
-aconfigure:7813: checking sys/timeb.h usability
-aconfigure:7825: gcc -c -O2  conftest.c >&5
-aconfigure:7831: $? = 0
-aconfigure:7835: test -z 
-			 || test ! -s conftest.err
-aconfigure:7838: $? = 0
-aconfigure:7841: test -s conftest.o
-aconfigure:7844: $? = 0
-aconfigure:7854: result: yes
-aconfigure:7858: checking sys/timeb.h presence
-aconfigure:7868: gcc -E  conftest.c
-aconfigure:7874: $? = 0
-aconfigure:7894: result: yes
-aconfigure:7929: checking for sys/timeb.h
-aconfigure:7936: result: yes
-aconfigure:7949: checking for sys/types.h
-aconfigure:7954: result: yes
-aconfigure:8103: checking time.h usability
-aconfigure:8115: gcc -c -O2  conftest.c >&5
-aconfigure:8121: $? = 0
-aconfigure:8125: test -z 
-			 || test ! -s conftest.err
-aconfigure:8128: $? = 0
-aconfigure:8131: test -s conftest.o
-aconfigure:8134: $? = 0
-aconfigure:8144: result: yes
-aconfigure:8148: checking time.h presence
-aconfigure:8158: gcc -E  conftest.c
-aconfigure:8164: $? = 0
-aconfigure:8184: result: yes
-aconfigure:8219: checking for time.h
-aconfigure:8226: result: yes
-aconfigure:8239: checking for unistd.h
-aconfigure:8244: result: yes
-aconfigure:8393: checking winsock.h usability
-aconfigure:8405: gcc -c -O2  conftest.c >&5
-conftest.c:93:21: error: winsock.h: No such file or directory
-aconfigure:8411: $? = 1
-aconfigure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "pjproject"
-| #define PACKAGE_TARNAME "pjproject"
-| #define PACKAGE_VERSION "1.0"
-| #define PACKAGE_STRING "pjproject 1.0"
-| #define PACKAGE_BUGREPORT ""
-| #ifdef __cplusplus
-| extern "C" void exit (int) throw ();
-| #endif
-| #define HAVE_LIBPTHREAD 1
-| #define HAVE_LIBRT 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_LIBUUID 1
-| #define PJ_M_NAME "x86_64"
-| #define PJ_POOL_ALIGNMENT 8
-| #define PJ_LINUX 1
-| #define PJ_HAS_FLOATING_POINT 1
-| #define HAVE_LIBM 1
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define PJ_HAS_ARPA_INET_H 1
-| #define PJ_HAS_ASSERT_H 1
-| #define PJ_HAS_CTYPE_H 1
-| #define PJ_HAS_ERRNO_H 1
-| #define PJ_HAS_FCNTL_H 1
-| #define PJ_HAS_LINUX_SOCKET_H 1
-| #define PJ_HAS_MALLOC_H 1
-| #define PJ_HAS_NETDB_H 1
-| #define PJ_HAS_NETINET_IN_SYSTM_H 1
-| #define PJ_HAS_NETINET_IN_H 1
-| #define PJ_HAS_NETINET_IP_H 1
-| #define PJ_HAS_IFADDRS_H 1
-| #define PJ_HAS_SEMAPHORE_H 1
-| #define PJ_HAS_SETJMP_H 1
-| #define PJ_HAS_STDARG_H 1
-| #define PJ_HAS_STDDEF_H 1
-| #define PJ_HAS_STDIO_H 1
-| #define PJ_HAS_STDINT_H 1
-| #define PJ_HAS_STDLIB_H 1
-| #define PJ_HAS_STRING_H 1
-| #define PJ_HAS_SYS_IOCTL_H 1
-| #define PJ_HAS_SYS_SELECT_H 1
-| #define PJ_HAS_SYS_SOCKET_H 1
-| #define PJ_HAS_SYS_TIME_H 1
-| #define PJ_HAS_SYS_TIMEB_H 1
-| #define PJ_HAS_SYS_TYPES_H 1
-| #define PJ_HAS_TIME_H 1
-| #define PJ_HAS_UNISTD_H 1
-| /* end confdefs.h.  */
-| #include <stdio.h>
-| #if HAVE_SYS_TYPES_H
-| # include <sys/types.h>
-| #endif
-| #if HAVE_SYS_STAT_H
-| # include <sys/stat.h>
-| #endif
-| #if STDC_HEADERS
-| # include <stdlib.h>
-| # include <stddef.h>
-| #else
-| # if HAVE_STDLIB_H
-| #  include <stdlib.h>
-| # endif
-| #endif
-| #if HAVE_STRING_H
-| # if !STDC_HEADERS && HAVE_MEMORY_H
-| #  include <memory.h>
-| # endif
-| # include <string.h>
-| #endif
-| #if HAVE_STRINGS_H
-| # include <strings.h>
-| #endif
-| #if HAVE_INTTYPES_H
-| # include <inttypes.h>
-| #else
-| # if HAVE_STDINT_H
-| #  include <stdint.h>
-| # endif
-| #endif
-| #if HAVE_UNISTD_H
-| # include <unistd.h>
-| #endif
-| #include <winsock.h>
-aconfigure:8434: result: no
-aconfigure:8438: checking winsock.h presence
-aconfigure:8448: gcc -E  conftest.c
-conftest.c:59:21: error: winsock.h: No such file or directory
-aconfigure:8454: $? = 1
-aconfigure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "pjproject"
-| #define PACKAGE_TARNAME "pjproject"
-| #define PACKAGE_VERSION "1.0"
-| #define PACKAGE_STRING "pjproject 1.0"
-| #define PACKAGE_BUGREPORT ""
-| #ifdef __cplusplus
-| extern "C" void exit (int) throw ();
-| #endif
-| #define HAVE_LIBPTHREAD 1
-| #define HAVE_LIBRT 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_LIBUUID 1
-| #define PJ_M_NAME "x86_64"
-| #define PJ_POOL_ALIGNMENT 8
-| #define PJ_LINUX 1
-| #define PJ_HAS_FLOATING_POINT 1
-| #define HAVE_LIBM 1
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define PJ_HAS_ARPA_INET_H 1
-| #define PJ_HAS_ASSERT_H 1
-| #define PJ_HAS_CTYPE_H 1
-| #define PJ_HAS_ERRNO_H 1
-| #define PJ_HAS_FCNTL_H 1
-| #define PJ_HAS_LINUX_SOCKET_H 1
-| #define PJ_HAS_MALLOC_H 1
-| #define PJ_HAS_NETDB_H 1
-| #define PJ_HAS_NETINET_IN_SYSTM_H 1
-| #define PJ_HAS_NETINET_IN_H 1
-| #define PJ_HAS_NETINET_IP_H 1
-| #define PJ_HAS_IFADDRS_H 1
-| #define PJ_HAS_SEMAPHORE_H 1
-| #define PJ_HAS_SETJMP_H 1
-| #define PJ_HAS_STDARG_H 1
-| #define PJ_HAS_STDDEF_H 1
-| #define PJ_HAS_STDIO_H 1
-| #define PJ_HAS_STDINT_H 1
-| #define PJ_HAS_STDLIB_H 1
-| #define PJ_HAS_STRING_H 1
-| #define PJ_HAS_SYS_IOCTL_H 1
-| #define PJ_HAS_SYS_SELECT_H 1
-| #define PJ_HAS_SYS_SOCKET_H 1
-| #define PJ_HAS_SYS_TIME_H 1
-| #define PJ_HAS_SYS_TIMEB_H 1
-| #define PJ_HAS_SYS_TYPES_H 1
-| #define PJ_HAS_TIME_H 1
-| #define PJ_HAS_UNISTD_H 1
-| /* end confdefs.h.  */
-| #include <winsock.h>
-aconfigure:8474: result: no
-aconfigure:8509: checking for winsock.h
-aconfigure:8516: result: no
-aconfigure:8538: checking winsock2.h usability
-aconfigure:8550: gcc -c -O2  conftest.c >&5
-conftest.c:93:22: error: winsock2.h: No such file or directory
-aconfigure:8556: $? = 1
-aconfigure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "pjproject"
-| #define PACKAGE_TARNAME "pjproject"
-| #define PACKAGE_VERSION "1.0"
-| #define PACKAGE_STRING "pjproject 1.0"
-| #define PACKAGE_BUGREPORT ""
-| #ifdef __cplusplus
-| extern "C" void exit (int) throw ();
-| #endif
-| #define HAVE_LIBPTHREAD 1
-| #define HAVE_LIBRT 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_LIBUUID 1
-| #define PJ_M_NAME "x86_64"
-| #define PJ_POOL_ALIGNMENT 8
-| #define PJ_LINUX 1
-| #define PJ_HAS_FLOATING_POINT 1
-| #define HAVE_LIBM 1
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define PJ_HAS_ARPA_INET_H 1
-| #define PJ_HAS_ASSERT_H 1
-| #define PJ_HAS_CTYPE_H 1
-| #define PJ_HAS_ERRNO_H 1
-| #define PJ_HAS_FCNTL_H 1
-| #define PJ_HAS_LINUX_SOCKET_H 1
-| #define PJ_HAS_MALLOC_H 1
-| #define PJ_HAS_NETDB_H 1
-| #define PJ_HAS_NETINET_IN_SYSTM_H 1
-| #define PJ_HAS_NETINET_IN_H 1
-| #define PJ_HAS_NETINET_IP_H 1
-| #define PJ_HAS_IFADDRS_H 1
-| #define PJ_HAS_SEMAPHORE_H 1
-| #define PJ_HAS_SETJMP_H 1
-| #define PJ_HAS_STDARG_H 1
-| #define PJ_HAS_STDDEF_H 1
-| #define PJ_HAS_STDIO_H 1
-| #define PJ_HAS_STDINT_H 1
-| #define PJ_HAS_STDLIB_H 1
-| #define PJ_HAS_STRING_H 1
-| #define PJ_HAS_SYS_IOCTL_H 1
-| #define PJ_HAS_SYS_SELECT_H 1
-| #define PJ_HAS_SYS_SOCKET_H 1
-| #define PJ_HAS_SYS_TIME_H 1
-| #define PJ_HAS_SYS_TIMEB_H 1
-| #define PJ_HAS_SYS_TYPES_H 1
-| #define PJ_HAS_TIME_H 1
-| #define PJ_HAS_UNISTD_H 1
-| /* end confdefs.h.  */
-| #include <stdio.h>
-| #if HAVE_SYS_TYPES_H
-| # include <sys/types.h>
-| #endif
-| #if HAVE_SYS_STAT_H
-| # include <sys/stat.h>
-| #endif
-| #if STDC_HEADERS
-| # include <stdlib.h>
-| # include <stddef.h>
-| #else
-| # if HAVE_STDLIB_H
-| #  include <stdlib.h>
-| # endif
-| #endif
-| #if HAVE_STRING_H
-| # if !STDC_HEADERS && HAVE_MEMORY_H
-| #  include <memory.h>
-| # endif
-| # include <string.h>
-| #endif
-| #if HAVE_STRINGS_H
-| # include <strings.h>
-| #endif
-| #if HAVE_INTTYPES_H
-| # include <inttypes.h>
-| #else
-| # if HAVE_STDINT_H
-| #  include <stdint.h>
-| # endif
-| #endif
-| #if HAVE_UNISTD_H
-| # include <unistd.h>
-| #endif
-| #include <winsock2.h>
-aconfigure:8579: result: no
-aconfigure:8583: checking winsock2.h presence
-aconfigure:8593: gcc -E  conftest.c
-conftest.c:59:22: error: winsock2.h: No such file or directory
-aconfigure:8599: $? = 1
-aconfigure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "pjproject"
-| #define PACKAGE_TARNAME "pjproject"
-| #define PACKAGE_VERSION "1.0"
-| #define PACKAGE_STRING "pjproject 1.0"
-| #define PACKAGE_BUGREPORT ""
-| #ifdef __cplusplus
-| extern "C" void exit (int) throw ();
-| #endif
-| #define HAVE_LIBPTHREAD 1
-| #define HAVE_LIBRT 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_LIBUUID 1
-| #define PJ_M_NAME "x86_64"
-| #define PJ_POOL_ALIGNMENT 8
-| #define PJ_LINUX 1
-| #define PJ_HAS_FLOATING_POINT 1
-| #define HAVE_LIBM 1
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define PJ_HAS_ARPA_INET_H 1
-| #define PJ_HAS_ASSERT_H 1
-| #define PJ_HAS_CTYPE_H 1
-| #define PJ_HAS_ERRNO_H 1
-| #define PJ_HAS_FCNTL_H 1
-| #define PJ_HAS_LINUX_SOCKET_H 1
-| #define PJ_HAS_MALLOC_H 1
-| #define PJ_HAS_NETDB_H 1
-| #define PJ_HAS_NETINET_IN_SYSTM_H 1
-| #define PJ_HAS_NETINET_IN_H 1
-| #define PJ_HAS_NETINET_IP_H 1
-| #define PJ_HAS_IFADDRS_H 1
-| #define PJ_HAS_SEMAPHORE_H 1
-| #define PJ_HAS_SETJMP_H 1
-| #define PJ_HAS_STDARG_H 1
-| #define PJ_HAS_STDDEF_H 1
-| #define PJ_HAS_STDIO_H 1
-| #define PJ_HAS_STDINT_H 1
-| #define PJ_HAS_STDLIB_H 1
-| #define PJ_HAS_STRING_H 1
-| #define PJ_HAS_SYS_IOCTL_H 1
-| #define PJ_HAS_SYS_SELECT_H 1
-| #define PJ_HAS_SYS_SOCKET_H 1
-| #define PJ_HAS_SYS_TIME_H 1
-| #define PJ_HAS_SYS_TIMEB_H 1
-| #define PJ_HAS_SYS_TYPES_H 1
-| #define PJ_HAS_TIME_H 1
-| #define PJ_HAS_UNISTD_H 1
-| /* end confdefs.h.  */
-| #include <winsock2.h>
-aconfigure:8619: result: no
-aconfigure:8654: checking for winsock2.h
-aconfigure:8661: result: no
-aconfigure:8673: checking for mswsock.h
-aconfigure:8694: gcc -c -O2  conftest.c >&5
-conftest.c:66:21: error: mswsock.h: No such file or directory
-aconfigure:8700: $? = 1
-aconfigure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "pjproject"
-| #define PACKAGE_TARNAME "pjproject"
-| #define PACKAGE_VERSION "1.0"
-| #define PACKAGE_STRING "pjproject 1.0"
-| #define PACKAGE_BUGREPORT ""
-| #ifdef __cplusplus
-| extern "C" void exit (int) throw ();
-| #endif
-| #define HAVE_LIBPTHREAD 1
-| #define HAVE_LIBRT 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_LIBUUID 1
-| #define PJ_M_NAME "x86_64"
-| #define PJ_POOL_ALIGNMENT 8
-| #define PJ_LINUX 1
-| #define PJ_HAS_FLOATING_POINT 1
-| #define HAVE_LIBM 1
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define PJ_HAS_ARPA_INET_H 1
-| #define PJ_HAS_ASSERT_H 1
-| #define PJ_HAS_CTYPE_H 1
-| #define PJ_HAS_ERRNO_H 1
-| #define PJ_HAS_FCNTL_H 1
-| #define PJ_HAS_LINUX_SOCKET_H 1
-| #define PJ_HAS_MALLOC_H 1
-| #define PJ_HAS_NETDB_H 1
-| #define PJ_HAS_NETINET_IN_SYSTM_H 1
-| #define PJ_HAS_NETINET_IN_H 1
-| #define PJ_HAS_NETINET_IP_H 1
-| #define PJ_HAS_IFADDRS_H 1
-| #define PJ_HAS_SEMAPHORE_H 1
-| #define PJ_HAS_SETJMP_H 1
-| #define PJ_HAS_STDARG_H 1
-| #define PJ_HAS_STDDEF_H 1
-| #define PJ_HAS_STDIO_H 1
-| #define PJ_HAS_STDINT_H 1
-| #define PJ_HAS_STDLIB_H 1
-| #define PJ_HAS_STRING_H 1
-| #define PJ_HAS_SYS_IOCTL_H 1
-| #define PJ_HAS_SYS_SELECT_H 1
-| #define PJ_HAS_SYS_SOCKET_H 1
-| #define PJ_HAS_SYS_TIME_H 1
-| #define PJ_HAS_SYS_TIMEB_H 1
-| #define PJ_HAS_SYS_TYPES_H 1
-| #define PJ_HAS_TIME_H 1
-| #define PJ_HAS_UNISTD_H 1
-| /* end confdefs.h.  */
-| #if PJ_HAS_WINSOCK2_H
-|           	  #	include <winsock2.h>
-| 		  #elif PJ_HAS_WINSOCK_H
-|           	  #	include <winsock.h>
-|           	  #endif
-| 
-| 
-| #include <mswsock.h>
-aconfigure:8724: result: no
-aconfigure:8744: checking ws2tcpip.h usability
-aconfigure:8756: gcc -c -O2  conftest.c >&5
-conftest.c:93:22: error: ws2tcpip.h: No such file or directory
-aconfigure:8762: $? = 1
-aconfigure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "pjproject"
-| #define PACKAGE_TARNAME "pjproject"
-| #define PACKAGE_VERSION "1.0"
-| #define PACKAGE_STRING "pjproject 1.0"
-| #define PACKAGE_BUGREPORT ""
-| #ifdef __cplusplus
-| extern "C" void exit (int) throw ();
-| #endif
-| #define HAVE_LIBPTHREAD 1
-| #define HAVE_LIBRT 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_LIBUUID 1
-| #define PJ_M_NAME "x86_64"
-| #define PJ_POOL_ALIGNMENT 8
-| #define PJ_LINUX 1
-| #define PJ_HAS_FLOATING_POINT 1
-| #define HAVE_LIBM 1
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define PJ_HAS_ARPA_INET_H 1
-| #define PJ_HAS_ASSERT_H 1
-| #define PJ_HAS_CTYPE_H 1
-| #define PJ_HAS_ERRNO_H 1
-| #define PJ_HAS_FCNTL_H 1
-| #define PJ_HAS_LINUX_SOCKET_H 1
-| #define PJ_HAS_MALLOC_H 1
-| #define PJ_HAS_NETDB_H 1
-| #define PJ_HAS_NETINET_IN_SYSTM_H 1
-| #define PJ_HAS_NETINET_IN_H 1
-| #define PJ_HAS_NETINET_IP_H 1
-| #define PJ_HAS_IFADDRS_H 1
-| #define PJ_HAS_SEMAPHORE_H 1
-| #define PJ_HAS_SETJMP_H 1
-| #define PJ_HAS_STDARG_H 1
-| #define PJ_HAS_STDDEF_H 1
-| #define PJ_HAS_STDIO_H 1
-| #define PJ_HAS_STDINT_H 1
-| #define PJ_HAS_STDLIB_H 1
-| #define PJ_HAS_STRING_H 1
-| #define PJ_HAS_SYS_IOCTL_H 1
-| #define PJ_HAS_SYS_SELECT_H 1
-| #define PJ_HAS_SYS_SOCKET_H 1
-| #define PJ_HAS_SYS_TIME_H 1
-| #define PJ_HAS_SYS_TIMEB_H 1
-| #define PJ_HAS_SYS_TYPES_H 1
-| #define PJ_HAS_TIME_H 1
-| #define PJ_HAS_UNISTD_H 1
-| /* end confdefs.h.  */
-| #include <stdio.h>
-| #if HAVE_SYS_TYPES_H
-| # include <sys/types.h>
-| #endif
-| #if HAVE_SYS_STAT_H
-| # include <sys/stat.h>
-| #endif
-| #if STDC_HEADERS
-| # include <stdlib.h>
-| # include <stddef.h>
-| #else
-| # if HAVE_STDLIB_H
-| #  include <stdlib.h>
-| # endif
-| #endif
-| #if HAVE_STRING_H
-| # if !STDC_HEADERS && HAVE_MEMORY_H
-| #  include <memory.h>
-| # endif
-| # include <string.h>
-| #endif
-| #if HAVE_STRINGS_H
-| # include <strings.h>
-| #endif
-| #if HAVE_INTTYPES_H
-| # include <inttypes.h>
-| #else
-| # if HAVE_STDINT_H
-| #  include <stdint.h>
-| # endif
-| #endif
-| #if HAVE_UNISTD_H
-| # include <unistd.h>
-| #endif
-| #include <ws2tcpip.h>
-aconfigure:8785: result: no
-aconfigure:8789: checking ws2tcpip.h presence
-aconfigure:8799: gcc -E  conftest.c
-conftest.c:59:22: error: ws2tcpip.h: No such file or directory
-aconfigure:8805: $? = 1
-aconfigure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "pjproject"
-| #define PACKAGE_TARNAME "pjproject"
-| #define PACKAGE_VERSION "1.0"
-| #define PACKAGE_STRING "pjproject 1.0"
-| #define PACKAGE_BUGREPORT ""
-| #ifdef __cplusplus
-| extern "C" void exit (int) throw ();
-| #endif
-| #define HAVE_LIBPTHREAD 1
-| #define HAVE_LIBRT 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_LIBUUID 1
-| #define PJ_M_NAME "x86_64"
-| #define PJ_POOL_ALIGNMENT 8
-| #define PJ_LINUX 1
-| #define PJ_HAS_FLOATING_POINT 1
-| #define HAVE_LIBM 1
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define PJ_HAS_ARPA_INET_H 1
-| #define PJ_HAS_ASSERT_H 1
-| #define PJ_HAS_CTYPE_H 1
-| #define PJ_HAS_ERRNO_H 1
-| #define PJ_HAS_FCNTL_H 1
-| #define PJ_HAS_LINUX_SOCKET_H 1
-| #define PJ_HAS_MALLOC_H 1
-| #define PJ_HAS_NETDB_H 1
-| #define PJ_HAS_NETINET_IN_SYSTM_H 1
-| #define PJ_HAS_NETINET_IN_H 1
-| #define PJ_HAS_NETINET_IP_H 1
-| #define PJ_HAS_IFADDRS_H 1
-| #define PJ_HAS_SEMAPHORE_H 1
-| #define PJ_HAS_SETJMP_H 1
-| #define PJ_HAS_STDARG_H 1
-| #define PJ_HAS_STDDEF_H 1
-| #define PJ_HAS_STDIO_H 1
-| #define PJ_HAS_STDINT_H 1
-| #define PJ_HAS_STDLIB_H 1
-| #define PJ_HAS_STRING_H 1
-| #define PJ_HAS_SYS_IOCTL_H 1
-| #define PJ_HAS_SYS_SELECT_H 1
-| #define PJ_HAS_SYS_SOCKET_H 1
-| #define PJ_HAS_SYS_TIME_H 1
-| #define PJ_HAS_SYS_TIMEB_H 1
-| #define PJ_HAS_SYS_TYPES_H 1
-| #define PJ_HAS_TIME_H 1
-| #define PJ_HAS_UNISTD_H 1
-| /* end confdefs.h.  */
-| #include <ws2tcpip.h>
-aconfigure:8825: result: no
-aconfigure:8860: checking for ws2tcpip.h
-aconfigure:8867: result: no
-aconfigure:8889: checking uuid/uuid.h usability
-aconfigure:8901: gcc -c -O2  conftest.c >&5
-aconfigure:8907: $? = 0
-aconfigure:8911: test -z 
-			 || test ! -s conftest.err
-aconfigure:8914: $? = 0
-aconfigure:8917: test -s conftest.o
-aconfigure:8920: $? = 0
-aconfigure:8930: result: yes
-aconfigure:8934: checking uuid/uuid.h presence
-aconfigure:8944: gcc -E  conftest.c
-aconfigure:8950: $? = 0
-aconfigure:8970: result: yes
-aconfigure:9005: checking for uuid/uuid.h
-aconfigure:9012: result: yes
-aconfigure:9021: checking for net/if.h
-aconfigure:9040: gcc -c -O2  conftest.c >&5
-aconfigure:9046: $? = 0
-aconfigure:9050: test -z 
-			 || test ! -s conftest.err
-aconfigure:9053: $? = 0
-aconfigure:9056: test -s conftest.o
-aconfigure:9059: $? = 0
-aconfigure:9070: result: yes
-aconfigure:9081: result: Setting PJ_OS_NAME to x86_64-unknown-linux-gnu
-aconfigure:9088: result: Setting PJ_HAS_ERRNO_VAR to 1
-aconfigure:9095: result: Setting PJ_HAS_HIGH_RES_TIMER to 1
-aconfigure:9102: result: Setting PJ_HAS_MALLOC to 1
-aconfigure:9109: result: Setting PJ_NATIVE_STRING_IS_UNICODE to 0
-aconfigure:9116: result: Setting PJ_ATOMIC_VALUE_TYPE to long
-aconfigure:9123: checking if inet_aton() is available
-aconfigure:9143: gcc -c -O2  conftest.c >&5
-aconfigure:9149: $? = 0
-aconfigure:9153: test -z 
-			 || test ! -s conftest.err
-aconfigure:9156: $? = 0
-aconfigure:9159: test -s conftest.o
-aconfigure:9162: $? = 0
-aconfigure:9168: result: yes
-aconfigure:9179: checking if inet_pton() is available
-aconfigure:9199: gcc -c -O2  conftest.c >&5
-aconfigure:9205: $? = 0
-aconfigure:9209: test -z 
-			 || test ! -s conftest.err
-aconfigure:9212: $? = 0
-aconfigure:9215: test -s conftest.o
-aconfigure:9218: $? = 0
-aconfigure:9224: result: yes
-aconfigure:9235: checking if inet_ntop() is available
-aconfigure:9255: gcc -c -O2  conftest.c >&5
-aconfigure:9261: $? = 0
-aconfigure:9265: test -z 
-			 || test ! -s conftest.err
-aconfigure:9268: $? = 0
-aconfigure:9271: test -s conftest.o
-aconfigure:9274: $? = 0
-aconfigure:9280: result: yes
-aconfigure:9291: checking if getaddrinfo() is available
-aconfigure:9311: gcc -c -O2  conftest.c >&5
-aconfigure:9317: $? = 0
-aconfigure:9321: test -z 
-			 || test ! -s conftest.err
-aconfigure:9324: $? = 0
-aconfigure:9327: test -s conftest.o
-aconfigure:9330: $? = 0
-aconfigure:9336: result: yes
-aconfigure:9347: checking if sockaddr_in has sin_len member
-aconfigure:9368: gcc -c -O2  conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:77: error: 'struct sockaddr_in' has no member named 'sin_len'
-aconfigure:9374: $? = 1
-aconfigure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "pjproject"
-| #define PACKAGE_TARNAME "pjproject"
-| #define PACKAGE_VERSION "1.0"
-| #define PACKAGE_STRING "pjproject 1.0"
-| #define PACKAGE_BUGREPORT ""
-| #ifdef __cplusplus
-| extern "C" void exit (int) throw ();
-| #endif
-| #define HAVE_LIBPTHREAD 1
-| #define HAVE_LIBRT 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_LIBUUID 1
-| #define PJ_M_NAME "x86_64"
-| #define PJ_POOL_ALIGNMENT 8
-| #define PJ_LINUX 1
-| #define PJ_HAS_FLOATING_POINT 1
-| #define HAVE_LIBM 1
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define PJ_HAS_ARPA_INET_H 1
-| #define PJ_HAS_ASSERT_H 1
-| #define PJ_HAS_CTYPE_H 1
-| #define PJ_HAS_ERRNO_H 1
-| #define PJ_HAS_FCNTL_H 1
-| #define PJ_HAS_LINUX_SOCKET_H 1
-| #define PJ_HAS_MALLOC_H 1
-| #define PJ_HAS_NETDB_H 1
-| #define PJ_HAS_NETINET_IN_SYSTM_H 1
-| #define PJ_HAS_NETINET_IN_H 1
-| #define PJ_HAS_NETINET_IP_H 1
-| #define PJ_HAS_IFADDRS_H 1
-| #define PJ_HAS_SEMAPHORE_H 1
-| #define PJ_HAS_SETJMP_H 1
-| #define PJ_HAS_STDARG_H 1
-| #define PJ_HAS_STDDEF_H 1
-| #define PJ_HAS_STDIO_H 1
-| #define PJ_HAS_STDINT_H 1
-| #define PJ_HAS_STDLIB_H 1
-| #define PJ_HAS_STRING_H 1
-| #define PJ_HAS_SYS_IOCTL_H 1
-| #define PJ_HAS_SYS_SELECT_H 1
-| #define PJ_HAS_SYS_SOCKET_H 1
-| #define PJ_HAS_SYS_TIME_H 1
-| #define PJ_HAS_SYS_TIMEB_H 1
-| #define PJ_HAS_SYS_TYPES_H 1
-| #define PJ_HAS_TIME_H 1
-| #define PJ_HAS_UNISTD_H 1
-| #define PJ_HAS_NET_IF_H 1
-| #define PJ_OS_NAME "x86_64-unknown-linux-gnu"
-| #define PJ_HAS_ERRNO_VAR 1
-| #define PJ_HAS_HIGH_RES_TIMER 1
-| #define PJ_HAS_MALLOC 1
-| #define PJ_NATIVE_STRING_IS_UNICODE 0
-| #define PJ_ATOMIC_VALUE_TYPE long
-| #define PJ_SOCK_HAS_INET_ATON 1
-| #define PJ_SOCK_HAS_INET_PTON 1
-| #define PJ_SOCK_HAS_INET_NTOP 1
-| #define PJ_SOCK_HAS_GETADDRINFO 1
-| /* end confdefs.h.  */
-| #include <sys/types.h>
-| 				     #include <sys/socket.h>
-| 		    		     #include <netinet/in.h>
-| 		    		     #include <arpa/inet.h>
-| int
-| main ()
-| {
-| struct sockaddr_in a; a.sin_len=0;
-|   ;
-|   return 0;
-| }
-aconfigure:9399: result: no
-aconfigure:9404: checking if socklen_t is available
-aconfigure:9422: gcc -c -O2  conftest.c >&5
-aconfigure:9428: $? = 0
-aconfigure:9432: test -z 
-			 || test ! -s conftest.err
-aconfigure:9435: $? = 0
-aconfigure:9438: test -s conftest.o
-aconfigure:9441: $? = 0
-aconfigure:9447: result: yes
-aconfigure:9458: checking if SO_ERROR is available
-aconfigure:9489: gcc -c -O2  conftest.c >&5
-aconfigure:9495: $? = 0
-aconfigure:9499: test -z 
-			 || test ! -s conftest.err
-aconfigure:9502: $? = 0
-aconfigure:9505: test -s conftest.o
-aconfigure:9508: $? = 0
-aconfigure:9514: result: yes
-aconfigure:9528: checking if pthread_rwlock_t is available
-aconfigure:9546: gcc -c -O2  conftest.c >&5
-aconfigure:9552: $? = 0
-aconfigure:9556: test -z 
-			 || test ! -s conftest.err
-aconfigure:9559: $? = 0
-aconfigure:9562: test -s conftest.o
-aconfigure:9565: $? = 0
-aconfigure:9572: result: yes
-aconfigure:9650: checking if pthread_mutexattr_settype() is available
-aconfigure:9668: gcc -c -O2  conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:77: error: 'PTHREAD_MUTEX_FAST_NP' undeclared (first use in this function)
-conftest.c:77: error: (Each undeclared identifier is reported only once
-conftest.c:77: error: for each function it appears in.)
-aconfigure:9674: $? = 1
-aconfigure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "pjproject"
-| #define PACKAGE_TARNAME "pjproject"
-| #define PACKAGE_VERSION "1.0"
-| #define PACKAGE_STRING "pjproject 1.0"
-| #define PACKAGE_BUGREPORT ""
-| #ifdef __cplusplus
-| extern "C" void exit (int) throw ();
-| #endif
-| #define HAVE_LIBPTHREAD 1
-| #define HAVE_LIBRT 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_LIBUUID 1
-| #define PJ_M_NAME "x86_64"
-| #define PJ_POOL_ALIGNMENT 8
-| #define PJ_LINUX 1
-| #define PJ_HAS_FLOATING_POINT 1
-| #define HAVE_LIBM 1
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define PJ_HAS_ARPA_INET_H 1
-| #define PJ_HAS_ASSERT_H 1
-| #define PJ_HAS_CTYPE_H 1
-| #define PJ_HAS_ERRNO_H 1
-| #define PJ_HAS_FCNTL_H 1
-| #define PJ_HAS_LINUX_SOCKET_H 1
-| #define PJ_HAS_MALLOC_H 1
-| #define PJ_HAS_NETDB_H 1
-| #define PJ_HAS_NETINET_IN_SYSTM_H 1
-| #define PJ_HAS_NETINET_IN_H 1
-| #define PJ_HAS_NETINET_IP_H 1
-| #define PJ_HAS_IFADDRS_H 1
-| #define PJ_HAS_SEMAPHORE_H 1
-| #define PJ_HAS_SETJMP_H 1
-| #define PJ_HAS_STDARG_H 1
-| #define PJ_HAS_STDDEF_H 1
-| #define PJ_HAS_STDIO_H 1
-| #define PJ_HAS_STDINT_H 1
-| #define PJ_HAS_STDLIB_H 1
-| #define PJ_HAS_STRING_H 1
-| #define PJ_HAS_SYS_IOCTL_H 1
-| #define PJ_HAS_SYS_SELECT_H 1
-| #define PJ_HAS_SYS_SOCKET_H 1
-| #define PJ_HAS_SYS_TIME_H 1
-| #define PJ_HAS_SYS_TIMEB_H 1
-| #define PJ_HAS_SYS_TYPES_H 1
-| #define PJ_HAS_TIME_H 1
-| #define PJ_HAS_UNISTD_H 1
-| #define PJ_HAS_NET_IF_H 1
-| #define PJ_OS_NAME "x86_64-unknown-linux-gnu"
-| #define PJ_HAS_ERRNO_VAR 1
-| #define PJ_HAS_HIGH_RES_TIMER 1
-| #define PJ_HAS_MALLOC 1
-| #define PJ_NATIVE_STRING_IS_UNICODE 0
-| #define PJ_ATOMIC_VALUE_TYPE long
-| #define PJ_SOCK_HAS_INET_ATON 1
-| #define PJ_SOCK_HAS_INET_PTON 1
-| #define PJ_SOCK_HAS_INET_NTOP 1
-| #define PJ_SOCK_HAS_GETADDRINFO 1
-| #define PJ_HAS_SOCKLEN_T 1
-| #define PJ_HAS_SO_ERROR 1
-| #define PJ_EMULATE_RWMUTEX 0
-| /* end confdefs.h.  */
-| #include <pthread.h>
-| int
-| main ()
-| {
-| pthread_mutexattr_settype(0,PTHREAD_MUTEX_FAST_NP);
-|   ;
-|   return 0;
-| }
-aconfigure:9699: result: no
-aconfigure:9704: checking if pthread_mutexattr_t has recursive member
-aconfigure:9723: gcc -c -O2  conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:78: error: 'pthread_mutexattr_t' has no member named 'recursive'
-aconfigure:9729: $? = 1
-aconfigure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "pjproject"
-| #define PACKAGE_TARNAME "pjproject"
-| #define PACKAGE_VERSION "1.0"
-| #define PACKAGE_STRING "pjproject 1.0"
-| #define PACKAGE_BUGREPORT ""
-| #ifdef __cplusplus
-| extern "C" void exit (int) throw ();
-| #endif
-| #define HAVE_LIBPTHREAD 1
-| #define HAVE_LIBRT 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_LIBUUID 1
-| #define PJ_M_NAME "x86_64"
-| #define PJ_POOL_ALIGNMENT 8
-| #define PJ_LINUX 1
-| #define PJ_HAS_FLOATING_POINT 1
-| #define HAVE_LIBM 1
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define PJ_HAS_ARPA_INET_H 1
-| #define PJ_HAS_ASSERT_H 1
-| #define PJ_HAS_CTYPE_H 1
-| #define PJ_HAS_ERRNO_H 1
-| #define PJ_HAS_FCNTL_H 1
-| #define PJ_HAS_LINUX_SOCKET_H 1
-| #define PJ_HAS_MALLOC_H 1
-| #define PJ_HAS_NETDB_H 1
-| #define PJ_HAS_NETINET_IN_SYSTM_H 1
-| #define PJ_HAS_NETINET_IN_H 1
-| #define PJ_HAS_NETINET_IP_H 1
-| #define PJ_HAS_IFADDRS_H 1
-| #define PJ_HAS_SEMAPHORE_H 1
-| #define PJ_HAS_SETJMP_H 1
-| #define PJ_HAS_STDARG_H 1
-| #define PJ_HAS_STDDEF_H 1
-| #define PJ_HAS_STDIO_H 1
-| #define PJ_HAS_STDINT_H 1
-| #define PJ_HAS_STDLIB_H 1
-| #define PJ_HAS_STRING_H 1
-| #define PJ_HAS_SYS_IOCTL_H 1
-| #define PJ_HAS_SYS_SELECT_H 1
-| #define PJ_HAS_SYS_SOCKET_H 1
-| #define PJ_HAS_SYS_TIME_H 1
-| #define PJ_HAS_SYS_TIMEB_H 1
-| #define PJ_HAS_SYS_TYPES_H 1
-| #define PJ_HAS_TIME_H 1
-| #define PJ_HAS_UNISTD_H 1
-| #define PJ_HAS_NET_IF_H 1
-| #define PJ_OS_NAME "x86_64-unknown-linux-gnu"
-| #define PJ_HAS_ERRNO_VAR 1
-| #define PJ_HAS_HIGH_RES_TIMER 1
-| #define PJ_HAS_MALLOC 1
-| #define PJ_NATIVE_STRING_IS_UNICODE 0
-| #define PJ_ATOMIC_VALUE_TYPE long
-| #define PJ_SOCK_HAS_INET_ATON 1
-| #define PJ_SOCK_HAS_INET_PTON 1
-| #define PJ_SOCK_HAS_INET_NTOP 1
-| #define PJ_SOCK_HAS_GETADDRINFO 1
-| #define PJ_HAS_SOCKLEN_T 1
-| #define PJ_HAS_SO_ERROR 1
-| #define PJ_EMULATE_RWMUTEX 0
-| /* end confdefs.h.  */
-| #include <pthread.h>
-| int
-| main ()
-| {
-| pthread_mutexattr_t attr;
-| 				     attr.recursive=1;
-|   ;
-|   return 0;
-| }
-aconfigure:9754: result: no
-aconfigure:9760: checking ioqueue backend
-aconfigure:9773: result: select()
-aconfigure:9820: checking sys/soundcard.h usability
-aconfigure:9832: gcc -c -O2  conftest.c >&5
-aconfigure:9838: $? = 0
-aconfigure:9842: test -z 
-			 || test ! -s conftest.err
-aconfigure:9845: $? = 0
-aconfigure:9848: test -s conftest.o
-aconfigure:9851: $? = 0
-aconfigure:9861: result: yes
-aconfigure:9865: checking sys/soundcard.h presence
-aconfigure:9875: gcc -E  conftest.c
-aconfigure:9881: $? = 0
-aconfigure:9901: result: yes
-aconfigure:9936: checking for sys/soundcard.h
-aconfigure:9943: result: yes
-aconfigure:9962: checking linux/soundcard.h usability
-aconfigure:9974: gcc -c -O2  conftest.c >&5
-aconfigure:9980: $? = 0
-aconfigure:9984: test -z 
-			 || test ! -s conftest.err
-aconfigure:9987: $? = 0
-aconfigure:9990: test -s conftest.o
-aconfigure:9993: $? = 0
-aconfigure:10003: result: yes
-aconfigure:10007: checking linux/soundcard.h presence
-aconfigure:10017: gcc -E  conftest.c
-aconfigure:10023: $? = 0
-aconfigure:10043: result: yes
-aconfigure:10078: checking for linux/soundcard.h
-aconfigure:10085: result: yes
-aconfigure:10104: checking machine/soundcard.h usability
-aconfigure:10116: gcc -c -O2  conftest.c >&5
-conftest.c:107:31: error: machine/soundcard.h: No such file or directory
-aconfigure:10122: $? = 1
-aconfigure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "pjproject"
-| #define PACKAGE_TARNAME "pjproject"
-| #define PACKAGE_VERSION "1.0"
-| #define PACKAGE_STRING "pjproject 1.0"
-| #define PACKAGE_BUGREPORT ""
-| #ifdef __cplusplus
-| extern "C" void exit (int) throw ();
-| #endif
-| #define HAVE_LIBPTHREAD 1
-| #define HAVE_LIBRT 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_LIBUUID 1
-| #define PJ_M_NAME "x86_64"
-| #define PJ_POOL_ALIGNMENT 8
-| #define PJ_LINUX 1
-| #define PJ_HAS_FLOATING_POINT 1
-| #define HAVE_LIBM 1
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define PJ_HAS_ARPA_INET_H 1
-| #define PJ_HAS_ASSERT_H 1
-| #define PJ_HAS_CTYPE_H 1
-| #define PJ_HAS_ERRNO_H 1
-| #define PJ_HAS_FCNTL_H 1
-| #define PJ_HAS_LINUX_SOCKET_H 1
-| #define PJ_HAS_MALLOC_H 1
-| #define PJ_HAS_NETDB_H 1
-| #define PJ_HAS_NETINET_IN_SYSTM_H 1
-| #define PJ_HAS_NETINET_IN_H 1
-| #define PJ_HAS_NETINET_IP_H 1
-| #define PJ_HAS_IFADDRS_H 1
-| #define PJ_HAS_SEMAPHORE_H 1
-| #define PJ_HAS_SETJMP_H 1
-| #define PJ_HAS_STDARG_H 1
-| #define PJ_HAS_STDDEF_H 1
-| #define PJ_HAS_STDIO_H 1
-| #define PJ_HAS_STDINT_H 1
-| #define PJ_HAS_STDLIB_H 1
-| #define PJ_HAS_STRING_H 1
-| #define PJ_HAS_SYS_IOCTL_H 1
-| #define PJ_HAS_SYS_SELECT_H 1
-| #define PJ_HAS_SYS_SOCKET_H 1
-| #define PJ_HAS_SYS_TIME_H 1
-| #define PJ_HAS_SYS_TIMEB_H 1
-| #define PJ_HAS_SYS_TYPES_H 1
-| #define PJ_HAS_TIME_H 1
-| #define PJ_HAS_UNISTD_H 1
-| #define PJ_HAS_NET_IF_H 1
-| #define PJ_OS_NAME "x86_64-unknown-linux-gnu"
-| #define PJ_HAS_ERRNO_VAR 1
-| #define PJ_HAS_HIGH_RES_TIMER 1
-| #define PJ_HAS_MALLOC 1
-| #define PJ_NATIVE_STRING_IS_UNICODE 0
-| #define PJ_ATOMIC_VALUE_TYPE long
-| #define PJ_SOCK_HAS_INET_ATON 1
-| #define PJ_SOCK_HAS_INET_PTON 1
-| #define PJ_SOCK_HAS_INET_NTOP 1
-| #define PJ_SOCK_HAS_GETADDRINFO 1
-| #define PJ_HAS_SOCKLEN_T 1
-| #define PJ_HAS_SO_ERROR 1
-| #define PJ_EMULATE_RWMUTEX 0
-| /* end confdefs.h.  */
-| #include <stdio.h>
-| #if HAVE_SYS_TYPES_H
-| # include <sys/types.h>
-| #endif
-| #if HAVE_SYS_STAT_H
-| # include <sys/stat.h>
-| #endif
-| #if STDC_HEADERS
-| # include <stdlib.h>
-| # include <stddef.h>
-| #else
-| # if HAVE_STDLIB_H
-| #  include <stdlib.h>
-| # endif
-| #endif
-| #if HAVE_STRING_H
-| # if !STDC_HEADERS && HAVE_MEMORY_H
-| #  include <memory.h>
-| # endif
-| # include <string.h>
-| #endif
-| #if HAVE_STRINGS_H
-| # include <strings.h>
-| #endif
-| #if HAVE_INTTYPES_H
-| # include <inttypes.h>
-| #else
-| # if HAVE_STDINT_H
-| #  include <stdint.h>
-| # endif
-| #endif
-| #if HAVE_UNISTD_H
-| # include <unistd.h>
-| #endif
-| #include <machine/soundcard.h>
-aconfigure:10145: result: no
-aconfigure:10149: checking machine/soundcard.h presence
-aconfigure:10159: gcc -E  conftest.c
-conftest.c:73:31: error: machine/soundcard.h: No such file or directory
-aconfigure:10165: $? = 1
-aconfigure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "pjproject"
-| #define PACKAGE_TARNAME "pjproject"
-| #define PACKAGE_VERSION "1.0"
-| #define PACKAGE_STRING "pjproject 1.0"
-| #define PACKAGE_BUGREPORT ""
-| #ifdef __cplusplus
-| extern "C" void exit (int) throw ();
-| #endif
-| #define HAVE_LIBPTHREAD 1
-| #define HAVE_LIBRT 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_LIBUUID 1
-| #define PJ_M_NAME "x86_64"
-| #define PJ_POOL_ALIGNMENT 8
-| #define PJ_LINUX 1
-| #define PJ_HAS_FLOATING_POINT 1
-| #define HAVE_LIBM 1
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define PJ_HAS_ARPA_INET_H 1
-| #define PJ_HAS_ASSERT_H 1
-| #define PJ_HAS_CTYPE_H 1
-| #define PJ_HAS_ERRNO_H 1
-| #define PJ_HAS_FCNTL_H 1
-| #define PJ_HAS_LINUX_SOCKET_H 1
-| #define PJ_HAS_MALLOC_H 1
-| #define PJ_HAS_NETDB_H 1
-| #define PJ_HAS_NETINET_IN_SYSTM_H 1
-| #define PJ_HAS_NETINET_IN_H 1
-| #define PJ_HAS_NETINET_IP_H 1
-| #define PJ_HAS_IFADDRS_H 1
-| #define PJ_HAS_SEMAPHORE_H 1
-| #define PJ_HAS_SETJMP_H 1
-| #define PJ_HAS_STDARG_H 1
-| #define PJ_HAS_STDDEF_H 1
-| #define PJ_HAS_STDIO_H 1
-| #define PJ_HAS_STDINT_H 1
-| #define PJ_HAS_STDLIB_H 1
-| #define PJ_HAS_STRING_H 1
-| #define PJ_HAS_SYS_IOCTL_H 1
-| #define PJ_HAS_SYS_SELECT_H 1
-| #define PJ_HAS_SYS_SOCKET_H 1
-| #define PJ_HAS_SYS_TIME_H 1
-| #define PJ_HAS_SYS_TIMEB_H 1
-| #define PJ_HAS_SYS_TYPES_H 1
-| #define PJ_HAS_TIME_H 1
-| #define PJ_HAS_UNISTD_H 1
-| #define PJ_HAS_NET_IF_H 1
-| #define PJ_OS_NAME "x86_64-unknown-linux-gnu"
-| #define PJ_HAS_ERRNO_VAR 1
-| #define PJ_HAS_HIGH_RES_TIMER 1
-| #define PJ_HAS_MALLOC 1
-| #define PJ_NATIVE_STRING_IS_UNICODE 0
-| #define PJ_ATOMIC_VALUE_TYPE long
-| #define PJ_SOCK_HAS_INET_ATON 1
-| #define PJ_SOCK_HAS_INET_PTON 1
-| #define PJ_SOCK_HAS_INET_NTOP 1
-| #define PJ_SOCK_HAS_GETADDRINFO 1
-| #define PJ_HAS_SOCKLEN_T 1
-| #define PJ_HAS_SO_ERROR 1
-| #define PJ_EMULATE_RWMUTEX 0
-| /* end confdefs.h.  */
-| #include <machine/soundcard.h>
-aconfigure:10185: result: no
-aconfigure:10220: checking for machine/soundcard.h
-aconfigure:10227: result: no
-aconfigure:10283: checking alsa/version.h usability
-aconfigure:10295: gcc -c -O2  conftest.c >&5
-aconfigure:10301: $? = 0
-aconfigure:10305: test -z 
-			 || test ! -s conftest.err
-aconfigure:10308: $? = 0
-aconfigure:10311: test -s conftest.o
-aconfigure:10314: $? = 0
-aconfigure:10324: result: yes
-aconfigure:10328: checking alsa/version.h presence
-aconfigure:10338: gcc -E  conftest.c
-aconfigure:10344: $? = 0
-aconfigure:10364: result: yes
-aconfigure:10399: checking for alsa/version.h
-aconfigure:10406: result: yes
-aconfigure:10421: result: Checking sound device backend... unix
-aconfigure:10462: result: Checking if small filter is disabled... no
-aconfigure:10476: result: Checking if large filter is disabled... no
-aconfigure:10490: result: Checking if Speex AEC is disabled...no
-aconfigure:10508: result: Checking if G.711 codec is disabled...no
-aconfigure:10527: result: Checking if L16 codec is disabled...no
-aconfigure:10546: result: Checking if GSM codec is disabled...no
-aconfigure:10564: result: Checking if G.722 codec is disabled...no
-aconfigure:10582: result: Checking if Speex codec is disabled...no
-aconfigure:10600: result: Checking if iLBC codec is disabled...no
-aconfigure:10682: result: Skipping libsamplerate detection
-aconfigure:10959: result: Skipping Intel IPP settings (not wanted)
-aconfigure:10978: result: checking for OpenSSL installations..
-aconfigure:10993: checking openssl/ssl.h usability
-aconfigure:11005: gcc -c -O2  conftest.c >&5
-conftest.c:107:25: error: openssl/ssl.h: No such file or directory
-aconfigure:11011: $? = 1
-aconfigure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "pjproject"
-| #define PACKAGE_TARNAME "pjproject"
-| #define PACKAGE_VERSION "1.0"
-| #define PACKAGE_STRING "pjproject 1.0"
-| #define PACKAGE_BUGREPORT ""
-| #ifdef __cplusplus
-| extern "C" void exit (int) throw ();
-| #endif
-| #define HAVE_LIBPTHREAD 1
-| #define HAVE_LIBRT 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_LIBUUID 1
-| #define PJ_M_NAME "x86_64"
-| #define PJ_POOL_ALIGNMENT 8
-| #define PJ_LINUX 1
-| #define PJ_HAS_FLOATING_POINT 1
-| #define HAVE_LIBM 1
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define PJ_HAS_ARPA_INET_H 1
-| #define PJ_HAS_ASSERT_H 1
-| #define PJ_HAS_CTYPE_H 1
-| #define PJ_HAS_ERRNO_H 1
-| #define PJ_HAS_FCNTL_H 1
-| #define PJ_HAS_LINUX_SOCKET_H 1
-| #define PJ_HAS_MALLOC_H 1
-| #define PJ_HAS_NETDB_H 1
-| #define PJ_HAS_NETINET_IN_SYSTM_H 1
-| #define PJ_HAS_NETINET_IN_H 1
-| #define PJ_HAS_NETINET_IP_H 1
-| #define PJ_HAS_IFADDRS_H 1
-| #define PJ_HAS_SEMAPHORE_H 1
-| #define PJ_HAS_SETJMP_H 1
-| #define PJ_HAS_STDARG_H 1
-| #define PJ_HAS_STDDEF_H 1
-| #define PJ_HAS_STDIO_H 1
-| #define PJ_HAS_STDINT_H 1
-| #define PJ_HAS_STDLIB_H 1
-| #define PJ_HAS_STRING_H 1
-| #define PJ_HAS_SYS_IOCTL_H 1
-| #define PJ_HAS_SYS_SELECT_H 1
-| #define PJ_HAS_SYS_SOCKET_H 1
-| #define PJ_HAS_SYS_TIME_H 1
-| #define PJ_HAS_SYS_TIMEB_H 1
-| #define PJ_HAS_SYS_TYPES_H 1
-| #define PJ_HAS_TIME_H 1
-| #define PJ_HAS_UNISTD_H 1
-| #define PJ_HAS_NET_IF_H 1
-| #define PJ_OS_NAME "x86_64-unknown-linux-gnu"
-| #define PJ_HAS_ERRNO_VAR 1
-| #define PJ_HAS_HIGH_RES_TIMER 1
-| #define PJ_HAS_MALLOC 1
-| #define PJ_NATIVE_STRING_IS_UNICODE 0
-| #define PJ_ATOMIC_VALUE_TYPE long
-| #define PJ_SOCK_HAS_INET_ATON 1
-| #define PJ_SOCK_HAS_INET_PTON 1
-| #define PJ_SOCK_HAS_INET_NTOP 1
-| #define PJ_SOCK_HAS_GETADDRINFO 1
-| #define PJ_HAS_SOCKLEN_T 1
-| #define PJ_HAS_SO_ERROR 1
-| #define PJ_EMULATE_RWMUTEX 0
-| /* end confdefs.h.  */
-| #include <stdio.h>
-| #if HAVE_SYS_TYPES_H
-| # include <sys/types.h>
-| #endif
-| #if HAVE_SYS_STAT_H
-| # include <sys/stat.h>
-| #endif
-| #if STDC_HEADERS
-| # include <stdlib.h>
-| # include <stddef.h>
-| #else
-| # if HAVE_STDLIB_H
-| #  include <stdlib.h>
-| # endif
-| #endif
-| #if HAVE_STRING_H
-| # if !STDC_HEADERS && HAVE_MEMORY_H
-| #  include <memory.h>
-| # endif
-| # include <string.h>
-| #endif
-| #if HAVE_STRINGS_H
-| # include <strings.h>
-| #endif
-| #if HAVE_INTTYPES_H
-| # include <inttypes.h>
-| #else
-| # if HAVE_STDINT_H
-| #  include <stdint.h>
-| # endif
-| #endif
-| #if HAVE_UNISTD_H
-| # include <unistd.h>
-| #endif
-| #include <openssl/ssl.h>
-aconfigure:11034: result: no
-aconfigure:11038: checking openssl/ssl.h presence
-aconfigure:11048: gcc -E  conftest.c
-conftest.c:73:25: error: openssl/ssl.h: No such file or directory
-aconfigure:11054: $? = 1
-aconfigure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "pjproject"
-| #define PACKAGE_TARNAME "pjproject"
-| #define PACKAGE_VERSION "1.0"
-| #define PACKAGE_STRING "pjproject 1.0"
-| #define PACKAGE_BUGREPORT ""
-| #ifdef __cplusplus
-| extern "C" void exit (int) throw ();
-| #endif
-| #define HAVE_LIBPTHREAD 1
-| #define HAVE_LIBRT 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_LIBUUID 1
-| #define PJ_M_NAME "x86_64"
-| #define PJ_POOL_ALIGNMENT 8
-| #define PJ_LINUX 1
-| #define PJ_HAS_FLOATING_POINT 1
-| #define HAVE_LIBM 1
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define PJ_HAS_ARPA_INET_H 1
-| #define PJ_HAS_ASSERT_H 1
-| #define PJ_HAS_CTYPE_H 1
-| #define PJ_HAS_ERRNO_H 1
-| #define PJ_HAS_FCNTL_H 1
-| #define PJ_HAS_LINUX_SOCKET_H 1
-| #define PJ_HAS_MALLOC_H 1
-| #define PJ_HAS_NETDB_H 1
-| #define PJ_HAS_NETINET_IN_SYSTM_H 1
-| #define PJ_HAS_NETINET_IN_H 1
-| #define PJ_HAS_NETINET_IP_H 1
-| #define PJ_HAS_IFADDRS_H 1
-| #define PJ_HAS_SEMAPHORE_H 1
-| #define PJ_HAS_SETJMP_H 1
-| #define PJ_HAS_STDARG_H 1
-| #define PJ_HAS_STDDEF_H 1
-| #define PJ_HAS_STDIO_H 1
-| #define PJ_HAS_STDINT_H 1
-| #define PJ_HAS_STDLIB_H 1
-| #define PJ_HAS_STRING_H 1
-| #define PJ_HAS_SYS_IOCTL_H 1
-| #define PJ_HAS_SYS_SELECT_H 1
-| #define PJ_HAS_SYS_SOCKET_H 1
-| #define PJ_HAS_SYS_TIME_H 1
-| #define PJ_HAS_SYS_TIMEB_H 1
-| #define PJ_HAS_SYS_TYPES_H 1
-| #define PJ_HAS_TIME_H 1
-| #define PJ_HAS_UNISTD_H 1
-| #define PJ_HAS_NET_IF_H 1
-| #define PJ_OS_NAME "x86_64-unknown-linux-gnu"
-| #define PJ_HAS_ERRNO_VAR 1
-| #define PJ_HAS_HIGH_RES_TIMER 1
-| #define PJ_HAS_MALLOC 1
-| #define PJ_NATIVE_STRING_IS_UNICODE 0
-| #define PJ_ATOMIC_VALUE_TYPE long
-| #define PJ_SOCK_HAS_INET_ATON 1
-| #define PJ_SOCK_HAS_INET_PTON 1
-| #define PJ_SOCK_HAS_INET_NTOP 1
-| #define PJ_SOCK_HAS_GETADDRINFO 1
-| #define PJ_HAS_SOCKLEN_T 1
-| #define PJ_HAS_SO_ERROR 1
-| #define PJ_EMULATE_RWMUTEX 0
-| /* end confdefs.h.  */
-| #include <openssl/ssl.h>
-aconfigure:11074: result: no
-aconfigure:11109: checking for openssl/ssl.h
-aconfigure:11116: result: no
-aconfigure:11125: checking for SSL_library_init in -lssl
-aconfigure:11155: gcc -o conftest -O2   conftest.c -lssl  -lm -luuid -lnsl -lrt -lpthread  -lasound >&5
-/usr/bin/ld: cannot find -lssl
-collect2: ld returned 1 exit status
-aconfigure:11161: $? = 1
-aconfigure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "pjproject"
-| #define PACKAGE_TARNAME "pjproject"
-| #define PACKAGE_VERSION "1.0"
-| #define PACKAGE_STRING "pjproject 1.0"
-| #define PACKAGE_BUGREPORT ""
-| #ifdef __cplusplus
-| extern "C" void exit (int) throw ();
-| #endif
-| #define HAVE_LIBPTHREAD 1
-| #define HAVE_LIBRT 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_LIBUUID 1
-| #define PJ_M_NAME "x86_64"
-| #define PJ_POOL_ALIGNMENT 8
-| #define PJ_LINUX 1
-| #define PJ_HAS_FLOATING_POINT 1
-| #define HAVE_LIBM 1
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define PJ_HAS_ARPA_INET_H 1
-| #define PJ_HAS_ASSERT_H 1
-| #define PJ_HAS_CTYPE_H 1
-| #define PJ_HAS_ERRNO_H 1
-| #define PJ_HAS_FCNTL_H 1
-| #define PJ_HAS_LINUX_SOCKET_H 1
-| #define PJ_HAS_MALLOC_H 1
-| #define PJ_HAS_NETDB_H 1
-| #define PJ_HAS_NETINET_IN_SYSTM_H 1
-| #define PJ_HAS_NETINET_IN_H 1
-| #define PJ_HAS_NETINET_IP_H 1
-| #define PJ_HAS_IFADDRS_H 1
-| #define PJ_HAS_SEMAPHORE_H 1
-| #define PJ_HAS_SETJMP_H 1
-| #define PJ_HAS_STDARG_H 1
-| #define PJ_HAS_STDDEF_H 1
-| #define PJ_HAS_STDIO_H 1
-| #define PJ_HAS_STDINT_H 1
-| #define PJ_HAS_STDLIB_H 1
-| #define PJ_HAS_STRING_H 1
-| #define PJ_HAS_SYS_IOCTL_H 1
-| #define PJ_HAS_SYS_SELECT_H 1
-| #define PJ_HAS_SYS_SOCKET_H 1
-| #define PJ_HAS_SYS_TIME_H 1
-| #define PJ_HAS_SYS_TIMEB_H 1
-| #define PJ_HAS_SYS_TYPES_H 1
-| #define PJ_HAS_TIME_H 1
-| #define PJ_HAS_UNISTD_H 1
-| #define PJ_HAS_NET_IF_H 1
-| #define PJ_OS_NAME "x86_64-unknown-linux-gnu"
-| #define PJ_HAS_ERRNO_VAR 1
-| #define PJ_HAS_HIGH_RES_TIMER 1
-| #define PJ_HAS_MALLOC 1
-| #define PJ_NATIVE_STRING_IS_UNICODE 0
-| #define PJ_ATOMIC_VALUE_TYPE long
-| #define PJ_SOCK_HAS_INET_ATON 1
-| #define PJ_SOCK_HAS_INET_PTON 1
-| #define PJ_SOCK_HAS_INET_NTOP 1
-| #define PJ_SOCK_HAS_GETADDRINFO 1
-| #define PJ_HAS_SOCKLEN_T 1
-| #define PJ_HAS_SO_ERROR 1
-| #define PJ_EMULATE_RWMUTEX 0
-| /* end confdefs.h.  */
-| 
-| /* Override any gcc2 internal prototype to avoid an error.  */
-| #ifdef __cplusplus
-| extern "C"
-| #endif
-| /* We use char because int might match the return type of a gcc2
-|    builtin and then its argument prototype would still apply.  */
-| char SSL_library_init ();
-| int
-| main ()
-| {
-| SSL_library_init ();
-|   ;
-|   return 0;
-| }
-aconfigure:11187: result: no
-aconfigure:11193: checking for ERR_load_BIO_strings in -lcrypto
-aconfigure:11223: gcc -o conftest -O2   conftest.c -lcrypto  -lm -luuid -lnsl -lrt -lpthread  -lasound >&5
-/usr/bin/ld: cannot find -lcrypto
-collect2: ld returned 1 exit status
-aconfigure:11229: $? = 1
-aconfigure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "pjproject"
-| #define PACKAGE_TARNAME "pjproject"
-| #define PACKAGE_VERSION "1.0"
-| #define PACKAGE_STRING "pjproject 1.0"
-| #define PACKAGE_BUGREPORT ""
-| #ifdef __cplusplus
-| extern "C" void exit (int) throw ();
-| #endif
-| #define HAVE_LIBPTHREAD 1
-| #define HAVE_LIBRT 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_LIBUUID 1
-| #define PJ_M_NAME "x86_64"
-| #define PJ_POOL_ALIGNMENT 8
-| #define PJ_LINUX 1
-| #define PJ_HAS_FLOATING_POINT 1
-| #define HAVE_LIBM 1
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define PJ_HAS_ARPA_INET_H 1
-| #define PJ_HAS_ASSERT_H 1
-| #define PJ_HAS_CTYPE_H 1
-| #define PJ_HAS_ERRNO_H 1
-| #define PJ_HAS_FCNTL_H 1
-| #define PJ_HAS_LINUX_SOCKET_H 1
-| #define PJ_HAS_MALLOC_H 1
-| #define PJ_HAS_NETDB_H 1
-| #define PJ_HAS_NETINET_IN_SYSTM_H 1
-| #define PJ_HAS_NETINET_IN_H 1
-| #define PJ_HAS_NETINET_IP_H 1
-| #define PJ_HAS_IFADDRS_H 1
-| #define PJ_HAS_SEMAPHORE_H 1
-| #define PJ_HAS_SETJMP_H 1
-| #define PJ_HAS_STDARG_H 1
-| #define PJ_HAS_STDDEF_H 1
-| #define PJ_HAS_STDIO_H 1
-| #define PJ_HAS_STDINT_H 1
-| #define PJ_HAS_STDLIB_H 1
-| #define PJ_HAS_STRING_H 1
-| #define PJ_HAS_SYS_IOCTL_H 1
-| #define PJ_HAS_SYS_SELECT_H 1
-| #define PJ_HAS_SYS_SOCKET_H 1
-| #define PJ_HAS_SYS_TIME_H 1
-| #define PJ_HAS_SYS_TIMEB_H 1
-| #define PJ_HAS_SYS_TYPES_H 1
-| #define PJ_HAS_TIME_H 1
-| #define PJ_HAS_UNISTD_H 1
-| #define PJ_HAS_NET_IF_H 1
-| #define PJ_OS_NAME "x86_64-unknown-linux-gnu"
-| #define PJ_HAS_ERRNO_VAR 1
-| #define PJ_HAS_HIGH_RES_TIMER 1
-| #define PJ_HAS_MALLOC 1
-| #define PJ_NATIVE_STRING_IS_UNICODE 0
-| #define PJ_ATOMIC_VALUE_TYPE long
-| #define PJ_SOCK_HAS_INET_ATON 1
-| #define PJ_SOCK_HAS_INET_PTON 1
-| #define PJ_SOCK_HAS_INET_NTOP 1
-| #define PJ_SOCK_HAS_GETADDRINFO 1
-| #define PJ_HAS_SOCKLEN_T 1
-| #define PJ_HAS_SO_ERROR 1
-| #define PJ_EMULATE_RWMUTEX 0
-| /* end confdefs.h.  */
-| 
-| /* Override any gcc2 internal prototype to avoid an error.  */
-| #ifdef __cplusplus
-| extern "C"
-| #endif
-| /* We use char because int might match the return type of a gcc2
-|    builtin and then its argument prototype would still apply.  */
-| char ERR_load_BIO_strings ();
-| int
-| main ()
-| {
-| ERR_load_BIO_strings ();
-|   ;
-|   return 0;
-| }
-aconfigure:11255: result: no
-aconfigure:11269: result: ** OpenSSL libraries not found, disabling SSL support **
-aconfigure:11278: checking if select() needs correct nfds
-aconfigure:11292: result: no (default)
-aconfigure:11294: result: ** Decided that select() doesn't need correct nfds (please check)
-aconfigure:11299: checking if pj_thread_create() should enforce stack size
-aconfigure:11313: result: no (default)
-aconfigure:11318: checking if pj_thread_create() should allocate stack
-aconfigure:11332: result: no (default)
-aconfigure:11348: result: ** Setting non-blocking recv() retval to EAGAIN (please check)
-aconfigure:11364: result: ** Setting non-blocking connect() retval to EINPROGRESS (please check)
-aconfigure:11488: creating ./config.status
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by pjproject config.status 1.0, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status 
-
-on emilou-desktop
-
-config.status:691: creating build.mak
-config.status:691: creating build/os-auto.mak
-config.status:691: creating pjlib/build/os-auto.mak
-config.status:691: creating pjlib-util/build/os-auto.mak
-config.status:691: creating pjmedia/build/os-auto.mak
-config.status:691: creating pjsip/build/os-auto.mak
-config.status:691: creating third_party/build/portaudio/os-auto.mak
-config.status:691: creating third_party/build/os-auto.mak
-config.status:794: creating pjlib/include/pj/compat/os_auto.h
-config.status:794: creating pjlib/include/pj/compat/m_auto.h
-config.status:794: creating pjmedia/include/pjmedia/config_auto.h
-config.status:794: creating pjmedia/include/pjmedia-codec/config_auto.h
-config.status:794: creating pjsip/include/pjsip/sip_autoconf.h
-aconfigure:12561: result:
-
-Configurations for current target have been written to 'build.mak', and 'os-auto.mak' in various build directories, and pjlib/include/pj/compat/os_auto.h.
-
-Further customizations can be put in:
-  - 'user.mak'
-  - 'pjlib/include/pj/config_site.h'
-
-The next step now is to run 'make dep' and 'make'.
-
-
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-
-ac_cv_build=x86_64-unknown-linux-gnu
-ac_cv_build_alias=x86_64-unknown-linux-gnu
-ac_cv_c_bigendian=no
-ac_cv_c_compiler_gnu=yes
-ac_cv_cxx_compiler_gnu=yes
-ac_cv_env_CC_set=
-ac_cv_env_CC_value=
-ac_cv_env_CFLAGS_set=
-ac_cv_env_CFLAGS_value=
-ac_cv_env_CPPFLAGS_set=
-ac_cv_env_CPPFLAGS_value=
-ac_cv_env_CPP_set=
-ac_cv_env_CPP_value=
-ac_cv_env_CXXFLAGS_set=
-ac_cv_env_CXXFLAGS_value=
-ac_cv_env_CXX_set=
-ac_cv_env_CXX_value=
-ac_cv_env_LDFLAGS_set=
-ac_cv_env_LDFLAGS_value=
-ac_cv_env_build_alias_set=
-ac_cv_env_build_alias_value=
-ac_cv_env_host_alias_set=
-ac_cv_env_host_alias_value=
-ac_cv_env_target_alias_set=
-ac_cv_env_target_alias_value=
-ac_cv_exeext=
-ac_cv_header_alsa_version_h=yes
-ac_cv_header_arpa_inet_h=yes
-ac_cv_header_assert_h=yes
-ac_cv_header_ctype_h=yes
-ac_cv_header_errno_h=yes
-ac_cv_header_fcntl_h=yes
-ac_cv_header_ifaddrs_h=yes
-ac_cv_header_inttypes_h=yes
-ac_cv_header_linux_socket_h=yes
-ac_cv_header_linux_soundcard_h=yes
-ac_cv_header_machine_soundcard_h=no
-ac_cv_header_malloc_h=yes
-ac_cv_header_memory_h=yes
-ac_cv_header_mswsock_h=no
-ac_cv_header_net_if_h=yes
-ac_cv_header_netdb_h=yes
-ac_cv_header_netinet_in_h=yes
-ac_cv_header_netinet_in_systm_h=yes
-ac_cv_header_netinet_ip_h=yes
-ac_cv_header_openssl_ssl_h=no
-ac_cv_header_semaphore_h=yes
-ac_cv_header_setjmp_h=yes
-ac_cv_header_stdarg_h=yes
-ac_cv_header_stdc=yes
-ac_cv_header_stddef_h=yes
-ac_cv_header_stdint_h=yes
-ac_cv_header_stdio_h=yes
-ac_cv_header_stdlib_h=yes
-ac_cv_header_string_h=yes
-ac_cv_header_strings_h=yes
-ac_cv_header_sys_ioctl_h=yes
-ac_cv_header_sys_select_h=yes
-ac_cv_header_sys_socket_h=yes
-ac_cv_header_sys_soundcard_h=yes
-ac_cv_header_sys_stat_h=yes
-ac_cv_header_sys_time_h=yes
-ac_cv_header_sys_timeb_h=yes
-ac_cv_header_sys_types_h=yes
-ac_cv_header_time_h=yes
-ac_cv_header_unistd_h=yes
-ac_cv_header_uuid_uuid_h=yes
-ac_cv_header_winsock2_h=no
-ac_cv_header_winsock_h=no
-ac_cv_header_ws2tcpip_h=no
-ac_cv_host=x86_64-unknown-linux-gnu
-ac_cv_host_alias=x86_64-unknown-linux-gnu
-ac_cv_lib_crypto_ERR_load_BIO_strings=no
-ac_cv_lib_m_fmod=yes
-ac_cv_lib_nsl_puts=yes
-ac_cv_lib_ole32_puts=no
-ac_cv_lib_pthread_pthread_create=yes
-ac_cv_lib_rt_puts=yes
-ac_cv_lib_socket_puts=no
-ac_cv_lib_ssl_SSL_library_init=no
-ac_cv_lib_uuid_uuid_generate=yes
-ac_cv_lib_winmm_puts=no
-ac_cv_lib_ws2_32_puts=no
-ac_cv_lib_wsock32_puts=no
-ac_cv_objext=o
-ac_cv_prog_CPP='gcc -E'
-ac_cv_prog_ac_ct_CC=gcc
-ac_cv_prog_ac_ct_CXX=g++
-ac_cv_prog_cc_g=yes
-ac_cv_prog_cc_stdc=
-ac_cv_prog_cxx_g=yes
-ac_cv_prog_egrep='grep -E'
-ac_cv_target=x86_64-unknown-linux-gnu
-ac_cv_target_alias=x86_64-unknown-linux-gnu
-
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-
-CC='gcc'
-CFLAGS='-O2'
-CPP='gcc -E'
-CPPFLAGS=''
-CXX='g++'
-CXXFLAGS='-O2 '
-DEFS='-DHAVE_CONFIG_H'
-ECHO_C=''
-ECHO_N='-n'
-ECHO_T=''
-EGREP='grep -E'
-EXEEXT=''
-LDFLAGS=''
-LIBOBJS=''
-LIBS='-lm -luuid -lnsl -lrt -lpthread  -lasound'
-LTLIBOBJS=''
-OBJEXT='o'
-PACKAGE_BUGREPORT=''
-PACKAGE_NAME='pjproject'
-PACKAGE_STRING='pjproject 1.0'
-PACKAGE_TARNAME='pjproject'
-PACKAGE_VERSION='1.0'
-PATH_SEPARATOR=':'
-SHELL='/bin/bash'
-ac_build_mak_vars=''
-ac_cross_compile=''
-ac_ct_CC='gcc'
-ac_ct_CXX='g++'
-ac_host='unix'
-ac_linux_poll='select'
-ac_main_obj='main.o'
-ac_no_g711_codec=''
-ac_no_g722_codec=''
-ac_no_gsm_codec=''
-ac_no_ilbc_codec=''
-ac_no_l16_codec=''
-ac_no_large_filter=''
-ac_no_small_filter=''
-ac_no_speex_aec=''
-ac_no_speex_codec=''
-ac_no_ssl=''
-ac_os_objs='ioqueue_select.o file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o guid_uuid.o'
-ac_pa_cflags=' -DHAVE_SYS_SOUNDCARD_H -DHAVE_LINUX_SOUNDCARD_H -DPA_LITTLE_ENDIAN'
-ac_pa_use_alsa='1'
-ac_pa_use_oss='1'
-ac_pjdir='/home/emilou/git-repos/sflphone/sflphone-common/libs/pjproject-1.0.2'
-ac_pjmedia_snd='pa_unix'
-bindir='${exec_prefix}/bin'
-build='x86_64-unknown-linux-gnu'
-build_alias=''
-build_cpu='x86_64'
-build_os='linux-gnu'
-build_vendor='unknown'
-datadir='${prefix}/share'
-exec_prefix='${prefix}'
-host='x86_64-unknown-linux-gnu'
-host_alias=''
-host_cpu='x86_64'
-host_os='linux-gnu'
-host_vendor='unknown'
-includedir='${prefix}/include'
-infodir='${prefix}/info'
-libcrypto_present=''
-libdir='${exec_prefix}/lib'
-libexecdir='${exec_prefix}/libexec'
-libssl_present=''
-localstatedir='${prefix}/var'
-mandir='${prefix}/man'
-oldincludedir='/usr/include'
-openssl_h_present=''
-prefix='/usr/local'
-program_transform_name='s,x,x,'
-sbindir='${exec_prefix}/sbin'
-sharedstatedir='${prefix}/com'
-sysconfdir='${prefix}/etc'
-target='x86_64-unknown-linux-gnu'
-target_alias=''
-target_cpu='x86_64'
-target_os='linux-gnu'
-target_vendor='unknown'
-
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-
-#define HAVE_INTTYPES_H 1
-#define HAVE_LIBM 1
-#define HAVE_LIBNSL 1
-#define HAVE_LIBPTHREAD 1
-#define HAVE_LIBRT 1
-#define HAVE_LIBUUID 1
-#define HAVE_MEMORY_H 1
-#define HAVE_STDINT_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRINGS_H 1
-#define HAVE_STRING_H 1
-#define HAVE_SYS_STAT_H 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_UNISTD_H 1
-#define PACKAGE_BUGREPORT ""
-#define PACKAGE_NAME "pjproject"
-#define PACKAGE_STRING "pjproject 1.0"
-#define PACKAGE_TARNAME "pjproject"
-#define PACKAGE_VERSION "1.0"
-#define PJ_ATOMIC_VALUE_TYPE long
-#define PJ_BLOCKING_CONNECT_ERROR_VAL EINPROGRESS
-#define PJ_BLOCKING_ERROR_VAL EAGAIN
-#define PJ_EMULATE_RWMUTEX 0
-#define PJ_HAS_ARPA_INET_H 1
-#define PJ_HAS_ASSERT_H 1
-#define PJ_HAS_CTYPE_H 1
-#define PJ_HAS_ERRNO_H 1
-#define PJ_HAS_ERRNO_VAR 1
-#define PJ_HAS_FCNTL_H 1
-#define PJ_HAS_FLOATING_POINT 1
-#define PJ_HAS_HIGH_RES_TIMER 1
-#define PJ_HAS_IFADDRS_H 1
-#define PJ_HAS_LINUX_SOCKET_H 1
-#define PJ_HAS_MALLOC 1
-#define PJ_HAS_MALLOC_H 1
-#define PJ_HAS_NETDB_H 1
-#define PJ_HAS_NETINET_IN_H 1
-#define PJ_HAS_NETINET_IN_SYSTM_H 1
-#define PJ_HAS_NETINET_IP_H 1
-#define PJ_HAS_NET_IF_H 1
-#define PJ_HAS_SEMAPHORE_H 1
-#define PJ_HAS_SETJMP_H 1
-#define PJ_HAS_SOCKLEN_T 1
-#define PJ_HAS_SO_ERROR 1
-#define PJ_HAS_STDARG_H 1
-#define PJ_HAS_STDDEF_H 1
-#define PJ_HAS_STDINT_H 1
-#define PJ_HAS_STDIO_H 1
-#define PJ_HAS_STDLIB_H 1
-#define PJ_HAS_STRING_H 1
-#define PJ_HAS_SYS_IOCTL_H 1
-#define PJ_HAS_SYS_SELECT_H 1
-#define PJ_HAS_SYS_SOCKET_H 1
-#define PJ_HAS_SYS_TIMEB_H 1
-#define PJ_HAS_SYS_TIME_H 1
-#define PJ_HAS_SYS_TYPES_H 1
-#define PJ_HAS_TIME_H 1
-#define PJ_HAS_UNISTD_H 1
-#define PJ_LINUX 1
-#define PJ_M_NAME "x86_64"
-#define PJ_NATIVE_STRING_IS_UNICODE 0
-#define PJ_OS_NAME "x86_64-unknown-linux-gnu"
-#define PJ_POOL_ALIGNMENT 8
-#define PJ_SELECT_NEEDS_NFDS 0
-#define PJ_SOCK_HAS_GETADDRINFO 1
-#define PJ_SOCK_HAS_INET_ATON 1
-#define PJ_SOCK_HAS_INET_NTOP 1
-#define PJ_SOCK_HAS_INET_PTON 1
-#define PJ_THREAD_ALLOCATE_STACK 0
-#define PJ_THREAD_SET_STACK_SIZE 0
-#define STDC_HEADERS 1
-#endif
-#ifdef __cplusplus
-extern "C" void exit (int) throw ();
-
-aconfigure: exit 0
diff --git a/sflphone-common/libs/pjproject-1.0.2/config.status b/sflphone-common/libs/pjproject-1.0.2/config.status
deleted file mode 100755
index 2c61c60623246bb10326e73dc4512833636b35aa..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject-1.0.2/config.status
+++ /dev/null
@@ -1,1075 +0,0 @@
-#! /bin/bash
-# Generated by aconfigure.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=${CONFIG_SHELL-/bin/bash}
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by pjproject $as_me 1.0, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-config_files=" build.mak build/os-auto.mak pjlib/build/os-auto.mak pjlib-util/build/os-auto.mak pjmedia/build/os-auto.mak pjsip/build/os-auto.mak third_party/build/portaudio/os-auto.mak third_party/build/os-auto.mak"
-config_headers=" pjlib/include/pj/compat/os_auto.h pjlib/include/pj/compat/m_auto.h pjmedia/include/pjmedia/config_auto.h pjmedia/include/pjmedia-codec/config_auto.h pjsip/include/pjsip/sip_autoconf.h"
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Report bugs to <bug-autoconf@gnu.org>."
-ac_cs_version="\
-pjproject config.status 1.0
-configured by ./aconfigure, generated by GNU Autoconf 2.59,
-  with options \"\"
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=.
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  -*)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1" ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-if $ac_cs_recheck; then
-  echo "running /bin/bash ./aconfigure "  $ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec /bin/bash ./aconfigure  $ac_configure_extra_args --no-create --no-recursion
-fi
-
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "build.mak" ) CONFIG_FILES="$CONFIG_FILES build.mak" ;;
-  "build/os-auto.mak" ) CONFIG_FILES="$CONFIG_FILES build/os-auto.mak" ;;
-  "pjlib/build/os-auto.mak" ) CONFIG_FILES="$CONFIG_FILES pjlib/build/os-auto.mak" ;;
-  "pjlib-util/build/os-auto.mak" ) CONFIG_FILES="$CONFIG_FILES pjlib-util/build/os-auto.mak" ;;
-  "pjmedia/build/os-auto.mak" ) CONFIG_FILES="$CONFIG_FILES pjmedia/build/os-auto.mak" ;;
-  "pjsip/build/os-auto.mak" ) CONFIG_FILES="$CONFIG_FILES pjsip/build/os-auto.mak" ;;
-  "third_party/build/portaudio/os-auto.mak" ) CONFIG_FILES="$CONFIG_FILES third_party/build/portaudio/os-auto.mak" ;;
-  "third_party/build/os-auto.mak" ) CONFIG_FILES="$CONFIG_FILES third_party/build/os-auto.mak" ;;
-  "pjlib/include/pj/compat/os_auto.h" ) CONFIG_HEADERS="$CONFIG_HEADERS pjlib/include/pj/compat/os_auto.h" ;;
-  "pjlib/include/pj/compat/m_auto.h" ) CONFIG_HEADERS="$CONFIG_HEADERS pjlib/include/pj/compat/m_auto.h" ;;
-  "pjmedia/include/pjmedia/config_auto.h" ) CONFIG_HEADERS="$CONFIG_HEADERS pjmedia/include/pjmedia/config_auto.h" ;;
-  "pjmedia/include/pjmedia-codec/config_auto.h" ) CONFIG_HEADERS="$CONFIG_HEADERS pjmedia/include/pjmedia-codec/config_auto.h" ;;
-  "pjsip/include/pjsip/sip_autoconf.h" ) CONFIG_HEADERS="$CONFIG_HEADERS pjsip/include/pjsip/sip_autoconf.h" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t$/@;t t/; /@;t t$/s/[\\&,]/\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t$/,;t t/' >$tmp/subs.sed <<\CEOF
-s,@SHELL@,/bin/bash,;t t
-s,@PATH_SEPARATOR@,:,;t t
-s,@PACKAGE_NAME@,pjproject,;t t
-s,@PACKAGE_TARNAME@,pjproject,;t t
-s,@PACKAGE_VERSION@,1.0,;t t
-s,@PACKAGE_STRING@,pjproject 1.0,;t t
-s,@PACKAGE_BUGREPORT@,,;t t
-s,@exec_prefix@,${prefix},;t t
-s,@prefix@,/usr/local,;t t
-s,@program_transform_name@,s,x,x,,;t t
-s,@bindir@,${exec_prefix}/bin,;t t
-s,@sbindir@,${exec_prefix}/sbin,;t t
-s,@libexecdir@,${exec_prefix}/libexec,;t t
-s,@datadir@,${prefix}/share,;t t
-s,@sysconfdir@,${prefix}/etc,;t t
-s,@sharedstatedir@,${prefix}/com,;t t
-s,@localstatedir@,${prefix}/var,;t t
-s,@libdir@,${exec_prefix}/lib,;t t
-s,@includedir@,${prefix}/include,;t t
-s,@oldincludedir@,/usr/include,;t t
-s,@infodir@,${prefix}/info,;t t
-s,@mandir@,${prefix}/man,;t t
-s,@build_alias@,,;t t
-s,@host_alias@,,;t t
-s,@target_alias@,,;t t
-s,@DEFS@,-DHAVE_CONFIG_H,;t t
-s,@ECHO_C@,,;t t
-s,@ECHO_N@,-n,;t t
-s,@ECHO_T@,,;t t
-s,@LIBS@,-lm -luuid -lnsl -lrt -lpthread  -lasound,;t t
-s,@build@,x86_64-unknown-linux-gnu,;t t
-s,@build_cpu@,x86_64,;t t
-s,@build_vendor@,unknown,;t t
-s,@build_os@,linux-gnu,;t t
-s,@host@,x86_64-unknown-linux-gnu,;t t
-s,@host_cpu@,x86_64,;t t
-s,@host_vendor@,unknown,;t t
-s,@host_os@,linux-gnu,;t t
-s,@target@,x86_64-unknown-linux-gnu,;t t
-s,@target_cpu@,x86_64,;t t
-s,@target_vendor@,unknown,;t t
-s,@target_os@,linux-gnu,;t t
-s,@CC@,gcc,;t t
-s,@CFLAGS@,-O2,;t t
-s,@LDFLAGS@,,;t t
-s,@CPPFLAGS@,,;t t
-s,@ac_ct_CC@,gcc,;t t
-s,@EXEEXT@,,;t t
-s,@OBJEXT@,o,;t t
-s,@CXX@,g++,;t t
-s,@CXXFLAGS@,-O2 ,;t t
-s,@ac_ct_CXX@,g++,;t t
-s,@ac_pjdir@,/home/emilou/git-repos/sflphone/sflphone-common/libs/pjproject-1.0.2,;t t
-s,@ac_build_mak_vars@,,;t t
-s,@CPP@,gcc -E,;t t
-s,@EGREP@,grep -E,;t t
-s,@ac_os_objs@,ioqueue_select.o file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o guid_uuid.o,;t t
-s,@ac_pjmedia_snd@,pa_unix,;t t
-s,@ac_pa_cflags@, -DHAVE_SYS_SOUNDCARD_H -DHAVE_LINUX_SOUNDCARD_H -DPA_LITTLE_ENDIAN,;t t
-s,@ac_pa_use_alsa@,1,;t t
-s,@ac_pa_use_oss@,1,;t t
-s,@ac_no_small_filter@,,;t t
-s,@ac_no_large_filter@,,;t t
-s,@ac_no_speex_aec@,,;t t
-s,@ac_no_g711_codec@,,;t t
-s,@ac_no_l16_codec@,,;t t
-s,@ac_no_gsm_codec@,,;t t
-s,@ac_no_g722_codec@,,;t t
-s,@ac_no_speex_codec@,,;t t
-s,@ac_no_ilbc_codec@,,;t t
-s,@ac_no_ssl@,,;t t
-s,@openssl_h_present@,,;t t
-s,@libssl_present@,,;t t
-s,@libcrypto_present@,,;t t
-s,@ac_cross_compile@,,;t t
-s,@ac_linux_poll@,select,;t t
-s,@ac_host@,unix,;t t
-s,@ac_main_obj@,main.o,;t t
-s,@LIBOBJS@,,;t t
-s,@LTLIBOBJS@,,;t t
-CEOF
-
-  # Split the substitutions into bite-sized pieces for seds with
-  # small command number limits, like on Digital OSF/1 and HP-UX.
-  ac_max_sed_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # Line after last line for current file.
-  ac_more_lines=:
-  ac_sed_cmds=
-  while $ac_more_lines; do
-    if test $ac_beg -gt 1; then
-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-  sed "/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}
-
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-
-#
-# CONFIG_HEADER section.
-#
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
-ac_dB='[	 ].*$,\1#\2'
-ac_dC=' '
-ac_dD=',;t'
-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
-ac_uB='$,\1#\2define\3'
-ac_uC=' '
-ac_uD=',;t'
-
-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 # Do quote $f, to prevent DOS paths from being IFS'd.
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-  # Remove the trailing spaces.
-  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
-
-  # Handle all the #define templates only if necessary.
-  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then
-  # If there are no defines, we may have an empty if/fi
-  :
-  cat >$tmp/defines.sed <<CEOF
-/^[	 ]*#[	 ]*define/!b
-t clr
-: clr
-${ac_dA}PACKAGE_NAME${ac_dB}PACKAGE_NAME${ac_dC}"pjproject"${ac_dD}
-${ac_dA}PACKAGE_TARNAME${ac_dB}PACKAGE_TARNAME${ac_dC}"pjproject"${ac_dD}
-${ac_dA}PACKAGE_VERSION${ac_dB}PACKAGE_VERSION${ac_dC}"1.0"${ac_dD}
-${ac_dA}PACKAGE_STRING${ac_dB}PACKAGE_STRING${ac_dC}"pjproject 1.0"${ac_dD}
-${ac_dA}PACKAGE_BUGREPORT${ac_dB}PACKAGE_BUGREPORT${ac_dC}""${ac_dD}
-${ac_dA}HAVE_LIBPTHREAD${ac_dB}HAVE_LIBPTHREAD${ac_dC}1${ac_dD}
-${ac_dA}HAVE_LIBRT${ac_dB}HAVE_LIBRT${ac_dC}1${ac_dD}
-${ac_dA}HAVE_LIBNSL${ac_dB}HAVE_LIBNSL${ac_dC}1${ac_dD}
-${ac_dA}HAVE_LIBUUID${ac_dB}HAVE_LIBUUID${ac_dC}1${ac_dD}
-${ac_dA}PJ_M_NAME${ac_dB}PJ_M_NAME${ac_dC}"x86_64"${ac_dD}
-${ac_dA}PJ_POOL_ALIGNMENT${ac_dB}PJ_POOL_ALIGNMENT${ac_dC}8${ac_dD}
-${ac_dA}PJ_LINUX${ac_dB}PJ_LINUX${ac_dC}1${ac_dD}
-${ac_dA}PJ_HAS_FLOATING_POINT${ac_dB}PJ_HAS_FLOATING_POINT${ac_dC}1${ac_dD}
-${ac_dA}HAVE_LIBM${ac_dB}HAVE_LIBM${ac_dC}1${ac_dD}
-${ac_dA}STDC_HEADERS${ac_dB}STDC_HEADERS${ac_dC}1${ac_dD}
-${ac_dA}HAVE_SYS_TYPES_H${ac_dB}HAVE_SYS_TYPES_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_SYS_STAT_H${ac_dB}HAVE_SYS_STAT_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_STDLIB_H${ac_dB}HAVE_STDLIB_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_STRING_H${ac_dB}HAVE_STRING_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_MEMORY_H${ac_dB}HAVE_MEMORY_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_STRINGS_H${ac_dB}HAVE_STRINGS_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_INTTYPES_H${ac_dB}HAVE_INTTYPES_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_STDINT_H${ac_dB}HAVE_STDINT_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_UNISTD_H${ac_dB}HAVE_UNISTD_H${ac_dC}1${ac_dD}
-${ac_dA}PJ_HAS_ARPA_INET_H${ac_dB}PJ_HAS_ARPA_INET_H${ac_dC}1${ac_dD}
-${ac_dA}PJ_HAS_ASSERT_H${ac_dB}PJ_HAS_ASSERT_H${ac_dC}1${ac_dD}
-${ac_dA}PJ_HAS_CTYPE_H${ac_dB}PJ_HAS_CTYPE_H${ac_dC}1${ac_dD}
-${ac_dA}PJ_HAS_ERRNO_H${ac_dB}PJ_HAS_ERRNO_H${ac_dC}1${ac_dD}
-${ac_dA}PJ_HAS_FCNTL_H${ac_dB}PJ_HAS_FCNTL_H${ac_dC}1${ac_dD}
-${ac_dA}PJ_HAS_LINUX_SOCKET_H${ac_dB}PJ_HAS_LINUX_SOCKET_H${ac_dC}1${ac_dD}
-${ac_dA}PJ_HAS_MALLOC_H${ac_dB}PJ_HAS_MALLOC_H${ac_dC}1${ac_dD}
-${ac_dA}PJ_HAS_NETDB_H${ac_dB}PJ_HAS_NETDB_H${ac_dC}1${ac_dD}
-${ac_dA}PJ_HAS_NETINET_IN_SYSTM_H${ac_dB}PJ_HAS_NETINET_IN_SYSTM_H${ac_dC}1${ac_dD}
-${ac_dA}PJ_HAS_NETINET_IN_H${ac_dB}PJ_HAS_NETINET_IN_H${ac_dC}1${ac_dD}
-${ac_dA}PJ_HAS_NETINET_IP_H${ac_dB}PJ_HAS_NETINET_IP_H${ac_dC}1${ac_dD}
-${ac_dA}PJ_HAS_IFADDRS_H${ac_dB}PJ_HAS_IFADDRS_H${ac_dC}1${ac_dD}
-${ac_dA}PJ_HAS_SEMAPHORE_H${ac_dB}PJ_HAS_SEMAPHORE_H${ac_dC}1${ac_dD}
-${ac_dA}PJ_HAS_SETJMP_H${ac_dB}PJ_HAS_SETJMP_H${ac_dC}1${ac_dD}
-CEOF
-  sed -f $tmp/defines.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-
-  cat >$tmp/defines.sed <<CEOF
-/^[	 ]*#[	 ]*define/!b
-t clr
-: clr
-${ac_dA}PJ_HAS_STDARG_H${ac_dB}PJ_HAS_STDARG_H${ac_dC}1${ac_dD}
-${ac_dA}PJ_HAS_STDDEF_H${ac_dB}PJ_HAS_STDDEF_H${ac_dC}1${ac_dD}
-${ac_dA}PJ_HAS_STDIO_H${ac_dB}PJ_HAS_STDIO_H${ac_dC}1${ac_dD}
-${ac_dA}PJ_HAS_STDINT_H${ac_dB}PJ_HAS_STDINT_H${ac_dC}1${ac_dD}
-${ac_dA}PJ_HAS_STDLIB_H${ac_dB}PJ_HAS_STDLIB_H${ac_dC}1${ac_dD}
-${ac_dA}PJ_HAS_STRING_H${ac_dB}PJ_HAS_STRING_H${ac_dC}1${ac_dD}
-${ac_dA}PJ_HAS_SYS_IOCTL_H${ac_dB}PJ_HAS_SYS_IOCTL_H${ac_dC}1${ac_dD}
-${ac_dA}PJ_HAS_SYS_SELECT_H${ac_dB}PJ_HAS_SYS_SELECT_H${ac_dC}1${ac_dD}
-${ac_dA}PJ_HAS_SYS_SOCKET_H${ac_dB}PJ_HAS_SYS_SOCKET_H${ac_dC}1${ac_dD}
-${ac_dA}PJ_HAS_SYS_TIME_H${ac_dB}PJ_HAS_SYS_TIME_H${ac_dC}1${ac_dD}
-${ac_dA}PJ_HAS_SYS_TIMEB_H${ac_dB}PJ_HAS_SYS_TIMEB_H${ac_dC}1${ac_dD}
-${ac_dA}PJ_HAS_SYS_TYPES_H${ac_dB}PJ_HAS_SYS_TYPES_H${ac_dC}1${ac_dD}
-${ac_dA}PJ_HAS_TIME_H${ac_dB}PJ_HAS_TIME_H${ac_dC}1${ac_dD}
-${ac_dA}PJ_HAS_UNISTD_H${ac_dB}PJ_HAS_UNISTD_H${ac_dC}1${ac_dD}
-${ac_dA}PJ_HAS_NET_IF_H${ac_dB}PJ_HAS_NET_IF_H${ac_dC}1${ac_dD}
-${ac_dA}PJ_OS_NAME${ac_dB}PJ_OS_NAME${ac_dC}"x86_64-unknown-linux-gnu"${ac_dD}
-${ac_dA}PJ_HAS_ERRNO_VAR${ac_dB}PJ_HAS_ERRNO_VAR${ac_dC}1${ac_dD}
-${ac_dA}PJ_HAS_HIGH_RES_TIMER${ac_dB}PJ_HAS_HIGH_RES_TIMER${ac_dC}1${ac_dD}
-${ac_dA}PJ_HAS_MALLOC${ac_dB}PJ_HAS_MALLOC${ac_dC}1${ac_dD}
-${ac_dA}PJ_NATIVE_STRING_IS_UNICODE${ac_dB}PJ_NATIVE_STRING_IS_UNICODE${ac_dC}0${ac_dD}
-${ac_dA}PJ_ATOMIC_VALUE_TYPE${ac_dB}PJ_ATOMIC_VALUE_TYPE${ac_dC}long${ac_dD}
-${ac_dA}PJ_SOCK_HAS_INET_ATON${ac_dB}PJ_SOCK_HAS_INET_ATON${ac_dC}1${ac_dD}
-${ac_dA}PJ_SOCK_HAS_INET_PTON${ac_dB}PJ_SOCK_HAS_INET_PTON${ac_dC}1${ac_dD}
-${ac_dA}PJ_SOCK_HAS_INET_NTOP${ac_dB}PJ_SOCK_HAS_INET_NTOP${ac_dC}1${ac_dD}
-${ac_dA}PJ_SOCK_HAS_GETADDRINFO${ac_dB}PJ_SOCK_HAS_GETADDRINFO${ac_dC}1${ac_dD}
-${ac_dA}PJ_HAS_SOCKLEN_T${ac_dB}PJ_HAS_SOCKLEN_T${ac_dC}1${ac_dD}
-${ac_dA}PJ_HAS_SO_ERROR${ac_dB}PJ_HAS_SO_ERROR${ac_dC}1${ac_dD}
-${ac_dA}PJ_EMULATE_RWMUTEX${ac_dB}PJ_EMULATE_RWMUTEX${ac_dC}0${ac_dD}
-${ac_dA}PJ_SELECT_NEEDS_NFDS${ac_dB}PJ_SELECT_NEEDS_NFDS${ac_dC}0${ac_dD}
-${ac_dA}PJ_THREAD_SET_STACK_SIZE${ac_dB}PJ_THREAD_SET_STACK_SIZE${ac_dC}0${ac_dD}
-${ac_dA}PJ_THREAD_ALLOCATE_STACK${ac_dB}PJ_THREAD_ALLOCATE_STACK${ac_dC}0${ac_dD}
-${ac_dA}PJ_BLOCKING_ERROR_VAL${ac_dB}PJ_BLOCKING_ERROR_VAL${ac_dC}EAGAIN${ac_dD}
-${ac_dA}PJ_BLOCKING_CONNECT_ERROR_VAL${ac_dB}PJ_BLOCKING_CONNECT_ERROR_VAL${ac_dC}EINPROGRESS${ac_dD}
-CEOF
-  sed -f $tmp/defines.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-
-  fi # grep
-
-  # Handle all the #undef templates
-  cat >$tmp/undefs.sed <<CEOF
-/^[	 ]*#[	 ]*undef/!b
-t clr
-: clr
-${ac_uA}PACKAGE_NAME${ac_uB}PACKAGE_NAME${ac_uC}"pjproject"${ac_uD}
-${ac_uA}PACKAGE_TARNAME${ac_uB}PACKAGE_TARNAME${ac_uC}"pjproject"${ac_uD}
-${ac_uA}PACKAGE_VERSION${ac_uB}PACKAGE_VERSION${ac_uC}"1.0"${ac_uD}
-${ac_uA}PACKAGE_STRING${ac_uB}PACKAGE_STRING${ac_uC}"pjproject 1.0"${ac_uD}
-${ac_uA}PACKAGE_BUGREPORT${ac_uB}PACKAGE_BUGREPORT${ac_uC}""${ac_uD}
-${ac_uA}HAVE_LIBPTHREAD${ac_uB}HAVE_LIBPTHREAD${ac_uC}1${ac_uD}
-${ac_uA}HAVE_LIBRT${ac_uB}HAVE_LIBRT${ac_uC}1${ac_uD}
-${ac_uA}HAVE_LIBNSL${ac_uB}HAVE_LIBNSL${ac_uC}1${ac_uD}
-${ac_uA}HAVE_LIBUUID${ac_uB}HAVE_LIBUUID${ac_uC}1${ac_uD}
-${ac_uA}PJ_M_NAME${ac_uB}PJ_M_NAME${ac_uC}"x86_64"${ac_uD}
-${ac_uA}PJ_POOL_ALIGNMENT${ac_uB}PJ_POOL_ALIGNMENT${ac_uC}8${ac_uD}
-${ac_uA}PJ_LINUX${ac_uB}PJ_LINUX${ac_uC}1${ac_uD}
-${ac_uA}PJ_HAS_FLOATING_POINT${ac_uB}PJ_HAS_FLOATING_POINT${ac_uC}1${ac_uD}
-${ac_uA}HAVE_LIBM${ac_uB}HAVE_LIBM${ac_uC}1${ac_uD}
-${ac_uA}STDC_HEADERS${ac_uB}STDC_HEADERS${ac_uC}1${ac_uD}
-${ac_uA}HAVE_SYS_TYPES_H${ac_uB}HAVE_SYS_TYPES_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_SYS_STAT_H${ac_uB}HAVE_SYS_STAT_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_STDLIB_H${ac_uB}HAVE_STDLIB_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_STRING_H${ac_uB}HAVE_STRING_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_MEMORY_H${ac_uB}HAVE_MEMORY_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_STRINGS_H${ac_uB}HAVE_STRINGS_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_INTTYPES_H${ac_uB}HAVE_INTTYPES_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_STDINT_H${ac_uB}HAVE_STDINT_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_UNISTD_H${ac_uB}HAVE_UNISTD_H${ac_uC}1${ac_uD}
-${ac_uA}PJ_HAS_ARPA_INET_H${ac_uB}PJ_HAS_ARPA_INET_H${ac_uC}1${ac_uD}
-${ac_uA}PJ_HAS_ASSERT_H${ac_uB}PJ_HAS_ASSERT_H${ac_uC}1${ac_uD}
-${ac_uA}PJ_HAS_CTYPE_H${ac_uB}PJ_HAS_CTYPE_H${ac_uC}1${ac_uD}
-${ac_uA}PJ_HAS_ERRNO_H${ac_uB}PJ_HAS_ERRNO_H${ac_uC}1${ac_uD}
-${ac_uA}PJ_HAS_FCNTL_H${ac_uB}PJ_HAS_FCNTL_H${ac_uC}1${ac_uD}
-${ac_uA}PJ_HAS_LINUX_SOCKET_H${ac_uB}PJ_HAS_LINUX_SOCKET_H${ac_uC}1${ac_uD}
-${ac_uA}PJ_HAS_MALLOC_H${ac_uB}PJ_HAS_MALLOC_H${ac_uC}1${ac_uD}
-${ac_uA}PJ_HAS_NETDB_H${ac_uB}PJ_HAS_NETDB_H${ac_uC}1${ac_uD}
-${ac_uA}PJ_HAS_NETINET_IN_SYSTM_H${ac_uB}PJ_HAS_NETINET_IN_SYSTM_H${ac_uC}1${ac_uD}
-${ac_uA}PJ_HAS_NETINET_IN_H${ac_uB}PJ_HAS_NETINET_IN_H${ac_uC}1${ac_uD}
-${ac_uA}PJ_HAS_NETINET_IP_H${ac_uB}PJ_HAS_NETINET_IP_H${ac_uC}1${ac_uD}
-${ac_uA}PJ_HAS_IFADDRS_H${ac_uB}PJ_HAS_IFADDRS_H${ac_uC}1${ac_uD}
-${ac_uA}PJ_HAS_SEMAPHORE_H${ac_uB}PJ_HAS_SEMAPHORE_H${ac_uC}1${ac_uD}
-${ac_uA}PJ_HAS_SETJMP_H${ac_uB}PJ_HAS_SETJMP_H${ac_uC}1${ac_uD}
-CEOF
-  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-
-  cat >$tmp/undefs.sed <<CEOF
-/^[	 ]*#[	 ]*undef/!b
-t clr
-: clr
-${ac_uA}PJ_HAS_STDARG_H${ac_uB}PJ_HAS_STDARG_H${ac_uC}1${ac_uD}
-${ac_uA}PJ_HAS_STDDEF_H${ac_uB}PJ_HAS_STDDEF_H${ac_uC}1${ac_uD}
-${ac_uA}PJ_HAS_STDIO_H${ac_uB}PJ_HAS_STDIO_H${ac_uC}1${ac_uD}
-${ac_uA}PJ_HAS_STDINT_H${ac_uB}PJ_HAS_STDINT_H${ac_uC}1${ac_uD}
-${ac_uA}PJ_HAS_STDLIB_H${ac_uB}PJ_HAS_STDLIB_H${ac_uC}1${ac_uD}
-${ac_uA}PJ_HAS_STRING_H${ac_uB}PJ_HAS_STRING_H${ac_uC}1${ac_uD}
-${ac_uA}PJ_HAS_SYS_IOCTL_H${ac_uB}PJ_HAS_SYS_IOCTL_H${ac_uC}1${ac_uD}
-${ac_uA}PJ_HAS_SYS_SELECT_H${ac_uB}PJ_HAS_SYS_SELECT_H${ac_uC}1${ac_uD}
-${ac_uA}PJ_HAS_SYS_SOCKET_H${ac_uB}PJ_HAS_SYS_SOCKET_H${ac_uC}1${ac_uD}
-${ac_uA}PJ_HAS_SYS_TIME_H${ac_uB}PJ_HAS_SYS_TIME_H${ac_uC}1${ac_uD}
-${ac_uA}PJ_HAS_SYS_TIMEB_H${ac_uB}PJ_HAS_SYS_TIMEB_H${ac_uC}1${ac_uD}
-${ac_uA}PJ_HAS_SYS_TYPES_H${ac_uB}PJ_HAS_SYS_TYPES_H${ac_uC}1${ac_uD}
-${ac_uA}PJ_HAS_TIME_H${ac_uB}PJ_HAS_TIME_H${ac_uC}1${ac_uD}
-${ac_uA}PJ_HAS_UNISTD_H${ac_uB}PJ_HAS_UNISTD_H${ac_uC}1${ac_uD}
-${ac_uA}PJ_HAS_NET_IF_H${ac_uB}PJ_HAS_NET_IF_H${ac_uC}1${ac_uD}
-${ac_uA}PJ_OS_NAME${ac_uB}PJ_OS_NAME${ac_uC}"x86_64-unknown-linux-gnu"${ac_uD}
-${ac_uA}PJ_HAS_ERRNO_VAR${ac_uB}PJ_HAS_ERRNO_VAR${ac_uC}1${ac_uD}
-${ac_uA}PJ_HAS_HIGH_RES_TIMER${ac_uB}PJ_HAS_HIGH_RES_TIMER${ac_uC}1${ac_uD}
-${ac_uA}PJ_HAS_MALLOC${ac_uB}PJ_HAS_MALLOC${ac_uC}1${ac_uD}
-${ac_uA}PJ_NATIVE_STRING_IS_UNICODE${ac_uB}PJ_NATIVE_STRING_IS_UNICODE${ac_uC}0${ac_uD}
-${ac_uA}PJ_ATOMIC_VALUE_TYPE${ac_uB}PJ_ATOMIC_VALUE_TYPE${ac_uC}long${ac_uD}
-${ac_uA}PJ_SOCK_HAS_INET_ATON${ac_uB}PJ_SOCK_HAS_INET_ATON${ac_uC}1${ac_uD}
-${ac_uA}PJ_SOCK_HAS_INET_PTON${ac_uB}PJ_SOCK_HAS_INET_PTON${ac_uC}1${ac_uD}
-${ac_uA}PJ_SOCK_HAS_INET_NTOP${ac_uB}PJ_SOCK_HAS_INET_NTOP${ac_uC}1${ac_uD}
-${ac_uA}PJ_SOCK_HAS_GETADDRINFO${ac_uB}PJ_SOCK_HAS_GETADDRINFO${ac_uC}1${ac_uD}
-${ac_uA}PJ_HAS_SOCKLEN_T${ac_uB}PJ_HAS_SOCKLEN_T${ac_uC}1${ac_uD}
-${ac_uA}PJ_HAS_SO_ERROR${ac_uB}PJ_HAS_SO_ERROR${ac_uC}1${ac_uD}
-${ac_uA}PJ_EMULATE_RWMUTEX${ac_uB}PJ_EMULATE_RWMUTEX${ac_uC}0${ac_uD}
-${ac_uA}PJ_SELECT_NEEDS_NFDS${ac_uB}PJ_SELECT_NEEDS_NFDS${ac_uC}0${ac_uD}
-${ac_uA}PJ_THREAD_SET_STACK_SIZE${ac_uB}PJ_THREAD_SET_STACK_SIZE${ac_uC}0${ac_uD}
-${ac_uA}PJ_THREAD_ALLOCATE_STACK${ac_uB}PJ_THREAD_ALLOCATE_STACK${ac_uC}0${ac_uD}
-${ac_uA}PJ_BLOCKING_ERROR_VAL${ac_uB}PJ_BLOCKING_ERROR_VAL${ac_uC}EAGAIN${ac_uD}
-${ac_uA}PJ_BLOCKING_CONNECT_ERROR_VAL${ac_uB}PJ_BLOCKING_CONNECT_ERROR_VAL${ac_uC}EINPROGRESS${ac_uD}
-s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-CEOF
-  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    echo "/* Generated by configure.  */" >$tmp/config.h
-  else
-    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
-  fi
-  cat $tmp/in >>$tmp/config.h
-  rm -f $tmp/in
-  if test x"$ac_file" != x-; then
-    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-      { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-      rm -f $ac_file
-      mv $tmp/config.h $ac_file
-    fi
-  else
-    cat $tmp/config.h
-    rm -f $tmp/config.h
-  fi
-done
-
-{ (exit 0); exit 0; }
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/bin/pjlib-util-test-x86_64-unknown-linux-gnu b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/bin/pjlib-util-test-x86_64-unknown-linux-gnu
deleted file mode 100755
index d29a2047c0c9e32e4549e062089937381641a02b..0000000000000000000000000000000000000000
Binary files a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/bin/pjlib-util-test-x86_64-unknown-linux-gnu and /dev/null differ
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/os-auto.mak b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/os-auto.mak
deleted file mode 100644
index fe7975b64497ac781be78cb52d8fcbd9cb2a9842..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/os-auto.mak
+++ /dev/null
@@ -1,3 +0,0 @@
-# pjlib-util/build/os-auto.mak.  Generated from os-auto.mak.in by configure.
-export UTIL_TEST_OBJS = main.o
-
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/bin/pjlib-test-x86_64-unknown-linux-gnu b/sflphone-common/libs/pjproject-1.0.2/pjlib/bin/pjlib-test-x86_64-unknown-linux-gnu
deleted file mode 100755
index c6ed11cacf80b33d2f1413c74947812304dcb047..0000000000000000000000000000000000000000
Binary files a/sflphone-common/libs/pjproject-1.0.2/pjlib/bin/pjlib-test-x86_64-unknown-linux-gnu and /dev/null differ
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-auto.mak b/sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-auto.mak
deleted file mode 100644
index 126fe0993bef586c6b993db41f27a391b0682806..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-auto.mak
+++ /dev/null
@@ -1,35 +0,0 @@
-# pjlib/build/os-auto.mak.  Generated from os-auto.mak.in by configure.
-
-# Determine OS specific files
-AC_OS_OBJS=ioqueue_select.o file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o guid_uuid.o
-
-#
-# PJLIB_OBJS specified here are object files to be included in PJLIB
-# (the library) for this specific operating system. Object files common 
-# to all operating systems should go in Makefile instead.
-#
-export PJLIB_OBJS +=	$(AC_OS_OBJS) \
-			addr_resolv_sock.o \
-			log_writer_stdout.o \
-			os_timestamp_common.o \
-			pool_policy_malloc.o sock_bsd.o sock_select.o
-
-#
-# TEST_OBJS are operating system specific object files to be included in
-# the test application.
-#
-export TEST_OBJS +=	main.o
-
-#
-# Additional LDFLAGS for pjlib-test
-#
-export TEST_LDFLAGS +=  -lm -luuid -lnsl -lrt -lpthread  -lasound
-
-#
-# TARGETS are make targets in the Makefile, to be executed for this given
-# operating system.
-#
-export TARGETS	    =	pjlib pjlib-test
-
-
-
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_auto.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_auto.h
deleted file mode 100644
index bbdce3ca67bafb8bef5e8186d18d37259be66260..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_auto.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* pjlib/include/pj/compat/m_auto.h.  Generated by configure.  */
-/* $Id: m_auto.h.in 2528 2009-03-23 12:09:19Z bennylp $ */
-/*
- * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
- * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-#ifndef __PJ_COMPAT_M_AUTO_H__
-#define __PJ_COMPAT_M_AUTO_H__
-
-/**
- * @file m_auto.h
- * @brief Automatically generated process definition file.
- */
-
-/* Machine name, filled in by autoconf script */
-#define PJ_M_NAME "x86_64"
-
-/* Endianness. It's reported on pjsip list on 09/02/13 that autoconf
- * endianness detection failed for universal build, so special case
- * for it here. Thanks Ruud Klaver for the fix.
- */
-#ifdef PJ_DARWINOS
-#  ifdef __BIG_ENDIAN__
-#    define WORDS_BIGENDIAN	1
-#  endif
-#else
-    /* Endianness, as detected by autoconf */
-/* #  undef WORDS_BIGENDIAN */
-#endif
-
-#ifdef WORDS_BIGENDIAN
-#  define PJ_IS_LITTLE_ENDIAN	0
-#  define PJ_IS_BIG_ENDIAN	1
-#else
-#  define PJ_IS_LITTLE_ENDIAN	1
-#  define PJ_IS_BIG_ENDIAN	0
-#endif
-
-
-/* Specify if floating point is present/desired */
-#define PJ_HAS_FLOATING_POINT 1
-
-/* Deprecated */
-#define PJ_HAS_PENTIUM		0
-
-#endif	/* __PJ_COMPAT_M_AUTO_H__ */
-
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_auto.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_auto.h
deleted file mode 100644
index 1d69febf20ff5dcf5a84f30e1320d1141f721c0f..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_auto.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/* pjlib/include/pj/compat/os_auto.h.  Generated by configure.  */
-/* $Id: os_auto.h.in 2394 2008-12-23 17:27:53Z bennylp $ */
-/*
- * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
- * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-#ifndef __PJ_COMPAT_OS_AUTO_H__
-#define __PJ_COMPAT_OS_AUTO_H__
-
-/**
- * @file os_auto.h
- * @brief Describes operating system specifics (automatically detected by
- *        autoconf)
- */
-
-/* Canonical OS name */
-#define PJ_OS_NAME "x86_64-unknown-linux-gnu"
-
-/* Legacy macros */
-/* #undef PJ_WIN32 */
-/* #undef PJ_WIN32_WINNT */
-/* #undef WIN32_LEAN_AND_MEAN */
-/* #undef PJ_DARWINOS */
-#define PJ_LINUX 1
-/* #undef PJ_RTEMS */
-/* #undef PJ_SUNOS */
-
-#if defined(PJ_WIN32_WINNT) && !defined(_WIN32_WINNT)
-#  define _WIN32_WINNT	PJ_WIN32_WINNT
-#endif
-
-/* Headers availability */
-#define PJ_HAS_ARPA_INET_H 1
-#define PJ_HAS_ASSERT_H 1
-#define PJ_HAS_CTYPE_H 1
-#define PJ_HAS_ERRNO_H 1
-#define PJ_HAS_FCNTL_H 1
-#define PJ_HAS_LINUX_SOCKET_H 1
-#define PJ_HAS_MALLOC_H 1
-#define PJ_HAS_NETDB_H 1
-#define PJ_HAS_NETINET_IN_SYSTM_H 1
-#define PJ_HAS_NETINET_IN_H 1
-#define PJ_HAS_NETINET_IP_H 1
-#define PJ_HAS_NET_IF_H 1
-#define PJ_HAS_IFADDRS_H 1
-#define PJ_HAS_SEMAPHORE_H 1
-#define PJ_HAS_SETJMP_H 1
-#define PJ_HAS_STDARG_H 1
-#define PJ_HAS_STDDEF_H 1
-#define PJ_HAS_STDIO_H 1
-#define PJ_HAS_STDINT_H 1
-#define PJ_HAS_STDLIB_H 1
-#define PJ_HAS_STRING_H 1
-#define PJ_HAS_SYS_IOCTL_H 1
-#define PJ_HAS_SYS_SELECT_H 1
-#define PJ_HAS_SYS_SOCKET_H 1
-#define PJ_HAS_SYS_TIME_H 1
-#define PJ_HAS_SYS_TIMEB_H 1
-#define PJ_HAS_SYS_TYPES_H 1
-#define PJ_HAS_TIME_H 1
-#define PJ_HAS_UNISTD_H 1
-
-/* #undef PJ_HAS_MSWSOCK_H */
-/* #undef PJ_HAS_WINSOCK_H */
-/* #undef PJ_HAS_WINSOCK2_H */
-/* #undef PJ_HAS_WS2TCPIP_H */
-
-#define PJ_SOCK_HAS_INET_ATON 1
-#define PJ_SOCK_HAS_INET_PTON 1
-#define PJ_SOCK_HAS_INET_NTOP 1
-#define PJ_SOCK_HAS_GETADDRINFO 1
-
-/* On these OSes, semaphore feature depends on semaphore.h */
-#if defined(PJ_HAS_SEMAPHORE_H) && PJ_HAS_SEMAPHORE_H!=0
-#   define PJ_HAS_SEMAPHORE	1
-#elif defined(PJ_WIN32) && PJ_WIN32!=0
-#   define PJ_HAS_SEMAPHORE	1
-#else
-#   define PJ_HAS_SEMAPHORE	0
-#endif
-
-/* Do we have pthread_mutexattr_settype()? */
-/* #undef PJ_HAS_PTHREAD_MUTEXATTR_SETTYPE */
-
-/* Does pthread_mutexattr_t has "recursive" member?  */
-/* #undef PJ_PTHREAD_MUTEXATTR_T_HAS_RECURSIVE */
-
-/* Set 1 if native sockaddr_in has sin_len member.
- * Default: 0
- */
-/* #undef PJ_SOCKADDR_HAS_LEN */
-
-/* Does the OS have socklen_t? */
-#define PJ_HAS_SOCKLEN_T 1
-
-#if !defined(socklen_t) && (!defined(PJ_HAS_SOCKLEN_T) || PJ_HAS_SOCKLEN_T==0)
-# define PJ_HAS_SOCKLEN_T 1
-  typedef int socklen_t;
-#endif
-
-/**
- * If this macro is set, it tells select I/O Queue that select() needs to
- * be given correct value of nfds (i.e. largest fd + 1). This requires
- * select ioqueue to re-scan the descriptors on each registration and
- * unregistration.
- * If this macro is not set, then ioqueue will always give FD_SETSIZE for
- * nfds argument when calling select().
- *
- * Default: 0
- */
-#define PJ_SELECT_NEEDS_NFDS 0
-
-/* Is errno a good way to retrieve OS errors?
- */
-#define PJ_HAS_ERRNO_VAR 1
-
-/* When this macro is set, getsockopt(SOL_SOCKET, SO_ERROR) will return
- * the status of non-blocking connect() operation.
- */
-#define PJ_HAS_SO_ERROR 1
-
-/* This value specifies the value set in errno by the OS when a non-blocking
- * socket recv() can not return immediate daata.
- */
-#define PJ_BLOCKING_ERROR_VAL EAGAIN
-
-/* This value specifies the value set in errno by the OS when a non-blocking
- * socket connect() can not get connected immediately.
- */
-#define PJ_BLOCKING_CONNECT_ERROR_VAL EINPROGRESS
-
-/* Default threading is enabled, unless it's overridden. */
-#ifndef PJ_HAS_THREADS
-#  define PJ_HAS_THREADS	    (1)
-#endif
-
-/* Do we need high resolution timer? */
-#define PJ_HAS_HIGH_RES_TIMER 1
-
-/* Is malloc() available? */
-#define PJ_HAS_MALLOC 1
-
-#ifndef PJ_OS_HAS_CHECK_STACK
-#   define PJ_OS_HAS_CHECK_STACK    0
-#endif
-
-/* Unicode? */
-#define PJ_NATIVE_STRING_IS_UNICODE 0
-
-/* Pool alignment in bytes */
-#define PJ_POOL_ALIGNMENT 8
-
-/* The type of atomic variable value: */
-#define PJ_ATOMIC_VALUE_TYPE long
-
-/* If 1, use Read/Write mutex emulation for platforms that don't support it */
-#define PJ_EMULATE_RWMUTEX 0
-
-/* If 1, pj_thread_create() should enforce the stack size when creating
- * threads.
- * Default: 0 (let OS decide the thread's stack size).
- */
-#define PJ_THREAD_SET_STACK_SIZE 0
-
-/* If 1, pj_thread_create() should allocate stack from the pool supplied.
- * Default: 0 (let OS allocate memory for thread's stack).
- */
-#define PJ_THREAD_ALLOCATE_STACK 0
-
-#endif	/* __PJ_COMPAT_OS_AUTO_H__ */
-
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/config_site.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/config_site.h
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_time_win32.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_time_win32.c
deleted file mode 100644
index 5b9af57ebccad704e4c1bdcda9d973de4ef724b4..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_time_win32.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/* $Id: os_time_win32.c 2394 2008-12-23 17:27:53Z bennylp $ */
-/* 
- * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
- * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
- */
-#include <pj/os.h>
-#include <pj/string.h>
-#include <windows.h>
-
-///////////////////////////////////////////////////////////////////////////////
-
-#define SECS_TO_FT_MULT 10000000
-
-static LARGE_INTEGER base_time;
-
-// Find 1st Jan 1970 as a FILETIME 
-static void get_base_time(void)
-{
-    SYSTEMTIME st;
-    FILETIME ft;
-
-    memset(&st,0,sizeof(st));
-    st.wYear=1970;
-    st.wMonth=1;
-    st.wDay=1;
-    SystemTimeToFileTime(&st, &ft);
-    
-    base_time.LowPart = ft.dwLowDateTime;
-    base_time.HighPart = ft.dwHighDateTime;
-    base_time.QuadPart /= SECS_TO_FT_MULT;
-}
-
-PJ_DEF(pj_status_t) pj_gettimeofday(pj_time_val *tv)
-{
-    SYSTEMTIME st;
-    FILETIME ft;
-    LARGE_INTEGER li;
-
-    if (base_time.QuadPart == 0)
-	get_base_time();
-
-    GetLocalTime(&st);
-    SystemTimeToFileTime(&st, &ft);
-
-    li.LowPart = ft.dwLowDateTime;
-    li.HighPart = ft.dwHighDateTime;
-    li.QuadPart /= SECS_TO_FT_MULT;
-    li.QuadPart -= base_time.QuadPart;
-
-    tv->sec = li.LowPart;
-    tv->msec = st.wMilliseconds;
-
-    return PJ_SUCCESS;
-}
-
-PJ_DEF(pj_status_t) pj_time_decode(const pj_time_val *tv, pj_parsed_time *pt)
-{
-    LARGE_INTEGER li;
-    FILETIME ft;
-    SYSTEMTIME st;
-
-    li.QuadPart = tv->sec;
-    li.QuadPart += base_time.QuadPart;
-    li.QuadPart *= SECS_TO_FT_MULT;
-
-    ft.dwLowDateTime = li.LowPart;
-    ft.dwHighDateTime = li.HighPart;
-    FileTimeToSystemTime(&ft, &st);
-
-    pt->year = st.wYear;
-    pt->mon = st.wMonth-1;
-    pt->day = st.wDay;
-    pt->wday = st.wDayOfWeek;
-
-    pt->hour = st.wHour;
-    pt->min = st.wMinute;
-    pt->sec = st.wSecond;
-    pt->msec = tv->msec;
-
-    return PJ_SUCCESS;
-}
-
-/**
- * Encode parsed time to time value.
- */
-PJ_DEF(pj_status_t) pj_time_encode(const pj_parsed_time *pt, pj_time_val *tv)
-{
-    SYSTEMTIME st;
-    FILETIME ft;
-    LARGE_INTEGER li;
-
-    pj_bzero(&st, sizeof(st));
-    st.wYear = (pj_uint16_t) pt->year;
-    st.wMonth = (pj_uint16_t) (pt->mon + 1);
-    st.wDay = (pj_uint16_t) pt->day;
-    st.wHour = (pj_uint16_t) pt->hour;
-    st.wMinute = (pj_uint16_t) pt->min;
-    st.wSecond = (pj_uint16_t) pt->sec;
-    st.wMilliseconds = (pj_uint16_t) pt->msec;
-    
-    SystemTimeToFileTime(&st, &ft);
-
-    li.LowPart = ft.dwLowDateTime;
-    li.HighPart = ft.dwHighDateTime;
-    li.QuadPart /= SECS_TO_FT_MULT;
-    li.QuadPart -= base_time.QuadPart;
-
-    tv->sec = li.LowPart;
-    tv->msec = st.wMilliseconds;
-
-    return PJ_SUCCESS;
-}
-
-/**
- * Convert local time to GMT.
- */
-PJ_DEF(pj_status_t) pj_time_local_to_gmt(pj_time_val *tv);
-
-/**
- * Convert GMT to local time.
- */
-PJ_DEF(pj_status_t) pj_time_gmt_to_local(pj_time_val *tv);
-
-
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/bin/pjmedia-test-x86_64-unknown-linux-gnu b/sflphone-common/libs/pjproject-1.0.2/pjmedia/bin/pjmedia-test-x86_64-unknown-linux-gnu
deleted file mode 100755
index e79b87acc0657fe03f984fa890304b3d4ef82de7..0000000000000000000000000000000000000000
Binary files a/sflphone-common/libs/pjproject-1.0.2/pjmedia/bin/pjmedia-test-x86_64-unknown-linux-gnu and /dev/null differ
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/Jbtest.dat b/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/Jbtest.dat
deleted file mode 100644
index 7646b6f597305c3e2e252b930c4ad3f458dc16b8..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/Jbtest.dat
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-###############################################################################
-# This test demonstrates situation where there is no jitter. 
-# Jitter should go the minimum configured value.
-###############################################################################
-#
-#PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG
-
-#
-###############################################################################
-# This test demonstrates situation where there is no jitter, but with
-# addition of silence compression. The jitter value should also go
-# to the minimum.
-###############################################################################
-#
-#PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG /* Start silence */ GGGGGGGGGGGGGGGGGGGGG /* End silence */ PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG
-
-#
-###############################################################################
-# This test demonstrates situation where there's about one-three packets jitter
-# in the network, without packet lost.
-###############################################################################
-#
-#PGPGPPGGPPGGPPGGGGPG PGPGPPGGPPPGGPPGGGPG PGPGPPGGPPPGGPPGGGPG PGPGPPGGPPGGPPPGGGPG PGPGPPGGPPGGPPPGGGPG
-
-#
-###############################################################################
-# Two gets two puts, no jitter
-###############################################################################
-#
-#PPGGPPGGPPGGPPGGPPGG PPGGPPGGPPGGPPGGPPGG PPGGPPGGPPGGPPGGPPGG PPGGPPGGPPGGPPGGPPGG PPGGPPGGPPGGPPGGPPGG
-
-#
-###############################################################################
-# Three gets three puts, no packet lost
-###############################################################################
-#
-#PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG
-
-
-#
-###############################################################################
-# Three gets three puts, with packet lost
-###############################################################################
-#
-#PPPGGGPPPGGGPPPGGGPGPG /* Lost */ GGGGGGGGGG PPPGGGPPPGGGPPPGGGPGPG /* Lost */ GGGGGGGGGG PPPGGGPPPGGGPPPGGGPGPG /* Lost */ GGGGGGGGGG PPPGGGPPPGGGPPPGGGPGPG /* Lost */ GGGGGGGGGG PPPGGGPPPGGGPPPGGGPGPG /* Lost */ GGGGGGGGGG PPPGGGPPPGGGPPPGGGPGPG /* Lost */ GGGGGGGGGG PPPGGGPPPGGGPPPGGGPGPG /* Lost */ GGGGGGGGGG PPPGGGPPPGGGPPPGGGPGPG /* Lost */ GGGGGGGGGG PPPGGGPPPGGGPPPGGGPGPG /* Lost */ GGGGGGGGGG PPPGGGPPPGGGPPPGGGPGPG /* Lost */ GGGGGGGGGG PPPGGGPPPGGGPPPGGGPGPG
-
-
-#
-###############################################################################
-# Three gets three puts, then stable
-###############################################################################
-#
-PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PPPGGGPPPGGGPPPGGGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG 
-
-#
-###############################################################################
-# Some jitter
-###############################################################################
-#
-#PGPGPGPGPG /*Some frames missing here*/ GG /*Some frames arrive*/ PPPG /*Normal*/ PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG
-
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-auto.mak b/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-auto.mak
deleted file mode 100644
index 88526c7557229514b8c39702af29d1293afeb01f..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-auto.mak
+++ /dev/null
@@ -1,109 +0,0 @@
-# pjmedia/build/os-auto.mak.  Generated from os-auto.mak.in by configure.
-
-# PJMEDIA features exclusion
-export CFLAGS +=   
-
-# Define the desired sound device backend
-# Valid values are:
-#   - pa_unix:	    	PortAudio on Unix (OSS or ALSA)
-#   - pa_darwinos:  	PortAudio on MacOSX (CoreAudio)
-#   - pa_old_darwinos:  PortAudio on MacOSX (old CoreAudio, for OSX 10.2)
-#   - pa_win32:	    	PortAudio on Win32 (WMME)
-#   - ds:	    	Win32 DirectSound (dsound.c)
-#   - null:	    	Null sound device (nullsound.c)
-#   - external:		Link with no sounddev (app will provide)
-AC_PJMEDIA_SND=pa_unix
-
-# For Unix, specify if ALSA should be supported
-AC_PA_USE_ALSA=1
-
-# Additional PortAudio CFLAGS are in  -DHAVE_SYS_SOUNDCARD_H -DHAVE_LINUX_SOUNDCARD_H -DPA_LITTLE_ENDIAN
-
-#
-# Codecs
-#
-AC_NO_G711_CODEC=
-AC_NO_L16_CODEC=
-AC_NO_GSM_CODEC=
-AC_NO_SPEEX_CODEC=
-AC_NO_ILBC_CODEC=
-AC_NO_G722_CODEC=
-
-export CODEC_OBJS=
-
-ifeq ($(AC_NO_G711_CODEC),1)
-export CFLAGS += -DPJMEDIA_HAS_G711_CODEC=0
-else
-export CODEC_OBJS +=
-endif
-
-ifeq ($(AC_NO_L16_CODEC),1)
-export CFLAGS += -DPJMEDIA_HAS_L16_CODEC=0
-else
-export CODEC_OBJS += l16.o
-endif
-
-ifeq ($(AC_NO_GSM_CODEC),1)
-export CFLAGS += -DPJMEDIA_HAS_GSM_CODEC=0
-else
-export CODEC_OBJS += gsm.o
-endif
-
-ifeq ($(AC_NO_SPEEX_CODEC),1)
-export CFLAGS += -DPJMEDIA_HAS_SPEEX_CODEC=0
-else
-export CFLAGS += -I$(THIRD_PARTY)/build/speex -I$(THIRD_PARTY)/speex/include
-export CODEC_OBJS += speex_codec.o
-
-ifneq (,1)
-export PJMEDIA_OBJS += echo_speex.o
-endif
-
-endif
-
-ifeq ($(AC_NO_ILBC_CODEC),1)
-export CFLAGS += -DPJMEDIA_HAS_ILBC_CODEC=0
-else
-export CODEC_OBJS += ilbc.o
-endif
-
-ifeq ($(AC_NO_G722_CODEC),1)
-export CFLAGS += -DPJMEDIA_HAS_G722_CODEC=0
-else
-export CODEC_OBJS += g722.o g722/g722_enc.o g722/g722_dec.o
-endif
-
-
-#
-# PortAudio
-#
-ifneq ($(findstring pa,$(AC_PJMEDIA_SND)),)
-export CFLAGS += -I$(THIRD_PARTY)/build/portaudio -I$(THIRD_PARTY)/portaudio/include -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_PORTAUDIO_SOUND
-export SOUND_OBJS = pasound.o
-endif
-
-#
-# Win32 DirectSound
-#
-ifeq ($(AC_PJMEDIA_SND),ds)
-export SOUND_OBJS = dsound.o
-export CFLAGS += -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_WIN32_DIRECT_SOUND
-endif
-
-#
-# Null sound device
-#
-ifeq ($(AC_PJMEDIA_SND),null)
-export SOUND_OBJS = nullsound.o
-export CFLAGS += -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_NULL_SOUND
-endif
-
-#
-# External sound device
-#
-ifeq ($(AC_PJMEDIA_SND),external)
-export SOUND_OBJS = 
-export CFLAGS += -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_EXTERNAL
-endif
-
-
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/config_auto.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/config_auto.h
deleted file mode 100644
index dce3d656a99f8fd0a857e40f4781068de96d3338..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/config_auto.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* pjmedia/include/pjmedia-codec/config_auto.h.  Generated by configure.  */
-/* $Id: config_auto.h.in 2394 2008-12-23 17:27:53Z bennylp $ */
-/*
- * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
- * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-#ifndef __PJMEDIA_CODEC_CONFIG_AUTO_H_
-#define __PJMEDIA_CODEC_CONFIG_AUTO_H_
-
-/**
- * @file config_auto.h
- * @brief PJMEDIA-CODEC configuration as set by autoconf script
- */
-
-/*
- * Note:
- *	The configuration in config_site.h overrides any other settings,
- *	including the setting as detected by autoconf.
- */
-
-/* L16 codec */
-#ifndef PJMEDIA_HAS_L16_CODEC
-/* #undef PJMEDIA_HAS_L16_CODEC */
-#endif
-
-
-/* GSM codec */
-#ifndef PJMEDIA_HAS_GSM_CODEC
-/* #undef PJMEDIA_HAS_GSM_CODEC */
-#endif
-
-
-/* Speex codec */
-#ifndef PJMEDIA_HAS_SPEEX_CODEC
-/* #undef PJMEDIA_HAS_SPEEX_CODEC */
-#endif
-
-
-/* iLBC codec */
-#ifndef PJMEDIA_HAS_ILBC_CODEC
-/* #undef PJMEDIA_HAS_ILBC_CODEC */
-#endif
-
-
-/* G722 codec */
-#ifndef PJMEDIA_HAS_G722_CODEC
-/* #undef PJMEDIA_HAS_G722_CODEC */
-#endif
-
-
-#endif	/* __PJMEDIA_CODEC_CONFIG_AUTO_H_ */
-
-
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/config_auto.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/config_auto.h
deleted file mode 100644
index e88f6b957d5632144858e0b6f1f5b2bda0f09cf3..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/config_auto.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* pjmedia/include/pjmedia/config_auto.h.  Generated by configure.  */
-/* $Id: config_auto.h.in 2394 2008-12-23 17:27:53Z bennylp $ */
-/*
- * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
- * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-#ifndef __PJMEDIA_CONFIG_AUTO_H_
-#define __PJMEDIA_CONFIG_AUTO_H_
-
-/**
- * @file config_auto.h
- * @brief PJMEDIA configuration as set by autoconf script
- */
-
-/*
- * Note:
- *	The configuration in config_site.h overrides any other settings,
- *	including the setting as detected by autoconf.
- */
-
-/* G711 codec */
-#ifndef PJMEDIA_HAS_G711_CODEC
-/* #undef PJMEDIA_HAS_G711_CODEC */
-#endif
-
-
-#endif	/* __PJMEDIA_CONFIG_AUTO_H_ */
-
-
-
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/jbuf.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/jbuf.c
deleted file mode 100644
index 75c3e11e7dbc5fbed8168be1bb25488dea727ffd..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/jbuf.c
+++ /dev/null
@@ -1,673 +0,0 @@
-/* $Id: jbuf.c 2549 2009-03-23 13:30:26Z nanang $ */
-/* 
- * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
- * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
- */
-/*
- * Based on implementation kindly contributed by Switchlab, Ltd.
- */
-#include <pjmedia/jbuf.h>
-#include <pjmedia/errno.h>
-#include <pj/pool.h>
-#include <pj/assert.h>
-#include <pj/log.h>
-#include <pj/math.h>
-#include <pj/string.h>
-
-
-#define THIS_FILE   "jbuf.c"
-
-#define SAFE_SHRINKING_DIFF	1
-#define MIN_SHRINK_GAP_MSEC	200
-
-typedef struct jb_framelist_t
-{
-    char	*flist_buffer;
-    int		*flist_frame_type;
-    pj_size_t	*flist_content_len;
-    pj_uint32_t	*flist_bit_info;
-    unsigned	 flist_frame_size;
-    unsigned	 flist_max_count;
-    unsigned	 flist_empty;
-    unsigned	 flist_head;
-    unsigned	 flist_tail;
-    unsigned	 flist_origin;
-} jb_framelist_t;
-
-
-struct pjmedia_jbuf
-{
-    pj_str_t	    name;		  // jitter buffer name
-    jb_framelist_t  jb_framelist;
-    pj_size_t	    jb_frame_size;	  // frame size	
-    unsigned	    jb_frame_ptime;	  // frame duration.
-    pj_size_t	    jb_max_count;	  // max frames in the jitter framelist->flist_buffer
-
-    int		    jb_level;		  // delay between source & destination
-					  // (calculated according of the number of get/put operations)
-    int		    jb_max_hist_level;    // max level during the last level calculations
-    int		    jb_stable_hist;	  // num of times the delay has	been lower then	the prefetch num
-    int		    jb_last_op;		  // last operation executed on	the framelist->flist_buffer (put/get)
-    int		    jb_last_seq_no;	  // seq no. of	the last frame inserted	to the framelist->flist_buffer
-    int		    jb_prefetch;	  // no. of frame to insert before removing some
-					  // (at the beginning of the framelist->flist_buffer operation)
-    int		    jb_prefetch_cnt;	  // prefetch counter
-    int		    jb_def_prefetch;	  // Default prefetch
-    int		    jb_min_prefetch;	  // Minimum allowable prefetch
-    int		    jb_max_prefetch;	  // Maximum allowable prefetch
-    int		    jb_status;		  // status is 'init' until the	first 'put' operation
-    pj_math_stat    jb_delay;		  // Delay statistics of jitter buffer (in frame unit)
-
-    unsigned	    jb_last_del_seq;	  // Seq # of last frame deleted
-    unsigned	    jb_min_shrink_gap;	  // How often can we shrink
-};
-
-
-#define JB_STATUS_INITIALIZING	0
-#define JB_STATUS_PROCESSING	1
-#define JB_STATUS_PREFETCHING	2
-
-/* Enabling this would log the jitter buffer state about once per 
- * second.
- */
-#if 1
-#  define TRACE__(args)	    PJ_LOG(5,args)
-#else
-#  define TRACE__(args)
-#endif
-
-
-static pj_status_t jb_framelist_init( pj_pool_t *pool,
-				      jb_framelist_t *framelist,
-				      unsigned frame_size,
-				      unsigned max_count) 
-{
-    PJ_ASSERT_RETURN(pool && framelist, PJ_EINVAL);
-
-    pj_bzero(framelist, sizeof(jb_framelist_t));
-
-    framelist->flist_frame_size = frame_size;
-    framelist->flist_max_count = max_count;
-    framelist->flist_buffer = (char*) 
-			      pj_pool_zalloc(pool,
-					     framelist->flist_frame_size * 
-					     framelist->flist_max_count);
-
-    framelist->flist_frame_type = (int*)
-	pj_pool_zalloc(pool, sizeof(framelist->flist_frame_type[0]) * 
-				framelist->flist_max_count);
-
-    framelist->flist_content_len = (pj_size_t*)
-	pj_pool_zalloc(pool, sizeof(framelist->flist_content_len[0]) * 
-				framelist->flist_max_count);
-
-    framelist->flist_bit_info = (pj_uint32_t*)
-	pj_pool_zalloc(pool, sizeof(framelist->flist_bit_info[0]) * 
-				framelist->flist_max_count);
-
-    framelist->flist_empty = 1;
-
-    return PJ_SUCCESS;
-
-}
-
-static pj_status_t jb_framelist_destroy(jb_framelist_t *framelist) 
-{
-    PJ_UNUSED_ARG(framelist);
-    return PJ_SUCCESS;
-}
-
-
-static unsigned jb_framelist_size(jb_framelist_t *framelist) 
-{
-    if (framelist->flist_tail == framelist->flist_head) {
-	return framelist->flist_empty ? 0 : framelist->flist_max_count;
-    } else {
-	return (framelist->flist_tail - framelist->flist_head + 
-		framelist->flist_max_count) % framelist->flist_max_count;
-    }
-}
-
-
-static pj_bool_t jb_framelist_get(jb_framelist_t *framelist,
-				  void *frame, pj_size_t *size,
-				  pjmedia_jb_frame_type *p_type,
-				  pj_uint32_t *bit_info) 
-{
-    if (!framelist->flist_empty) {
-	pj_memcpy(frame, 
-		  framelist->flist_buffer + 
-		    framelist->flist_head * framelist->flist_frame_size,
-		  framelist->flist_frame_size);
-	*p_type = (pjmedia_jb_frame_type) 
-		  framelist->flist_frame_type[framelist->flist_head];
-	if (size)
-	    *size   = framelist->flist_content_len[framelist->flist_head];
-	if (bit_info)
-	    *bit_info = framelist->flist_bit_info[framelist->flist_head];
-
-	pj_bzero(framelist->flist_buffer + 
-		    framelist->flist_head * framelist->flist_frame_size,
-		  framelist->flist_frame_size);
-	framelist->flist_frame_type[framelist->flist_head] = 
-	    PJMEDIA_JB_MISSING_FRAME;
-	framelist->flist_content_len[framelist->flist_head] = 0;
-
-	framelist->flist_origin++;
-	framelist->flist_head = (framelist->flist_head + 1 ) % 
-				framelist->flist_max_count;
-	if (framelist->flist_head == framelist->flist_tail) 
-	    framelist->flist_empty = PJ_TRUE;
-	
-	return PJ_TRUE;
-
-    } else {
-	pj_bzero(frame, framelist->flist_frame_size);
-	return PJ_FALSE;
-    }
-}
-
-
-static void jb_framelist_remove_head( jb_framelist_t *framelist,
-				      unsigned count) 
-{
-    unsigned cur_size;
-
-    cur_size = jb_framelist_size(framelist);
-    if (count > cur_size) 
-	count = cur_size;
-
-    if (count) {
-	// may be done in two steps if overlapping
-	unsigned step1,step2;
-	unsigned tmp = framelist->flist_head+count;
-
-	if (tmp > framelist->flist_max_count) {
-	    step1 = framelist->flist_max_count - framelist->flist_head;
-	    step2 = count-step1;
-	} else {
-	    step1 = count;
-	    step2 = 0;
-	}
-
-	pj_bzero(framelist->flist_buffer + 
-		    framelist->flist_head * framelist->flist_frame_size,
-	          step1*framelist->flist_frame_size);
-	pj_memset(framelist->flist_frame_type+framelist->flist_head,
-		  PJMEDIA_JB_MISSING_FRAME,
-		  step1*sizeof(framelist->flist_frame_type[0]));
-	pj_bzero(framelist->flist_content_len+framelist->flist_head,
-		  step1*sizeof(framelist->flist_content_len[0]));
-
-	if (step2) {
-	    pj_bzero( framelist->flist_buffer,
-		      step2*framelist->flist_frame_size);
-	    pj_memset(framelist->flist_frame_type,
-		      PJMEDIA_JB_MISSING_FRAME,
-		      step2*sizeof(framelist->flist_frame_type[0]));
-	    pj_bzero (framelist->flist_content_len,
-		      step2*sizeof(framelist->flist_content_len[0]));
-	}
-
-	// update pointers
-	framelist->flist_origin += count;
-	framelist->flist_head = (framelist->flist_head + count) % 
-			        framelist->flist_max_count;
-	if (framelist->flist_head == framelist->flist_tail) 
-	    framelist->flist_empty = PJ_TRUE;
-    }
-}
-
-
-static pj_bool_t jb_framelist_put_at(jb_framelist_t *framelist,
-				     unsigned index,
-				     const void *frame,
-				     unsigned frame_size,
-				     pj_uint32_t bit_info)
-{
-    unsigned where;
-
-    assert(frame_size <= framelist->flist_frame_size);
-
-    if (!framelist->flist_empty) {
-	unsigned max_index;
-	unsigned cur_size;
-
-	// too late
-	if (index < framelist->flist_origin) 
-	    return PJ_FALSE;
-
-	// too soon
-	max_index = framelist->flist_origin + framelist->flist_max_count - 1;
-	if (index > max_index)
-	    return PJ_FALSE;
-
-	where = (index - framelist->flist_origin + framelist->flist_head) % 
-	        framelist->flist_max_count;
-
-	// update framelist->flist_tail pointer
-	cur_size = jb_framelist_size(framelist);
-	if (index >= framelist->flist_origin + cur_size) {
-	    unsigned diff = (index - (framelist->flist_origin + cur_size));
-	    framelist->flist_tail = (framelist->flist_tail + diff + 1) % 
-				    framelist->flist_max_count;
-	}
-    } else {
-	// check if frame is not too late, but watch out for sequence restart.
-	if (index < framelist->flist_origin && 
-	    framelist->flist_origin - index < 0x7FFF) 
-	{
-	    return PJ_FALSE;
-	}
-
-	where = framelist->flist_tail;
-	framelist->flist_origin = index;
-	framelist->flist_tail = (framelist->flist_tail + 1) % 
-				framelist->flist_max_count;
-	framelist->flist_empty = PJ_FALSE;
-    }
-
-    pj_memcpy(framelist->flist_buffer + where * framelist->flist_frame_size, 
-	      frame, frame_size);
-
-    framelist->flist_frame_type[where] = PJMEDIA_JB_NORMAL_FRAME;
-    framelist->flist_content_len[where] = frame_size;
-    framelist->flist_bit_info[where] = bit_info;
-
-    return PJ_TRUE;
-}
-
-
-
-enum pjmedia_jb_op
-{
-    JB_OP_INIT  = -1,
-    JB_OP_PUT   = 1,
-    JB_OP_GET   = 2
-};
-
-
-PJ_DEF(pj_status_t) pjmedia_jbuf_create(pj_pool_t *pool, 
-					const pj_str_t *name,
-					unsigned frame_size, 
-					unsigned ptime,
-					unsigned max_count,
-					pjmedia_jbuf **p_jb)
-{
-    pjmedia_jbuf *jb;
-    pj_status_t status;
-
-    jb = PJ_POOL_ZALLOC_T(pool, pjmedia_jbuf);
-
-    status = jb_framelist_init(pool, &jb->jb_framelist, frame_size, max_count);
-    if (status != PJ_SUCCESS)
-	return status;
-
-    pj_strdup_with_null(pool, &jb->name, name);
-    jb->jb_frame_size	 = frame_size;
-    jb->jb_frame_ptime   = ptime;
-    jb->jb_last_seq_no	 = -1;
-    jb->jb_level	 = 0;
-    jb->jb_last_op	 = JB_OP_INIT;
-    jb->jb_prefetch	 = PJ_MIN(PJMEDIA_JB_DEFAULT_INIT_DELAY,max_count*4/5);
-    jb->jb_prefetch_cnt	 = 0;
-    jb->jb_min_prefetch  = 0;
-    jb->jb_max_prefetch  = max_count*4/5;
-    jb->jb_stable_hist	 = 0;
-    jb->jb_status	 = JB_STATUS_INITIALIZING;
-    jb->jb_max_hist_level = 0;
-    jb->jb_max_count	 = max_count;
-    jb->jb_min_shrink_gap= MIN_SHRINK_GAP_MSEC / ptime;
-
-    pj_math_stat_init(&jb->jb_delay);
-
-    *p_jb = jb;
-    return PJ_SUCCESS;
-}
-
-
-/*
- * Set the jitter buffer to fixed delay mode. The default behavior
- * is to adapt the delay with actual packet delay.
- *
- */
-PJ_DEF(pj_status_t) pjmedia_jbuf_set_fixed( pjmedia_jbuf *jb,
-					    unsigned prefetch)
-{
-    PJ_ASSERT_RETURN(jb, PJ_EINVAL);
-    PJ_ASSERT_RETURN(prefetch <= jb->jb_max_count, PJ_EINVAL);
-
-    jb->jb_min_prefetch = jb->jb_max_prefetch = 
-	jb->jb_prefetch = jb->jb_def_prefetch = prefetch;
-
-    return PJ_SUCCESS;
-}
-
-
-/*
- * Set the jitter buffer to adaptive mode.
- */
-PJ_DEF(pj_status_t) pjmedia_jbuf_set_adaptive( pjmedia_jbuf *jb,
-					       unsigned prefetch,
-					       unsigned min_prefetch,
-					       unsigned max_prefetch)
-{
-    PJ_ASSERT_RETURN(jb, PJ_EINVAL);
-    PJ_ASSERT_RETURN(min_prefetch < max_prefetch &&
-		     prefetch <= max_prefetch &&
-		     max_prefetch <= jb->jb_max_count,
-		     PJ_EINVAL);
-
-    jb->jb_prefetch = jb->jb_def_prefetch = prefetch;
-    jb->jb_min_prefetch = min_prefetch;
-    jb->jb_max_prefetch = max_prefetch;
-
-    return PJ_SUCCESS;
-}
-
-
-PJ_DEF(pj_status_t) pjmedia_jbuf_reset(pjmedia_jbuf *jb)
-{
-    jb->jb_last_seq_no	 = -1;
-    jb->jb_level	 = 0;
-    jb->jb_last_op	 = JB_OP_INIT;
-    jb->jb_prefetch_cnt	 = 0;
-    jb->jb_stable_hist	 = 0;
-    jb->jb_status	 = JB_STATUS_INITIALIZING;
-    jb->jb_max_hist_level = 0;
-
-    jb_framelist_remove_head(&jb->jb_framelist, 
-			     jb_framelist_size(&jb->jb_framelist));
-
-    pj_math_stat_init(&jb->jb_delay);
-    
-    return PJ_SUCCESS;
-}
-
-
-PJ_DEF(pj_status_t) pjmedia_jbuf_destroy(pjmedia_jbuf *jb)
-{
-    return jb_framelist_destroy(&jb->jb_framelist);
-}
-
-
-static void jbuf_calculate_jitter(pjmedia_jbuf *jb)
-{
-    int diff, cur_size;
-
-    cur_size = jb_framelist_size(&jb->jb_framelist);
-
-    /* Only apply burst-level calculation on PUT operation since if VAD is 
-     * active the burst-level may not be accurate.
-     */
-    if (jb->jb_last_op == JB_OP_PUT) {
-
-	jb->jb_max_hist_level = PJ_MAX(jb->jb_max_hist_level,jb->jb_level);
-
-	/* Level is decreasing */
-	if (jb->jb_level < jb->jb_prefetch) {
-
-	    enum { STABLE_HISTORY_LIMIT = 100 };
-	    
-	    jb->jb_stable_hist++;
-	    
-	    /* Only update the prefetch if 'stable' condition is reached 
-	     * (not just short time impulse)
-	     */
-	    if (jb->jb_stable_hist > STABLE_HISTORY_LIMIT) {
-		
-		diff = (jb->jb_prefetch - jb->jb_max_hist_level) / 3;
-
-		if (diff < 1)
-		    diff = 1;
-
-		/* Update max_hist_level. */
-		jb->jb_max_hist_level = jb->jb_prefetch;
-
-		jb->jb_prefetch -= diff;
-		if (jb->jb_prefetch < jb->jb_min_prefetch) 
-		    jb->jb_prefetch = jb->jb_min_prefetch;
-
-		jb->jb_stable_hist = 0;
-
-		TRACE__((jb->name.ptr,"jb updated(1), prefetch=%d, size=%d", 
-			 jb->jb_prefetch, cur_size));
-	    }
-	}
-
-	/* Level is increasing */
-	else if (jb->jb_level > jb->jb_prefetch) {
-
-	    /* Instaneous set prefetch */
-	    jb->jb_prefetch = PJ_MIN(jb->jb_max_hist_level,
-				     (int)(jb->jb_max_count*4/5));
-	    if (jb->jb_prefetch > jb->jb_max_prefetch)
-		jb->jb_prefetch = jb->jb_max_prefetch;
-
-	    jb->jb_stable_hist = 0;
-	    // Keep max_hist_level.
-	    //jb->jb_max_hist_level = 0;
-
-	    TRACE__((jb->name.ptr,"jb updated(2), prefetch=%d, size=%d", 
-		     jb->jb_prefetch, cur_size));
-	}
-
-	/* Level is unchanged */
-	else {
-	    jb->jb_stable_hist = 0;
-	}
-    }
-
-    /* These code is used for shortening the delay in the jitter buffer. */
-    // Shrinking based on max_hist_level (recent max level).
-    //diff = cur_size - jb->jb_prefetch;
-    diff = cur_size - jb->jb_max_hist_level;
-    if (diff > SAFE_SHRINKING_DIFF && 
-	jb->jb_framelist.flist_origin-jb->jb_last_del_seq > jb->jb_min_shrink_gap)
-    {
-	/* Shrink slowly */
-	diff = 1;
-
-	/* Drop frame(s)! */
-	jb_framelist_remove_head(&jb->jb_framelist, diff);
-	jb->jb_last_del_seq = jb->jb_framelist.flist_origin;
-
-	pj_math_stat_update(&jb->jb_delay, cur_size - diff);
-
-	TRACE__((jb->name.ptr, 
-		 "JB shrinking %d frame(s), size=%d", diff,
-		 jb_framelist_size(&jb->jb_framelist)));
-    } else {
-	pj_math_stat_update(&jb->jb_delay, cur_size);
-    }
-
-    jb->jb_level = 0;
-}
-
-PJ_INLINE(void) jbuf_update(pjmedia_jbuf *jb, int oper)
-{
-    if(jb->jb_last_op != oper) {
-	jbuf_calculate_jitter(jb);
-	jb->jb_last_op = oper;
-    }
-}
-
-PJ_DEF(void) pjmedia_jbuf_put_frame( pjmedia_jbuf *jb, 
-				     const void *frame, 
-				     pj_size_t frame_size, 
-				     int frame_seq)
-{
-    pjmedia_jbuf_put_frame2(jb, frame, frame_size, 0, frame_seq, NULL);
-}
-
-PJ_DEF(void) pjmedia_jbuf_put_frame2(pjmedia_jbuf *jb, 
-				     const void *frame, 
-				     pj_size_t frame_size, 
-				     pj_uint32_t bit_info,
-				     int frame_seq,
-				     pj_bool_t *discarded)
-{
-    pj_size_t min_frame_size;
-    int seq_diff;
-
-    if (jb->jb_last_seq_no == -1)	{
-	jb->jb_last_seq_no = frame_seq - 1;
-    }
-
-    seq_diff = frame_seq - jb->jb_last_seq_no;
-    jb->jb_last_seq_no = PJ_MAX(jb->jb_last_seq_no, frame_seq);
-    if (seq_diff > 0) jb->jb_level += seq_diff;
-
-    if(jb->jb_status ==	JB_STATUS_INITIALIZING) {
-	jb->jb_status = JB_STATUS_PROCESSING;
-	jb->jb_level = 0;
-    } else {
-	jbuf_update(jb, JB_OP_PUT);
-    }
-
-    min_frame_size = PJ_MIN(frame_size, jb->jb_frame_size);
-    if (seq_diff > 0) {
-
-	while (jb_framelist_put_at(&jb->jb_framelist, frame_seq, frame,
-				   min_frame_size, bit_info) == PJ_FALSE)
-	{
-	    jb_framelist_remove_head(&jb->jb_framelist,
-				     PJ_MAX(jb->jb_max_count/4,1) );
-	}
-
-	if (jb->jb_prefetch_cnt < jb->jb_prefetch) {
-	    jb->jb_prefetch_cnt += seq_diff;
-	    
-	    TRACE__((jb->name.ptr, "PUT prefetch_cnt=%d/%d", 
-		     jb->jb_prefetch_cnt, jb->jb_prefetch));
-
-	    if (jb->jb_status == JB_STATUS_PREFETCHING && 
-		jb->jb_prefetch_cnt >= jb->jb_prefetch)
-	    {
-		jb->jb_status = JB_STATUS_PROCESSING;
-	    }
-	}
-
-
-
-	if (discarded)
-	    *discarded = PJ_FALSE;
-    }
-    else
-    {
-	pj_bool_t res;
-	res = jb_framelist_put_at(&jb->jb_framelist,frame_seq,frame,
-				  min_frame_size, bit_info);
-	if (discarded)
-	    *discarded = !res;
-    }
-}
-
-/*
- * Get frame from jitter buffer.
- */
-PJ_DEF(void) pjmedia_jbuf_get_frame( pjmedia_jbuf *jb, 
-				     void *frame, 
-				     char *p_frame_type)
-{
-    pjmedia_jbuf_get_frame2(jb, frame, NULL, p_frame_type, NULL);
-}
-
-/*
- * Get frame from jitter buffer.
- */
-PJ_DEF(void) pjmedia_jbuf_get_frame2(pjmedia_jbuf *jb, 
-				     void *frame, 
-				     pj_size_t *size,
-				     char *p_frame_type,
-				     pj_uint32_t *bit_info)
-{
-    pjmedia_jb_frame_type ftype;
-
-    jb->jb_level++;
-
-    jbuf_update(jb, JB_OP_GET);
-
-    if (jb_framelist_size(&jb->jb_framelist) == 0) {
-	jb->jb_prefetch_cnt = 0;
-	if (jb->jb_def_prefetch)
-	    jb->jb_status = JB_STATUS_PREFETCHING;
-    }
-
-    if (jb->jb_status == JB_STATUS_PREFETCHING && 
-	jb->jb_prefetch_cnt < jb->jb_prefetch)
-    {
-	/* Can't return frame because jitter buffer is filling up
-	 * minimum prefetch.
-	 */
-	pj_bzero(frame, jb->jb_frame_size);
-	if (jb_framelist_size(&jb->jb_framelist) == 0)
-	    *p_frame_type = PJMEDIA_JB_ZERO_EMPTY_FRAME;
-	else
-	    *p_frame_type = PJMEDIA_JB_ZERO_PREFETCH_FRAME;
-
-	if (size)
-	    *size = 0;
-
-	TRACE__((jb->name.ptr, "GET prefetch_cnt=%d/%d",
-		 jb->jb_prefetch_cnt, jb->jb_prefetch));
-	return;
-    }
-
-    /* Retrieve a frame from frame list */
-    if (jb_framelist_get(&jb->jb_framelist,frame,size,&ftype,bit_info) ==
-	PJ_FALSE) 
-    {
-	/* Can't return frame because jitter buffer is empty! */
-	pj_bzero(frame, jb->jb_frame_size);
-	*p_frame_type = PJMEDIA_JB_ZERO_EMPTY_FRAME;
-	if (size)
-	    *size = 0;
-
-	return;
-    }
-
-    /* We've successfully retrieved a frame from the frame list, but
-     * the frame could be a blank frame!
-     */
-    if (ftype == PJMEDIA_JB_NORMAL_FRAME) 
-	*p_frame_type	= PJMEDIA_JB_NORMAL_FRAME;
-    else 
-	*p_frame_type	= PJMEDIA_JB_MISSING_FRAME;
-}
-
-/*
- * Get jitter buffer state.
- */
-PJ_DEF(pj_status_t) pjmedia_jbuf_get_state( pjmedia_jbuf *jb,
-					    pjmedia_jb_state *state )
-{
-    PJ_ASSERT_RETURN(jb && state, PJ_EINVAL);
-
-    state->frame_size = jb->jb_frame_size;
-    state->prefetch = jb->jb_prefetch;
-    state->min_prefetch = jb->jb_min_prefetch;
-    state->max_prefetch = jb->jb_max_prefetch;
-    state->size = jb_framelist_size(&jb->jb_framelist);
-    state->avg_delay = jb->jb_delay.mean * jb->jb_frame_ptime;
-    state->min_delay = jb->jb_delay.min * jb->jb_frame_ptime;
-    state->max_delay = jb->jb_delay.max * jb->jb_frame_ptime;
-    state->dev_delay = pj_math_stat_get_stddev(&jb->jb_delay) * 
-		       jb->jb_frame_ptime;
-
-    return PJ_SUCCESS;
-}
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/jbuf_test.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/jbuf_test.c
deleted file mode 100644
index c8a5681fdc4ecab99518f8b3e7c8554aea30830f..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/jbuf_test.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/* $Id$ */
-/* 
- * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
- * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
- */
-#include <stdio.h>
-#include <ctype.h>
-#include <pj/pool.h>
-#include "test.h"
-
-#define JB_INIT_PREFETCH    0
-#define JB_MIN_PREFETCH	    0
-#define JB_MAX_PREFETCH	    10
-#define JB_PTIME	    20
-#define JB_BUF_SIZE	    20
-
-#define REPORT
-//#define PRINT_COMMENT
-
-int jbuf_main(void)
-{
-    pjmedia_jbuf *jb;
-    FILE *input = fopen("JBTEST.DAT", "rt");
-    unsigned seq;
-    char line[1024 * 10], *p;
-    pj_pool_t *pool;
-    pjmedia_jb_state state;
-    pj_str_t jb_name = {"JBTEST", 6};
-
-    pj_init();
-    pool = pj_pool_create(mem, "JBPOOL", 256*16, 256*16, NULL);
-
-    pjmedia_jbuf_create(pool, &jb_name, 1, JB_PTIME, JB_BUF_SIZE, &jb);
-    pjmedia_jbuf_set_adaptive(jb, JB_INIT_PREFETCH, JB_MIN_PREFETCH, 
-			      JB_MAX_PREFETCH);
-
-    while ((p=fgets(line, sizeof(line), input)) != NULL) {
-
-	while (*p && isspace(*p))
-	    ++p;
-
-	if (!*p)
-	    continue;
-
-	if (*p == '#') {
-#ifdef PRINT_COMMENT
-	    printf("%s", p);
-#endif
-	    continue;
-	}
-
-	pjmedia_jbuf_reset(jb);
-	seq = 1;
-
-#ifdef REPORT
-	pjmedia_jbuf_get_state(jb, &state);
-	printf("Initial\tsize=%d\tprefetch=%d\tmin.pftch=%d\tmax.pftch=%d\n", 
-	    state.size, state.prefetch, state.min_prefetch, state.max_prefetch);
-#endif
-
-	while (*p) {
-	    int c;
-	    char frame[1];
-	    char f_type;
-	    
-	    c = *p++;
-	    if (isspace(c))
-		continue;
-	    
-	    if (c == '/') {
-		putchar('\n');
-
-		while (*++p && *p != '/')
-		    putchar(*p);
-
-		putchar('\n');
-
-		if (*++p == 0)
-		    break;
-
-		continue;
-	    }
-
-	    switch (toupper(c)) {
-	    case 'G':
-		pjmedia_jbuf_get_frame(jb, frame, &f_type);
-		break;
-	    case 'P':
-		pjmedia_jbuf_put_frame(jb, (void*)frame, 1, seq);
-		seq++;
-		break;
-	    case 'L':
-		seq++;
-		printf("Lost\n");
-		break;
-	    default:
-		printf("Unknown character '%c'\n", c);
-		break;
-	    }
-
-#ifdef REPORT
-	    if (toupper(c) != 'L') {
-		pjmedia_jbuf_get_state(jb, &state);
-		printf("seq=%d\t%c\tsize=%d\tprefetch=%d\n", 
-		       seq, toupper(c), state.size, state.prefetch);
-	    }
-#endif
-	}
-    }
-
-    pjmedia_jbuf_destroy(jb);
-
-    if (input != stdin)
-	fclose(input);
-
-    pj_pool_release(pool);
-    return 0;
-}
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/bin/pjnath-test-x86_64-unknown-linux-gnu b/sflphone-common/libs/pjproject-1.0.2/pjnath/bin/pjnath-test-x86_64-unknown-linux-gnu
deleted file mode 100755
index 04211592492fdd6811a6d506b60633266625aabb..0000000000000000000000000000000000000000
Binary files a/sflphone-common/libs/pjproject-1.0.2/pjnath/bin/pjnath-test-x86_64-unknown-linux-gnu and /dev/null differ
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/bin/pjturn-client-x86_64-unknown-linux-gnu b/sflphone-common/libs/pjproject-1.0.2/pjnath/bin/pjturn-client-x86_64-unknown-linux-gnu
deleted file mode 100755
index 1069246a783679a577d95a9863aabcb7ccf686af..0000000000000000000000000000000000000000
Binary files a/sflphone-common/libs/pjproject-1.0.2/pjnath/bin/pjturn-client-x86_64-unknown-linux-gnu and /dev/null differ
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/bin/pjturn-srv-x86_64-unknown-linux-gnu b/sflphone-common/libs/pjproject-1.0.2/pjnath/bin/pjturn-srv-x86_64-unknown-linux-gnu
deleted file mode 100755
index 0d2af4648b03b5043df35934f540320bff1bd532..0000000000000000000000000000000000000000
Binary files a/sflphone-common/libs/pjproject-1.0.2/pjnath/bin/pjturn-srv-x86_64-unknown-linux-gnu and /dev/null differ
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/bin/pjsua-x86_64-unknown-linux-gnu b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/bin/pjsua-x86_64-unknown-linux-gnu
deleted file mode 100755
index 3f1ed10dc8e3c7e2a38ef4bbd8cab83a25d611aa..0000000000000000000000000000000000000000
Binary files a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/bin/pjsua-x86_64-unknown-linux-gnu and /dev/null differ
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/bin/pjsip-test-x86_64-unknown-linux-gnu b/sflphone-common/libs/pjproject-1.0.2/pjsip/bin/pjsip-test-x86_64-unknown-linux-gnu
deleted file mode 100755
index 45542bd1c516ee8b685b2f16469808270c040be0..0000000000000000000000000000000000000000
Binary files a/sflphone-common/libs/pjproject-1.0.2/pjsip/bin/pjsip-test-x86_64-unknown-linux-gnu and /dev/null differ
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/os-auto.mak b/sflphone-common/libs/pjproject-1.0.2/pjsip/build/os-auto.mak
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_autoconf.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_autoconf.h
deleted file mode 100644
index ff184d20d616b16ad37f2b09f6d43c1ac2b9f35b..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_autoconf.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* pjsip/include/pjsip/sip_autoconf.h.  Generated by configure.  */
-/* $Id: sip_autoconf.h.in 2394 2008-12-23 17:27:53Z bennylp $ */
-/*
- * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
- * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-#ifndef __PJSIP_SIP_AUTOCONF_H__
-#define __PJSIP_SIP_AUTOCONF_H__
-
-/**
- * @file sip_autoconf.h
- * @brief Describes operating system specifics (automatically detected by
- *        autoconf)
- */
-
-/**
- * Enable/disable TLS transport, as configured by autoconf.
- * But only do this if user doesn't explicitly configure in pj/config_site.h.
- */
-#ifndef PJSIP_HAS_TLS_TRANSPORT
-/* #undef PJSIP_HAS_TLS_TRANSPORT */
-#endif
-
-
-#endif	/* __PJSIP_SIP_AUTOCONF_H__ */
-
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/os-auto.mak b/sflphone-common/libs/pjproject-1.0.2/third_party/build/os-auto.mak
deleted file mode 100644
index 16e37e22b0f30fdb29d2b9a6f62255d41e3bc2d0..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject-1.0.2/third_party/build/os-auto.mak
+++ /dev/null
@@ -1,16 +0,0 @@
-
-ifneq (,1)
-DIRS += gsm
-endif
-
-ifneq (,1)
-DIRS += ilbc
-endif
-
-ifneq (,1)
-DIRS += speex
-endif
-
-ifneq ($(findstring pa,pa_unix),)
-DIRS += portaudio
-endif
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/os-auto.mak b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/os-auto.mak
deleted file mode 100644
index 79022f6df192d1ccb21fc34000725dd8e694aa22..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/os-auto.mak
+++ /dev/null
@@ -1,79 +0,0 @@
-# third_party/build/portaudio/os-auto.mak.  Generated from os-auto.mak.in by configure.
-
-# Define the desired sound device backend
-# Valid values are:
-#   - pa_unix:	    	PortAudio on Unix (OSS or ALSA)
-#   - pa_darwinos:  	PortAudio on MacOSX (CoreAudio)
-#   - pa_old_darwinos:  PortAudio on MacOSX (old CoreAudio, for OSX 10.2)
-#   - pa_win32:	    	PortAudio on Win32 (WMME)
-#
-# There are other values below, but these are handled by PJMEDIA's Makefile
-#   - ds:	    	Win32 DirectSound (dsound.c)
-#   - null:	    	Null sound device (nullsound.c)
-AC_PJMEDIA_SND=pa_unix
-
-# For Unix, specify if ALSA should be supported
-AC_PA_USE_ALSA=1
-
-# For Unix, specify if OSS should be supported
-AC_PA_USE_OSS=1
-
-# Additional PortAudio CFLAGS are in  -DHAVE_SYS_SOUNDCARD_H -DHAVE_LINUX_SOUNDCARD_H -DPA_LITTLE_ENDIAN
-
-
-#
-# PortAudio on Unix
-#
-ifeq ($(AC_PJMEDIA_SND),pa_unix)
-# Host APIs and utils
-export PORTAUDIO_OBJS += pa_unix_hostapis.o pa_unix_util.o
-
-# Include ALSA?
-ifeq ($(AC_PA_USE_ALSA),1)
-export CFLAGS += -DPA_USE_ALSA=1
-export PORTAUDIO_OBJS += pa_linux_alsa.o
-endif
-
-export CFLAGS +=  -DHAVE_SYS_SOUNDCARD_H -DHAVE_LINUX_SOUNDCARD_H -DPA_LITTLE_ENDIAN
-endif
-
-# Include OSS?
-ifeq ($(AC_PA_USE_OSS),1)
-export CFLAGS += -DPA_USE_OSS=1
-export PORTAUDIO_OBJS += pa_unix_oss.o
-endif
-
-#
-# PortAudio on MacOS X (using current PortAudio)
-#
-ifeq ($(AC_PJMEDIA_SND),pa_darwinos)
-export PORTAUDIO_OBJS +=pa_mac_hostapis.o \
-			pa_unix_util.o \
-			pa_mac_core.o \
-			pa_mac_core_blocking.o \
-			pa_mac_core_utilities.o \
-			pa_ringbuffer.o
-export CFLAGS += -DPA_USE_COREAUDIO=1
-export CFLAGS +=  -DHAVE_SYS_SOUNDCARD_H -DHAVE_LINUX_SOUNDCARD_H -DPA_LITTLE_ENDIAN
-endif
-
-#
-# PortAudio on MacOS X (using old PortAudio, for MacOS X 10.2.x)
-#
-ifeq ($(AC_PJMEDIA_SND),pa_old_darwinos)
-export PORTAUDIO_OBJS +=pa_mac_hostapis.o \
-			pa_unix_util.o \
-			pa_mac_core_old.o 
-export CFLAGS += -DPA_USE_COREAUDIO=1
-export CFLAGS +=  -DHAVE_SYS_SOUNDCARD_H -DHAVE_LINUX_SOUNDCARD_H -DPA_LITTLE_ENDIAN
-endif
-
-#
-#
-# PortAudio on Win32 (WMME)
-#
-ifeq ($(AC_PJMEDIA_SND),pa_win32)
-export PORTAUDIO_OBJS += pa_win_hostapis.o pa_win_util.o \
-		       pa_win_wmme.o pa_win_waveformat.o
-export CFLAGS += -DPA_NO_ASIO -DPA_NO_DS
-endif
diff --git a/sflphone-common/libs/pjproject-1.0.2/COPYING b/sflphone-common/libs/pjproject-1.0.3/COPYING
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/COPYING
rename to sflphone-common/libs/pjproject-1.0.3/COPYING
diff --git a/sflphone-common/libs/pjproject-1.0.2/INSTALL.txt b/sflphone-common/libs/pjproject-1.0.3/INSTALL.txt
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/INSTALL.txt
rename to sflphone-common/libs/pjproject-1.0.3/INSTALL.txt
diff --git a/sflphone-common/libs/pjproject-1.0.2/Makefile b/sflphone-common/libs/pjproject-1.0.3/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/Makefile
rename to sflphone-common/libs/pjproject-1.0.3/Makefile
diff --git a/sflphone-common/libs/pjproject-1.0.2/README-RTEMS b/sflphone-common/libs/pjproject-1.0.3/README-RTEMS
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/README-RTEMS
rename to sflphone-common/libs/pjproject-1.0.3/README-RTEMS
diff --git a/sflphone-common/libs/pjproject-1.0.2/README.txt b/sflphone-common/libs/pjproject-1.0.3/README.txt
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/README.txt
rename to sflphone-common/libs/pjproject-1.0.3/README.txt
diff --git a/sflphone-common/libs/pjproject-1.0.2/aconfigure b/sflphone-common/libs/pjproject-1.0.3/aconfigure
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/aconfigure
rename to sflphone-common/libs/pjproject-1.0.3/aconfigure
diff --git a/sflphone-common/libs/pjproject-1.0.2/aconfigure.ac b/sflphone-common/libs/pjproject-1.0.3/aconfigure.ac
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/aconfigure.ac
rename to sflphone-common/libs/pjproject-1.0.3/aconfigure.ac
diff --git a/sflphone-common/libs/pjproject-1.0.2/autogen.sh b/sflphone-common/libs/pjproject-1.0.3/autogen.sh
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/autogen.sh
rename to sflphone-common/libs/pjproject-1.0.3/autogen.sh
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.mak.in b/sflphone-common/libs/pjproject-1.0.3/build.mak.in
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.mak.in
rename to sflphone-common/libs/pjproject-1.0.3/build.mak.in
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/00.bat b/sflphone-common/libs/pjproject-1.0.3/build.symbian/00.bat
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/00.bat
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/00.bat
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/01.bat b/sflphone-common/libs/pjproject-1.0.3/build.symbian/01.bat
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/01.bat
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/01.bat
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/bld.inf b/sflphone-common/libs/pjproject-1.0.3/build.symbian/bld.inf
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/bld.inf
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/bld.inf
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/libgsmcodec.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/libgsmcodec.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/libgsmcodec.mmp
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/libgsmcodec.mmp
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/libspeexcodec.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/libspeexcodec.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/libspeexcodec.mmp
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/libspeexcodec.mmp
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/libsrtp.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/libsrtp.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/libsrtp.mmp
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/libsrtp.mmp
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/makedef.sh b/sflphone-common/libs/pjproject-1.0.3/build.symbian/makedef.sh
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/makedef.sh
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/makedef.sh
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/null_audio.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/null_audio.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/null_audio.mmp
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/null_audio.mmp
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/null_audioU.def b/sflphone-common/libs/pjproject-1.0.3/build.symbian/null_audioU.def
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/null_audioU.def
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/null_audioU.def
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjlib.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjlib.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjlib.mmp
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjlib.mmp
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjlibU.def b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjlibU.def
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjlibU.def
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjlibU.def
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjlib_test.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjlib_test.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjlib_test.mmp
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjlib_test.mmp
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjlib_util.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjlib_util.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjlib_util.mmp
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjlib_util.mmp
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjlib_utilU.def b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjlib_utilU.def
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjlib_utilU.def
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjlib_utilU.def
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjmedia.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjmedia.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjmedia.mmp
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjmedia.mmp
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjmediaU.def b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjmediaU.def
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjmediaU.def
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjmediaU.def
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjnath.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjnath.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjnath.mmp
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjnath.mmp
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjnathU.def b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjnathU.def
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjnathU.def
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjnathU.def
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjproject.cww b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjproject.cww
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjproject.cww
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjproject.cww
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsdp.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsdp.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsdp.mmp
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsdp.mmp
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsdpU.def b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsdpU.def
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsdpU.def
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsdpU.def
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsip.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsip.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsip.mmp
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsip.mmp
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsipU.def b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsipU.def
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsipU.def
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsipU.def
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsip_simple.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsip_simple.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsip_simple.mmp
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsip_simple.mmp
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsip_simpleU.def b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsip_simpleU.def
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsip_simpleU.def
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsip_simpleU.def
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsip_ua.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsip_ua.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsip_ua.mmp
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsip_ua.mmp
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsip_uaU.def b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsip_uaU.def
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsip_uaU.def
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsip_uaU.def
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjstun_client.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjstun_client.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjstun_client.mmp
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjstun_client.mmp
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsua_lib.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsua_lib.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsua_lib.mmp
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsua_lib.mmp
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsua_libU.def b/sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsua_libU.def
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsua_libU.def
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/pjsua_libU.def
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_audio.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/symbian_audio.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_audio.mmp
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/symbian_audio.mmp
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_audioU.def b/sflphone-common/libs/pjproject-1.0.3/build.symbian/symbian_audioU.def
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_audioU.def
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/symbian_audioU.def
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_audio_aps.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/symbian_audio_aps.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_audio_aps.mmp
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/symbian_audio_aps.mmp
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_ua.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/symbian_ua.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_ua.mmp
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/symbian_ua.mmp
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_ua_udeb.pkg b/sflphone-common/libs/pjproject-1.0.3/build.symbian/symbian_ua_udeb.pkg
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_ua_udeb.pkg
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/symbian_ua_udeb.pkg
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_ua_urel.pkg b/sflphone-common/libs/pjproject-1.0.3/build.symbian/symbian_ua_urel.pkg
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_ua_urel.pkg
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/symbian_ua_urel.pkg
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/symsndtest.mmp b/sflphone-common/libs/pjproject-1.0.3/build.symbian/symsndtest.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/symsndtest.mmp
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/symsndtest.mmp
diff --git a/sflphone-common/libs/pjproject-1.0.2/build.symbian/symsndtest.pkg b/sflphone-common/libs/pjproject-1.0.3/build.symbian/symsndtest.pkg
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build.symbian/symsndtest.pkg
rename to sflphone-common/libs/pjproject-1.0.3/build.symbian/symsndtest.pkg
diff --git a/sflphone-common/libs/pjproject-1.0.2/build/cc-gcc.mak b/sflphone-common/libs/pjproject-1.0.3/build/cc-gcc.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build/cc-gcc.mak
rename to sflphone-common/libs/pjproject-1.0.3/build/cc-gcc.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/build/cc-vc.mak b/sflphone-common/libs/pjproject-1.0.3/build/cc-vc.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build/cc-vc.mak
rename to sflphone-common/libs/pjproject-1.0.3/build/cc-vc.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/build/common.mak b/sflphone-common/libs/pjproject-1.0.3/build/common.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build/common.mak
rename to sflphone-common/libs/pjproject-1.0.3/build/common.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/build/host-mingw.mak b/sflphone-common/libs/pjproject-1.0.3/build/host-mingw.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build/host-mingw.mak
rename to sflphone-common/libs/pjproject-1.0.3/build/host-mingw.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/build/host-unix.mak b/sflphone-common/libs/pjproject-1.0.3/build/host-unix.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build/host-unix.mak
rename to sflphone-common/libs/pjproject-1.0.3/build/host-unix.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/build/host-win32.mak b/sflphone-common/libs/pjproject-1.0.3/build/host-win32.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build/host-win32.mak
rename to sflphone-common/libs/pjproject-1.0.3/build/host-win32.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/build/m-alpha.mak b/sflphone-common/libs/pjproject-1.0.3/build/m-alpha.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build/m-alpha.mak
rename to sflphone-common/libs/pjproject-1.0.3/build/m-alpha.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/build/m-arm.mak b/sflphone-common/libs/pjproject-1.0.3/build/m-arm.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build/m-arm.mak
rename to sflphone-common/libs/pjproject-1.0.3/build/m-arm.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/build/m-auto.mak b/sflphone-common/libs/pjproject-1.0.3/build/m-auto.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build/m-auto.mak
rename to sflphone-common/libs/pjproject-1.0.3/build/m-auto.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/build/m-i386.mak b/sflphone-common/libs/pjproject-1.0.3/build/m-i386.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build/m-i386.mak
rename to sflphone-common/libs/pjproject-1.0.3/build/m-i386.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/build/m-m68k.mak b/sflphone-common/libs/pjproject-1.0.3/build/m-m68k.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build/m-m68k.mak
rename to sflphone-common/libs/pjproject-1.0.3/build/m-m68k.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/build/m-mpc860.mak b/sflphone-common/libs/pjproject-1.0.3/build/m-mpc860.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build/m-mpc860.mak
rename to sflphone-common/libs/pjproject-1.0.3/build/m-mpc860.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/build/m-powerpc.mak b/sflphone-common/libs/pjproject-1.0.3/build/m-powerpc.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build/m-powerpc.mak
rename to sflphone-common/libs/pjproject-1.0.3/build/m-powerpc.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/build/m-sparc.mak b/sflphone-common/libs/pjproject-1.0.3/build/m-sparc.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build/m-sparc.mak
rename to sflphone-common/libs/pjproject-1.0.3/build/m-sparc.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/build/m-x86_64.mak b/sflphone-common/libs/pjproject-1.0.3/build/m-x86_64.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build/m-x86_64.mak
rename to sflphone-common/libs/pjproject-1.0.3/build/m-x86_64.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/build/os-auto.mak.in b/sflphone-common/libs/pjproject-1.0.3/build/os-auto.mak.in
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build/os-auto.mak.in
rename to sflphone-common/libs/pjproject-1.0.3/build/os-auto.mak.in
diff --git a/sflphone-common/libs/pjproject-1.0.2/build/os-darwinos.mak b/sflphone-common/libs/pjproject-1.0.3/build/os-darwinos.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build/os-darwinos.mak
rename to sflphone-common/libs/pjproject-1.0.3/build/os-darwinos.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/build/os-linux-kernel.mak b/sflphone-common/libs/pjproject-1.0.3/build/os-linux-kernel.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build/os-linux-kernel.mak
rename to sflphone-common/libs/pjproject-1.0.3/build/os-linux-kernel.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/build/os-linux.mak b/sflphone-common/libs/pjproject-1.0.3/build/os-linux.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build/os-linux.mak
rename to sflphone-common/libs/pjproject-1.0.3/build/os-linux.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/build/os-palmos.mak b/sflphone-common/libs/pjproject-1.0.3/build/os-palmos.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build/os-palmos.mak
rename to sflphone-common/libs/pjproject-1.0.3/build/os-palmos.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/build/os-rtems.mak b/sflphone-common/libs/pjproject-1.0.3/build/os-rtems.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build/os-rtems.mak
rename to sflphone-common/libs/pjproject-1.0.3/build/os-rtems.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/build/os-sunos.mak b/sflphone-common/libs/pjproject-1.0.3/build/os-sunos.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build/os-sunos.mak
rename to sflphone-common/libs/pjproject-1.0.3/build/os-sunos.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/build/os-win32.mak b/sflphone-common/libs/pjproject-1.0.3/build/os-win32.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build/os-win32.mak
rename to sflphone-common/libs/pjproject-1.0.3/build/os-win32.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/build/rules.mak b/sflphone-common/libs/pjproject-1.0.3/build/rules.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/build/rules.mak
rename to sflphone-common/libs/pjproject-1.0.3/build/rules.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/c++-build.mak b/sflphone-common/libs/pjproject-1.0.3/c++-build.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/c++-build.mak
rename to sflphone-common/libs/pjproject-1.0.3/c++-build.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/configure b/sflphone-common/libs/pjproject-1.0.3/configure
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/configure
rename to sflphone-common/libs/pjproject-1.0.3/configure
diff --git a/sflphone-common/libs/pjproject-1.0.2/configure-legacy b/sflphone-common/libs/pjproject-1.0.3/configure-legacy
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/configure-legacy
rename to sflphone-common/libs/pjproject-1.0.3/configure-legacy
diff --git a/sflphone-common/libs/pjproject-1.0.2/configure.ac b/sflphone-common/libs/pjproject-1.0.3/configure.ac
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/configure.ac
rename to sflphone-common/libs/pjproject-1.0.3/configure.ac
diff --git a/sflphone-common/libs/pjproject-1.0.2/install-sh b/sflphone-common/libs/pjproject-1.0.3/install-sh
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/install-sh
rename to sflphone-common/libs/pjproject-1.0.3/install-sh
diff --git a/sflphone-common/libs/pjproject-1.0.2/libpj-sfl.pc.in b/sflphone-common/libs/pjproject-1.0.3/libpj-sfl.pc.in
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/libpj-sfl.pc.in
rename to sflphone-common/libs/pjproject-1.0.3/libpj-sfl.pc.in
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/Makefile b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/Makefile
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/Makefile
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/os-auto.mak.in b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/os-auto.mak.in
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/os-auto.mak.in
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/os-auto.mak.in
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/os-rtems.mak b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/os-rtems.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/os-rtems.mak
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/os-rtems.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/pjlib_util.dsp b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/pjlib_util.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/pjlib_util.dsp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/pjlib_util.dsp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/pjlib_util.dsw b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/pjlib_util.dsw
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/pjlib_util.dsw
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/pjlib_util.dsw
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/pjlib_util.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/pjlib_util.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/pjlib_util.vcproj
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/pjlib_util.vcproj
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/pjlib_util_test.dsp b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/pjlib_util_test.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/pjlib_util_test.dsp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/pjlib_util_test.dsp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/pjlib_util_test.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/pjlib_util_test.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/pjlib_util_test.vcproj
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/pjlib_util_test.vcproj
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/wince-evc4/pjlib_util_test_wince.vcp b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/wince-evc4/pjlib_util_test_wince.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/wince-evc4/pjlib_util_test_wince.vcp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/wince-evc4/pjlib_util_test_wince.vcp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/wince-evc4/pjlib_util_wince.vcp b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/wince-evc4/pjlib_util_wince.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/wince-evc4/pjlib_util_wince.vcp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/wince-evc4/pjlib_util_wince.vcp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/wince-evc4/pjlib_util_wince.vcw b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/wince-evc4/pjlib_util_wince.vcw
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/wince-evc4/pjlib_util_wince.vcw
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/build/wince-evc4/pjlib_util_wince.vcw
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/docs/doxygen.cfg b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/docs/doxygen.cfg
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/docs/doxygen.cfg
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/docs/doxygen.cfg
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/docs/doxygen.css b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/docs/doxygen.css
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/docs/doxygen.css
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/docs/doxygen.css
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/docs/footer.html b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/docs/footer.html
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/docs/footer.html
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/docs/footer.html
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/docs/header.html b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/docs/header.html
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/docs/header.html
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/docs/header.html
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/base64.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/base64.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/base64.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/base64.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/config.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/config.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/config.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/config.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/crc32.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/crc32.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/crc32.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/crc32.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/dns.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/dns.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/dns.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/dns.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/dns_server.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/dns_server.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/dns_server.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/dns_server.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/errno.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/errno.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/errno.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/errno.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/getopt.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/getopt.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/getopt.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/getopt.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/hmac_md5.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/hmac_md5.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/hmac_md5.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/hmac_md5.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/hmac_sha1.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/hmac_sha1.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/hmac_sha1.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/hmac_sha1.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/md5.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/md5.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/md5.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/md5.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/pcap.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/pcap.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/pcap.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/pcap.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/resolver.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/resolver.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/resolver.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/resolver.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/scanner.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/scanner.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/scanner.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/scanner.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/scanner_cis_bitwise.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/scanner_cis_bitwise.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/scanner_cis_bitwise.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/scanner_cis_bitwise.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/scanner_cis_uint.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/scanner_cis_uint.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/scanner_cis_uint.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/scanner_cis_uint.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/sha1.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/sha1.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/sha1.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/sha1.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/srv_resolver.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/srv_resolver.h
similarity index 94%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/srv_resolver.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/srv_resolver.h
index 216e91b9e5d525d9807b1d26cd4896b639fba186..da41024acdec6fb7533c3392fdca9ded0524f3ef 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/srv_resolver.h
+++ b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/srv_resolver.h
@@ -104,7 +104,19 @@ typedef enum pj_dns_srv_option
      * this option is not specified, the SRV resolver will query
      * the DNS A record for the target instead.
      */
-    PJ_DNS_SRV_RESOLVE_AAAA	= 4
+    PJ_DNS_SRV_RESOLVE_AAAA	= 4,
+    
+    /** 
+     * Specify if the resolver should fallback to getaddrinfo 
+     * under IPV4 mode if DNS A fails after DNS SRV.
+     */
+    PJ_DNS_SRV_FALLBACK_GETADDRINFO_IPV4 = 8,
+    
+    /** 
+     * Specify if the resolver should fallback to getaddrinfo 
+     * under IPV6 mode if DNS A fails after DNS SRV.
+     */
+    PJ_DNS_SRV_FALLBACK_GETADDRINFO_IPV6 = 16,
 
 } pj_dns_srv_option;
 
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/string.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/string.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/string.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/string.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/stun_simple.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/stun_simple.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/stun_simple.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/stun_simple.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/types.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/types.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/types.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/types.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/xml.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/xml.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/xml.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/xml.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/encryption.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/encryption.c
similarity index 94%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/encryption.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/encryption.c
index 50fd1dd296027c71c206a3b5bebde5e2796e5555..9553892f894b5530cf768c8422b5d019f898e367 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/encryption.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/encryption.c
@@ -1,4 +1,4 @@
-/* $Id: encryption.c 2394 2008-12-23 17:27:53Z bennylp $ */
+/* $Id: encryption.c 2809 2009-06-25 12:46:00Z bennylp $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -64,10 +64,13 @@ static void digest_to_hex(const pj_uint8_t digest[PJ_SHA1_DIGEST_SIZE],
 
 static int sha1_test1(void)
 {
+    enum { MILLION = 1000000 };
     int k;
     pj_sha1_context context;
     pj_uint8_t digest[20];
     char output[80];
+    pj_pool_t *pool;
+    pj_uint8_t *block;
 
     PJ_LOG(3, (THIS_FILE, "  SHA1 test vector 1 from sha1.c.."));
     
@@ -86,7 +89,7 @@ static int sha1_test1(void)
 
     /* million 'a' vector we feed separately */
     pj_sha1_init(&context);
-    for (k = 0; k < 1000000; k++)
+    for (k = 0; k < MILLION; k++)
         pj_sha1_update(&context, (pj_uint8_t*)"a", 1);
     pj_sha1_final(&context, digest);
     digest_to_hex(digest, output);
@@ -95,6 +98,32 @@ static int sha1_test1(void)
         return -20;
     }
 
+    /* million 'a' test, using block */
+    pool = pj_pool_create(mem, "sha1test", 256, 512, NULL);
+    block = (pj_uint8_t*)pj_pool_alloc(pool, MILLION);
+    pj_memset(block, 'a', MILLION);
+
+    pj_sha1_init(&context);
+    pj_sha1_update(&context, block, MILLION);
+    pj_sha1_final(&context, digest);
+    digest_to_hex(digest, output);
+    if (strcmp(output, sha1_test_results[2])) {
+	pj_pool_release(pool);
+	PJ_LOG(3, (THIS_FILE, "    incorrect hash result for block update!"));
+        return -21;
+    }
+
+    /* verify that original buffer was not modified */
+    for (k=0; k<MILLION; ++k) {
+	if (block[k] != 'a') {
+	    pj_pool_release(pool);
+	    PJ_LOG(3, (THIS_FILE, "    block was modified!"));
+	    return -22;
+	}
+    }
+
+    pj_pool_release(pool);
+
     /* success */
     return(0);
 }
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/main.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/main.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/main.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/main.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/main_rtems.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/main_rtems.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/main_rtems.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/main_rtems.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/main_win32.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/main_win32.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/main_win32.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/main_win32.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/resolver_test.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/resolver_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/resolver_test.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/resolver_test.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/stun.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/stun.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/stun.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/stun.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/test.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/test.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/test.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/test.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/test.h b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/test.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/test.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/test.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/xml.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/xml.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/xml.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util-test/xml.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/base64.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/base64.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/base64.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/base64.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/crc32.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/crc32.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/crc32.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/crc32.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/dns.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/dns.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/dns.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/dns.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/dns_dump.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/dns_dump.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/dns_dump.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/dns_dump.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/dns_server.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/dns_server.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/dns_server.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/dns_server.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/errno.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/errno.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/errno.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/errno.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/getopt.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/getopt.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/getopt.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/getopt.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/hmac_md5.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/hmac_md5.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/hmac_md5.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/hmac_md5.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/hmac_sha1.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/hmac_sha1.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/hmac_sha1.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/hmac_sha1.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/md5.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/md5.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/md5.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/md5.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/pcap.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/pcap.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/pcap.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/pcap.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/resolver.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/resolver.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/resolver.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/resolver.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/scanner.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/scanner.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/scanner.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/scanner.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/scanner_cis_bitwise.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/scanner_cis_bitwise.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/scanner_cis_bitwise.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/scanner_cis_bitwise.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/scanner_cis_uint.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/scanner_cis_uint.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/scanner_cis_uint.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/scanner_cis_uint.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/sha1.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/sha1.c
similarity index 96%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/sha1.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/sha1.c
index 3cb20f6463f7319fa3ba57ad48abb219e668e6da..a591449b0bc450d11b27a1cbb46224068e96f677 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/sha1.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/sha1.c
@@ -1,4 +1,4 @@
-/* $Id: sha1.c 1001 2007-02-25 15:38:32Z bennylp $ */
+/* $Id: sha1.c 2809 2009-06-25 12:46:00Z bennylp $ */
 /*
  * Modified 2/07
  * By Benny Prijono <benny@prijono.org>
@@ -105,7 +105,7 @@ A million repetitions of "a"
 #undef SHA1HANDSOFF
 
 
-static void SHA1_Transform(pj_uint32_t state[5], const pj_uint8_t buffer[64]);
+static void SHA1_Transform(pj_uint32_t state[5], pj_uint8_t buffer[64]);
 
 #define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
 
@@ -131,7 +131,7 @@ static void SHA1_Transform(pj_uint32_t state[5], const pj_uint8_t buffer[64]);
 
 
 /* Hash a single 512-bit block. This is the core of the algorithm. */
-static void SHA1_Transform(pj_uint32_t state[5], const pj_uint8_t buffer[64])
+static void SHA1_Transform(pj_uint32_t state[5], pj_uint8_t buffer[64])
 {
     pj_uint32_t a, b, c, d, e;
     typedef union {
@@ -214,8 +214,10 @@ PJ_DEF(void) pj_sha1_update(pj_sha1_context* context,
     if ((j + len) > 63) {
         pj_memcpy(&context->buffer[j], data, (i = 64-j));
         SHA1_Transform(context->state, context->buffer);
-        for ( ; i + 63 < len; i += 64) {
-            SHA1_Transform(context->state, data + i);
+        for ( ; i + 63 < len; i += 64) {
+	    pj_uint8_t tmp[64];
+	    pj_memcpy(tmp, data + i, 64);
+            SHA1_Transform(context->state, tmp);
         }
         j = 0;
     }
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/srv_resolver.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/srv_resolver.c
similarity index 90%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/srv_resolver.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/srv_resolver.c
index 83963495574d53a1b9cfdaa596d02629eda89e1d..c4b433561c1796e757253887cb04a21be1882a31 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/srv_resolver.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/srv_resolver.c
@@ -19,6 +19,7 @@
  */
 #include <pjlib-util/srv_resolver.h>
 #include <pjlib-util/errno.h>
+#include <pj/addr_resolv.h>
 #include <pj/array.h>
 #include <pj/assert.h>
 #include <pj/log.h>
@@ -71,7 +72,7 @@ struct pj_dns_srv_async_query
     pj_str_t		     full_name;
     pj_str_t		     domain_part;
     pj_uint16_t		     def_port;
-
+    
     /* SRV records and their resolved IP addresses: */
     unsigned		     srv_cnt;
     struct srv_target	     srv[PJ_DNS_SRV_MAX_ADDR];
@@ -134,7 +135,7 @@ PJ_DEF(pj_status_t) pj_dns_srv_resolve( const pj_str_t *domain_name,
     query_job->domain_part.ptr = target_name.ptr + len;
     query_job->domain_part.slen = target_name.slen - len;
     query_job->def_port = (pj_uint16_t)def_port;
-
+    
     /* Start the asynchronous query_job */
 
     query_job->dns_state = PJ_DNS_TYPE_SRV;
@@ -582,14 +583,54 @@ static void dns_callback(void *user_data,
 
 	} else if (status != PJ_SUCCESS) {
 	    char errmsg[PJ_ERR_MSG_SIZE];
-
-	    /* Update last error */
-	    query_job->last_error = status;
-
-	    /* Log error */
-	    pj_strerror(status, errmsg, sizeof(errmsg));
-	    PJ_LOG(4,(query_job->objname, "DNS A record resolution failed: %s", 
-		      errmsg));
+    		   
+	    if ((query_job->option & 
+	     (PJ_DNS_SRV_FALLBACK_GETADDRINFO_IPV4 | PJ_DNS_SRV_FALLBACK_GETADDRINFO_IPV6)))
+	    {
+	        pj_strerror(status, errmsg, sizeof(errmsg));
+            PJ_LOG(4,(query_job->objname, 
+                      "DNS A record resolution failed: %s,"
+                      " trying getaddrinfo()", 
+        	           errmsg));
+        	           
+            pj_addrinfo ai;
+    	    unsigned count;
+        	int af;
+        	
+        	if ((query_job->option & PJ_DNS_SRV_FALLBACK_GETADDRINFO_IPV6)) {
+        	    af = pj_AF_INET6();
+        	} else {
+	            af = pj_AF_INET();
+        	}   
+        	
+        	count = 1;   
+            status = pj_getaddrinfo(af, &query_job->domain_part, &count, &ai);
+            if (status != PJ_SUCCESS) {     
+                query_job->last_error = status;
+                pj_strerror(status, errmsg, sizeof(errmsg));
+                PJ_LOG(4,(query_job->objname, "DNS resolution failed with getaddrinfo(): %s", 
+            	          errmsg));
+            } else {
+
+                if (srv->addr_cnt < ADDR_MAX_COUNT) {
+                    srv->addr[srv->addr_cnt++].s_addr = ai.ai_addr.ipv4.sin_addr.s_addr;
+                }
+                
+            	PJ_LOG(5,(query_job->objname, 
+                          "DNS getaddrinfo() for %.*s: %s",
+                          (int)srv->target_name.slen, 
+                          srv->target_name.ptr,
+                          pj_inet_ntoa(srv->addr[srv->addr_cnt])));
+            }
+	    } else {
+             /* Update last error */
+            query_job->last_error = status;
+            
+            /* Log error */
+            pj_strerror(status, errmsg, sizeof(errmsg));
+            PJ_LOG(4,(query_job->objname, "DNS A record resolution failed: %s", 
+                      errmsg));
+	    }
 	}
 
 	++query_job->host_resolved;
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/string.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/string.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/string.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/string.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/stun_simple.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/stun_simple.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/stun_simple.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/stun_simple.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/stun_simple_client.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/stun_simple_client.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/stun_simple_client.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/stun_simple_client.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/symbols.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/symbols.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/symbols.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/symbols.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/xml.c b/sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/xml.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/xml.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/xml.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/Makefile b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/Makefile
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/Makefile
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-auto.mak.in b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/os-auto.mak.in
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-auto.mak.in
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/os-auto.mak.in
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-darwinos.mak b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/os-darwinos.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-darwinos.mak
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/os-darwinos.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-linux-kernel.mak b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/os-linux-kernel.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-linux-kernel.mak
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/os-linux-kernel.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-linux.mak b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/os-linux.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-linux.mak
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/os-linux.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-rtems.mak b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/os-rtems.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-rtems.mak
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/os-rtems.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-sunos.mak b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/os-sunos.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-sunos.mak
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/os-sunos.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-win32.mak b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/os-win32.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-win32.mak
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/os-win32.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib++-test.dsp b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib++-test.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib++-test.dsp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib++-test.dsp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib++.dsp b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib++.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib++.dsp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib++.dsp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib.dsp b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib.dsp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib.dsp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib.dsw b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib.dsw
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib.dsw
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib.dsw
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib.vcproj
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib.vcproj
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib_samples.dsp b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib_samples.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib_samples.dsp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib_samples.dsp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib_samples.mak b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib_samples.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib_samples.mak
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib_samples.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib_test.dsp b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib_test.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib_test.dsp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib_test.dsp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib_test.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib_test.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib_test.vcproj
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/pjlib_test.vcproj
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/wince-evc4/pjlib_test_wince.vcp b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/wince-evc4/pjlib_test_wince.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/wince-evc4/pjlib_test_wince.vcp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/wince-evc4/pjlib_test_wince.vcp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/wince-evc4/pjlib_wince.vcp b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/wince-evc4/pjlib_wince.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/wince-evc4/pjlib_wince.vcp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/wince-evc4/pjlib_wince.vcp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/wince-evc4/pjlib_wince.vcw b/sflphone-common/libs/pjproject-1.0.3/pjlib/build/wince-evc4/pjlib_wince.vcw
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/build/wince-evc4/pjlib_wince.vcw
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/build/wince-evc4/pjlib_wince.vcw
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/docs/doxygen.cfg b/sflphone-common/libs/pjproject-1.0.3/pjlib/docs/doxygen.cfg
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/docs/doxygen.cfg
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/docs/doxygen.cfg
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/docs/doxygen.css b/sflphone-common/libs/pjproject-1.0.3/pjlib/docs/doxygen.css
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/docs/doxygen.css
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/docs/doxygen.css
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/docs/footer.html b/sflphone-common/libs/pjproject-1.0.3/pjlib/docs/footer.html
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/docs/footer.html
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/docs/footer.html
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/docs/header.html b/sflphone-common/libs/pjproject-1.0.3/pjlib/docs/header.html
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/docs/header.html
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/docs/header.html
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/file.hpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/file.hpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/file.hpp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/file.hpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/hash.hpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/hash.hpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/hash.hpp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/hash.hpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/list.hpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/list.hpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/list.hpp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/list.hpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/lock.hpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/lock.hpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/lock.hpp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/lock.hpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/os.hpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/os.hpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/os.hpp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/os.hpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/pool.hpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/pool.hpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/pool.hpp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/pool.hpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/proactor.hpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/proactor.hpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/proactor.hpp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/proactor.hpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/scanner.hpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/scanner.hpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/scanner.hpp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/scanner.hpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/sock.hpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/sock.hpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/sock.hpp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/sock.hpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/string.hpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/string.hpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/string.hpp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/string.hpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/timer.hpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/timer.hpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/timer.hpp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/timer.hpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/tree.hpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/tree.hpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/tree.hpp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/tree.hpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/types.hpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/types.hpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/types.hpp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj++/types.hpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/activesock.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/activesock.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/activesock.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/activesock.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/addr_resolv.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/addr_resolv.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/addr_resolv.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/addr_resolv.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/array.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/array.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/array.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/array.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/assert.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/assert.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/assert.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/assert.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/assert.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/assert.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/assert.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/assert.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_armcc.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/cc_armcc.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_armcc.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/cc_armcc.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_codew.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/cc_codew.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_codew.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/cc_codew.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_gcc.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/cc_gcc.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_gcc.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/cc_gcc.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_gcce.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/cc_gcce.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_gcce.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/cc_gcce.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_msvc.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/cc_msvc.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_msvc.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/cc_msvc.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_mwcc.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/cc_mwcc.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_mwcc.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/cc_mwcc.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/ctype.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/ctype.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/ctype.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/ctype.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/errno.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/errno.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/errno.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/errno.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/high_precision.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/high_precision.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/high_precision.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/high_precision.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_alpha.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/m_alpha.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_alpha.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/m_alpha.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_armv4.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/m_armv4.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_armv4.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/m_armv4.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_auto.h.in b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/m_auto.h.in
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_auto.h.in
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/m_auto.h.in
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_i386.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/m_i386.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_i386.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/m_i386.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_m68k.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/m_m68k.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_m68k.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/m_m68k.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_powerpc.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/m_powerpc.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_powerpc.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/m_powerpc.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_sparc.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/m_sparc.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_sparc.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/m_sparc.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_x86_64.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/m_x86_64.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_x86_64.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/m_x86_64.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/malloc.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/malloc.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/malloc.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/malloc.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_auto.h.in b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_auto.h.in
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_auto.h.in
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_auto.h.in
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_darwinos.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_darwinos.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_darwinos.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_darwinos.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_linux.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_linux.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_linux.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_linux.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_linux_kernel.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_linux_kernel.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_linux_kernel.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_linux_kernel.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_palmos.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_palmos.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_palmos.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_palmos.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_rtems.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_rtems.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_rtems.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_rtems.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_sunos.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_sunos.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_sunos.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_sunos.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_symbian.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_symbian.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_symbian.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_symbian.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_win32.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_win32.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_win32.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_win32.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_win32_wince.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_win32_wince.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_win32_wince.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_win32_wince.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/rand.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/rand.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/rand.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/rand.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/setjmp.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/setjmp.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/setjmp.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/setjmp.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/size_t.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/size_t.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/size_t.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/size_t.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/socket.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/socket.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/socket.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/socket.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/stdarg.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/stdarg.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/stdarg.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/stdarg.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/stdfileio.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/stdfileio.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/stdfileio.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/stdfileio.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/string.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/string.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/string.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/string.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/time.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/time.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/time.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/compat/time.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/config.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/config.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/config.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/config.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/config_site_sample.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/config_site_sample.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/config_site_sample.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/config_site_sample.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/ctype.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/ctype.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/ctype.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/ctype.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/doxygen.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/doxygen.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/doxygen.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/doxygen.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/errno.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/errno.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/errno.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/errno.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/except.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/except.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/except.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/except.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/fifobuf.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/fifobuf.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/fifobuf.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/fifobuf.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/file_access.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/file_access.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/file_access.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/file_access.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/file_io.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/file_io.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/file_io.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/file_io.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/guid.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/guid.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/guid.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/guid.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/hash.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/hash.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/hash.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/hash.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/ioqueue.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/ioqueue.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/ioqueue.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/ioqueue.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/ip_helper.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/ip_helper.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/ip_helper.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/ip_helper.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/list.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/list.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/list.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/list.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/list_i.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/list_i.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/list_i.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/list_i.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/lock.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/lock.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/lock.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/lock.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/log.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/log.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/log.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/log.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/math.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/math.h
similarity index 96%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/math.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/math.h
index 93ba2d997782f5785db0684c12f5d54f054e96f2..9d0209589a19acf025b5f1c7aa2d167703c84f9c 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/math.h
+++ b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/math.h
@@ -1,4 +1,4 @@
-/* $Id: math.h 2394 2008-12-23 17:27:53Z bennylp $ */
+/* $Id: math.h 2818 2009-06-25 13:27:02Z bennylp $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -140,7 +140,9 @@ PJ_INLINE(void) pj_math_stat_update(pj_math_stat *stat, int val)
 #if PJ_HAS_FLOATING_POINT
     delta = val - stat->fmean_;
     stat->fmean_ += delta/stat->n;
-    stat->mean = (int) stat->fmean_;
+    
+    /* Return mean value with 'rounding' */
+    stat->mean = (int) (stat->fmean_ + 0.5);
 
     stat->m2_ += (int)(delta * (val-stat->fmean_));
 #else
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/os.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/os.h
similarity index 99%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/os.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/os.h
index 9e221e8ee0959a1aa16b93a7f14431e706167505..b85af2a22e78827098804baf16b9025f8a0ef351 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/os.h
+++ b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/os.h
@@ -1,4 +1,4 @@
-/* $Id: os.h 2482 2009-03-02 15:50:12Z nanang $ */
+/* $Id: os.h 2805 2009-06-25 12:29:04Z bennylp $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -1267,6 +1267,12 @@ PJ_DECL(pj_time_val) pj_elapsed_time( const pj_timestamp *start,
 PJ_DECL(pj_uint32_t) pj_elapsed_msec( const pj_timestamp *start,
                                       const pj_timestamp *stop );
 
+/**
+ * Variant of #pj_elapsed_msec() which returns 64bit value.
+ */
+PJ_DECL(pj_uint64_t) pj_elapsed_msec64(const pj_timestamp *start,
+                                       const pj_timestamp *stop );
+
 /**
  * Calculate the elapsed time in 32-bit microseconds.
  * This function calculates the elapsed time using highest precision
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/pool.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/pool.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/pool.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/pool.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/pool_alt.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/pool_alt.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/pool_alt.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/pool_alt.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/pool_buf.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/pool_buf.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/pool_buf.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/pool_buf.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/pool_i.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/pool_i.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/pool_i.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/pool_i.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/rand.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/rand.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/rand.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/rand.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/rbtree.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/rbtree.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/rbtree.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/rbtree.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/sock.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/sock.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/sock.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/sock.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/sock_select.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/sock_select.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/sock_select.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/sock_select.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/string.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/string.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/string.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/string.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/string_i.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/string_i.h
similarity index 98%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/string_i.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/string_i.h
index 495a7995735f4a1f3fa69a6d1a52ee1e5bdede71..d99c13bd8b912fce84a0ea78571cd7d71da91c42 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/string_i.h
+++ b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/string_i.h
@@ -1,4 +1,4 @@
-/* $Id: string_i.h 2394 2008-12-23 17:27:53Z bennylp $ */
+/* $Id: string_i.h 2819 2009-06-25 13:29:52Z bennylp $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -32,6 +32,10 @@ PJ_IDEF(pj_str_t*) pj_strdup(pj_pool_t *pool,
 			      pj_str_t *dst,
 			      const pj_str_t *src)
 {
+    /* Without this, destination will be corrupted */
+    if (dst == src)
+	return dst;
+
     if (src->slen) {
 	dst->ptr = (char*)pj_pool_alloc(pool, src->slen);
 	pj_memcpy(dst->ptr, src->ptr, src->slen);
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/timer.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/timer.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/timer.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/timer.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/types.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/types.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/types.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/types.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/unicode.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/unicode.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/unicode.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pj/unicode.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pjlib++.hpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pjlib++.hpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pjlib++.hpp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pjlib++.hpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pjlib.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/include/pjlib.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/include/pjlib.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/include/pjlib.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/activesock.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/activesock.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/activesock.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/activesock.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/addr_resolv_linux_kernel.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/addr_resolv_linux_kernel.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/addr_resolv_linux_kernel.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/addr_resolv_linux_kernel.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/addr_resolv_sock.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/addr_resolv_sock.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/addr_resolv_sock.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/addr_resolv_sock.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/addr_resolv_symbian.cpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/addr_resolv_symbian.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/addr_resolv_symbian.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/addr_resolv_symbian.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/array.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/array.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/array.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/array.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/compat/longjmp_i386.S b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/compat/longjmp_i386.S
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/compat/longjmp_i386.S
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/compat/longjmp_i386.S
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/compat/setjmp_i386.S b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/compat/setjmp_i386.S
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/compat/setjmp_i386.S
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/compat/setjmp_i386.S
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/compat/sigjmp.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/compat/sigjmp.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/compat/sigjmp.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/compat/sigjmp.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/compat/string.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/compat/string.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/compat/string.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/compat/string.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/compat/string_compat.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/compat/string_compat.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/compat/string_compat.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/compat/string_compat.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/config.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/config.c
similarity index 97%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/config.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/config.c
index f2beb56635399cfc789ea6a03ca35137c457c5b7..6c8d6df3c56493d874f974829db4c9cc87312408 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/config.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/config.c
@@ -1,4 +1,4 @@
-/* $Id: config.c 2551 2009-03-25 12:13:09Z bennylp $ */
+/* $Id: config.c 2828 2009-07-02 14:50:38Z bennylp $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -22,7 +22,7 @@
 #include <pj/ioqueue.h>
 
 static const char *id = "config.c";
-PJ_DEF_DATA(const char*) PJ_VERSION = "1.0.2";
+PJ_DEF_DATA(const char*) PJ_VERSION = "1.0.3";
 
 /*
  * Get PJLIB version string.
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ctype.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ctype.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ctype.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ctype.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/errno.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/errno.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/errno.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/errno.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/except.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/except.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/except.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/except.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/exception_symbian.cpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/exception_symbian.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/exception_symbian.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/exception_symbian.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/extra-exports.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/extra-exports.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/extra-exports.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/extra-exports.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/fifobuf.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/fifobuf.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/fifobuf.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/fifobuf.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/file_access_unistd.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/file_access_unistd.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/file_access_unistd.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/file_access_unistd.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/file_access_win32.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/file_access_win32.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/file_access_win32.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/file_access_win32.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/file_io_ansi.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/file_io_ansi.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/file_io_ansi.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/file_io_ansi.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/file_io_win32.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/file_io_win32.c
similarity index 93%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/file_io_win32.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/file_io_win32.c
index 82269bc3ed6a6e3784256b4de3ca490dfec1f9d8..e5d6d857336d49aaba98d47d77f40d7618bd63af 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/file_io_win32.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/file_io_win32.c
@@ -1,4 +1,4 @@
-/* $Id: file_io_win32.c 2394 2008-12-23 17:27:53Z bennylp $ */
+/* $Id: file_io_win32.c 2807 2009-06-25 12:33:59Z bennylp $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -59,7 +59,15 @@ PJ_DEF(pj_status_t) pj_file_open( pj_pool_t *pool,
     if ((flags & PJ_O_WRONLY) == PJ_O_WRONLY) {
         dwDesiredAccess |= GENERIC_WRITE;
         if ((flags & PJ_O_APPEND) == PJ_O_APPEND) {
+#if !defined(PJ_WIN32_WINCE) || !PJ_WIN32_WINCE
+	    /* FILE_APPEND_DATA is invalid on WM2003 and WM5, but it seems
+	     * to be working on WM6. All are tested on emulator though.
+	     * Removing this also seem to work (i.e. data is appended), so
+	     * I guess this flag is "optional".
+	     * See http://trac.pjsip.org/repos/ticket/825
+	     */
             dwDesiredAccess |= FILE_APPEND_DATA;
+#endif
 	    dwCreationDisposition |= OPEN_ALWAYS;
         } else {
             dwDesiredAccess &= ~(FILE_APPEND_DATA);
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/guid.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/guid.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/guid.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/guid.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/guid_simple.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/guid_simple.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/guid_simple.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/guid_simple.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/guid_uuid.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/guid_uuid.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/guid_uuid.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/guid_uuid.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/guid_win32.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/guid_win32.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/guid_win32.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/guid_win32.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/hash.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/hash.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/hash.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/hash.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_common_abs.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_common_abs.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_common_abs.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_common_abs.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_common_abs.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_common_abs.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_common_abs.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_common_abs.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_dummy.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_dummy.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_dummy.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_dummy.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_epoll.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_epoll.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_epoll.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_epoll.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_linux_kernel.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_linux_kernel.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_linux_kernel.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_linux_kernel.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_select.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_select.c
similarity index 99%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_select.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_select.c
index e6ed8c1de0f5e45bab5e7cbfc5fa7db32e31fc2a..e64037ceac2f9b130771f67f6631c3b1d7de0f7f 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_select.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_select.c
@@ -1,4 +1,4 @@
-/* $Id: ioqueue_select.c 2394 2008-12-23 17:27:53Z bennylp $ */
+/* $Id: ioqueue_select.c 2806 2009-06-25 12:31:52Z bennylp $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -727,7 +727,8 @@ PJ_DEF(int) pj_ioqueue_poll( pj_ioqueue_t *ioqueue, const pj_time_val *timeout)
 
         /* Scan for readable socket. */
 	if ((key_has_pending_read(h) || key_has_pending_accept(h))
-            && PJ_FD_ISSET(h->fd, &rfdset) && !IS_CLOSING(h))
+            && PJ_FD_ISSET(h->fd, &rfdset) && !IS_CLOSING(h) &&
+	    counter<count)
         {
 #if PJ_IOQUEUE_HAS_SAFE_UNREG
 	    increment_counter(h);
@@ -739,7 +740,7 @@ PJ_DEF(int) pj_ioqueue_poll( pj_ioqueue_t *ioqueue, const pj_time_val *timeout)
 
 #if PJ_HAS_TCP
         if (key_has_pending_connect(h) && PJ_FD_ISSET(h->fd, &xfdset) &&
-	    !IS_CLOSING(h)) 
+	    !IS_CLOSING(h) && counter<count) 
 	{
 #if PJ_IOQUEUE_HAS_SAFE_UNREG
 	    increment_counter(h);
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_symbian.cpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_symbian.cpp
similarity index 97%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_symbian.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_symbian.cpp
index ceb23e258d9f2dd286ea5fcc918fddedd838c06c..0c2836a664f0057392c452d25c3f93889c8894a1 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_symbian.cpp
+++ b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_symbian.cpp
@@ -1,4 +1,4 @@
-/* $Id: ioqueue_symbian.cpp 2482 2009-03-02 15:50:12Z nanang $ */
+/* $Id: ioqueue_symbian.cpp 2804 2009-06-25 12:26:15Z bennylp $ */
 /*
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -210,7 +210,16 @@ pj_status_t CIoqueueCallback::StartRead (pj_ioqueue_op_key_t *op_key,
     } else {
         aAddress_.SetAddress (0);
         aAddress_.SetPort (0);
-        sock_->Socket().Recv (aBufferPtr_, flags, iStatus);
+
+        if (sock_->IsDatagram()) {
+            sock_->Socket().Recv (aBufferPtr_, flags, iStatus);
+        } else {
+            // Using static like this is not pretty, but we don't need to use
+            // the value anyway, hence doing it like this is probably most
+            // optimal.
+            static TSockXfrLength len;
+            sock_->Socket().RecvOneOrMore (aBufferPtr_, flags, iStatus, len);
+        }
     }
 
     SetActive();
@@ -275,6 +284,7 @@ void CIoqueueCallback::HandleReadCompletion()
 CPjSocket *CIoqueueCallback::HandleAcceptCompletion()
 {
     CPjSocket *pjNewSock = new CPjSocket (get_pj_socket()->GetAf(),
+                                          get_pj_socket()->GetSockType(),
                                           blank_sock_);
     int addrlen = 0;
 
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_winnt.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_winnt.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_winnt.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ioqueue_winnt.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ip_helper_generic.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ip_helper_generic.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ip_helper_generic.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ip_helper_generic.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ip_helper_symbian.cpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ip_helper_symbian.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ip_helper_symbian.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ip_helper_symbian.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ip_helper_win32.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ip_helper_win32.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ip_helper_win32.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/ip_helper_win32.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/list.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/list.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/list.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/list.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/lock.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/lock.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/lock.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/lock.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/log.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/log.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/log.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/log.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/log_writer_printk.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/log_writer_printk.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/log_writer_printk.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/log_writer_printk.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/log_writer_stdout.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/log_writer_stdout.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/log_writer_stdout.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/log_writer_stdout.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/log_writer_symbian_console.cpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/log_writer_symbian_console.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/log_writer_symbian_console.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/log_writer_symbian_console.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_core_linux_kernel.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_core_linux_kernel.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_core_linux_kernel.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_core_linux_kernel.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_core_symbian.cpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_core_symbian.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_core_symbian.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_core_symbian.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_core_unix.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_core_unix.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_core_unix.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_core_unix.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_core_win32.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_core_win32.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_core_win32.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_core_win32.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_error_linux_kernel.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_error_linux_kernel.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_error_linux_kernel.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_error_linux_kernel.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_error_symbian.cpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_error_symbian.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_error_symbian.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_error_symbian.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_error_unix.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_error_unix.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_error_unix.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_error_unix.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_error_win32.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_error_win32.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_error_win32.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_error_win32.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_rwmutex.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_rwmutex.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_rwmutex.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_rwmutex.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_symbian.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_symbian.h
similarity index 95%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_symbian.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_symbian.h
index 9c01516fa7cf9ef09b80e34513e7ab6df90841d3..54d8a8011309e04b3bb741efc6ad5ef9eea80743 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_symbian.h
+++ b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_symbian.h
@@ -1,4 +1,4 @@
-/* $Id: os_symbian.h 2482 2009-03-02 15:50:12Z nanang $ */
+/* $Id: os_symbian.h 2804 2009-06-25 12:26:15Z bennylp $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -54,8 +54,9 @@ public:
     };
 
     // Construct CPjSocket
-    CPjSocket(int af, RSocket &sock)
-	: af_(af), sock_(sock), connected_(false), sockReader_(NULL)
+    CPjSocket(int af, int sock_type, RSocket &sock)
+	: af_(af), sock_(sock), sock_type_(sock_type), connected_(false), 
+	  sockReader_(NULL)
     { 
     }
 
@@ -86,6 +87,18 @@ public:
 	connected_ = connected;
     }
 
+    // Get socket type
+    int GetSockType() const
+    {
+	return sock_type_;
+    }
+    
+    // Returns true if socket is a datagram
+    bool IsDatagram() const
+    {
+	return sock_type_ == KSockDatagram;
+    }
+    
     // Get socket reader, if any.
     // May return NULL.
     CPjSocketReader *Reader()
@@ -103,6 +116,8 @@ private:
     int		     af_;
     RSocket	     sock_;	    // Must not be reference, or otherwise
 				    // it may point to local variable!
+    unsigned   	     sock_type_;
+    
     bool	     connected_;
     CPjSocketReader *sockReader_;
 };
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_time_bsd.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_time_bsd.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_time_bsd.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_time_bsd.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_time_common.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_time_common.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_time_common.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_time_common.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_time_linux_kernel.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_time_linux_kernel.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_time_linux_kernel.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_time_linux_kernel.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_time_unix.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_time_unix.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_time_unix.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_time_unix.c
diff --git a/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_time_win32.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_time_win32.c
new file mode 100644
index 0000000000000000000000000000000000000000..2fe985c56981fca47fe0eac74638bcff0595980d
--- /dev/null
+++ b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_time_win32.c
@@ -0,0 +1,303 @@
+/* $Id: os_time_win32.c 2805 2009-06-25 12:29:04Z bennylp $ */
+/* 
+ * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
+ * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
+ */
+#include <pj/os.h>
+#include <pj/string.h>
+#include <pj/log.h>
+#include <windows.h>
+
+///////////////////////////////////////////////////////////////////////////////
+
+#define SECS_TO_FT_MULT 10000000
+
+static LARGE_INTEGER base_time;
+
+#if defined(PJ_WIN32_WINCE) && PJ_WIN32_WINCE
+#   define WINCE_TIME
+#endif
+
+#ifdef WINCE_TIME
+/* Note:
+ *  In Windows CE/Windows Mobile platforms, the availability of milliseconds
+ *  time resolution in SYSTEMTIME.wMilliseconds depends on the OEM, and most
+ *  likely it won't be available. When it's not available, the 
+ *  SYSTEMTIME.wMilliseconds will contain a constant arbitrary value.
+ *
+ *  Because of that, we need to emulate the milliseconds time resolution
+ *  using QueryPerformanceCounter() (via pj_get_timestamp() API). However 
+ *  there is limitation on using this, i.e. the time returned by 
+ *  pj_gettimeofday() may be off by up to plus/minus 999 msec (the second
+ *  part will be correct, however the msec part may be off), because we're 
+ *  not synchronizing the msec field with the change of value of the "second"
+ *  field of the system time.
+ *
+ *  Also there is other caveat which need to be handled (and they are 
+ *  handled by this implementation):
+ *   - user may change system time, so pj_gettimeofday() needs to periodically
+ *     checks if system time has changed. The period on which system time is
+ *     checked is controlled by PJ_WINCE_TIME_CHECK_INTERVAL macro.
+ */
+static LARGE_INTEGER g_start_time;  /* Time gettimeofday() is first called  */
+static pj_timestamp  g_start_tick;  /* TS gettimeofday() is first called  */
+static pj_timestamp  g_last_update; /* Last time check_system_time() is 
+				       called, to periodically synchronize
+				       with up-to-date system time (in case
+				       user changes system time).	    */
+static pj_uint64_t   g_update_period; /* Period (in TS) check_system_time()
+				         should be called.		    */
+
+/* Period on which check_system_time() is called, in seconds		    */
+#ifndef PJ_WINCE_TIME_CHECK_INTERVAL
+#   define PJ_WINCE_TIME_CHECK_INTERVAL (10)
+#endif
+
+#endif
+
+#ifdef WINCE_TIME
+static pj_status_t init_start_time(void)
+{
+    SYSTEMTIME st;
+    FILETIME ft;
+    pj_timestamp freq;
+    pj_status_t status;
+
+    GetLocalTime(&st);
+    SystemTimeToFileTime(&st, &ft);
+
+    g_start_time.LowPart = ft.dwLowDateTime;
+    g_start_time.HighPart = ft.dwHighDateTime;
+    g_start_time.QuadPart /= SECS_TO_FT_MULT;
+    g_start_time.QuadPart -= base_time.QuadPart;
+
+    status = pj_get_timestamp(&g_start_tick);
+    if (status != PJ_SUCCESS)
+	return status;
+
+    g_last_update.u64 = g_start_tick.u64;
+
+    status = pj_get_timestamp_freq(&freq);
+    if (status != PJ_SUCCESS)
+	return status;
+
+    g_update_period = PJ_WINCE_TIME_CHECK_INTERVAL * freq.u64;
+
+    PJ_LOG(4,("os_time_win32.c", "WinCE time (re)started"));
+
+    return PJ_SUCCESS;
+}
+
+static pj_status_t check_system_time(pj_uint64_t ts_elapsed)
+{
+    enum { MIS = 5 };
+    SYSTEMTIME st;
+    FILETIME ft;
+    LARGE_INTEGER cur, calc;
+    DWORD diff;
+    pj_timestamp freq;
+    pj_status_t status;
+
+    /* Get system's current time */
+    GetLocalTime(&st);
+    SystemTimeToFileTime(&st, &ft);
+    
+    cur.LowPart = ft.dwLowDateTime;
+    cur.HighPart = ft.dwHighDateTime;
+    cur.QuadPart /= SECS_TO_FT_MULT;
+    cur.QuadPart -= base_time.QuadPart;
+
+    /* Get our calculated system time */
+    status = pj_get_timestamp_freq(&freq);
+    if (status != PJ_SUCCESS)
+	return status;
+
+    calc.QuadPart = g_start_time.QuadPart + ts_elapsed / freq.u64;
+
+    /* See the difference between calculated and actual system time */
+    if (calc.QuadPart >= cur.QuadPart) {
+	diff = (DWORD)(calc.QuadPart - cur.QuadPart);
+    } else {
+	diff = (DWORD)(cur.QuadPart - calc.QuadPart);
+    }
+
+    if (diff > MIS) {
+	/* System time has changed */
+	PJ_LOG(3,("os_time_win32.c", "WinCE system time changed detected "
+				      "(diff=%u)", diff));
+	status = init_start_time();
+    } else {
+	status = PJ_SUCCESS;
+    }
+
+    return status;
+}
+
+#endif
+
+// Find 1st Jan 1970 as a FILETIME 
+static pj_status_t get_base_time(void)
+{
+    SYSTEMTIME st;
+    FILETIME ft;
+    pj_status_t status = PJ_SUCCESS;
+
+    memset(&st,0,sizeof(st));
+    st.wYear=1970;
+    st.wMonth=1;
+    st.wDay=1;
+    SystemTimeToFileTime(&st, &ft);
+    
+    base_time.LowPart = ft.dwLowDateTime;
+    base_time.HighPart = ft.dwHighDateTime;
+    base_time.QuadPart /= SECS_TO_FT_MULT;
+
+#ifdef WINCE_TIME
+    pj_enter_critical_section();
+    status = init_start_time();
+    pj_leave_critical_section();
+#endif
+
+    return status;
+}
+
+PJ_DEF(pj_status_t) pj_gettimeofday(pj_time_val *tv)
+{
+#ifdef WINCE_TIME
+    pj_timestamp tick;
+    pj_uint64_t msec_elapsed;
+#else
+    SYSTEMTIME st;
+    FILETIME ft;
+    LARGE_INTEGER li;
+#endif
+    pj_status_t status;
+
+    if (base_time.QuadPart == 0) {
+	status = get_base_time();
+	if (status != PJ_SUCCESS)
+	    return status;
+    }
+
+#ifdef WINCE_TIME
+    do {
+	status = pj_get_timestamp(&tick);
+	if (status != PJ_SUCCESS)
+	    return status;
+
+	if (tick.u64 - g_last_update.u64 >= g_update_period) {
+	    pj_enter_critical_section();
+	    if (tick.u64 - g_last_update.u64 >= g_update_period) {
+		g_last_update.u64 = tick.u64;
+		check_system_time(tick.u64 - g_start_tick.u64);
+	    }
+	    pj_leave_critical_section();
+	} else {
+	    break;
+	}
+    } while (1);
+
+    msec_elapsed = pj_elapsed_msec64(&g_start_tick, &tick);
+
+    tv->sec = (long)(g_start_time.QuadPart + msec_elapsed/1000);
+    tv->msec = (long)(msec_elapsed % 1000);
+#else
+    /* Standard Win32 GetLocalTime */
+    GetLocalTime(&st);
+    SystemTimeToFileTime(&st, &ft);
+
+    li.LowPart = ft.dwLowDateTime;
+    li.HighPart = ft.dwHighDateTime;
+    li.QuadPart /= SECS_TO_FT_MULT;
+    li.QuadPart -= base_time.QuadPart;
+
+    tv->sec = li.LowPart;
+    tv->msec = st.wMilliseconds;
+#endif	/* WINCE_TIME */
+
+    return PJ_SUCCESS;
+}
+
+PJ_DEF(pj_status_t) pj_time_decode(const pj_time_val *tv, pj_parsed_time *pt)
+{
+    LARGE_INTEGER li;
+    FILETIME ft;
+    SYSTEMTIME st;
+
+    li.QuadPart = tv->sec;
+    li.QuadPart += base_time.QuadPart;
+    li.QuadPart *= SECS_TO_FT_MULT;
+
+    ft.dwLowDateTime = li.LowPart;
+    ft.dwHighDateTime = li.HighPart;
+    FileTimeToSystemTime(&ft, &st);
+
+    pt->year = st.wYear;
+    pt->mon = st.wMonth-1;
+    pt->day = st.wDay;
+    pt->wday = st.wDayOfWeek;
+
+    pt->hour = st.wHour;
+    pt->min = st.wMinute;
+    pt->sec = st.wSecond;
+    pt->msec = tv->msec;
+
+    return PJ_SUCCESS;
+}
+
+/**
+ * Encode parsed time to time value.
+ */
+PJ_DEF(pj_status_t) pj_time_encode(const pj_parsed_time *pt, pj_time_val *tv)
+{
+    SYSTEMTIME st;
+    FILETIME ft;
+    LARGE_INTEGER li;
+
+    pj_bzero(&st, sizeof(st));
+    st.wYear = (pj_uint16_t) pt->year;
+    st.wMonth = (pj_uint16_t) (pt->mon + 1);
+    st.wDay = (pj_uint16_t) pt->day;
+    st.wHour = (pj_uint16_t) pt->hour;
+    st.wMinute = (pj_uint16_t) pt->min;
+    st.wSecond = (pj_uint16_t) pt->sec;
+    st.wMilliseconds = (pj_uint16_t) pt->msec;
+    
+    SystemTimeToFileTime(&st, &ft);
+
+    li.LowPart = ft.dwLowDateTime;
+    li.HighPart = ft.dwHighDateTime;
+    li.QuadPart /= SECS_TO_FT_MULT;
+    li.QuadPart -= base_time.QuadPart;
+
+    tv->sec = li.LowPart;
+    tv->msec = st.wMilliseconds;
+
+    return PJ_SUCCESS;
+}
+
+/**
+ * Convert local time to GMT.
+ */
+PJ_DEF(pj_status_t) pj_time_local_to_gmt(pj_time_val *tv);
+
+/**
+ * Convert GMT to local time.
+ */
+PJ_DEF(pj_status_t) pj_time_gmt_to_local(pj_time_val *tv);
+
+
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_timestamp_common.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_timestamp_common.c
similarity index 95%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_timestamp_common.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_timestamp_common.c
index 6262a1993fa4d57caacde071209c1dc55b428035..10941d211d6b36cca6ccb9309eb41e386b44cb43 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_timestamp_common.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_timestamp_common.c
@@ -1,4 +1,4 @@
-/* $Id: os_timestamp_common.c 2394 2008-12-23 17:27:53Z bennylp $ */
+/* $Id: os_timestamp_common.c 2805 2009-06-25 12:29:04Z bennylp $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -152,6 +152,12 @@ PJ_DEF(pj_uint32_t) pj_elapsed_msec( const pj_timestamp *start,
     return (pj_uint32_t)elapsed_msec(start, stop);
 }
 
+PJ_DEF(pj_uint64_t) pj_elapsed_msec64(const pj_timestamp *start,
+                                      const pj_timestamp *stop )
+{
+    return (pj_uint64_t)elapsed_msec(start, stop);
+}
+
 PJ_DEF(pj_time_val) pj_elapsed_time( const pj_timestamp *start,
                                      const pj_timestamp *stop )
 {
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_timestamp_linux_kernel.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_timestamp_linux_kernel.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_timestamp_linux_kernel.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_timestamp_linux_kernel.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_timestamp_posix.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_timestamp_posix.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_timestamp_posix.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_timestamp_posix.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_timestamp_win32.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_timestamp_win32.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_timestamp_win32.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/os_timestamp_win32.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/pool.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/pool.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_buf.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/pool_buf.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_buf.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/pool_buf.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_caching.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/pool_caching.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_caching.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/pool_caching.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_dbg.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/pool_dbg.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_dbg.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/pool_dbg.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_policy_kmalloc.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/pool_policy_kmalloc.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_policy_kmalloc.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/pool_policy_kmalloc.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_policy_malloc.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/pool_policy_malloc.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_policy_malloc.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/pool_policy_malloc.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_policy_new.cpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/pool_policy_new.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_policy_new.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/pool_policy_new.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_signature.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/pool_signature.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_signature.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/pool_signature.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/rand.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/rand.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/rand.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/rand.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/rbtree.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/rbtree.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/rbtree.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/rbtree.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_bsd.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/sock_bsd.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_bsd.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/sock_bsd.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_common.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/sock_common.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_common.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/sock_common.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_linux_kernel.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/sock_linux_kernel.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_linux_kernel.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/sock_linux_kernel.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_select.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/sock_select.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_select.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/sock_select.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_select_symbian.cpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/sock_select_symbian.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_select_symbian.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/sock_select_symbian.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_symbian.cpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/sock_symbian.cpp
similarity index 97%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_symbian.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/sock_symbian.cpp
index 29858afab1d4485e6f476eb7c5d506f7ca57bfe1..f3124a1490a91a2d61e897913f9b925f57d5cc13 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_symbian.cpp
+++ b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/sock_symbian.cpp
@@ -1,4 +1,4 @@
-/* $Id: sock_symbian.cpp 2482 2009-03-02 15:50:12Z nanang $ */
+/* $Id: sock_symbian.cpp 2804 2009-06-25 12:26:15Z bennylp $ */
 /*
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -125,13 +125,7 @@ CPjSocketReader::CPjSocketReader (CPjSocket &sock)
 
 void CPjSocketReader::ConstructL (unsigned max_len)
 {
-    TProtocolDesc aProtocol;
-    TInt err;
-
-    err = sock_.Socket().Info (aProtocol);
-    User::LeaveIfError (err);
-
-    isDatagram_ = (aProtocol.iSockType == KSockDatagram);
+    isDatagram_ = sock_.IsDatagram();
 
     TUint8 *ptr = new TUint8[max_len];
     buffer_.Set (ptr, 0, (TInt) max_len);
@@ -535,7 +529,7 @@ PJ_DEF (pj_status_t) pj_sock_socket (int af,
 
 
     /* Wrap Symbian RSocket into PJLIB's CPjSocket, and return to caller */
-    CPjSocket *pjSock = new CPjSocket (af, rSock);
+    CPjSocket *pjSock = new CPjSocket (af, type, rSock);
 
     *p_sock = (pj_sock_t) pjSock;
 
@@ -757,7 +751,6 @@ PJ_DEF (pj_status_t) pj_sock_recv (pj_sock_t sock,
     PJ_SYMBIAN_CHECK_CONNECTION();
 
     CPjSocket *pjSock = (CPjSocket*) sock;
-    RSocket &rSock = pjSock->Socket();
 
     if (pjSock->Reader()) {
         CPjSocketReader *reader = pjSock->Reader();
@@ -782,7 +775,16 @@ PJ_DEF (pj_status_t) pj_sock_recv (pj_sock_t sock,
     TSockXfrLength recvLen;
     TPtr8 data ( (TUint8*) buf, (TInt) *len, (TInt) *len);
 
-    rSock.Recv (data, flags, reqStatus, recvLen);
+    if (pjSock->IsDatagram()) {
+        pjSock->Socket().Recv (data, flags, reqStatus);
+    } else {
+        // Using static like this is not pretty, but we don't need to use
+        // the value anyway, hence doing it like this is probably most
+        // optimal.
+        static TSockXfrLength len;
+        pjSock->Socket().RecvOneOrMore (data, flags, reqStatus, len);
+    }
+
     User::WaitForRequest (reqStatus);
 
     if (reqStatus == KErrNone) {
@@ -1027,7 +1029,8 @@ PJ_DEF (pj_status_t) pj_sock_accept (pj_sock_t serverfd,
     }
 
     // Create PJ socket
-    CPjSocket *newPjSock = new CPjSocket (pjSock->GetAf(), newSock);
+    CPjSocket *newPjSock = new CPjSocket (pjSock->GetAf(), pjSock->GetSockType(),
+                                          newSock);
 
     newPjSock->SetConnected (true);
 
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/string.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/string.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/string.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/string.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/symbols.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/symbols.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/symbols.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/symbols.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/timer.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/timer.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/timer.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/timer.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/timer_symbian.cpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/timer_symbian.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/timer_symbian.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/timer_symbian.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/types.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/types.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/types.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/types.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/unicode_symbian.cpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/unicode_symbian.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/unicode_symbian.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/unicode_symbian.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/unicode_win32.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/unicode_win32.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/unicode_win32.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pj/unicode_win32.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib++-test/main.cpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib++-test/main.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib++-test/main.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib++-test/main.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-samples/except.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-samples/except.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-samples/except.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-samples/except.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-samples/list.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-samples/list.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-samples/list.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-samples/list.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-samples/log.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-samples/log.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-samples/log.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-samples/log.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/activesock.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/activesock.c
similarity index 92%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/activesock.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/activesock.c
index 770493b1531efd9e2dfe1c5094876658d19b1231..ed6da1359514b70b20a90edc1980de1147e69063 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/activesock.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/activesock.c
@@ -1,4 +1,4 @@
-/* $Id: activesock.c 2394 2008-12-23 17:27:53Z bennylp $ */
+/* $Id: activesock.c 2804 2009-06-25 12:26:15Z bennylp $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -212,7 +212,11 @@ static int udp_ping_pong_test(void)
 
 	for (i=0; i<10 && last_rx1 == srv1->rx_cnt && last_rx2 == srv2->rx_cnt; ++i) {
 	    pj_time_val delay = {0, 10};
+#ifdef PJ_SYMBIAN
+	    pj_symbianos_poll(-1, 100);
+#else
 	    pj_ioqueue_poll(ioqueue, &delay);
+#endif
 	}
 
 	if (srv1->rx_err_cnt+srv1->tx_err_cnt != 0 ||
@@ -403,26 +407,47 @@ static int tcp_perf_test(void)
 	status = pj_activesock_send(asock2, &op_key->op_key, pkt, &len, 0);
 	if (status == PJ_EPENDING) {
 	    do {
+#if PJ_SYMBIAN
+		pj_symbianos_poll(-1, -1);
+#else
 		pj_ioqueue_poll(ioqueue, NULL);
+#endif
 	    } while (!state2->sent);
-	} else if (status != PJ_SUCCESS) {
-		PJ_LOG(1,("", "   err: send status=%d", status));
-	    status = -180;
-	    break;
-	} else if (status == PJ_SUCCESS) {
-	    if (len != sizeof(*pkt)) {
-		PJ_LOG(1,("", "   err: shouldn't report partial sent"));
-		status = -190;
-		break;
-	    }
+	} else {
+#if PJ_SYMBIAN
+		/* The Symbian socket always returns PJ_SUCCESS for TCP send,
+		 * eventhough the remote end hasn't received the data yet.
+		 * If we continue sending, eventually send() will block,
+		 * possibly because the send buffer is full. So we need to
+		 * poll the ioqueue periodically, to let receiver gets the 
+		 * data.
+		 */
+		pj_symbianos_poll(-1, 0);
+#endif
+		if (status != PJ_SUCCESS) {
+		    PJ_LOG(1,("", "   err: send status=%d", status));
+		    status = -180;
+		    break;
+		} else if (status == PJ_SUCCESS) {
+		    if (len != sizeof(*pkt)) {
+			PJ_LOG(1,("", "   err: shouldn't report partial sent"));
+			status = -190;
+			break;
+		    }
+		}
 	}
     }
 
     /* Wait until everything has been sent/received */
     if (state1->next_recv_seq < COUNT) {
+#ifdef PJ_SYMBIAN
+	while (pj_symbianos_poll(-1, 1000) == PJ_TRUE)
+	    ;
+#else
 	pj_time_val delay = {0, 100};
 	while (pj_ioqueue_poll(ioqueue, &delay) > 0)
 	    ;
+#endif
     }
 
     if (status == PJ_EPENDING)
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/atomic.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/atomic.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/atomic.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/atomic.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/echo_clt.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/echo_clt.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/echo_clt.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/echo_clt.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/errno.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/errno.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/errno.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/errno.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/exception.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/exception.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/exception.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/exception.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/fifobuf.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/fifobuf.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/fifobuf.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/fifobuf.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/file.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/file.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/file.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/file.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/hash_test.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/hash_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/hash_test.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/hash_test.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/ioq_perf.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/ioq_perf.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/ioq_perf.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/ioq_perf.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/ioq_tcp.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/ioq_tcp.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/ioq_tcp.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/ioq_tcp.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/ioq_udp.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/ioq_udp.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/ioq_udp.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/ioq_udp.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/ioq_unreg.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/ioq_unreg.c
similarity index 98%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/ioq_unreg.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/ioq_unreg.c
index 95cfce7f66101c1910e1dbbb8cafc01e80ee6acf..bbd96dc0f94f67fbacba2bf28fbe94d492cdd598 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/ioq_unreg.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/ioq_unreg.c
@@ -1,4 +1,4 @@
-/* $Id: ioq_unreg.c 2394 2008-12-23 17:27:53Z bennylp $ */
+/* $Id: ioq_unreg.c 2816 2009-06-25 13:14:54Z bennylp $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -250,11 +250,12 @@ static int perform_unreg_test(pj_ioqueue_t *ioqueue,
 	    PJ_TIME_VAL_GTE(now, time_to_unregister) &&
 	    sock_data.pool) 
 	{
-	    pj_mutex_lock(sock_data.mutex);
+	    //Can't do this otherwise it'll deadlock
+	    //pj_mutex_lock(sock_data.mutex);
 
 	    sock_data.unregistered = 1;
 	    pj_ioqueue_unregister(sock_data.key);
-	    pj_mutex_unlock(sock_data.mutex);
+	    //pj_mutex_unlock(sock_data.mutex);
 	    pj_mutex_destroy(sock_data.mutex);
 	    pj_pool_release(sock_data.pool);
 	    sock_data.pool = NULL;
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/list.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/list.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/list.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/list.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/main.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/main.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/main.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/main.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/main_mod.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/main_mod.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/main_mod.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/main_mod.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/main_rtems.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/main_rtems.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/main_rtems.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/main_rtems.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/main_symbian.cpp b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/main_symbian.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/main_symbian.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/main_symbian.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/main_win32.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/main_win32.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/main_win32.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/main_win32.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/mutex.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/mutex.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/mutex.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/mutex.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/os.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/os.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/os.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/os.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/pool.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/pool.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/pool.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/pool.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/pool_perf.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/pool_perf.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/pool_perf.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/pool_perf.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/rand.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/rand.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/rand.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/rand.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/rbtree.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/rbtree.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/rbtree.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/rbtree.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/rtems_network_config.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/rtems_network_config.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/rtems_network_config.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/rtems_network_config.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/select.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/select.c
similarity index 97%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/select.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/select.c
index f9f37b96a083abb5415ff4785c3142a8eba8af2f..935168ec936a1436e4359264b8bd980e3b8687fc 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/select.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/select.c
@@ -1,4 +1,4 @@
-/* $Id: select.c 2394 2008-12-23 17:27:53Z bennylp $ */
+/* $Id: select.c 2820 2009-06-29 11:35:40Z nanang $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -142,6 +142,9 @@ int select_test()
 	status=-40; goto on_return;
     }
 
+    // Sleep a bit. See http://trac.pjsip.org/repos/ticket/908
+    pj_thread_sleep(10);
+
     // Check that socket is marked as reable.
     // Note that select() may also report that sockets are writable.
     status = do_select(udp1, udp2, setcount);
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/sleep.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/sleep.c
similarity index 83%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/sleep.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/sleep.c
index 46a1e06780abd99980c28560985958aa90a626ee..11c3db98afcf907acea001fa199cbcb82216869c 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/sleep.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/sleep.c
@@ -1,4 +1,4 @@
-/* $Id: sleep.c 2394 2008-12-23 17:27:53Z bennylp $ */
+/* $Id: sleep.c 2805 2009-06-25 12:29:04Z bennylp $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -55,19 +55,35 @@
 
 static int simple_sleep_test(void)
 {
-    enum { COUNT = 5 };
+    enum { COUNT = 10 };
     int i;
     pj_status_t rc;
     
     PJ_LOG(3,(THIS_FILE, "..will write messages every 1 second:"));
     
     for (i=0; i<COUNT; ++i) {
+	pj_time_val tv;
+	pj_parsed_time pt;
+
 	rc = pj_thread_sleep(1000);
 	if (rc != PJ_SUCCESS) {
 	    app_perror("...error: pj_thread_sleep()", rc);
 	    return -10;
 	}
-	PJ_LOG(3,(THIS_FILE, "...wake up.."));
+
+	rc = pj_gettimeofday(&tv);
+	if (rc != PJ_SUCCESS) {
+	    app_perror("...error: pj_gettimeofday()", rc);
+	    return -11;
+	}
+
+	pj_time_decode(&tv, &pt);
+
+	PJ_LOG(3,(THIS_FILE, 
+		  "...%04d-%02d-%02d %02d:%02d:%02d.%03d",
+		  pt.year, pt.mon, pt.day,
+		  pt.hour, pt.min, pt.sec, pt.msec));
+
     }
 
     return 0;
@@ -75,13 +91,15 @@ static int simple_sleep_test(void)
 
 static int sleep_duration_test(void)
 {
-    enum { MIS = 20, DURATION = 1000, DURATION2 = 500 };
+    enum { MIS = 20};
+    unsigned duration[] = { 2000, 1000, 500, 200, 100 };
+    unsigned i;
     pj_status_t rc;
 
     PJ_LOG(3,(THIS_FILE, "..running sleep duration test"));
 
     /* Test pj_thread_sleep() and pj_gettimeofday() */
-    {
+    for (i=0; i<PJ_ARRAY_SIZE(duration); ++i) {
         pj_time_val start, stop;
 	pj_uint32_t msec;
 
@@ -93,7 +111,7 @@ static int sleep_duration_test(void)
         }
 
         /* Sleep */
-        rc = pj_thread_sleep(DURATION);
+        rc = pj_thread_sleep(duration[i]);
         if (rc != PJ_SUCCESS) {
             app_perror("...error: pj_thread_sleep()", rc);
             return -20;
@@ -109,20 +127,20 @@ static int sleep_duration_test(void)
 	msec = PJ_TIME_VAL_MSEC(stop);
 
 	/* Check if it's within range. */
-	if (msec < DURATION * (100-MIS)/100 ||
-	    msec > DURATION * (100+MIS)/100)
+	if (msec < duration[i] * (100-MIS)/100 ||
+	    msec > duration[i] * (100+MIS)/100)
 	{
 	    PJ_LOG(3,(THIS_FILE, 
 		      "...error: slept for %d ms instead of %d ms "
 		      "(outside %d%% err window)",
-		      msec, DURATION, MIS));
+		      msec, duration[i], MIS));
 	    return -30;
 	}
     }
 
 
     /* Test pj_thread_sleep() and pj_get_timestamp() and friends */
-    {
+    for (i=0; i<PJ_ARRAY_SIZE(duration); ++i) {
 	pj_time_val t1, t2;
         pj_timestamp start, stop;
 	pj_uint32_t msec;
@@ -140,7 +158,7 @@ static int sleep_duration_test(void)
 	pj_gettimeofday(&t1);
 
         /* Sleep */
-        rc = pj_thread_sleep(DURATION2);
+        rc = pj_thread_sleep(duration[i]);
         if (rc != PJ_SUCCESS) {
             app_perror("...error: pj_thread_sleep()", rc);
             return -70;
@@ -162,13 +180,13 @@ static int sleep_duration_test(void)
         msec = pj_elapsed_msec(&start, &stop);
 
 	/* Check if it's within range. */
-	if (msec < DURATION2 * (100-MIS)/100 ||
-	    msec > DURATION2 * (100+MIS)/100)
+	if (msec < duration[i] * (100-MIS)/100 ||
+	    msec > duration[i] * (100+MIS)/100)
 	{
 	    PJ_LOG(3,(THIS_FILE, 
 		      "...error: slept for %d ms instead of %d ms "
 		      "(outside %d%% err window)",
-		      msec, DURATION2, MIS));
+		      msec, duration[i], MIS));
 	    PJ_TIME_VAL_SUB(t2, t1);
 	    PJ_LOG(3,(THIS_FILE, 
 		      "...info: gettimeofday() reported duration is "
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/sock.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/sock.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/sock.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/sock.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/sock_perf.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/sock_perf.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/sock_perf.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/sock_perf.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/string.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/string.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/string.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/string.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/test.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/test.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/test.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/test.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/test.h b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/test.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/test.h
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/test.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/thread.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/thread.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/thread.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/thread.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/timer.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/timer.c
similarity index 93%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/timer.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/timer.c
index f378091b746343aa0edb891dd22caed6571bcc80..5409172abe3864fc8fda3cd39198aeb93640c91f 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/timer.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/timer.c
@@ -1,4 +1,4 @@
-/* $Id: timer.c 2394 2008-12-23 17:27:53Z bennylp $ */
+/* $Id: timer.c 2817 2009-06-25 13:18:36Z bennylp $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -139,7 +139,16 @@ static int test_timer_heap(void)
 	    pj_gettimeofday(&now);
 
 	    pj_get_timestamp(&t1);
+#if defined(PJ_SYMBIAN) && PJ_SYMBIAN!=0
+	    /* On Symbian, we must use OS poll (Active Scheduler poll) since 
+	     * timer is implemented using Active Object.
+	     */
+	    rc = 0;
+	    while (pj_symbianos_poll(-1, 0))
+		++rc;
+#else
 	    rc = pj_timer_heap_poll(timer, NULL);
+#endif
 	    pj_get_timestamp(&t2);
 	    if (rc > 0) {
 		done += rc;
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/timestamp.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/timestamp.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/timestamp.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/timestamp.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/udp_echo_srv_sync.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/udp_echo_srv_sync.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/udp_echo_srv_sync.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/udp_echo_srv_sync.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/util.c b/sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/util.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/util.c
rename to sflphone-common/libs/pjproject-1.0.3/pjlib/src/pjlib-test/util.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/README.txt b/sflphone-common/libs/pjproject-1.0.3/pjmedia/README.txt
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/README.txt
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/README.txt
diff --git a/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/Jbtest.dat b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/Jbtest.dat
new file mode 100644
index 0000000000000000000000000000000000000000..3e2169c433078b38ced52575f88d92a21976c79c
--- /dev/null
+++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/Jbtest.dat
@@ -0,0 +1,324 @@
+= Ideal condition
+%adaptive 0 0 10
+!burst	    1
+!discard    0
+!lost	    0
+!empty	    0
+!delay	    1
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG 
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG 
+.
+
+= DTX
+%adaptive 0 0 10
+!burst	    1
+!discard    0
+!lost	    0
+!empty	    20
+!delay	    1
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG
+# Start silence
+GGGGGGGGGGGGGGGGGGGG
+# End silence
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG
+.
+
+= Regular burst (three gets three puts)
+%adaptive 0 0 10
+!burst	    3
+!discard    0
+!lost	    0
+!empty	    0
+!delay	    3
+PPPGGGPPPGGGPPPGGG PPPGGGPPPGGGPPPGGG PPPGGGPPPGGGPPPGGG PPPGGGPPPGGGPPPGGG
+PPPGGGPPPGGGPPPGGG PPPGGGPPPGGGPPPGGG PPPGGGPPPGGGPPPGGG PPPGGGPPPGGGPPPGGG
+.
+
+= Random burst (no drift)
+%adaptive 0 0 10
+!burst	    4
+!discard    1 <- there may be delay adaptation caused by multiple empty GETs followed by multiple PUTs, later when burst level reaches 'stable' condition, JB may shrink some excess frames
+!lost	    0
+!empty	    4
+!delay	    4
+PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG 
+PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG 
+PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG 
+PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG 
+PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG 
+PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG 
+PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG 
+PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG 
+PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG 
+PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG 
+PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG 
+PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG 
+PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG 
+PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG 
+PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG 
+PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG 
+PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG 
+PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG 
+PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG 
+PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG 
+PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG 
+PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG 
+PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG 
+PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG 
+PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG 
+PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG 
+PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG 
+PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG 
+PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG 
+PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG 
+PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG 
+PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG 
+PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG 
+PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG 
+PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG 
+PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG 
+PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG 
+PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG 
+PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG 
+PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG 
+PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG 
+PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG 
+PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG 
+PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG 
+PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG 
+PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG 
+PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG 
+PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG 
+PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG 
+PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG 
+PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG 
+PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG 
+.
+
+= Random burst (with drift, PUT > GET)
+%adaptive 0 0 10
+!burst	    4
+!discard    68 <- number of PUT - GET, JB does shrinking by discarding frames
+!lost	    0
+!empty	    4
+!delay	    8  <- should be less than or equal to twice of burst
+P PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG P PGPGPPGGPPPPGGPGGGPG 
+P PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG P PGGGGPPPGPPGPPPGGPGG 
+P PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG P PGPGPPGGPPPPGGPGGGPG 
+P PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG P PGGGGPPPGPPGPPPGGPGG 
+P PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG P PGPGPPGGPPPPGGPGGGPG 
+P PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG P PGGGGPPPGPPGPPPGGPGG 
+P PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG P PGPGPPGGPPPPGGPGGGPG 
+P PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG P PGGGGPPPGPPGPPPGGPGG 
+P PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG P PGPGPPGGPPPPGGPGGGPG 
+P PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG P PGGGGPPPGPPGPPPGGPGG 
+P PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG P PGPGPPGGPPPPGGPGGGPG 
+P PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG P PGGGGPPPGPPGPPPGGPGG 
+P PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG P PGPGPPGGPPPPGGPGGGPG 
+P PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG P PGGGGPPPGPPGPPPGGPGG 
+P PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG P PGPGPPGGPPPPGGPGGGPG 
+P PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG P PGGGGPPPGPPGPPPGGPGG 
+P PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG P PGPGPPGGPPPPGGPGGGPG 
+P PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG P PGGGGPPPGPPGPPPGGPGG 
+P PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG P PGPGPPGGPPPPGGPGGGPG 
+P PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG P PGGGGPPPGPPGPPPGGPGG 
+P PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG P PGPGPPGGPPPPGGPGGGPG 
+P PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG P PGGGGPPPGPPGPPPGGPGG 
+P PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG P PGPGPPGGPPPPGGPGGGPG 
+P PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG P PGGGGPPPGPPGPPPGGPGG 
+P PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG P PGPGPPGGPPPPGGPGGGPG 
+P PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG P PGGGGPPPGPPGPPPGGPGG 
+P PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG P PGPGPPGGPPPPGGPGGGPG 
+P PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG P PGGGGPPPGPPGPPPGGPGG 
+P PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG P PGPGPPGGPPPPGGPGGGPG 
+P PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG P PGGGGPPPGPPGPPPGGPGG 
+P PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG P PGPGPPGGPPPPGGPGGGPG 
+P PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG P PGGGGPPPGPPGPPPGGPGG 
+P PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG P PGPGPPGGPPPPGGPGGGPG 
+P PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG P PGGGGPPPGPPGPPPGGPGG 
+.
+
+= Random burst (with drift, PUT < GET)
+%adaptive 0 0 10
+!burst	    4
+!discard    0
+!lost	    0
+!empty	    70 <- GET - PUT = 66, added 4 for tolerating empty caused by burst
+!delay	    4  <- should be less than or equal to burst
+G PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG G PGPGPPGGPPPPGGPGGGPG 
+G PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG G PGGGGPPPGPPGPPPGGPGG 
+G PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG G PGPGPPGGPPPPGGPGGGPG 
+G PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG G PGGGGPPPGPPGPPPGGPGG 
+G PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG G PGPGPPGGPPPPGGPGGGPG 
+G PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG G PGGGGPPPGPPGPPPGGPGG 
+G PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG G PGPGPPGGPPPPGGPGGGPG 
+G PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG G PGGGGPPPGPPGPPPGGPGG 
+G PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG G PGPGPPGGPPPPGGPGGGPG 
+G PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG G PGGGGPPPGPPGPPPGGPGG 
+G PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG G PGPGPPGGPPPPGGPGGGPG 
+G PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG G PGGGGPPPGPPGPPPGGPGG 
+G PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG G PGPGPPGGPPPPGGPGGGPG 
+G PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG G PGGGGPPPGPPGPPPGGPGG 
+G PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG G PGPGPPGGPPPPGGPGGGPG 
+G PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG G PGGGGPPPGPPGPPPGGPGG 
+G PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG G PGPGPPGGPPPPGGPGGGPG 
+G PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG G PGGGGPPPGPPGPPPGGPGG 
+G PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG G PGPGPPGGPPPPGGPGGGPG 
+G PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG G PGGGGPPPGPPGPPPGGPGG 
+G PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG G PGPGPPGGPPPPGGPGGGPG 
+G PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG G PGGGGPPPGPPGPPPGGPGG 
+G PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG G PGPGPPGGPPPPGGPGGGPG 
+G PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG G PGGGGPPPGPPGPPPGGPGG 
+G PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG G PGPGPPGGPPPPGGPGGGPG 
+G PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG G PGGGGPPPGPPGPPPGGPGG 
+G PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG G PGPGPPGGPPPPGGPGGGPG 
+G PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG G PGGGGPPPGPPGPPPGGPGG 
+G PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG G PGPGPPGGPPPPGGPGGGPG 
+G PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG G PGGGGPPPGPPGPPPGGPGG 
+G PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG G PGPGPPGGPPPPGGPGGGPG 
+G PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG G PGGGGPPPGPPGPPPGGPGG 
+G PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG G PGPGPPGGPPPPGGPGGGPG 
+.
+
+= Packet lost
+%adaptive 0 0 10
+!burst	    1
+!discard    0
+!lost	    7
+!empty	    3
+!delay	    3
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG
+# Some losts
+LGPGPGLGPGPGPGLGPGPG
+# Normal
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG
+# More losts
+PLPGGGPPPGGGPLPGGGPG PLPGGGPPPGGGPLPGGGPG
+# Normal
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG
+.
+
+= Sequence restart
+%adaptive 0 0 10
+!burst	    1
+!discard    0
+!lost	    0
+!empty	    0
+!delay	    1
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG 
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG 
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG 
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG 
+# seq restarted after 120 PUTs (default MAX_MISORDER == 100)
+R
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG 
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG 
+.
+
+= Duplicated frames
+= e.g.: some Forward Error Correction (FEC) methods.
+%adaptive 0 0 10
+!burst	    1
+!discard    40
+!lost	    0
+!empty	    0
+!delay	    1
+PDGPDGPDGPDGPDG PDGPDGPDGPDGPDG PDGPDGPDGPDGPDG PDGPDGPDGPDGPDG
+PDGPDGPDGPDGPDG PDGPDGPDGPDGPDG PDGPDGPDGPDGPDG PDGPDGPDGPDGPDG
+.
+
+= Late frames
+%adaptive 0 0 10
+!burst	    1
+!discard    8  <- late frames are discarded + delay adaptation
+!lost	    4
+!empty	    4
+!delay	    4
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG 
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG 
+# Suddenly there are some lost frames
+LGLGPGLGLGPG
+# Those lost frames are actually late (+misordered), here they come
+OOOO
+# Then back to normal
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG 
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG 
+.
+
+= PUT burst at the beginning
+%adaptive 0 0 10
+!burst	    1
+!discard    50 <- frames discarded for delay adaptation
+!lost	    0
+!empty	    0
+!delay	    25 <- average delay, JB is able to adapt the delay
+PPPPPPPPPPPPPPPPPPPP PPPPPPPPPPPPPPPPPPPP PPPPPPPPPP
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG
+.
+
+= Fixed mode prefetch 5, with two empty events
+%fixed 5
+!burst	    1
+!discard    0
+!lost	    0
+!empty	    10
+!delay	    5
+G
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG
+GGGGG
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG
+.
+
+= Fixed mode prefetch 5, with random burst
+%fixed 5
+!burst	    3
+!discard    0
+!lost	    0
+!empty	    5
+!delay	    5
+PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG 
+PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG 
+PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG 
+PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG 
+PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG 
+PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG 
+PGPGPPGGPPPPGGPGGGPG PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPPPGGPGGGPG 
+PGGGGPPPGPPGPPPGGPGG PGPGPPGGPPGGPPPGGGPG PGGGGPPPGPPGPPPGGPGG 
+.
+
+= Fixed mode prefetch 10, PUT burst at the beginning
+%fixed 10
+!burst	    1
+!discard    35 <- frames discarded for delay adaptation
+!lost	    0
+!empty	    0
+!delay	    30 <- average delay
+PPPPPPPPPPPPPPPPPPPP PPPPPPPPPPPPPPPPPPPP PPPPPPPPPP
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG PGPGPGPGPG
+.
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/Makefile b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/Makefile
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/Makefile
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/m-i386.mak b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/m-i386.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/m-i386.mak
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/m-i386.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/m-x86_64.mak b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/m-x86_64.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/m-x86_64.mak
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/m-x86_64.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-auto.mak.in b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/os-auto.mak.in
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-auto.mak.in
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/os-auto.mak.in
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-darwinos.mak b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/os-darwinos.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-darwinos.mak
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/os-darwinos.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-linux.mak b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/os-linux.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-linux.mak
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/os-linux.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-rtems.mak b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/os-rtems.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-rtems.mak
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/os-rtems.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-win32.mak b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/os-win32.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-win32.mak
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/os-win32.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjaut.dsp b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/pjaut.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjaut.dsp
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/pjaut.dsp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia.dsp b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/pjmedia.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia.dsp
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/pjmedia.dsp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia.dsw b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/pjmedia.dsw
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia.dsw
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/pjmedia.dsw
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/pjmedia.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia.vcproj
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/pjmedia.vcproj
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia_codec.dsp b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/pjmedia_codec.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia_codec.dsp
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/pjmedia_codec.dsp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia_codec.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/pjmedia_codec.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia_codec.vcproj
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/pjmedia_codec.vcproj
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia_test.dsp b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/pjmedia_test.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia_test.dsp
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/pjmedia_test.dsp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia_test.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/pjmedia_test.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia_test.vcproj
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/pjmedia_test.vcproj
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/wince-evc4/pjmedia_codec_wince.vcp b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/wince-evc4/pjmedia_codec_wince.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/wince-evc4/pjmedia_codec_wince.vcp
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/wince-evc4/pjmedia_codec_wince.vcp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/wince-evc4/pjmedia_test.vcp b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/wince-evc4/pjmedia_test.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/wince-evc4/pjmedia_test.vcp
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/wince-evc4/pjmedia_test.vcp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/wince-evc4/pjmedia_wince.vcp b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/wince-evc4/pjmedia_wince.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/wince-evc4/pjmedia_wince.vcp
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/wince-evc4/pjmedia_wince.vcp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/wince-evc4/pjmedia_wince.vcw b/sflphone-common/libs/pjproject-1.0.3/pjmedia/build/wince-evc4/pjmedia_wince.vcw
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/build/wince-evc4/pjmedia_wince.vcw
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/build/wince-evc4/pjmedia_wince.vcw
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/doxygen.cfg b/sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/doxygen.cfg
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/doxygen.cfg
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/doxygen.cfg
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/footer.html b/sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/footer.html
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/footer.html
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/footer.html
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/header.html b/sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/header.html
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/header.html
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/header.html
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/master-port.jpg b/sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/master-port.jpg
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/master-port.jpg
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/master-port.jpg
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/media-flow.jpg b/sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/media-flow.jpg
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/media-flow.jpg
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/media-flow.jpg
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/media-flow.vsd b/sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/media-flow.vsd
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/media-flow.vsd
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/media-flow.vsd
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/media-srtp-transport.PNG b/sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/media-srtp-transport.PNG
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/media-srtp-transport.PNG
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/media-srtp-transport.PNG
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/media-transport.PNG b/sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/media-transport.PNG
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/media-transport.PNG
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/media-transport.PNG
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/sample-manual-resampling.jpg b/sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/sample-manual-resampling.jpg
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/sample-manual-resampling.jpg
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/sample-manual-resampling.jpg
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/siprtp.jpg b/sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/siprtp.jpg
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/siprtp.jpg
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/siprtp.jpg
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/sndtest.jpg b/sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/sndtest.jpg
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/sndtest.jpg
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/docs/sndtest.jpg
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/amr_helper.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/amr_helper.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/amr_helper.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/amr_helper.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/config.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/config.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/config.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/config.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/config_auto.h.in b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/config_auto.h.in
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/config_auto.h.in
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/config_auto.h.in
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/g722.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/g722.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/g722.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/g722.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/gsm.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/gsm.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/gsm.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/gsm.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/ilbc.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/ilbc.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/ilbc.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/ilbc.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/ipp_codecs.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/ipp_codecs.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/ipp_codecs.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/ipp_codecs.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/l16.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/l16.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/l16.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/l16.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/speex.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/speex.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/speex.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/speex.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/types.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/types.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/types.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/types.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/alaw_ulaw.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/alaw_ulaw.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/alaw_ulaw.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/alaw_ulaw.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/bidirectional.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/bidirectional.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/bidirectional.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/bidirectional.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/circbuf.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/circbuf.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/circbuf.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/circbuf.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/clock.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/clock.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/clock.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/clock.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/codec.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/codec.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/codec.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/codec.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/conference.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/conference.h
similarity index 98%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/conference.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/conference.h
index 3206ce614b886520d6e0fc95635f3971c1b4f7b6..7c296adc98b9762caf5c026ff3c65b4cb2ea5eba 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/conference.h
+++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/conference.h
@@ -1,4 +1,4 @@
-/* $Id: conference.h 2394 2008-12-23 17:27:53Z bennylp $ */
+/* $Id: conference.h 2790 2009-06-24 15:26:59Z nanang $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -224,6 +224,9 @@ PJ_DECL(pj_status_t) pjmedia_conf_add_port( pjmedia_conf *conf,
 
 
 /**
+ * <i><b>Warning:</b> This API has been deprecated since 1.3 and will be
+ * removed in the future release, use #PJMEDIA_SPLITCOMB instead.</i>
+ *
  * Create and add a passive media port to the conference bridge. Unlike
  * "normal" media port that is added with #pjmedia_conf_add_port(), media
  * port created with this function will not have its get_frame() and
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/config.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/config.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/config.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/config.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/config_auto.h.in b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/config_auto.h.in
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/config_auto.h.in
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/config_auto.h.in
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/delaybuf.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/delaybuf.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/delaybuf.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/delaybuf.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/doxygen.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/doxygen.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/doxygen.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/doxygen.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/echo.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/echo.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/echo.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/echo.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/echo_port.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/echo_port.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/echo_port.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/echo_port.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/endpoint.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/endpoint.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/endpoint.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/endpoint.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/errno.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/errno.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/errno.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/errno.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/g711.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/g711.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/g711.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/g711.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/jbuf.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/jbuf.h
similarity index 95%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/jbuf.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/jbuf.h
index a941ae0d8112addf80a7bba602d2ef155fd561d6..99e4728e752b4567bfba49d333f5502f724ac7a5 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/jbuf.h
+++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/jbuf.h
@@ -1,4 +1,4 @@
-/* $Id: jbuf.h 2394 2008-12-23 17:27:53Z bennylp $ */
+/* $Id: jbuf.h 2788 2009-06-24 14:46:36Z nanang $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -66,19 +66,28 @@ typedef enum pjmedia_jb_frame_type pjmedia_jb_frame_type;
 
 
 /**
- * This structure describes jitter buffer current status.
+ * This structure describes jitter buffer state.
  */
 struct pjmedia_jb_state
 {
+    /* Setting */
     unsigned	frame_size;	    /**< Individual frame size, in bytes.   */
-    unsigned	prefetch;	    /**< Current prefetch value, in frames  */
     unsigned	min_prefetch;	    /**< Minimum allowed prefetch, in frms. */
     unsigned	max_prefetch;	    /**< Maximum allowed prefetch, in frms. */
+
+    /* Status */
+    unsigned	prefetch;	    /**< Current prefetch value, in frames  */
     unsigned	size;		    /**< Current buffer size, in frames.    */
+
+    /* Statistic */
     unsigned	avg_delay;	    /**< Average delay, in ms.		    */
     unsigned	min_delay;	    /**< Minimum delay, in ms.		    */
     unsigned	max_delay;	    /**< Maximum delay, in ms.		    */
-    unsigned	dev_delay;	    /**< Standard deviation of delay, in ms. */
+    unsigned	dev_delay;	    /**< Standard deviation of delay, in ms.*/
+    unsigned	avg_burst;	    /**< Average burst, in frames.	    */
+    unsigned	lost;		    /**< Number of lost frames.		    */
+    unsigned	discard;	    /**< Number of discarded frames.	    */
+    unsigned	empty;		    /**< Number of empty on GET events.	    */
 };
 
 
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/master_port.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/master_port.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/master_port.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/master_port.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/mem_port.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/mem_port.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/mem_port.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/mem_port.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/null_port.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/null_port.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/null_port.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/null_port.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/plc.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/plc.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/plc.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/plc.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/port.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/port.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/port.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/port.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/resample.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/resample.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/resample.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/resample.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/rtcp.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/rtcp.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/rtcp.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/rtcp.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/rtcp_xr.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/rtcp_xr.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/rtcp_xr.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/rtcp_xr.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/rtp.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/rtp.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/rtp.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/rtp.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/sdp.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/sdp.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/sdp.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/sdp.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/sdp_neg.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/sdp_neg.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/sdp_neg.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/sdp_neg.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/session.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/session.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/session.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/session.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/silencedet.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/silencedet.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/silencedet.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/silencedet.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/sound.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/sound.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/sound.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/sound.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/sound_port.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/sound_port.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/sound_port.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/sound_port.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/splitcomb.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/splitcomb.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/splitcomb.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/splitcomb.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/stereo.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/stereo.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/stereo.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/stereo.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/stream.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/stream.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/stream.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/stream.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/symbian_sound_aps.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/symbian_sound_aps.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/symbian_sound_aps.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/symbian_sound_aps.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/tonegen.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/tonegen.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/tonegen.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/tonegen.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/transport.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/transport.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport_adapter_sample.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/transport_adapter_sample.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport_adapter_sample.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/transport_adapter_sample.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport_ice.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/transport_ice.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport_ice.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/transport_ice.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport_loop.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/transport_loop.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport_loop.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/transport_loop.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport_srtp.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/transport_srtp.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport_srtp.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/transport_srtp.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport_udp.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/transport_udp.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport_udp.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/transport_udp.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/types.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/types.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/types.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/types.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/wav_playlist.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/wav_playlist.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/wav_playlist.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/wav_playlist.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/wav_port.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/wav_port.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/wav_port.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/wav_port.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/wave.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/wave.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/wave.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/wave.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/wsola.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/wsola.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/wsola.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/include/pjmedia/wsola.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/g722.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/g722.c
similarity index 98%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/g722.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/g722.c
index 033317d608e1a6e3eb1be4e1b9ae9112e237ab6f..ff8483bf092b3f62ef4e6e407cce72c591ee2c01 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/g722.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/g722.c
@@ -1,4 +1,4 @@
-/* $Id: g722.c 2394 2008-12-23 17:27:53Z bennylp $ */
+/* $Id: g722.c 2792 2009-06-24 15:46:49Z nanang $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -552,8 +552,8 @@ static pj_status_t g722_codec_encode(pjmedia_codec *codec,
 						(input->size >> 1),
 						NULL);
 	if (is_silence &&
-	    PJMEDIA_CODEC_MAX_SILENCE_PERIOD != -1 &&
-	    silence_duration < PJMEDIA_CODEC_MAX_SILENCE_PERIOD*16000/1000) 
+	    (PJMEDIA_CODEC_MAX_SILENCE_PERIOD == -1 ||
+	     silence_duration < PJMEDIA_CODEC_MAX_SILENCE_PERIOD*16000/1000))
 	{
 	    output->type = PJMEDIA_FRAME_TYPE_NONE;
 	    output->buf = NULL;
@@ -578,6 +578,7 @@ static pj_status_t g722_codec_encode(pjmedia_codec *codec,
     }
 
     output->type = PJMEDIA_FRAME_TYPE_AUDIO;
+    output->timestamp = input->timestamp;
     
     TRACE_((THIS_FILE, "G722 encode(): size=%d", output->size));
     return PJ_SUCCESS;
@@ -624,6 +625,7 @@ static pj_status_t g722_codec_decode(pjmedia_codec *codec,
     pj_assert(output->size == SAMPLES_PER_FRAME);
     output->size = SAMPLES_PER_FRAME * 2;
     output->type = PJMEDIA_FRAME_TYPE_AUDIO;
+    output->timestamp = input->timestamp;
 
 #if !PLC_DISABLED
     if (g722_data->plc_enabled)
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/g722/g722_dec.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/g722/g722_dec.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/g722/g722_dec.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/g722/g722_dec.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/g722/g722_dec.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/g722/g722_dec.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/g722/g722_dec.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/g722/g722_dec.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/g722/g722_enc.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/g722/g722_enc.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/g722/g722_enc.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/g722/g722_enc.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/g722/g722_enc.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/g722/g722_enc.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/g722/g722_enc.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/g722/g722_enc.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/gsm.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/gsm.c
similarity index 98%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/gsm.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/gsm.c
index 19e6b0394c950cc7bb7b7d50e27cd2d45690b89b..f56b1e949b53813476fb92c37f7b5034b88b10ad 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/gsm.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/gsm.c
@@ -1,4 +1,4 @@
-/* $Id: gsm.c 2394 2008-12-23 17:27:53Z bennylp $ */
+/* $Id: gsm.c 2792 2009-06-24 15:46:49Z nanang $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -542,8 +542,8 @@ static pj_status_t gsm_codec_encode( pjmedia_codec *codec,
 						(input->size >> 1),
 						NULL);
 	if (is_silence &&
-	    PJMEDIA_CODEC_MAX_SILENCE_PERIOD != -1 &&
-	    silence_duration < PJMEDIA_CODEC_MAX_SILENCE_PERIOD*8000/1000) 
+	    (PJMEDIA_CODEC_MAX_SILENCE_PERIOD == -1 ||
+	     silence_duration < PJMEDIA_CODEC_MAX_SILENCE_PERIOD*8000/1000))
 	{
 	    output->type = PJMEDIA_FRAME_TYPE_NONE;
 	    output->buf = NULL;
@@ -566,6 +566,7 @@ static pj_status_t gsm_codec_encode( pjmedia_codec *codec,
     }
 
     output->type = PJMEDIA_FRAME_TYPE_AUDIO;
+    output->timestamp = input->timestamp;
 
     return PJ_SUCCESS;
 }
@@ -595,6 +596,7 @@ static pj_status_t gsm_codec_decode( pjmedia_codec *codec,
 
     output->size = 320;
     output->type = PJMEDIA_FRAME_TYPE_AUDIO;
+    output->timestamp = input->timestamp;
 
 #if !PLC_DISABLED
     if (gsm_data->plc_enabled)
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/ilbc.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/ilbc.c
similarity index 99%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/ilbc.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/ilbc.c
index ff004aa734d99f973bb6a86538d85caf912b14c3..7feb1370c850d8679aac47abe514e8b5b5e8a9af 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/ilbc.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/ilbc.c
@@ -1,4 +1,4 @@
-/* $Id: ilbc.c 2394 2008-12-23 17:27:53Z bennylp $ */
+/* $Id: ilbc.c 2792 2009-06-24 15:46:49Z nanang $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -563,8 +563,8 @@ static pj_status_t ilbc_codec_encode(pjmedia_codec *codec,
 						(input->size >> 1),
 						NULL);
 	if (is_silence &&
-	    PJMEDIA_CODEC_MAX_SILENCE_PERIOD != -1 &&
-	    silence_period < PJMEDIA_CODEC_MAX_SILENCE_PERIOD*8000/1000)
+	    (PJMEDIA_CODEC_MAX_SILENCE_PERIOD == -1 ||
+	     silence_period < PJMEDIA_CODEC_MAX_SILENCE_PERIOD*8000/1000))
 	{
 	    output->type = PJMEDIA_FRAME_TYPE_NONE;
 	    output->buf = NULL;
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/ipp_codecs.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/ipp_codecs.c
similarity index 99%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/ipp_codecs.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/ipp_codecs.c
index 2ae0654012e2ddde699b89fd0ff1553055fd062b..34948362ae20395c0cc84afeb25e9c4393829b45 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/ipp_codecs.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/ipp_codecs.c
@@ -1,4 +1,4 @@
-/* $Id: ipp_codecs.c 2543 2009-03-23 13:22:45Z nanang $ */
+/* $Id: ipp_codecs.c 2792 2009-06-24 15:46:49Z nanang $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -1172,9 +1172,9 @@ static pj_status_t ipp_codec_encode( pjmedia_codec *codec,
 						(input->size >> 1),
 						NULL);
 	if (is_silence &&
-	    PJMEDIA_CODEC_MAX_SILENCE_PERIOD != -1 &&
-	    silence_duration < (PJMEDIA_CODEC_MAX_SILENCE_PERIOD *
-				(int)ippc->clock_rate / 1000)) 
+	    (PJMEDIA_CODEC_MAX_SILENCE_PERIOD == -1 ||
+	     silence_duration < (PJMEDIA_CODEC_MAX_SILENCE_PERIOD *
+	 			 (int)ippc->clock_rate / 1000)))
 	{
 	    output->type = PJMEDIA_FRAME_TYPE_NONE;
 	    output->buf = NULL;
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/l16.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/l16.c
similarity index 98%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/l16.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/l16.c
index c4aee2ab9d436298f05751156da0579ab1199a6d..4e8d187d7d145bd7490099d9c9708368ff5d49c9 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/l16.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/l16.c
@@ -1,4 +1,4 @@
-/* $Id: l16.c 2547 2009-03-23 13:27:54Z nanang $ */
+/* $Id: l16.c 2792 2009-06-24 15:46:49Z nanang $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -624,9 +624,9 @@ static pj_status_t l16_encode(pjmedia_codec *codec,
 						(input->size >> 1),
 						NULL);
 	if (is_silence &&
-	    PJMEDIA_CODEC_MAX_SILENCE_PERIOD != -1 &&
-	    silence_duration < PJMEDIA_CODEC_MAX_SILENCE_PERIOD*
-			       (int)data->clock_rate/1000)
+	    (PJMEDIA_CODEC_MAX_SILENCE_PERIOD == -1 ||
+	     silence_duration < PJMEDIA_CODEC_MAX_SILENCE_PERIOD*
+			        (int)data->clock_rate/1000))
 	{
 	    output->type = PJMEDIA_FRAME_TYPE_NONE;
 	    output->buf = NULL;
@@ -650,6 +650,7 @@ static pj_status_t l16_encode(pjmedia_codec *codec,
     /* Done */
     output->type = PJMEDIA_FRAME_TYPE_AUDIO;
     output->size = input->size;
+    output->timestamp = input->timestamp;
 
     return PJ_SUCCESS;
 }
@@ -684,6 +685,7 @@ static pj_status_t l16_decode(pjmedia_codec *codec,
 
     output->type = PJMEDIA_FRAME_TYPE_AUDIO;
     output->size = input->size;
+    output->timestamp = input->timestamp;
 
 #if !PLC_DISABLED
     if (l16_data->plc_enabled)
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/speex_codec.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/speex_codec.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/speex_codec.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia-codec/speex_codec.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/alaw_ulaw.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/alaw_ulaw.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/alaw_ulaw.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/alaw_ulaw.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/alaw_ulaw_table.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/alaw_ulaw_table.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/alaw_ulaw_table.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/alaw_ulaw_table.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/bidirectional.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/bidirectional.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/bidirectional.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/bidirectional.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/clock_thread.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/clock_thread.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/clock_thread.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/clock_thread.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/codec.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/codec.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/codec.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/codec.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/conference.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/conference.c
similarity index 95%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/conference.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/conference.c
index c46444f8badaf28a0b294ef0b1cfdda78e460b68..41ccea787a48ffe50aecc8fccc53694c2dfb0fb7 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/conference.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/conference.c
@@ -1,4 +1,4 @@
-/* $Id: conference.c 2394 2008-12-23 17:27:53Z bennylp $ */
+/* $Id: conference.c 2790 2009-06-24 15:26:59Z nanang $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -570,13 +570,17 @@ PJ_DEF(pj_status_t) pjmedia_conf_create( pj_pool_t *pool,
 
     /* Create port zero for sound device. */
     status = create_sound_port(pool, conf);
-    if (status != PJ_SUCCESS)
+    if (status != PJ_SUCCESS) {
+	pjmedia_conf_destroy(conf);
 	return status;
+    }
 
     /* Create mutex. */
     status = pj_mutex_create_recursive(pool, "conf", &conf->mutex);
-    if (status != PJ_SUCCESS)
+    if (status != PJ_SUCCESS) {
+	pjmedia_conf_destroy(conf);
 	return status;
+    }
 
     /* If sound device was created, connect sound device to the
      * master port.
@@ -625,6 +629,8 @@ static pj_status_t resume_sound( pjmedia_conf *conf )
  */
 PJ_DEF(pj_status_t) pjmedia_conf_destroy( pjmedia_conf *conf )
 {
+    unsigned i, ci;
+
     PJ_ASSERT_RETURN(conf != NULL, PJ_EINVAL);
 
     /* Destroy sound device port. */
@@ -633,8 +639,24 @@ PJ_DEF(pj_status_t) pjmedia_conf_destroy( pjmedia_conf *conf )
 	conf->snd_dev_port = NULL;
     }
 
+    /* Destroy delay buf of all (passive) ports. */
+    for (i=0, ci=0; i<conf->max_ports && ci<conf->port_cnt; ++i) {
+	struct conf_port *cport;
+
+	cport = conf->ports[i];
+	if (!cport)
+	    continue;
+	
+	++ci;
+	if (cport->delay_buf) {
+	    pjmedia_delay_buf_destroy(cport->delay_buf);
+	    cport->delay_buf = NULL;
+	}
+    }
+
     /* Destroy mutex */
-    pj_mutex_destroy(conf->mutex);
+    if (conf->mutex)
+	pj_mutex_destroy(conf->mutex);
 
     return PJ_SUCCESS;
 }
@@ -792,6 +814,9 @@ PJ_DEF(pj_status_t) pjmedia_conf_add_passive_port( pjmedia_conf *conf,
     pj_str_t tmp;
     pj_status_t status;
 
+    PJ_LOG(1, (THIS_FILE, "This API has been deprecated since 1.3 and will "
+			  "be removed in the future release!"));
+
     PJ_ASSERT_RETURN(conf && pool, PJ_EINVAL);
 
     /* For this version of PJMEDIA, channel(s) number MUST be:
@@ -886,8 +911,14 @@ PJ_DEF(pj_status_t) pjmedia_conf_configure_port( pjmedia_conf *conf,
     /* Check arguments */
     PJ_ASSERT_RETURN(conf && slot<conf->max_ports, PJ_EINVAL);
 
+    pj_mutex_lock(conf->mutex);
+
     /* Port must be valid. */
-    PJ_ASSERT_RETURN(conf->ports[slot] != NULL, PJ_EINVAL);
+    conf_port = conf->ports[slot];
+    if (conf_port == NULL) {
+	pj_mutex_unlock(conf->mutex);
+	return PJ_EINVAL;
+    }
 
     conf_port = conf->ports[slot];
 
@@ -897,6 +928,8 @@ PJ_DEF(pj_status_t) pjmedia_conf_configure_port( pjmedia_conf *conf,
     if (rx != PJMEDIA_PORT_NO_CHANGE)
 	conf_port->rx_setting = rx;
 
+    pj_mutex_unlock(conf->mutex);
+
     return PJ_SUCCESS;
 }
 
@@ -917,17 +950,18 @@ PJ_DEF(pj_status_t) pjmedia_conf_connect_port( pjmedia_conf *conf,
     PJ_ASSERT_RETURN(conf && src_slot<conf->max_ports && 
 		     sink_slot<conf->max_ports, PJ_EINVAL);
 
-    /* Ports must be valid. */
-    PJ_ASSERT_RETURN(conf->ports[src_slot] != NULL, PJ_EINVAL);
-    PJ_ASSERT_RETURN(conf->ports[sink_slot] != NULL, PJ_EINVAL);
-
     /* For now, level MUST be zero. */
     PJ_ASSERT_RETURN(level == 0, PJ_EINVAL);
 
     pj_mutex_lock(conf->mutex);
 
+    /* Ports must be valid. */
     src_port = conf->ports[src_slot];
     dst_port = conf->ports[sink_slot];
+    if (!src_port || !dst_port) {
+	pj_mutex_unlock(conf->mutex);
+	return PJ_EINVAL;
+    }
 
     /* Check if connection has been made */
     for (i=0; i<src_port->listener_cnt; ++i) {
@@ -979,14 +1013,15 @@ PJ_DEF(pj_status_t) pjmedia_conf_disconnect_port( pjmedia_conf *conf,
     PJ_ASSERT_RETURN(conf && src_slot<conf->max_ports && 
 		     sink_slot<conf->max_ports, PJ_EINVAL);
 
-    /* Ports must be valid. */
-    PJ_ASSERT_RETURN(conf->ports[src_slot] != NULL, PJ_EINVAL);
-    PJ_ASSERT_RETURN(conf->ports[sink_slot] != NULL, PJ_EINVAL);
-
     pj_mutex_lock(conf->mutex);
 
+    /* Ports must be valid. */
     src_port = conf->ports[src_slot];
     dst_port = conf->ports[sink_slot];
+    if (!src_port || !dst_port) {
+	pj_mutex_unlock(conf->mutex);
+	return PJ_EINVAL;
+    }
 
     /* Check if connection has been made */
     for (i=0; i<src_port->listener_cnt; ++i) {
@@ -1057,9 +1092,6 @@ PJ_DEF(pj_status_t) pjmedia_conf_remove_port( pjmedia_conf *conf,
     /* Check arguments */
     PJ_ASSERT_RETURN(conf && port < conf->max_ports, PJ_EINVAL);
 
-    /* Port must be valid. */
-    PJ_ASSERT_RETURN(conf->ports[port] != NULL, PJ_EINVAL);
-
     /* Suspend the sound devices.
      * Don't want to remove port while port is being accessed by sound
      * device's threads!
@@ -1067,7 +1099,13 @@ PJ_DEF(pj_status_t) pjmedia_conf_remove_port( pjmedia_conf *conf,
 
     pj_mutex_lock(conf->mutex);
 
+    /* Port must be valid. */
     conf_port = conf->ports[port];
+    if (conf_port == NULL) {
+	pj_mutex_unlock(conf->mutex);
+	return PJ_EINVAL;
+    }
+
     conf_port->tx_setting = PJMEDIA_PORT_DISABLE;
     conf_port->rx_setting = PJMEDIA_PORT_DISABLE;
 
@@ -1109,6 +1147,14 @@ PJ_DEF(pj_status_t) pjmedia_conf_remove_port( pjmedia_conf *conf,
 	--conf->connect_cnt;
     }
 
+    /* Destroy pjmedia port if this conf port is passive port,
+     * i.e: has delay buf.
+     */
+    if (conf_port->delay_buf) {
+	pjmedia_port_destroy(conf_port->port);
+	conf_port->port = NULL;
+    }
+
     /* Remove the port. */
     conf->ports[port] = NULL;
     --conf->port_cnt;
@@ -1136,6 +1182,9 @@ PJ_DEF(pj_status_t) pjmedia_conf_enum_ports( pjmedia_conf *conf,
 
     PJ_ASSERT_RETURN(conf && p_count && ports, PJ_EINVAL);
 
+    /* Lock mutex */
+    pj_mutex_lock(conf->mutex);
+
     for (i=0; i<conf->max_ports && count<*p_count; ++i) {
 	if (!conf->ports[i])
 	    continue;
@@ -1143,6 +1192,9 @@ PJ_DEF(pj_status_t) pjmedia_conf_enum_ports( pjmedia_conf *conf,
 	ports[count++] = i;
     }
 
+    /* Unlock mutex */
+    pj_mutex_unlock(conf->mutex);
+
     *p_count = count;
     return PJ_SUCCESS;
 }
@@ -1159,10 +1211,15 @@ PJ_DEF(pj_status_t) pjmedia_conf_get_port_info( pjmedia_conf *conf,
     /* Check arguments */
     PJ_ASSERT_RETURN(conf && slot<conf->max_ports, PJ_EINVAL);
 
-    /* Port must be valid. */
-    PJ_ASSERT_RETURN(conf->ports[slot] != NULL, PJ_EINVAL);
+    /* Lock mutex */
+    pj_mutex_lock(conf->mutex);
 
+    /* Port must be valid. */
     conf_port = conf->ports[slot];
+    if (conf_port == NULL) {
+	pj_mutex_unlock(conf->mutex);
+	return PJ_EINVAL;
+    }
 
     info->slot = slot;
     info->name = conf_port->name;
@@ -1177,6 +1234,9 @@ PJ_DEF(pj_status_t) pjmedia_conf_get_port_info( pjmedia_conf *conf,
     info->tx_adj_level = conf_port->tx_adj_level - NORMAL_LEVEL;
     info->rx_adj_level = conf_port->rx_adj_level - NORMAL_LEVEL;
 
+    /* Unlock mutex */
+    pj_mutex_unlock(conf->mutex);
+
     return PJ_SUCCESS;
 }
 
@@ -1189,6 +1249,9 @@ PJ_DEF(pj_status_t) pjmedia_conf_get_ports_info(pjmedia_conf *conf,
 
     PJ_ASSERT_RETURN(conf && size && info, PJ_EINVAL);
 
+    /* Lock mutex */
+    pj_mutex_lock(conf->mutex);
+
     for (i=0; i<conf->max_ports && count<*size; ++i) {
 	if (!conf->ports[i])
 	    continue;
@@ -1197,6 +1260,9 @@ PJ_DEF(pj_status_t) pjmedia_conf_get_ports_info(pjmedia_conf *conf,
 	++count;
     }
 
+    /* Unlock mutex */
+    pj_mutex_unlock(conf->mutex);
+
     *size = count;
     return PJ_SUCCESS;
 }
@@ -1215,10 +1281,15 @@ PJ_DEF(pj_status_t) pjmedia_conf_get_signal_level( pjmedia_conf *conf,
     /* Check arguments */
     PJ_ASSERT_RETURN(conf && slot<conf->max_ports, PJ_EINVAL);
 
-    /* Port must be valid. */
-    PJ_ASSERT_RETURN(conf->ports[slot] != NULL, PJ_EINVAL);
+    /* Lock mutex */
+    pj_mutex_lock(conf->mutex);
 
+    /* Port must be valid. */
     conf_port = conf->ports[slot];
+    if (conf_port == NULL) {
+	pj_mutex_unlock(conf->mutex);
+	return PJ_EINVAL;
+    }
 
     if (tx_level != NULL) {
 	*tx_level = conf_port->tx_level;
@@ -1227,6 +1298,9 @@ PJ_DEF(pj_status_t) pjmedia_conf_get_signal_level( pjmedia_conf *conf,
     if (rx_level != NULL) 
 	*rx_level = conf_port->rx_level;
 
+    /* Unlock mutex */
+    pj_mutex_unlock(conf->mutex);
+
     return PJ_SUCCESS;
 }
 
@@ -1243,20 +1317,28 @@ PJ_DEF(pj_status_t) pjmedia_conf_adjust_rx_level( pjmedia_conf *conf,
     /* Check arguments */
     PJ_ASSERT_RETURN(conf && slot<conf->max_ports, PJ_EINVAL);
 
-    /* Port must be valid. */
-    PJ_ASSERT_RETURN(conf->ports[slot] != NULL, PJ_EINVAL);
-
     /* Value must be from -128 to +127 */
     /* Disabled, you can put more than +127, at your own risk: 
      PJ_ASSERT_RETURN(adj_level >= -128 && adj_level <= 127, PJ_EINVAL);
      */
     PJ_ASSERT_RETURN(adj_level >= -128, PJ_EINVAL);
 
+    /* Lock mutex */
+    pj_mutex_lock(conf->mutex);
+
+    /* Port must be valid. */
     conf_port = conf->ports[slot];
+    if (conf_port == NULL) {
+	pj_mutex_unlock(conf->mutex);
+	return PJ_EINVAL;
+    }
 
     /* Set normalized adjustment level. */
     conf_port->rx_adj_level = adj_level + NORMAL_LEVEL;
 
+    /* Unlock mutex */
+    pj_mutex_unlock(conf->mutex);
+
     return PJ_SUCCESS;
 }
 
@@ -1273,20 +1355,28 @@ PJ_DEF(pj_status_t) pjmedia_conf_adjust_tx_level( pjmedia_conf *conf,
     /* Check arguments */
     PJ_ASSERT_RETURN(conf && slot<conf->max_ports, PJ_EINVAL);
 
-    /* Port must be valid. */
-    PJ_ASSERT_RETURN(conf->ports[slot] != NULL, PJ_EINVAL);
-
     /* Value must be from -128 to +127 */
     /* Disabled, you can put more than +127,, at your own risk:
      PJ_ASSERT_RETURN(adj_level >= -128 && adj_level <= 127, PJ_EINVAL);
      */
     PJ_ASSERT_RETURN(adj_level >= -128, PJ_EINVAL);
 
+    /* Lock mutex */
+    pj_mutex_lock(conf->mutex);
+
+    /* Port must be valid. */
     conf_port = conf->ports[slot];
+    if (conf_port == NULL) {
+	pj_mutex_unlock(conf->mutex);
+	return PJ_EINVAL;
+    }
 
     /* Set normalized adjustment level. */
     conf_port->tx_adj_level = adj_level + NORMAL_LEVEL;
 
+    /* Unlock mutex */
+    pj_mutex_unlock(conf->mutex);
+
     return PJ_SUCCESS;
 }
 
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/delaybuf.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/delaybuf.c
similarity index 98%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/delaybuf.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/delaybuf.c
index 9fd748bc4193635e24f8c4a4c42d4d8c682de5b9..908fe5c5396339425e76810c2107b3a05c931451 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/delaybuf.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/delaybuf.c
@@ -1,4 +1,4 @@
-/* $Id: delaybuf.c 2394 2008-12-23 17:27:53Z bennylp $ */
+/* $Id: delaybuf.c 2790 2009-06-24 15:26:59Z nanang $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -121,20 +121,23 @@ PJ_DEF(pj_status_t) pjmedia_delay_buf_create( pj_pool_t *pool,
     b->eff_cnt = b->max_cnt >> 1;
     b->recalc_timer = RECALC_TIME;
 
-    status = pj_lock_create_recursive_mutex(pool, b->obj_name, 
-					    &b->lock);
-    if (status != PJ_SUCCESS)
-	return status;
-
+    /* Create circular buffer */
     status = pjmedia_circ_buf_create(pool, b->max_cnt, &b->circ_buf);
     if (status != PJ_SUCCESS)
 	return status;
 
+    /* Create WSOLA */
     status = pjmedia_wsola_create(pool, clock_rate, samples_per_frame, 1,
 				  0, &b->wsola);
     if (status != PJ_SUCCESS)
 	return status;
 
+    /* Finally, create mutex */
+    status = pj_lock_create_recursive_mutex(pool, b->obj_name, 
+					    &b->lock);
+    if (status != PJ_SUCCESS)
+	return status;
+
     *p_b = b;
 
     TRACE__((b->obj_name,"Delay buffer created"));
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/dsound.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/dsound.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/dsound.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/dsound.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/echo_common.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/echo_common.c
similarity index 98%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/echo_common.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/echo_common.c
index fb13055976677bc939388c47fce006fc5159f354..7275e7a4d049dad54eca57fa59f978283093b65b 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/echo_common.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/echo_common.c
@@ -1,4 +1,4 @@
-/* $Id: echo_common.c 2394 2008-12-23 17:27:53Z bennylp $ */
+/* $Id: echo_common.c 2790 2009-06-24 15:26:59Z nanang $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -239,6 +239,12 @@ PJ_DEF(pj_status_t) pjmedia_echo_create2(pj_pool_t *pool,
 PJ_DEF(pj_status_t) pjmedia_echo_destroy(pjmedia_echo_state *echo )
 {
     (*echo->op->ec_destroy)(echo->state);
+
+    if (echo->delay_buf) {
+	pjmedia_delay_buf_destroy(echo->delay_buf);
+	echo->delay_buf = NULL;
+    }
+
     pj_pool_release(echo->pool);
     return PJ_SUCCESS;
 }
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/echo_internal.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/echo_internal.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/echo_internal.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/echo_internal.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/echo_port.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/echo_port.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/echo_port.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/echo_port.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/echo_speex.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/echo_speex.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/echo_speex.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/echo_speex.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/echo_suppress.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/echo_suppress.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/echo_suppress.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/echo_suppress.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/endpoint.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/endpoint.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/endpoint.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/endpoint.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/errno.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/errno.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/errno.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/errno.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/g711.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/g711.c
similarity index 98%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/g711.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/g711.c
index f595fb9877d71c8b9b6f4772447a9218dde830c7..33b9b1524e2250b0d41ab9dc2aea6592762babd8 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/g711.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/g711.c
@@ -1,4 +1,4 @@
-/* $Id: g711.c 2394 2008-12-23 17:27:53Z bennylp $ */
+/* $Id: g711.c 2792 2009-06-24 15:46:49Z nanang $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -502,8 +502,8 @@ static pj_status_t  g711_encode(pjmedia_codec *codec,
 						(const pj_int16_t*) input->buf, 
 						(input->size >> 1), NULL);
 	if (is_silence && 
-	    PJMEDIA_CODEC_MAX_SILENCE_PERIOD != -1 &&
-	    silence_period < PJMEDIA_CODEC_MAX_SILENCE_PERIOD*8000/1000) 
+	    (PJMEDIA_CODEC_MAX_SILENCE_PERIOD == -1 ||
+	     silence_period < PJMEDIA_CODEC_MAX_SILENCE_PERIOD*8000/1000))
 	{
 	    output->type = PJMEDIA_FRAME_TYPE_NONE;
 	    output->buf = NULL;
@@ -539,6 +539,7 @@ static pj_status_t  g711_encode(pjmedia_codec *codec,
 
     output->type = PJMEDIA_FRAME_TYPE_AUDIO;
     output->size = (input->size >> 1);
+    output->timestamp = input->timestamp;
 
     return PJ_SUCCESS;
 }
@@ -582,6 +583,7 @@ static pj_status_t  g711_decode(pjmedia_codec *codec,
 
     output->type = PJMEDIA_FRAME_TYPE_AUDIO;
     output->size = (input->size << 1);
+    output->timestamp = input->timestamp;
 
 #if !PLC_DISABLED
     if (priv->plc_enabled)
diff --git a/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/jbuf.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/jbuf.c
new file mode 100644
index 0000000000000000000000000000000000000000..6e1e8b3fdd5b756a90403f790f16bce8dc637ef2
--- /dev/null
+++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/jbuf.c
@@ -0,0 +1,791 @@
+/* $Id: jbuf.c 2788 2009-06-24 14:46:36Z nanang $ */
+/* 
+ * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
+ * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
+ */
+/*
+ * Based on implementation kindly contributed by Switchlab, Ltd.
+ */
+#include <pjmedia/jbuf.h>
+#include <pjmedia/errno.h>
+#include <pj/pool.h>
+#include <pj/assert.h>
+#include <pj/log.h>
+#include <pj/math.h>
+#include <pj/string.h>
+
+
+#define THIS_FILE   "jbuf.c"
+
+
+/* Minimal difference between JB size and 2*burst-level to perform 
+ * JB shrinking. 
+ */
+#define SAFE_SHRINKING_DIFF	1
+
+/* Minimal gap (in ms) between JB shrinking */
+#define MIN_SHRINK_GAP_MSEC	200
+
+/* Invalid sequence number, used as the initial value. */
+#define INVALID_OFFSET		-9999
+
+/* Maximum burst length, whenever an operation is bursting longer than 
+ * this value, JB will assume that the opposite operation was idle.
+ */
+#define MAX_BURST_MSEC		1000
+
+/* Number of OP switches to be performed in JB_STATUS_INITIALIZING, before
+ * JB can switch its states to JB_STATUS_PROCESSING.
+ */
+#define INIT_CYCLE		10
+
+
+/* Struct of JB internal buffer, represented in a circular buffer containing
+ * frame content, frame type, frame length, and frame bit info.
+ */
+typedef struct jb_framelist_t
+{
+    /* Settings */
+    unsigned	     frame_size;	/**< maximum size of frame	    */
+    unsigned	     max_count;		/**< maximum number of frames	    */
+
+    /* Buffers */
+    char	    *content;		/**< frame content array	    */
+    int		    *frame_type;	/**< frame type array		    */
+    pj_size_t	    *content_len;	/**< frame length array		    */
+    pj_uint32_t	    *bit_info;		/**< frame bit info array	    */
+    
+    /* States */
+    unsigned	     head;		/**< index of head, pointed frame
+					     will be returned by next GET   */
+    unsigned	     size;		/**< current size of framelist.	    */
+    int		     origin;		/**< original index of flist_head   */
+} jb_framelist_t;
+
+
+struct pjmedia_jbuf
+{
+    /* Settings (consts) */
+    pj_str_t	    jb_name;		/**< jitter buffer name		    */
+    pj_size_t	    jb_frame_size;	/**< frame size			    */
+    unsigned	    jb_frame_ptime;	/**< frame duration.		    */
+    pj_size_t	    jb_max_count;	/**< capacity of jitter buffer, 
+					     in frames			    */
+    int		    jb_def_prefetch;	/**< Default prefetch		    */
+    int		    jb_min_prefetch;	/**< Minimum allowable prefetch	    */
+    int		    jb_max_prefetch;	/**< Maximum allowable prefetch	    */
+    int		    jb_max_burst;	/**< maximum possible burst, whenever
+					     burst exceeds this value, it 
+					     won't be included in level 
+					     calculation		    */
+    int		    jb_min_shrink_gap;	/**< How often can we shrink	    */
+
+    /* Buffer */
+    jb_framelist_t  jb_framelist;	/**< the buffer			    */
+
+    /* States */
+    int		    jb_level;		/**< delay between source & 
+					     destination (calculated according 
+					     of the number of burst get/put 
+					     operations)		    */
+    int		    jb_max_hist_level;  /**< max level during the last level 
+					     calculations		    */
+    int		    jb_stable_hist;	/**< num of times the delay has	been 
+					     lower then the prefetch num    */
+    int		    jb_last_op;		/**< last operation executed 
+					     (put/get)			    */
+    int		    jb_prefetch;	/**< no. of frame to insert before 
+					     removing some (at the beginning 
+					     of the framelist->content 
+					     operation), the value may be
+					     continuously updated based on
+					     current frame burst level.	    */
+    int		    jb_status;		/**< status is 'init' until the	first 
+					     'put' operation		    */
+    int		    jb_init_cycle_cnt;	/**< status is 'init' until the	first 
+					     'put' operation		    */
+    int		    jb_last_del_seq;	/**< Seq # of last frame deleted    */
+
+    /* Statistics */
+    pj_math_stat    jb_delay;		/**< Delay statistics of jitter buffer 
+					     (in ms)			    */
+    pj_math_stat    jb_burst;		/**< Burst statistics (in frames)   */
+    unsigned	    jb_lost;		/**< Number of lost frames.	    */
+    unsigned	    jb_discard;		/**< Number of discarded frames.    */
+    unsigned	    jb_empty;		/**< Number of empty/prefetching frame
+					     returned by GET. */
+};
+
+
+#define JB_STATUS_INITIALIZING	0
+#define JB_STATUS_PROCESSING	1
+#define JB_STATUS_PREFETCHING	2
+
+/* Enabling this would log the jitter buffer state about once per 
+ * second.
+ */
+#if 1
+#  define TRACE__(args)	    PJ_LOG(5,args)
+#else
+#  define TRACE__(args)
+#endif
+
+static pj_status_t jb_framelist_reset(jb_framelist_t *framelist);
+
+static pj_status_t jb_framelist_init( pj_pool_t *pool,
+				      jb_framelist_t *framelist,
+				      unsigned frame_size,
+				      unsigned max_count) 
+{
+    PJ_ASSERT_RETURN(pool && framelist, PJ_EINVAL);
+
+    pj_bzero(framelist, sizeof(jb_framelist_t));
+
+    framelist->frame_size   = frame_size;
+    framelist->max_count    = max_count;
+    framelist->content	    = (char*) 
+			      pj_pool_alloc(pool,
+					    framelist->frame_size* 
+					    framelist->max_count);
+    framelist->frame_type   = (int*)
+			      pj_pool_alloc(pool, 
+					    sizeof(framelist->frame_type[0])*
+					    framelist->max_count);
+    framelist->content_len  = (pj_size_t*)
+			      pj_pool_alloc(pool, 
+					    sizeof(framelist->content_len[0])*
+					    framelist->max_count);
+    framelist->bit_info	    = (pj_uint32_t*)
+			      pj_pool_alloc(pool, 
+					    sizeof(framelist->bit_info[0])*
+					    framelist->max_count);
+
+    return jb_framelist_reset(framelist);
+
+}
+
+static pj_status_t jb_framelist_destroy(jb_framelist_t *framelist) 
+{
+    PJ_UNUSED_ARG(framelist);
+    return PJ_SUCCESS;
+}
+
+static pj_status_t jb_framelist_reset(jb_framelist_t *framelist) 
+{
+    framelist->head = 0;
+    framelist->origin = INVALID_OFFSET;
+    framelist->size = 0;
+
+    //pj_bzero(framelist->content, 
+    //	     framelist->frame_size * 
+    //	     framelist->max_count);
+
+    pj_memset(framelist->frame_type,
+	      PJMEDIA_JB_MISSING_FRAME,
+	      sizeof(framelist->frame_type[0]) * 
+	      framelist->max_count);
+
+    pj_bzero(framelist->content_len, 
+	     sizeof(framelist->content_len[0]) * 
+	     framelist->max_count);
+
+    //pj_bzero(framelist->bit_info,
+    //	     sizeof(framelist->bit_info[0]) * 
+    //	     framelist->max_count);
+
+    return PJ_SUCCESS;
+}
+
+
+static unsigned jb_framelist_size(jb_framelist_t *framelist) 
+{
+    return framelist->size;
+}
+
+
+static pj_bool_t jb_framelist_get(jb_framelist_t *framelist,
+				  void *frame, pj_size_t *size,
+				  pjmedia_jb_frame_type *p_type,
+				  pj_uint32_t *bit_info) 
+{
+    if (framelist->size) {
+	pj_memcpy(frame, 
+		  framelist->content + 
+		  framelist->head * framelist->frame_size,
+		  framelist->frame_size);
+	*p_type = (pjmedia_jb_frame_type) 
+		  framelist->frame_type[framelist->head];
+	if (size)
+	    *size   = framelist->content_len[framelist->head];
+	if (bit_info)
+	    *bit_info = framelist->bit_info[framelist->head];
+
+	//pj_bzero(framelist->content + 
+	//	 framelist->head * framelist->frame_size,
+	//	 framelist->frame_size);
+	framelist->frame_type[framelist->head] = PJMEDIA_JB_MISSING_FRAME;
+	framelist->content_len[framelist->head] = 0;
+	framelist->bit_info[framelist->head] = 0;
+
+	framelist->origin++;
+	framelist->head = (framelist->head + 1) % framelist->max_count;
+	framelist->size--;
+	
+	return PJ_TRUE;
+    } else {
+	pj_bzero(frame, framelist->frame_size);
+
+	return PJ_FALSE;
+    }
+}
+
+
+static unsigned jb_framelist_remove_head(jb_framelist_t *framelist,
+					 unsigned count) 
+{
+    if (count > framelist->size) 
+	count = framelist->size;
+
+    if (count) {
+	/* may be done in two steps if overlapping */
+	unsigned step1,step2;
+	unsigned tmp = framelist->head+count;
+
+	if (tmp > framelist->max_count) {
+	    step1 = framelist->max_count - framelist->head;
+	    step2 = count-step1;
+	} else {
+	    step1 = count;
+	    step2 = 0;
+	}
+
+	//pj_bzero(framelist->content + 
+	//	    framelist->head * framelist->frame_size,
+	//          step1*framelist->frame_size);
+	pj_memset(framelist->frame_type+framelist->head,
+		  PJMEDIA_JB_MISSING_FRAME,
+		  step1*sizeof(framelist->frame_type[0]));
+	pj_bzero(framelist->content_len+framelist->head,
+		  step1*sizeof(framelist->content_len[0]));
+
+	if (step2) {
+	    //pj_bzero( framelist->content,
+	    //	      step2*framelist->frame_size);
+	    pj_memset(framelist->frame_type,
+		      PJMEDIA_JB_MISSING_FRAME,
+		      step2*sizeof(framelist->frame_type[0]));
+	    pj_bzero (framelist->content_len,
+		      step2*sizeof(framelist->content_len[0]));
+	}
+
+	/* update states */
+	framelist->origin += count;
+	framelist->head = (framelist->head + count) % framelist->max_count;
+	framelist->size -= count;
+    }
+    
+    return count;
+}
+
+
+static pj_status_t jb_framelist_put_at(jb_framelist_t *framelist,
+				       int index,
+				       const void *frame,
+				       unsigned frame_size,
+				       pj_uint32_t bit_info)
+{
+    int distance;
+    unsigned where;
+    enum { MAX_MISORDER = 100 };
+    enum { MAX_DROPOUT = 3000 };
+
+    assert(frame_size <= framelist->frame_size);
+
+    /* too late or duplicated or sequence restart */
+    if (index < framelist->origin) {
+	if (framelist->origin - index < MAX_MISORDER) {
+	    /* too late or duplicated */
+	    return PJ_ETOOSMALL;
+	} else {
+	    /* sequence restart */
+	    framelist->origin = index - framelist->size;
+	}
+    }
+
+    /* if jbuf is empty, just reset the origin */
+    if (framelist->size == 0) {
+	framelist->origin = index;
+    }
+
+    /* get distance of this frame to the first frame in the buffer */
+    distance = index - framelist->origin;
+
+    /* far jump, the distance is greater than buffer capacity */
+    if (distance >= (int)framelist->max_count) {
+	if (distance > MAX_DROPOUT) {
+	    /* jump too far, reset the buffer */
+	    jb_framelist_reset(framelist);
+	    framelist->origin = index;
+	    distance = 0;
+	} else {
+	    /* otherwise, reject the frame */
+	    return PJ_ETOOMANY;
+	}
+    }
+
+    /* get the slot position */
+    where = (framelist->head + distance) % framelist->max_count;
+
+    /* if the slot is occupied, it must be duplicated frame, ignore it. */
+    if (framelist->frame_type[where] != PJMEDIA_JB_MISSING_FRAME)
+	return PJ_EEXISTS;
+
+    /* put the frame into the slot */
+    pj_memcpy(framelist->content + where * framelist->frame_size,
+	      frame, frame_size);
+    framelist->frame_type[where] = PJMEDIA_JB_NORMAL_FRAME;
+    framelist->content_len[where] = frame_size;
+    framelist->bit_info[where] = bit_info;
+    if (framelist->origin + (int)framelist->size <= index)
+	framelist->size = distance + 1;
+
+    return PJ_SUCCESS;
+}
+
+
+
+enum pjmedia_jb_op
+{
+    JB_OP_INIT  = -1,
+    JB_OP_PUT   = 1,
+    JB_OP_GET   = 2
+};
+
+
+PJ_DEF(pj_status_t) pjmedia_jbuf_create(pj_pool_t *pool, 
+					const pj_str_t *name,
+					unsigned frame_size, 
+					unsigned ptime,
+					unsigned max_count,
+					pjmedia_jbuf **p_jb)
+{
+    pjmedia_jbuf *jb;
+    pj_status_t status;
+
+    jb = PJ_POOL_ZALLOC_T(pool, pjmedia_jbuf);
+
+    status = jb_framelist_init(pool, &jb->jb_framelist, frame_size, max_count);
+    if (status != PJ_SUCCESS)
+	return status;
+
+    pj_strdup_with_null(pool, &jb->jb_name, name);
+    jb->jb_frame_size	 = frame_size;
+    jb->jb_frame_ptime   = ptime;
+    jb->jb_prefetch	 = PJ_MIN(PJMEDIA_JB_DEFAULT_INIT_DELAY,max_count*4/5);
+    jb->jb_min_prefetch  = 0;
+    jb->jb_max_prefetch  = max_count*4/5;
+    jb->jb_max_count	 = max_count;
+    jb->jb_min_shrink_gap= MIN_SHRINK_GAP_MSEC / ptime;
+    jb->jb_max_burst	 = MAX_BURST_MSEC / ptime;
+    pj_math_stat_init(&jb->jb_delay);
+    pj_math_stat_init(&jb->jb_burst);
+
+    pjmedia_jbuf_reset(jb);
+
+    *p_jb = jb;
+    return PJ_SUCCESS;
+}
+
+
+/*
+ * Set the jitter buffer to fixed delay mode. The default behavior
+ * is to adapt the delay with actual packet delay.
+ *
+ */
+PJ_DEF(pj_status_t) pjmedia_jbuf_set_fixed( pjmedia_jbuf *jb,
+					    unsigned prefetch)
+{
+    PJ_ASSERT_RETURN(jb, PJ_EINVAL);
+    PJ_ASSERT_RETURN(prefetch <= jb->jb_max_count, PJ_EINVAL);
+
+    jb->jb_min_prefetch = jb->jb_max_prefetch = 
+	jb->jb_prefetch = jb->jb_def_prefetch = prefetch;
+
+    return PJ_SUCCESS;
+}
+
+
+/*
+ * Set the jitter buffer to adaptive mode.
+ */
+PJ_DEF(pj_status_t) pjmedia_jbuf_set_adaptive( pjmedia_jbuf *jb,
+					       unsigned prefetch,
+					       unsigned min_prefetch,
+					       unsigned max_prefetch)
+{
+    PJ_ASSERT_RETURN(jb, PJ_EINVAL);
+    PJ_ASSERT_RETURN(min_prefetch < max_prefetch &&
+		     prefetch <= max_prefetch &&
+		     max_prefetch <= jb->jb_max_count,
+		     PJ_EINVAL);
+
+    jb->jb_prefetch = jb->jb_def_prefetch = prefetch;
+    jb->jb_min_prefetch = min_prefetch;
+    jb->jb_max_prefetch = max_prefetch;
+
+    return PJ_SUCCESS;
+}
+
+
+PJ_DEF(pj_status_t) pjmedia_jbuf_reset(pjmedia_jbuf *jb)
+{
+    jb->jb_level	 = 0;
+    jb->jb_last_op	 = JB_OP_INIT;
+    jb->jb_stable_hist	 = 0;
+    jb->jb_status	 = JB_STATUS_INITIALIZING;
+    jb->jb_init_cycle_cnt= 0;
+    jb->jb_max_hist_level= 0;
+
+    jb_framelist_reset(&jb->jb_framelist);
+
+    return PJ_SUCCESS;
+}
+
+
+PJ_DEF(pj_status_t) pjmedia_jbuf_destroy(pjmedia_jbuf *jb)
+{
+    TRACE__((jb->jb_name.ptr, "\n"
+	    "  JB summary:\n"
+	    "    size=%d prefetch=%d\n"
+	    "    delay (min/max/avg/dev)=%d/%d/%d/%d ms\n"
+	    "    burst (min/max/avg/dev)=%d/%d/%d/%d frames\n"
+	    "    lost=%d discard=%d empty=%d\n",
+	    jb->jb_framelist.size, jb->jb_prefetch,
+	    jb->jb_delay.min, jb->jb_delay.max, jb->jb_delay.mean, 
+	    pj_math_stat_get_stddev(&jb->jb_delay),
+	    jb->jb_burst.min, jb->jb_burst.max, jb->jb_burst.mean, 
+	    pj_math_stat_get_stddev(&jb->jb_burst),
+	    jb->jb_lost, jb->jb_discard, jb->jb_empty));
+
+    return jb_framelist_destroy(&jb->jb_framelist);
+}
+
+
+static void jbuf_calculate_jitter(pjmedia_jbuf *jb)
+{
+    int diff, cur_size;
+
+    cur_size = jb_framelist_size(&jb->jb_framelist);
+    pj_math_stat_update(&jb->jb_burst, jb->jb_level);
+    jb->jb_max_hist_level = PJ_MAX(jb->jb_max_hist_level, jb->jb_level);
+
+    /* Burst level is decreasing */
+    if (jb->jb_level < jb->jb_prefetch) {
+
+	enum { STABLE_HISTORY_LIMIT = 100 };
+        
+	jb->jb_stable_hist++;
+        
+	/* Only update the prefetch if 'stable' condition is reached 
+	 * (not just short time impulse)
+	 */
+	if (jb->jb_stable_hist > STABLE_HISTORY_LIMIT) {
+    	
+	    diff = (jb->jb_prefetch - jb->jb_max_hist_level) / 3;
+
+	    if (diff < 1)
+		diff = 1;
+
+	    jb->jb_prefetch -= diff;
+	    if (jb->jb_prefetch < jb->jb_min_prefetch) 
+		jb->jb_prefetch = jb->jb_min_prefetch;
+
+	    /* Reset history */
+	    jb->jb_max_hist_level = 0;
+	    jb->jb_stable_hist = 0;
+
+	    TRACE__((jb->jb_name.ptr,"jb updated(1), prefetch=%d, size=%d",
+		     jb->jb_prefetch, cur_size));
+	}
+    }
+
+    /* Burst level is increasing */
+    else if (jb->jb_level > jb->jb_prefetch) {
+
+	/* Instaneous set prefetch to recent maximum level (max_hist_level) */
+	jb->jb_prefetch = PJ_MIN(jb->jb_max_hist_level,
+				 (int)(jb->jb_max_count*4/5));
+	if (jb->jb_prefetch > jb->jb_max_prefetch)
+	    jb->jb_prefetch = jb->jb_max_prefetch;
+
+	jb->jb_stable_hist = 0;
+	/* Do not reset max_hist_level. */
+	//jb->jb_max_hist_level = 0;
+
+	TRACE__((jb->jb_name.ptr,"jb updated(2), prefetch=%d, size=%d", 
+		 jb->jb_prefetch, cur_size));
+    }
+
+    /* Level is unchanged */
+    else {
+	jb->jb_stable_hist = 0;
+    }
+}
+
+PJ_INLINE(void) jbuf_update(pjmedia_jbuf *jb, int oper)
+{
+    int diff, burst_level;
+
+    if(jb->jb_last_op != oper) {
+	jb->jb_last_op = oper;
+
+	if (jb->jb_status == JB_STATUS_INITIALIZING) {
+	    /* Switch status 'initializing' -> 'processing' after some OP 
+	     * switch cycles and current OP is GET (burst level is calculated 
+	     * based on PUT burst), so burst calculation is guaranted to be
+	     * performed right after the status switching.
+	     */
+	    if (++jb->jb_init_cycle_cnt >= INIT_CYCLE && oper == JB_OP_GET) {
+		jb->jb_status = JB_STATUS_PROCESSING;
+	    } else {
+		jb->jb_level = 0;
+		return;
+	    }
+	}
+
+	/* Perform jitter calculation based on PUT burst-level only, since 
+	 * GET burst-level may not be accurate, e.g: when VAD is active.
+	 * Note that when burst-level is too big, i.e: exceeds jb_max_burst,
+	 * the GET op may be idle, in this case, we better skip the jitter 
+	 * calculation.
+	 */
+	if (oper == JB_OP_GET && jb->jb_level < jb->jb_max_burst)
+	    jbuf_calculate_jitter(jb);
+
+	jb->jb_level = 0;
+    }
+
+    /* These code is used for shortening the delay in the jitter buffer.
+     * It needs shrink only when there is possibility of drift. Drift
+     * detection is performed by inspecting the jitter buffer size, if
+     * its size is twice of current burst level, there can be drift.
+     *
+     * Moreover, normally drift level is quite low, so JB shouldn't need
+     * to shrink aggresively, it will shrink maximum one frame per 
+     * MIN_SHRINK_GAP_MSEC ms. Theoritically, JB may handle drift level 
+     * as much as = FRAME_PTIME/MIN_SHRINK_GAP_MSEC * 100%
+     *
+     * Whenever there is drift, where PUT > GET, this method will keep 
+     * the latency (JB size) as much as twice of burst level.
+     */
+
+    if (jb->jb_status != JB_STATUS_PROCESSING)
+	return;
+
+    burst_level = PJ_MAX(jb->jb_prefetch, jb->jb_level);
+    diff = jb_framelist_size(&jb->jb_framelist) - burst_level*2;
+
+    if (diff >= SAFE_SHRINKING_DIFF) {
+	/* Check and adjust jb_last_del_seq, in case there was seq restart */
+	if (jb->jb_framelist.origin < jb->jb_last_del_seq)
+	    jb->jb_last_del_seq = jb->jb_framelist.origin;
+
+	if (jb->jb_framelist.origin - jb->jb_last_del_seq >=
+	    jb->jb_min_shrink_gap)
+	{
+	    /* Shrink slowly, one frame per cycle */
+	    diff = 1;
+
+	    /* Drop frame(s)! */
+	    diff = jb_framelist_remove_head(&jb->jb_framelist, diff);
+	    jb->jb_last_del_seq = jb->jb_framelist.origin;
+	    jb->jb_discard += diff;
+
+	    TRACE__((jb->jb_name.ptr, 
+		     "JB shrinking %d frame(s), cur size=%d", diff,
+		     jb_framelist_size(&jb->jb_framelist)));
+	}
+    }
+}
+
+PJ_DEF(void) pjmedia_jbuf_put_frame( pjmedia_jbuf *jb, 
+				     const void *frame, 
+				     pj_size_t frame_size, 
+				     int frame_seq)
+{
+    pjmedia_jbuf_put_frame2(jb, frame, frame_size, 0, frame_seq, NULL);
+}
+
+PJ_DEF(void) pjmedia_jbuf_put_frame2(pjmedia_jbuf *jb, 
+				     const void *frame, 
+				     pj_size_t frame_size, 
+				     pj_uint32_t bit_info,
+				     int frame_seq,
+				     pj_bool_t *discarded)
+{
+    pj_size_t min_frame_size;
+    int prev_size, cur_size;
+    pj_status_t status;
+
+    /* Get JB size before PUT */
+    prev_size = jb_framelist_size(&jb->jb_framelist);
+    
+    /* Attempt to store the frame */
+    min_frame_size = PJ_MIN(frame_size, jb->jb_frame_size);
+    status = jb_framelist_put_at(&jb->jb_framelist, frame_seq, frame,
+				 min_frame_size, bit_info);
+    
+    /* Jitter buffer is full, cannot store the frame */
+    while (status == PJ_ETOOMANY) {
+	unsigned removed;
+
+	removed = jb_framelist_remove_head(&jb->jb_framelist,
+					   PJ_MAX(jb->jb_max_count/4, 1));
+	status = jb_framelist_put_at(&jb->jb_framelist, frame_seq, frame,
+				     min_frame_size, bit_info);
+
+	jb->jb_discard += removed;
+    }
+
+    /* Get JB size after PUT */
+    cur_size = jb_framelist_size(&jb->jb_framelist);
+
+    /* Return the flag if this frame is discarded */
+    if (discarded)
+	*discarded = (status != PJ_SUCCESS);
+
+    if (status == PJ_SUCCESS) {
+	if (jb->jb_status == JB_STATUS_PREFETCHING) {
+	    TRACE__((jb->jb_name.ptr, "PUT prefetch_cnt=%d/%d", 
+		     cur_size, jb->jb_prefetch));
+	    if (cur_size >= jb->jb_prefetch)
+		jb->jb_status = JB_STATUS_PROCESSING;
+	}
+	jb->jb_level += (cur_size > prev_size ? cur_size-prev_size : 1);
+	jbuf_update(jb, JB_OP_PUT);
+    } else
+	jb->jb_discard++;
+}
+
+/*
+ * Get frame from jitter buffer.
+ */
+PJ_DEF(void) pjmedia_jbuf_get_frame( pjmedia_jbuf *jb, 
+				     void *frame, 
+				     char *p_frame_type)
+{
+    pjmedia_jbuf_get_frame2(jb, frame, NULL, p_frame_type, NULL);
+}
+
+/*
+ * Get frame from jitter buffer.
+ */
+PJ_DEF(void) pjmedia_jbuf_get_frame2(pjmedia_jbuf *jb, 
+				     void *frame, 
+				     pj_size_t *size,
+				     char *p_frame_type,
+				     pj_uint32_t *bit_info)
+{
+    int cur_size;
+
+    cur_size = jb_framelist_size(&jb->jb_framelist);
+
+    if (cur_size == 0) {
+	/* jitter buffer empty */
+
+	if (jb->jb_def_prefetch)
+	    jb->jb_status = JB_STATUS_PREFETCHING;
+
+	//pj_bzero(frame, jb->jb_frame_size);
+	*p_frame_type = PJMEDIA_JB_ZERO_EMPTY_FRAME;
+	if (size)
+	    *size = 0;
+
+	jb->jb_empty++;
+
+    } else if (jb->jb_status == JB_STATUS_PREFETCHING) {
+
+	/* Can't return frame because jitter buffer is filling up
+	 * minimum prefetch.
+	 */
+
+	//pj_bzero(frame, jb->jb_frame_size);
+	*p_frame_type = PJMEDIA_JB_ZERO_PREFETCH_FRAME;
+	if (size)
+	    *size = 0;
+
+	TRACE__((jb->jb_name.ptr, "GET prefetch_cnt=%d/%d",
+		 cur_size, jb->jb_prefetch));
+
+	jb->jb_empty++;
+
+    } else {
+
+	pjmedia_jb_frame_type ftype;
+	pj_bool_t res;
+
+	/* Retrieve a frame from frame list */
+	res = jb_framelist_get(&jb->jb_framelist, frame, size, &ftype, 
+			       bit_info);
+	pj_assert(res);
+
+	/* We've successfully retrieved a frame from the frame list, but
+	 * the frame could be a blank frame!
+	 */
+	if (ftype == PJMEDIA_JB_NORMAL_FRAME) {
+	    *p_frame_type = PJMEDIA_JB_NORMAL_FRAME;
+	} else {
+	    *p_frame_type = PJMEDIA_JB_MISSING_FRAME;
+	    jb->jb_lost++;
+	}
+
+	/* Calculate delay on the first GET */
+	if (jb->jb_last_op == JB_OP_PUT)
+	    pj_math_stat_update(&jb->jb_delay, cur_size * jb->jb_frame_ptime);
+    }
+
+    jb->jb_level++;
+    jbuf_update(jb, JB_OP_GET);
+}
+
+/*
+ * Get jitter buffer state.
+ */
+PJ_DEF(pj_status_t) pjmedia_jbuf_get_state( pjmedia_jbuf *jb,
+					    pjmedia_jb_state *state )
+{
+    PJ_ASSERT_RETURN(jb && state, PJ_EINVAL);
+
+    state->frame_size = jb->jb_frame_size;
+    state->min_prefetch = jb->jb_min_prefetch;
+    state->max_prefetch = jb->jb_max_prefetch;
+    
+    state->prefetch = jb->jb_prefetch;
+    state->size = jb_framelist_size(&jb->jb_framelist);
+    
+    state->avg_delay = jb->jb_delay.mean;
+    state->min_delay = jb->jb_delay.min;
+    state->max_delay = jb->jb_delay.max;
+    state->dev_delay = pj_math_stat_get_stddev(&jb->jb_delay);
+    
+    state->avg_burst = jb->jb_burst.mean;
+    state->empty = jb->jb_empty;
+    state->discard = jb->jb_discard;
+    state->lost = jb->jb_lost;
+
+    return PJ_SUCCESS;
+}
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/master_port.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/master_port.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/master_port.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/master_port.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/mem_capture.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/mem_capture.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/mem_capture.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/mem_capture.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/mem_player.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/mem_player.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/mem_player.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/mem_player.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/null_port.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/null_port.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/null_port.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/null_port.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/nullsound.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/nullsound.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/nullsound.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/nullsound.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/pasound.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/pasound.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/pasound.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/pasound.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/plc_common.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/plc_common.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/plc_common.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/plc_common.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/port.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/port.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/port.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/port.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/resample_libsamplerate.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/resample_libsamplerate.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/resample_libsamplerate.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/resample_libsamplerate.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/resample_port.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/resample_port.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/resample_port.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/resample_port.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/resample_resample.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/resample_resample.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/resample_resample.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/resample_resample.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/resample_speex.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/resample_speex.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/resample_speex.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/resample_speex.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/rtcp.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/rtcp.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/rtcp.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/rtcp.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/rtcp_xr.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/rtcp_xr.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/rtcp_xr.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/rtcp_xr.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/rtp.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/rtp.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/rtp.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/rtp.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/sdp.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/sdp.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/sdp.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/sdp.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/sdp_cmp.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/sdp_cmp.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/sdp_cmp.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/sdp_cmp.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/sdp_neg.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/sdp_neg.c
similarity index 98%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/sdp_neg.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/sdp_neg.c
index 7d14c9e265c93a19cbf2f5276f4f9cae9f17ee44..c128118a157d3bbb25f0c0565770e63bb6c5b071 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/sdp_neg.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/sdp_neg.c
@@ -1,4 +1,4 @@
-/* $Id: sdp_neg.c 2394 2008-12-23 17:27:53Z bennylp $ */
+/* $Id: sdp_neg.c 2795 2009-06-24 18:52:57Z bennylp $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -422,10 +422,18 @@ PJ_DEF(pj_status_t) pjmedia_sdp_neg_set_local_answer( pj_pool_t *pool,
     /* State now is STATE_WAIT_NEGO. */
     neg->state = PJMEDIA_SDP_NEG_STATE_WAIT_NEGO;
     if (local) {
-	if (!neg->initial_sdp) {
+	neg->neg_local_sdp = pjmedia_sdp_session_clone(pool, local);
+	if (neg->initial_sdp) {
+	    /* I don't think there is anything in RFC 3264 that mandates
+	     * answerer to place the same origin (and increment version)
+	     * in the answer, but probably it won't hurt either.
+	     * Note that the version will be incremented in 
+	     * pjmedia_sdp_neg_negotiate()
+	     */
+	    neg->neg_local_sdp->origin.id = neg->initial_sdp->origin.id;
+	} else {
 	    neg->initial_sdp = pjmedia_sdp_session_clone(pool, local);
 	}
-	neg->neg_local_sdp = pjmedia_sdp_session_clone(pool, local);
     } else {
 	PJ_ASSERT_RETURN(neg->initial_sdp, PJMEDIA_SDPNEG_ENOINITIAL);
 	neg->neg_local_sdp = pjmedia_sdp_session_clone(pool, neg->initial_sdp);
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/session.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/session.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/session.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/session.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/silencedet.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/silencedet.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/silencedet.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/silencedet.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/sound_port.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/sound_port.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/sound_port.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/sound_port.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/splitcomb.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/splitcomb.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/splitcomb.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/splitcomb.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/stereo_port.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/stereo_port.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/stereo_port.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/stereo_port.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/stream.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/stream.c
similarity index 99%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/stream.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/stream.c
index ca518d73ccbdc48ffa679ec9038005e0227ffa10..479a8a1ff109bd1e16f9c219cebba7c535f784c8 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/stream.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/stream.c
@@ -1,4 +1,4 @@
-/* $Id: stream.c 2543 2009-03-23 13:22:45Z nanang $ */
+/* $Id: stream.c 2818 2009-06-25 13:27:02Z bennylp $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -1884,6 +1884,10 @@ PJ_DEF(pj_status_t) pjmedia_stream_destroy( pjmedia_stream *stream )
 	stream->jb_mutex = NULL;
     }
 
+    /* Destroy jitter buffer */
+    if (stream->jb)
+	pjmedia_jbuf_destroy(stream->jb);
+
     return PJ_SUCCESS;
 }
 
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/symbian_sound.cpp b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/symbian_sound.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/symbian_sound.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/symbian_sound.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/symbian_sound_aps.cpp b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/symbian_sound_aps.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/symbian_sound_aps.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/symbian_sound_aps.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/tonegen.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/tonegen.c
similarity index 99%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/tonegen.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/tonegen.c
index 9338fe8b0a54ba7875f5f74089cb31a1b7c7789d..4065cf0bcc1485fca85daf9b422942c230a68131 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/tonegen.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/tonegen.c
@@ -1,4 +1,4 @@
-/* $Id: tonegen.c 2394 2008-12-23 17:27:53Z bennylp $ */
+/* $Id: tonegen.c 2793 2009-06-24 15:52:17Z nanang $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -384,13 +384,13 @@ static pjmedia_tone_digit_map digit_map =
 	{ '0', 941,  1336 },
 	{ '1', 697,  1209 },
 	{ '2', 697,  1336 },
-	{ '3', 697,  1447 },
+	{ '3', 697,  1477 },
 	{ '4', 770,  1209 },
 	{ '5', 770,  1336 },
-	{ '6', 770,  1447 },
+	{ '6', 770,  1477 },
 	{ '7', 852,  1209 },
 	{ '8', 852,  1336 },
-	{ '9', 852,  1447 },
+	{ '9', 852,  1477 },
 	{ 'a', 697,  1633 },
 	{ 'b', 770,  1633 },
 	{ 'c', 852,  1633 },
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/transport_adapter_sample.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/transport_adapter_sample.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/transport_adapter_sample.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/transport_adapter_sample.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/transport_ice.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/transport_ice.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/transport_ice.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/transport_ice.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/transport_loop.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/transport_loop.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/transport_loop.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/transport_loop.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/transport_srtp.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/transport_srtp.c
similarity index 99%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/transport_srtp.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/transport_srtp.c
index b9650d1b02c14c04a10993bf905dc6a748377aff..92f22fd8bebcb235b855424c00c815f8e7ea1c7e 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/transport_srtp.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/transport_srtp.c
@@ -1,4 +1,4 @@
-/* $Id: transport_srtp.c 2533 2009-03-23 13:07:05Z nanang $ */
+/* $Id: transport_srtp.c 2794 2009-06-24 16:00:36Z nanang $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -22,6 +22,7 @@
 #include <pjmedia/endpoint.h>
 #include <pjlib-util/base64.h>
 #include <pj/assert.h>
+#include <pj/ctype.h>
 #include <pj/lock.h>
 #include <pj/log.h>
 #include <pj/os.h>
@@ -979,6 +980,7 @@ static pj_status_t parse_attr_crypto(pj_pool_t *pool,
 {
     pj_str_t input;
     char *token;
+    int token_len;
     pj_str_t tmp;
     pj_status_t status;
     int itmp;
@@ -992,10 +994,20 @@ static pj_status_t parse_attr_crypto(pj_pool_t *pool,
 	PJ_LOG(4,(THIS_FILE, "Attribute crypto expecting tag"));
 	return PJMEDIA_SDP_EINATTR;
     }
-    *tag = atoi(token);
-    if (*tag == 0)
+    token_len = pj_ansi_strlen(token);
+
+    /* Tag must not use leading zeroes. */
+    if (token_len > 1 && *token == '0')
 	return PJMEDIA_SDP_EINATTR;
 
+    /* Tag must be decimal, i.e: contains only digit '0'-'9'. */
+    for (itmp = 0; itmp < token_len; ++itmp)
+	if (!pj_isdigit(token[itmp]))
+	    return PJMEDIA_SDP_EINATTR;
+
+    /* Get tag value. */
+    *tag = atoi(token);
+
     /* Crypto-suite */
     token = strtok(NULL, " ");
     if (!token) {
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/transport_udp.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/transport_udp.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/transport_udp.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/transport_udp.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wav_player.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/wav_player.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wav_player.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/wav_player.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wav_playlist.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/wav_playlist.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wav_playlist.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/wav_playlist.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wav_writer.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/wav_writer.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wav_writer.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/wav_writer.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wave.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/wave.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wave.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/wave.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wmme_sound.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/wmme_sound.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wmme_sound.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/wmme_sound.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wsola.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/wsola.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wsola.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/pjmedia/wsola.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/audio_tool.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/audio_tool.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/audio_tool.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/audio_tool.c
diff --git a/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/jbuf_test.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/jbuf_test.c
new file mode 100644
index 0000000000000000000000000000000000000000..3e8964832e9bdde62fd3dc62f063f5543e7f1c8b
--- /dev/null
+++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/jbuf_test.c
@@ -0,0 +1,308 @@
+/* $Id$ */
+/* 
+ * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
+ * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
+ */
+#include <stdio.h>
+#include <ctype.h>
+#include <pj/pool.h>
+#include "test.h"
+
+#define JB_INIT_PREFETCH    0
+#define JB_MIN_PREFETCH	    0
+#define JB_MAX_PREFETCH	    10
+#define JB_PTIME	    20
+#define JB_BUF_SIZE	    50
+
+#define REPORT
+//#define PRINT_COMMENT
+
+typedef struct test_param_t {
+    pj_bool_t adaptive;
+    unsigned init_prefetch;
+    unsigned min_prefetch;
+    unsigned max_prefetch;
+} test_param_t;
+
+typedef struct test_cond_t {
+    int burst;
+    int discard;
+    int lost;
+    int empty;
+    int delay;	    /**< Maximum delay, in frames.	    */
+} test_cond_t;
+
+static pj_bool_t parse_test_headers(char *line, test_param_t *param, 
+			       test_cond_t *cond)
+{
+    char *p = line;
+
+    if (*p == '%') {
+	/* Test params. */
+	char mode_st[16];
+
+	sscanf(p+1, "%s %u %u %u", mode_st, &param->init_prefetch, 
+	       &param->min_prefetch, &param->max_prefetch);
+	param->adaptive = (pj_ansi_stricmp(mode_st, "adaptive") == 0);
+
+    } else if (*p == '!') {
+	/* Success condition. */
+	char cond_st[16];
+	unsigned cond_val;
+
+	sscanf(p+1, "%s %u", cond_st, &cond_val);
+	if (pj_ansi_stricmp(cond_st, "burst") == 0)
+	    cond->burst = cond_val;
+	else if (pj_ansi_stricmp(cond_st, "delay") == 0)
+	    cond->delay = cond_val;
+	else if (pj_ansi_stricmp(cond_st, "discard") == 0)
+	    cond->discard = cond_val;
+	else if (pj_ansi_stricmp(cond_st, "empty") == 0)
+	    cond->empty = cond_val;
+	else if (pj_ansi_stricmp(cond_st, "lost") == 0)
+	    cond->lost = cond_val;
+
+    } else if (*p == '=') {
+	/* Test title. */
+	++p;
+	while (*p && isspace(*p)) ++p;
+	printf("%s", p);
+    } else {
+	/* Unknown header, perhaps this is the test data */
+
+	/* Skip spaces */
+	while (*p && isspace(*p)) ++p;
+
+	/* Test data started.*/
+	if (*p != 0)
+	    return PJ_FALSE;
+    }
+
+    return PJ_TRUE;
+}
+
+static pj_bool_t process_test_data(char data, pjmedia_jbuf *jb, 
+				   pj_uint16_t *seq, pj_uint16_t *last_seq)
+{
+    char frame[1];
+    char f_type;
+    pj_bool_t print_state = PJ_TRUE;
+    pj_bool_t data_eos = PJ_FALSE;
+
+    switch (toupper(data)) {
+    case 'G': /* Get */
+	pjmedia_jbuf_get_frame(jb, frame, &f_type);
+	break;
+    case 'P': /* Put */
+	pjmedia_jbuf_put_frame(jb, (void*)frame, 1, *seq);
+	*last_seq = *seq;
+	++*seq;
+	break;
+    case 'L': /* Lost */
+	*last_seq = *seq;
+	++*seq;
+	printf("Lost\n");
+	break;
+    case 'R': /* Sequence restarts */
+	*seq = 1;
+	printf("Sequence restarting, from %u to %u\n", *last_seq, *seq);
+	break;
+    case 'J': /* Sequence jumps */
+	(*seq) += 5000;
+	printf("Sequence jumping, from %u to %u\n", *last_seq, *seq);
+	break;
+    case 'D': /* Frame duplicated */
+	pjmedia_jbuf_put_frame(jb, (void*)frame, 1, *seq - 1);
+	break;
+    case 'O': /* Old/late frame */
+	pjmedia_jbuf_put_frame(jb, (void*)frame, 1, *seq - 10 - pj_rand()%40);
+	break;
+    case '.': /* End of test session. */
+	data_eos = PJ_TRUE;
+	break;
+    default:
+	print_state = PJ_FALSE;
+	printf("Unknown test data '%c'\n", data);
+	break;
+    }
+
+    if (data_eos)
+	return PJ_FALSE;
+
+#ifdef REPORT
+    if (print_state) {
+	pjmedia_jb_state state;
+
+	pjmedia_jbuf_get_state(jb, &state);
+	printf("seq=%d\t%c\tsize=%d\tprefetch=%d\n", 
+	       *last_seq, toupper(data), state.size, state.prefetch);
+    }
+#endif
+
+    return PJ_TRUE;
+}
+
+int jbuf_main(void)
+{
+    FILE *input = fopen("JBTEST.DAT", "rt");
+    pj_bool_t data_eof = PJ_FALSE;
+    int old_log_level;
+    int rc = 0;
+
+    old_log_level = pj_log_get_level();
+    pj_log_set_level(5);
+
+    while (rc == 0 && !data_eof) {
+	pj_str_t jb_name = {"JBTEST", 6};
+	pjmedia_jbuf *jb;
+	pj_pool_t *pool;
+	pjmedia_jb_state state;
+	pj_uint16_t last_seq = 0;
+	pj_uint16_t seq = 1;
+	char line[1024], *p = NULL;
+
+	test_param_t param;
+	test_cond_t cond;
+
+	param.adaptive = PJ_TRUE;
+	param.init_prefetch = JB_INIT_PREFETCH;
+	param.min_prefetch = JB_MIN_PREFETCH;
+	param.max_prefetch = JB_MAX_PREFETCH;
+
+	cond.burst = -1;
+	cond.delay = -1;
+	cond.discard = -1;
+	cond.empty = -1;
+	cond.lost = -1;
+
+	printf("\n\n");
+
+	/* Parse test session title, param, and conditions */
+	do {
+	    p = fgets(line, sizeof(line), input);
+	} while (p && parse_test_headers(line, &param, &cond));
+
+	/* EOF test data */
+	if (p == NULL)
+	    break;
+
+	//printf("======================================================\n");
+
+	/* Initialize test session */
+	pool = pj_pool_create(mem, "JBPOOL", 256*16, 256*16, NULL);
+	pjmedia_jbuf_create(pool, &jb_name, 1, JB_PTIME, JB_BUF_SIZE, &jb);
+	pjmedia_jbuf_reset(jb);
+
+	if (param.adaptive) {
+	    pjmedia_jbuf_set_adaptive(jb, 
+				      param.init_prefetch, 
+				      param.min_prefetch,
+				      param.max_prefetch);
+	} else {
+	    pjmedia_jbuf_set_fixed(jb, param.init_prefetch);
+	}
+
+#ifdef REPORT
+	pjmedia_jbuf_get_state(jb, &state);
+	printf("Initial\tsize=%d\tprefetch=%d\tmin.pftch=%d\tmax.pftch=%d\n", 
+	       state.size, state.prefetch, state.min_prefetch, 
+	       state.max_prefetch);
+#endif
+
+
+	/* Test session start */
+	while (1) {
+	    int c;
+	    
+	    /* Get next line of test data */
+	    if (!p || *p == 0) {
+		p = fgets(line, sizeof(line), input);
+		if (p == NULL) {
+		    data_eof = PJ_TRUE;
+		    break;
+		}
+	    }
+
+	    /* Get next char of test data */
+	    c = *p++;
+
+	    /* Skip spaces */
+	    if (isspace(c))
+		continue;
+
+	    /* Print comment line */
+	    if (c == '#') {
+#ifdef PRINT_COMMENT
+		while (*p && isspace(*p)) ++p;
+		if (*p) printf("..%s", p);
+#endif
+		*p = 0;
+		continue;
+	    }
+
+	    /* Process test data */
+	    if (!process_test_data(c, jb, &seq, &last_seq))
+		break;
+	}
+
+	/* Print JB states */
+	pjmedia_jbuf_get_state(jb, &state);
+	printf("------------------------------------------------------\n");
+	printf("Summary:\n");
+	printf("  size=%d prefetch=%d\n", state.size, state.prefetch);
+	printf("  delay (min/max/avg/dev)=%d/%d/%d/%d ms\n",
+	       state.min_delay, state.max_delay, state.avg_delay, 
+	       state.dev_delay);
+	printf("  lost=%d discard=%d empty=%d burst(avg)=%d\n", 
+	       state.lost, state.discard, state.empty, state.avg_burst);
+
+	/* Evaluate test session */
+	if (cond.burst >= 0 && (int)state.avg_burst > cond.burst) {
+	    printf("! 'Burst' should be %d, it is %d\n", 
+		   cond.burst, state.avg_burst);
+	    rc |= 1;
+	}
+	if (cond.delay >= 0 && (int)state.avg_delay/JB_PTIME > cond.delay) {
+	    printf("! 'Delay' should be %d, it is %d\n", 
+		   cond.delay, state.avg_delay/JB_PTIME);
+	    rc |= 2;
+	}
+	if (cond.discard >= 0 && (int)state.discard > cond.discard) {
+	    printf("! 'Discard' should be %d, it is %d\n",
+		   cond.discard, state.discard);
+	    rc |= 4;
+	}
+	if (cond.empty >= 0 && (int)state.empty > cond.empty) {
+	    printf("! 'Empty' should be %d, it is %d\n", 
+		   cond.empty, state.empty);
+	    rc |= 8;
+	}
+	if (cond.lost >= 0 && (int)state.lost > cond.lost) {
+	    printf("! 'Lost' should be %d, it is %d\n", 
+		   cond.lost, state.lost);
+	    rc |= 16;
+	}
+
+	pjmedia_jbuf_destroy(jb);
+	pj_pool_release(pool);
+    }
+
+    fclose(input);
+    pj_log_set_level(old_log_level);
+
+    return rc;
+}
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/main.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/main.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/main.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/main.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/mips_test.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/mips_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/mips_test.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/mips_test.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/rtp_test.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/rtp_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/rtp_test.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/rtp_test.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/sdp_neg_test.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/sdp_neg_test.c
similarity index 99%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/sdp_neg_test.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/sdp_neg_test.c
index 35c414cea67f364614b7ecb8163452b11c7c78bd..c0be9d34d14bab1f569b46b06c6ae311dcf2af3d 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/sdp_neg_test.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/sdp_neg_test.c
@@ -1,4 +1,4 @@
-/* $Id: sdp_neg_test.c 2548 2009-03-23 13:28:30Z bennylp $ */
+/* $Id: sdp_neg_test.c 2818 2009-06-25 13:27:02Z bennylp $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -39,7 +39,7 @@ struct offer_answer
     char *sdp3;			/* local active media	local answer	*/
 };
 
-struct test
+static struct test
 {
     const char		*title;
     unsigned		 offer_answer_count;
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/sdptest.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/sdptest.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/sdptest.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/sdptest.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/session_test.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/session_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/session_test.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/session_test.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/test.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/test.c
similarity index 96%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/test.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/test.c
index 2bae030b1a4352c84bba6bfcf3e61847e904a7e9..0c39963eb91d14b68fdc1f132b8caa887bfe8350 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/test.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/test.c
@@ -60,11 +60,12 @@ int test_main(void)
     //sdp_test (&caching_pool.factory);
     //rtp_test(&caching_pool.factory);
     //session_test (&caching_pool.factory);
-    //jbuf_main();
-    mips_test();
+    DO_TEST(jbuf_main());
+    //DO_TEST(mips_test());
 
     PJ_LOG(3,(THIS_FILE," "));
 
+on_return:
     if (rc != 0) {
 	PJ_LOG(3,(THIS_FILE,"Test completed with error(s)!"));
     } else {
@@ -72,5 +73,6 @@ int test_main(void)
     }
 
     pj_caching_pool_destroy(&caching_pool);
+
     return rc;
 }
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/test.h b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/test.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/test.h
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/test.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/wince_main.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/wince_main.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/wince_main.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/wince_main.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/wsola_test.c b/sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/wsola_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/wsola_test.c
rename to sflphone-common/libs/pjproject-1.0.3/pjmedia/src/test/wsola_test.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/build/Makefile b/sflphone-common/libs/pjproject-1.0.3/pjnath/build/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/build/Makefile
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/build/Makefile
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjnath.dsp b/sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjnath.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjnath.dsp
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjnath.dsp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjnath.dsw b/sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjnath.dsw
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjnath.dsw
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjnath.dsw
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjnath.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjnath.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjnath.vcproj
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjnath.vcproj
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjnath_test.dsp b/sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjnath_test.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjnath_test.dsp
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjnath_test.dsp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjnath_test.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjnath_test.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjnath_test.vcproj
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjnath_test.vcproj
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjstun_srv_test.dsp b/sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjstun_srv_test.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjstun_srv_test.dsp
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjstun_srv_test.dsp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjstun_srv_test.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjstun_srv_test.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjstun_srv_test.vcproj
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjstun_srv_test.vcproj
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjturn_client.dsp b/sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjturn_client.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjturn_client.dsp
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjturn_client.dsp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjturn_client.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjturn_client.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjturn_client.vcproj
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjturn_client.vcproj
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjturn_srv.dsp b/sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjturn_srv.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjturn_srv.dsp
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/build/pjturn_srv.dsp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/build/wince-evc4/pjnath_test_wince.vcp b/sflphone-common/libs/pjproject-1.0.3/pjnath/build/wince-evc4/pjnath_test_wince.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/build/wince-evc4/pjnath_test_wince.vcp
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/build/wince-evc4/pjnath_test_wince.vcp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/build/wince-evc4/pjnath_wince.vcp b/sflphone-common/libs/pjproject-1.0.3/pjnath/build/wince-evc4/pjnath_wince.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/build/wince-evc4/pjnath_wince.vcp
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/build/wince-evc4/pjnath_wince.vcp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/build/wince-evc4/pjnath_wince.vcw b/sflphone-common/libs/pjproject-1.0.3/pjnath/build/wince-evc4/pjnath_wince.vcw
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/build/wince-evc4/pjnath_wince.vcw
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/build/wince-evc4/pjnath_wince.vcw
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/docs/UML-class-diagram.dia b/sflphone-common/libs/pjproject-1.0.3/pjnath/docs/UML-class-diagram.dia
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/docs/UML-class-diagram.dia
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/docs/UML-class-diagram.dia
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/docs/UML-class-diagram.png b/sflphone-common/libs/pjproject-1.0.3/pjnath/docs/UML-class-diagram.png
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/docs/UML-class-diagram.png
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/docs/UML-class-diagram.png
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/docs/doxygen.cfg b/sflphone-common/libs/pjproject-1.0.3/pjnath/docs/doxygen.cfg
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/docs/doxygen.cfg
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/docs/doxygen.cfg
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/docs/doxygen.css b/sflphone-common/libs/pjproject-1.0.3/pjnath/docs/doxygen.css
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/docs/doxygen.css
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/docs/doxygen.css
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/docs/footer.html b/sflphone-common/libs/pjproject-1.0.3/pjnath/docs/footer.html
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/docs/footer.html
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/docs/footer.html
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/docs/header.html b/sflphone-common/libs/pjproject-1.0.3/pjnath/docs/header.html
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/docs/header.html
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/docs/header.html
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/docs/ice-arch.jpg b/sflphone-common/libs/pjproject-1.0.3/pjnath/docs/ice-arch.jpg
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/docs/ice-arch.jpg
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/docs/ice-arch.jpg
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/docs/stun-arch.jpg b/sflphone-common/libs/pjproject-1.0.3/pjnath/docs/stun-arch.jpg
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/docs/stun-arch.jpg
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/docs/stun-arch.jpg
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath.h
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/config.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/config.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/config.h
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/config.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/errno.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/errno.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/errno.h
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/errno.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/ice_session.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/ice_session.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/ice_session.h
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/ice_session.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/ice_strans.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/ice_strans.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/ice_strans.h
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/ice_strans.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/nat_detect.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/nat_detect.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/nat_detect.h
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/nat_detect.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_auth.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/stun_auth.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_auth.h
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/stun_auth.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_config.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/stun_config.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_config.h
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/stun_config.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_msg.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/stun_msg.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_msg.h
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/stun_msg.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_session.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/stun_session.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_session.h
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/stun_session.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_sock.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/stun_sock.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_sock.h
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/stun_sock.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_transaction.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/stun_transaction.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_transaction.h
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/stun_transaction.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/turn_session.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/turn_session.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/turn_session.h
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/turn_session.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/turn_sock.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/turn_sock.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/turn_sock.h
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/turn_sock.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/types.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/types.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/types.h
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/include/pjnath/types.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/ice_test.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/ice_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/ice_test.c
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/ice_test.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/main.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/main.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/main.c
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/main.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/main_win32.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/main_win32.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/main_win32.c
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/main_win32.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/server.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/server.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/server.c
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/server.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/server.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/server.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/server.h
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/server.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/sess_auth.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/sess_auth.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/sess_auth.c
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/sess_auth.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/stun.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/stun.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/stun.c
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/stun.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/stun_sock_test.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/stun_sock_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/stun_sock_test.c
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/stun_sock_test.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/test.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/test.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/test.c
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/test.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/test.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/test.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/test.h
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/test.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/turn_sock_test.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/turn_sock_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/turn_sock_test.c
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath-test/turn_sock_test.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/errno.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/errno.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/errno.c
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/errno.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/ice_session.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/ice_session.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/ice_session.c
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/ice_session.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/ice_strans.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/ice_strans.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/ice_strans.c
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/ice_strans.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/nat_detect.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/nat_detect.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/nat_detect.c
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/nat_detect.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_auth.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/stun_auth.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_auth.c
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/stun_auth.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_msg.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/stun_msg.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_msg.c
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/stun_msg.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_msg_dump.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/stun_msg_dump.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_msg_dump.c
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/stun_msg_dump.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_session.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/stun_session.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_session.c
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/stun_session.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_sock.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/stun_sock.c
similarity index 97%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_sock.c
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/stun_sock.c
index 40ab8ad5891db05fb1f8a91045fb6558b84ee279..90b32e50c126debb55c85571044e786df21cefff 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_sock.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/stun_sock.c
@@ -1,4 +1,4 @@
-/* $Id: stun_sock.c 2531 2009-03-23 13:02:53Z bennylp $ */
+/* $Id: stun_sock.c 2808 2009-06-25 12:42:03Z bennylp $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -534,8 +534,17 @@ PJ_DEF(pj_status_t) pj_stun_sock_get_info( pj_stun_sock *stun_sock,
 	info->alias_cnt = 1;
 	pj_sockaddr_cp(&info->aliases[0], &info->bound_addr);
     } else {
+	pj_sockaddr def_addr;
+	pj_uint16_t port = pj_sockaddr_get_port(&info->bound_addr); 
 	unsigned i;
 
+	/* Get the default address */
+	status = pj_gethostip(stun_sock->af, &def_addr);
+	if (status != PJ_SUCCESS)
+	    return status;
+	
+	pj_sockaddr_set_port(&def_addr, port);
+	
 	/* Enum all IP interfaces in the host */
 	info->alias_cnt = PJ_ARRAY_SIZE(info->aliases);
 	status = pj_enum_ip_interface(stun_sock->af, &info->alias_cnt, 
@@ -545,10 +554,18 @@ PJ_DEF(pj_status_t) pj_stun_sock_get_info( pj_stun_sock *stun_sock,
 
 	/* Set the port number for each address.
 	 */
-	if (stun_sock->af == pj_AF_INET()) {
-	    for (i=0; i<info->alias_cnt; ++i) {
-		pj_sockaddr_set_port(&info->aliases[i],
-				     pj_sockaddr_get_port(&info->bound_addr));
+	for (i=0; i<info->alias_cnt; ++i) {
+	    pj_sockaddr_set_port(&info->aliases[i], port);
+	}
+
+	/* Put the default IP in the first slot */
+	for (i=0; i<info->alias_cnt; ++i) {
+	    if (pj_sockaddr_cmp(&info->aliases[i], &def_addr)==0) {
+		if (i!=0) {
+		    pj_sockaddr_cp(&info->aliases[i], &info->aliases[0]);
+		    pj_sockaddr_cp(&info->aliases[0], &def_addr);
+		}
+		break;
 	    }
 	}
     }
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_transaction.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/stun_transaction.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_transaction.c
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/stun_transaction.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/turn_session.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/turn_session.c
similarity index 99%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/turn_session.c
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/turn_session.c
index 1edb2f944e7c911123a99b499754fffd77cf2bfd..43801fe7f48fc3c38ba1271b3a4fbc0dd0162fdb 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/turn_session.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/turn_session.c
@@ -1,4 +1,4 @@
-/* $Id: turn_session.c 2407 2009-01-01 20:56:36Z bennylp $ */
+/* $Id: turn_session.c 2810 2009-06-25 12:53:14Z bennylp $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -638,9 +638,10 @@ PJ_DEF(pj_status_t) pj_turn_session_alloc(pj_turn_session *sess,
 
     pj_lock_acquire(sess->lock);
 
+    if (param && param != &sess->alloc_param) 
+	pj_turn_alloc_param_copy(sess->pool, &sess->alloc_param, param);
+
     if (sess->state < PJ_TURN_STATE_RESOLVED) {
-	if (param && param != &sess->alloc_param) 
-	    pj_turn_alloc_param_copy(sess->pool, &sess->alloc_param, param);
 	sess->pending_alloc = PJ_TRUE;
 
 	PJ_LOG(4,(sess->obj_name, "Pending ALLOCATE in state %s",
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/turn_sock.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/turn_sock.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/turn_sock.c
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjnath/turn_sock.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-client/client_main.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-client/client_main.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-client/client_main.c
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-client/client_main.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/allocation.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-srv/allocation.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/allocation.c
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-srv/allocation.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/auth.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-srv/auth.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/auth.c
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-srv/auth.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/auth.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-srv/auth.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/auth.h
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-srv/auth.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/listener_tcp.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-srv/listener_tcp.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/listener_tcp.c
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-srv/listener_tcp.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/listener_udp.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-srv/listener_udp.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/listener_udp.c
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-srv/listener_udp.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/main.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-srv/main.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/main.c
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-srv/main.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/server.c b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-srv/server.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/server.c
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-srv/server.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/turn.h b/sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-srv/turn.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/turn.h
rename to sflphone-common/libs/pjproject-1.0.3/pjnath/src/pjturn-srv/turn.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjproject-vs8.sln b/sflphone-common/libs/pjproject-1.0.3/pjproject-vs8.sln
similarity index 97%
rename from sflphone-common/libs/pjproject-1.0.2/pjproject-vs8.sln
rename to sflphone-common/libs/pjproject-1.0.3/pjproject-vs8.sln
index 3bd34e2527a35efbe218c8895f6310fad3f78cb4..c7662a8d0c11ddb98b4d459440268081b1a3d238 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjproject-vs8.sln
+++ b/sflphone-common/libs/pjproject-1.0.3/pjproject-vs8.sln
@@ -103,8 +103,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjnath", "pjnath\build\pjna
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgsmcodec", "third_party\build\gsm\libgsmcodec.vcproj", "{E53AA5FF-B737-40AA-BD13-387EFA99023D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libilbccodec", "third_party\build\ilbc\libilbccodec.vcproj", "{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libportaudio", "third_party\build\portaudio\libportaudio.vcproj", "{3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libresample", "third_party\build\resample\libresample.vcproj", "{6794B975-4E84-4F49-B2DC-C31F2224E03E}"
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjproject.dsw b/sflphone-common/libs/pjproject-1.0.3/pjproject.dsw
similarity index 91%
rename from sflphone-common/libs/pjproject-1.0.2/pjproject.dsw
rename to sflphone-common/libs/pjproject-1.0.3/pjproject.dsw
index 069bebdd373e455cc825bdf1122851df3176ad5d..3041ac2cf9e28bf875d1fc4af476aa731d610402 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjproject.dsw
+++ b/sflphone-common/libs/pjproject-1.0.3/pjproject.dsw
@@ -15,18 +15,6 @@ Package=<4>
 
 ###############################################################################
 
-Project: "libilbccodec"=.\THIRD_PARTY\BUILD\ILBC\libilbccodec.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
 Project: "libportaudio"=.\THIRD_PARTY\BUILD\PORTAUDIO\libportaudio.dsp - Package Owner=<4>
 
 Package=<5>
@@ -180,9 +168,6 @@ Package=<4>
     Project_Dep_Name libgsmcodec
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libilbccodec
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name libportaudio
     End Project Dependency
     Begin Project Dependency
@@ -321,9 +306,6 @@ Package=<4>
     Project_Dep_Name libgsmcodec
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libilbccodec
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name libportaudio
     End Project Dependency
     Begin Project Dependency
@@ -429,9 +411,6 @@ Package=<4>
     Project_Dep_Name libgsmcodec
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libilbccodec
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name libportaudio
     End Project Dependency
     Begin Project Dependency
@@ -486,9 +465,6 @@ Package=<4>
     Project_Dep_Name libgsmcodec
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libilbccodec
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name libportaudio
     End Project Dependency
     Begin Project Dependency
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/bin/samples/hack b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/bin/samples/hack
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/bin/samples/hack
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/bin/samples/hack
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/Footprint.mak b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/Footprint.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/Footprint.mak
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/Footprint.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/Makefile b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/Makefile
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/Makefile
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/Samples-vc.mak b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/Samples-vc.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/Samples-vc.mak
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/Samples-vc.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/Samples.mak b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/Samples.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/Samples.mak
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/Samples.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/get-footprint.py b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/get-footprint.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/get-footprint.py
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/get-footprint.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/os-win32.mak b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/os-win32.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/os-win32.mak
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/os-win32.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/pjsip_apps.dsw b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/pjsip_apps.dsw
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/pjsip_apps.dsw
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/pjsip_apps.dsw
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/pjsua.dsp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/pjsua.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/pjsua.dsp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/pjsua.dsp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/pjsua.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/pjsua.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/pjsua.vcproj
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/pjsua.vcproj
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/py_pjsua.dsp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/py_pjsua.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/py_pjsua.dsp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/py_pjsua.dsp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/py_pjsua.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/py_pjsua.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/py_pjsua.vcproj
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/py_pjsua.vcproj
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/python_pjsua.dsp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/python_pjsua.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/python_pjsua.dsp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/python_pjsua.dsp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/sample_debug.dsp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/sample_debug.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/sample_debug.dsp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/sample_debug.dsp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/sample_debug.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/sample_debug.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/sample_debug.vcproj
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/sample_debug.vcproj
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/samples.dsp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/samples.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/samples.dsp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/samples.dsp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/samples.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/samples.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/samples.vcproj
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/samples.vcproj
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/wince-evc4/wince_demos.vcw b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/wince-evc4/wince_demos.vcw
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/wince-evc4/wince_demos.vcw
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/build/wince-evc4/wince_demos.vcw
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua/main.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua/main.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua/main.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua/main.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua/main_rtems.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua/main_rtems.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua/main_rtems.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua/main_rtems.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua/pjsua_app.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua/pjsua_app.c
similarity index 99%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua/pjsua_app.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua/pjsua_app.c
index ad3df904b6be652071afa52bbee19643f0af50b0..654d06100a36e95456096f52eb688a13fef3c20a 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua/pjsua_app.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua/pjsua_app.c
@@ -1,4 +1,4 @@
-/* $Id: pjsua_app.c 2544 2009-03-23 13:23:20Z bennylp $ */
+/* $Id: pjsua_app.c 2818 2009-06-25 13:27:02Z bennylp $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -3131,14 +3131,16 @@ void console_app_main(const pj_str_t *uri_to_call)
 		} else {
 		    pjsua_buddy_info binfo;
 		    pjsua_buddy_get_info(result.nb_result-1, &binfo);
-		    uri = binfo.uri.ptr;
+		    tmp.ptr = buf;
+		    pj_strncpy(&tmp, &binfo.uri, sizeof(buf));
 		}
 
 	    } else if (result.uri_result) {
-		uri = result.uri_result;
+		tmp = pj_str(result.uri_result);
+	    } else {
+		tmp.slen = 0;
 	    }
 	    
-	    tmp = pj_str(uri);
 	    pjsua_call_make_call( current_acc, &tmp, 0, NULL, NULL, NULL);
 	    break;
 
@@ -3162,15 +3164,15 @@ void console_app_main(const pj_str_t *uri_to_call)
 		    continue;
 		}
 		pjsua_buddy_get_info(result.nb_result-1, &binfo);
-		uri = binfo.uri.ptr;
+		tmp.ptr = buf;
+		pj_strncpy(&tmp, &binfo.uri, sizeof(buf));
 	    } else {
-		uri =  result.uri_result;
+		tmp = pj_str(result.uri_result);
 	    }
 
 	    for (i=0; i<my_atoi(menuin); ++i) {
 		pj_status_t status;
 	    
-		tmp = pj_str(uri);
 		status = pjsua_call_make_call(current_acc, &tmp, 0, NULL,
 					      NULL, NULL);
 		if (status != PJ_SUCCESS)
@@ -3208,7 +3210,9 @@ void console_app_main(const pj_str_t *uri_to_call)
 		} else {
 		    pjsua_buddy_info binfo;
 		    pjsua_buddy_get_info(result.nb_result-1, &binfo);
-		    uri = binfo.uri.ptr;
+		    tmp.ptr = buf;
+		    pj_strncpy_with_null(&tmp, &binfo.uri, sizeof(buf));
+		    uri = buf;
 		}
 
 	    } else if (result.uri_result) {
@@ -3759,22 +3763,39 @@ void console_app_main(const pj_str_t *uri_to_call)
 	    ui_input_url("Destination URI", buf, sizeof(buf), &result);
 	    if (result.nb_result != NO_NB) {
 
-		if (result.nb_result == -1 || result.nb_result == 0) {
+		if (result.nb_result == -1) {
 		    puts("Sorry you can't do that!");
 		    continue;
+		} else if (result.nb_result == 0) {
+		    uri = NULL;
+		    if (current_call == PJSUA_INVALID_ID) {
+			puts("No current call");
+			continue;
+		    }
 		} else {
 		    pjsua_buddy_info binfo;
 		    pjsua_buddy_get_info(result.nb_result-1, &binfo);
-		    uri = binfo.uri.ptr;
+		    tmp.ptr = buf;
+		    pj_strncpy_with_null(&tmp, &binfo.uri, sizeof(buf));
+		    uri = buf;
 		}
 
 	    } else if (result.uri_result) {
 		uri = result.uri_result;
 	    }
 	    
-	    tmp = pj_str(uri);
-
-	    send_request(text, &tmp);
+	    if (uri) {
+		tmp = pj_str(uri);
+		send_request(text, &tmp);
+	    } else {
+		/* If you send call control request using this method
+		 * (such requests includes BYE, CANCEL, etc.), it will
+		 * not go well with the call state, so don't do it
+		 * unless it's for testing.
+		 */
+		pj_str_t method = pj_str(text);
+		pjsua_call_send_request(current_call, &method, NULL);
+	    }
 	    break;
 
 	case 'e':
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/README.TXT b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/README.TXT
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/README.TXT
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/README.TXT
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/StdAfx.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/StdAfx.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/StdAfx.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/StdAfx.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/StdAfx.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/StdAfx.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/StdAfx.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/StdAfx.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/newres.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/newres.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/newres.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/newres.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/pjsua_wince.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/pjsua_wince.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/pjsua_wince.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/pjsua_wince.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/pjsua_wince.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/pjsua_wince.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/pjsua_wince.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/pjsua_wince.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/pjsua_wince.ico b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/pjsua_wince.ico
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/pjsua_wince.ico
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/pjsua_wince.ico
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/pjsua_wince.rc b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/pjsua_wince.rc
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/pjsua_wince.rc
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/pjsua_wince.rc
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/pjsua_wince.vcp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/pjsua_wince.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/pjsua_wince.vcp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/pjsua_wince.vcp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/resource.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/resource.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/resource.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pjsua_wince/resource.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PocketPJ.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PocketPJ.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PocketPJ.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PocketPJ.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.rc b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PocketPJ.rc
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.rc
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PocketPJ.rc
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.vcc b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PocketPJ.vcc
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.vcc
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PocketPJ.vcc
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.vcp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PocketPJ.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.vcp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PocketPJ.vcp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.vcw b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PocketPJ.vcw
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.vcw
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PocketPJ.vcw
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJDlg.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PocketPJDlg.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJDlg.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PocketPJDlg.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJDlg.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PocketPJDlg.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJDlg.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PocketPJDlg.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PopUpWnd.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PopUpWnd.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PopUpWnd.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PopUpWnd.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PopUpWnd.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PopUpWnd.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PopUpWnd.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/PopUpWnd.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/ReadMe.txt b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/ReadMe.txt
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/ReadMe.txt
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/ReadMe.txt
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/SettingsDlg.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/SettingsDlg.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/SettingsDlg.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/SettingsDlg.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/SettingsDlg.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/SettingsDlg.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/SettingsDlg.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/SettingsDlg.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/StdAfx.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/StdAfx.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/StdAfx.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/StdAfx.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/StdAfx.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/StdAfx.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/StdAfx.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/StdAfx.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/newres.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/newres.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/newres.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/newres.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/PocketPJ.ico b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/PocketPJ.ico
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/PocketPJ.ico
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/PocketPJ.ico
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/PocketPJ.rc2 b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/PocketPJ.rc2
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/PocketPJ.rc2
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/PocketPJ.rc2
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/action.bmp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/action.bmp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/action.bmp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/action.bmp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/blank.bmp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/blank.bmp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/blank.bmp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/blank.bmp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/invisibl.bmp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/invisibl.bmp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/invisibl.bmp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/invisibl.bmp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/invisibl.ico b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/invisibl.ico
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/invisibl.ico
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/invisibl.ico
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/offline.bmp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/offline.bmp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/offline.bmp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/offline.bmp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/offline.ico b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/offline.ico
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/offline.ico
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/offline.ico
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/online.bmp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/online.bmp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/online.bmp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/online.bmp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/online.ico b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/online.ico
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/online.ico
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/res/online.ico
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/resource.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/resource.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/resource.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/pocketpj/resource.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/DEPRECATED.txt b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/DEPRECATED.txt
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/DEPRECATED.txt
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/DEPRECATED.txt
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/Makefile b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/Makefile
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/Makefile
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/helper.mak b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/helper.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/helper.mak
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/helper.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/pjsua.py b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/pjsua.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/pjsua.py
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/pjsua.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/pjsua_app.py b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/pjsua_app.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/pjsua_app.py
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/pjsua_app.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/py_pjsua.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/py_pjsua.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/py_pjsua.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/py_pjsua.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/py_pjsua.def b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/py_pjsua.def
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/py_pjsua.def
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/py_pjsua.def
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/py_pjsua.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/py_pjsua.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/py_pjsua.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/py_pjsua.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/setup.py b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/setup.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/setup.py
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/py_pjsua/setup.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/Makefile b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/Makefile
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/Makefile
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/_pjsua.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/_pjsua.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/_pjsua.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/_pjsua.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/_pjsua.def b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/_pjsua.def
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/_pjsua.def
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/_pjsua.def
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/_pjsua.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/_pjsua.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/_pjsua.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/_pjsua.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/helper.mak b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/helper.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/helper.mak
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/helper.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/pjsua.py b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/pjsua.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/pjsua.py
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/pjsua.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/samples/call.py b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/samples/call.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/samples/call.py
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/samples/call.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/samples/presence.py b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/samples/presence.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/samples/presence.py
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/samples/presence.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/samples/registration.py b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/samples/registration.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/samples/registration.py
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/samples/registration.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/samples/simplecall.py b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/samples/simplecall.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/samples/simplecall.py
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/samples/simplecall.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/setup-vc.py b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/setup-vc.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/setup-vc.py
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/setup-vc.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/setup.py b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/setup.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/setup.py
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/python/setup.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/aectest.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/aectest.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/aectest.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/aectest.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/confbench.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/confbench.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/confbench.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/confbench.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/confsample.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/confsample.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/confsample.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/confsample.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/debug.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/debug.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/debug.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/debug.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/encdec.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/encdec.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/encdec.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/encdec.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/footprint.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/footprint.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/footprint.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/footprint.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/invtester.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/invtester.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/invtester.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/invtester.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/latency.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/latency.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/latency.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/latency.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/level.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/level.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/level.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/level.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/main_rtems.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/main_rtems.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/main_rtems.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/main_rtems.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/mix.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/mix.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/mix.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/mix.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/pcaputil.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/pcaputil.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/pcaputil.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/pcaputil.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/pjsip-perf.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/pjsip-perf.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/pjsip-perf.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/pjsip-perf.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/playfile.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/playfile.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/playfile.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/playfile.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/playsine.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/playsine.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/playsine.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/playsine.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/proxy.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/proxy.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/proxy.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/proxy.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/recfile.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/recfile.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/recfile.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/recfile.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/resampleplay.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/resampleplay.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/resampleplay.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/resampleplay.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/simple_pjsua.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/simple_pjsua.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/simple_pjsua.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/simple_pjsua.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/simpleua.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/simpleua.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/simpleua.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/simpleua.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/siprtp.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/siprtp.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/siprtp.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/siprtp.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/siprtp_report.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/siprtp_report.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/siprtp_report.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/siprtp_report.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/sipstateless.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/sipstateless.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/sipstateless.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/sipstateless.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/sndinfo.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/sndinfo.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/sndinfo.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/sndinfo.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/sndtest.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/sndtest.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/sndtest.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/sndtest.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/stateful_proxy.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/stateful_proxy.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/stateful_proxy.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/stateful_proxy.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/stateless_proxy.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/stateless_proxy.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/stateless_proxy.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/stateless_proxy.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/stereotest.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/stereotest.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/stereotest.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/stereotest.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/streamutil.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/streamutil.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/streamutil.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/streamutil.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/strerror.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/strerror.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/strerror.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/strerror.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/tonegen.c b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/tonegen.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/tonegen.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/tonegen.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/util.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/util.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/util.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/samples/util.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua/main_symbian.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua/main_symbian.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua/main_symbian.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua/main_symbian.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua/symbian_ua_reg.rss b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua/symbian_ua_reg.rss
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua/symbian_ua_reg.rss
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua/symbian_ua_reg.rss
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua/ua.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua/ua.cpp
similarity index 97%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua/ua.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua/ua.cpp
index 6e790f246d61316afcd7f7edcd995f0af709dbc4..4ca32b66f5f3587cf43997d3abbf530b8856e7df 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua/ua.cpp
+++ b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua/ua.cpp
@@ -1,4 +1,4 @@
-/* $Id: ua.cpp 2482 2009-03-02 15:50:12Z nanang $ */
+/* $Id: ua.cpp 2804 2009-06-25 12:26:15Z bennylp $ */
 /*
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -49,6 +49,10 @@
 #define SIP_PROXY	NULL
 //#define SIP_PROXY	"<sip:192.168.0.8;lr>"
 
+//
+// Set to 1 if TCP is desired (experimental)
+//
+#define ENABLE_SIP_TCP	0
 
 //
 // Configure nameserver if DNS SRV is to be used with both SIP
@@ -401,11 +405,27 @@ static pj_status_t app_startup()
     status = pjsua_transport_create (PJSIP_TRANSPORT_UDP, &tcfg, &tid);
 
     if (status != PJ_SUCCESS) {
-        pjsua_perror (THIS_FILE, "Error creating transport", status);
+        pjsua_perror (THIS_FILE, "Error creating UDP transport", status);
+        pjsua_destroy();
+        return status;
+    }
+
+    /* Add TCP transport */
+#if ENABLE_SIP_TCP
+    pjsua_transport_config_default (&tcfg);
+
+    tcfg.port = SIP_PORT;
+
+    status = pjsua_transport_create (PJSIP_TRANSPORT_TCP, &tcfg, &tid);
+
+    if (status != PJ_SUCCESS) {
+        pjsua_perror (THIS_FILE, "Error creating TCP transport", status);
         pjsua_destroy();
         return status;
     }
 
+#endif
+
     /* Add account for the transport */
     pjsua_acc_add_local (tid, PJ_TRUE, &g_acc_id);
 
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua/ua.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua/ua.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua/ua.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua/ua.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/application.uidesign b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/application.uidesign
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/application.uidesign
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/application.uidesign
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.l01 b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.l01
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.l01
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.l01
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.loc b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.loc
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.loc
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.loc
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.rss b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.rss
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.rss
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.rss
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.l01 b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.l01
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.l01
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.l01
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.loc b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.loc
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.loc
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.loc
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.rssi b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.rssi
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.rssi
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.rssi
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.l01 b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.l01
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.l01
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.l01
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.loc b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.loc
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.loc
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.loc
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.rssi b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.rssi
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.rssi
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.rssi
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.loc b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.loc
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.loc
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.loc
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.rss b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.rss
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.rss
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.rss
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/gfx/list_icon.bmp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/gfx/list_icon.bmp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/gfx/list_icon.bmp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/gfx/list_icon.bmp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/gfx/list_icon_mask.bmp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/gfx/list_icon_mask.bmp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/gfx/list_icon_mask.bmp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/gfx/list_icon_mask.bmp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon.bmp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon.bmp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon.bmp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon.bmp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon_mask.bmp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon_mask.bmp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon_mask.bmp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon_mask.bmp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/gfx/qgn_menu_symbian_ua_gui.svg b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/gfx/qgn_menu_symbian_ua_gui.svg
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/gfx/qgn_menu_symbian_ua_gui.svg
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/gfx/qgn_menu_symbian_ua_gui.svg
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/group/ABLD.BAT b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/group/ABLD.BAT
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/group/ABLD.BAT
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/group/ABLD.BAT
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/group/Icons_aif_scalable_dc.mk b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/group/Icons_aif_scalable_dc.mk
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/group/Icons_aif_scalable_dc.mk
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/group/Icons_aif_scalable_dc.mk
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/group/bld.inf b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/group/bld.inf
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/group/bld.inf
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/group/bld.inf
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/Symbian_ua_guiSettingItemListSettings.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/Symbian_ua_guiSettingItemListSettings.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/Symbian_ua_guiSettingItemListSettings.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/Symbian_ua_guiSettingItemListSettings.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.hrh b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.hrh
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.hrh
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.hrh
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.pan b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.pan
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.pan
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.pan
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiAppUi.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiAppUi.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiAppUi.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiAppUi.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiApplication.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiApplication.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiApplication.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiApplication.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.hrh b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.hrh
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.hrh
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.hrh
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainerView.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainerView.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainerView.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainerView.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiDocument.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiDocument.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiDocument.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiDocument.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.hrh b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.hrh
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.hrh
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.hrh
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemListView.h b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemListView.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemListView.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemListView.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.pkg b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.pkg
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.pkg
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.pkg
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.txt b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.txt
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.txt
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.txt
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/Symbian_ua_guiSettingItemListSets.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/Symbian_ua_guiSettingItemListSets.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/Symbian_ua_guiSettingItemListSets.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/Symbian_ua_guiSettingItemListSets.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiAppUi.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiAppUi.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiAppUi.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiAppUi.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiApplication.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiApplication.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiApplication.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiApplication.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainer.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainer.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainer.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainer.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainerView.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainerView.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainerView.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainerView.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiDocument.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiDocument.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiDocument.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiDocument.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemList.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemList.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemList.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemList.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemListView.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemListView.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemListView.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemListView.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiContainer.uidesign b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiContainer.uidesign
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiContainer.uidesign
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiContainer.uidesign
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiSettingItemList.uidesign b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiSettingItemList.uidesign
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiSettingItemList.uidesign
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiSettingItemList.uidesign
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symsndtest/app_main.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symsndtest/app_main.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symsndtest/app_main.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symsndtest/app_main.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symsndtest/main_symbian.cpp b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symsndtest/main_symbian.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symsndtest/main_symbian.cpp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symsndtest/main_symbian.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symsndtest/symsndtest_reg.rss b/sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symsndtest/symsndtest_reg.rss
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symsndtest/symsndtest_reg.rss
rename to sflphone-common/libs/pjproject-1.0.3/pjsip-apps/src/symsndtest/symsndtest_reg.rss
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/Makefile b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/Makefile
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/Makefile
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/os-auto.mak.in b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/os-auto.mak.in
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/os-auto.mak.in
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/os-auto.mak.in
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/os-rtems.mak b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/os-rtems.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/os-rtems.mak
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/os-rtems.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip.dsw b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsip.dsw
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip.dsw
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsip.dsw
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_core.dsp b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsip_core.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_core.dsp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsip_core.dsp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_core.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsip_core.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_core.vcproj
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsip_core.vcproj
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_simple.dsp b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsip_simple.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_simple.dsp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsip_simple.dsp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_simple.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsip_simple.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_simple.vcproj
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsip_simple.vcproj
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_ua.dsp b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsip_ua.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_ua.dsp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsip_ua.dsp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_ua.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsip_ua.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_ua.vcproj
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsip_ua.vcproj
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsua_lib.dsp b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsua_lib.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsua_lib.dsp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsua_lib.dsp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsua_lib.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsua_lib.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsua_lib.vcproj
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/pjsua_lib.vcproj
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/test_pjsip.dsp b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/test_pjsip.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/test_pjsip.dsp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/test_pjsip.dsp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/test_pjsip.vcproj b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/test_pjsip.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/test_pjsip.vcproj
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/test_pjsip.vcproj
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/pjsip_core_wince.vcp b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/wince-evc4/pjsip_core_wince.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/pjsip_core_wince.vcp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/wince-evc4/pjsip_core_wince.vcp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/pjsip_simple_wince.vcp b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/wince-evc4/pjsip_simple_wince.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/pjsip_simple_wince.vcp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/wince-evc4/pjsip_simple_wince.vcp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/pjsip_ua_wince.vcp b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/wince-evc4/pjsip_ua_wince.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/pjsip_ua_wince.vcp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/wince-evc4/pjsip_ua_wince.vcp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/pjsip_wince.vcw b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/wince-evc4/pjsip_wince.vcw
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/pjsip_wince.vcw
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/wince-evc4/pjsip_wince.vcw
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/pjsua_lib_wince.vcp b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/wince-evc4/pjsua_lib_wince.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/pjsua_lib_wince.vcp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/wince-evc4/pjsua_lib_wince.vcp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/test_pjsip_wince.vcp b/sflphone-common/libs/pjproject-1.0.3/pjsip/build/wince-evc4/test_pjsip_wince.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/test_pjsip_wince.vcp
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/build/wince-evc4/test_pjsip_wince.vcp
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/docs/PJSUA-TESTING.txt b/sflphone-common/libs/pjproject-1.0.3/pjsip/docs/PJSUA-TESTING.txt
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/docs/PJSUA-TESTING.txt
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/docs/PJSUA-TESTING.txt
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/docs/TRANSPORT-PROBLEMS.TXT b/sflphone-common/libs/pjproject-1.0.3/pjsip/docs/TRANSPORT-PROBLEMS.TXT
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/docs/TRANSPORT-PROBLEMS.TXT
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/docs/TRANSPORT-PROBLEMS.TXT
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/docs/doxygen.cfg b/sflphone-common/libs/pjproject-1.0.3/pjsip/docs/doxygen.cfg
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/docs/doxygen.cfg
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/docs/doxygen.cfg
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/docs/doxygen.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/docs/doxygen.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/docs/doxygen.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/docs/doxygen.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/docs/footer.html b/sflphone-common/libs/pjproject-1.0.3/pjsip/docs/footer.html
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/docs/footer.html
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/docs/footer.html
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/docs/header.html b/sflphone-common/libs/pjproject-1.0.3/pjsip/docs/header.html
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/docs/header.html
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/docs/header.html
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/docs/pjsip-arch.jpg b/sflphone-common/libs/pjproject-1.0.3/pjsip/docs/pjsip-arch.jpg
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/docs/pjsip-arch.jpg
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/docs/pjsip-arch.jpg
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/docs/pjsip-perf.jpg b/sflphone-common/libs/pjproject-1.0.3/pjsip/docs/pjsip-perf.jpg
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/docs/pjsip-perf.jpg
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/docs/pjsip-perf.jpg
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/docs/pjsua.jpg b/sflphone-common/libs/pjproject-1.0.3/pjsip/docs/pjsua.jpg
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/docs/pjsua.jpg
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/docs/pjsua.jpg
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/docs/siprtp.jpg b/sflphone-common/libs/pjproject-1.0.3/pjsip/docs/siprtp.jpg
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/docs/siprtp.jpg
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/docs/siprtp.jpg
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/errno.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/errno.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/errno.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/errno.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/evsub.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/evsub.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/evsub.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/evsub.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/evsub_msg.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/evsub_msg.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/evsub_msg.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/evsub_msg.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/iscomposing.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/iscomposing.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/iscomposing.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/iscomposing.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/pidf.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/pidf.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/pidf.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/pidf.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/presence.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/presence.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/presence.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/presence.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/publish.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/publish.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/publish.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/publish.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/rpid.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/rpid.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/rpid.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/rpid.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/types.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/types.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/types.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/types.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/xpidf.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/xpidf.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/xpidf.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-simple/xpidf.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-ua/sip_100rel.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-ua/sip_100rel.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-ua/sip_100rel.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-ua/sip_100rel.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-ua/sip_inv.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-ua/sip_inv.h
similarity index 95%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-ua/sip_inv.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-ua/sip_inv.h
index f4066b4fa7a96cf5f598e127c97b27aa8afb1832..532eeb57d24218034c34e5f05d66a2ceb6ec1532 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-ua/sip_inv.h
+++ b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-ua/sip_inv.h
@@ -1,4 +1,4 @@
-/* $Id: sip_inv.h 2394 2008-12-23 17:27:53Z bennylp $ */
+/* $Id: sip_inv.h 2799 2009-06-25 10:58:13Z bennylp $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -653,16 +653,32 @@ PJ_DECL(pj_status_t) pjsip_inv_set_sdp_answer(pjsip_inv_session *inv,
 /**
  * Create a SIP message to initiate invite session termination. Depending on 
  * the state of the session, this function may return CANCEL request, 
- * a non-2xx final response, or a BYE request. If the session has not answered
- * the incoming INVITE, this function creates the non-2xx final response with 
- * the specified status code in st_code and optional status text in st_text.
+ * a non-2xx final response, a BYE request, or even no request. 
+ *
+ * For UAS, if the session has not answered the incoming INVITE, this function
+ * creates the non-2xx final response with the specified status code in 
+ * \a st_code and optional status text in \a st_text. 
+ *
+ * For UAC, if the original INVITE has not been answered with a final 
+ * response, the behavior depends on whether provisional response has been
+ * received. If provisional response has been received, this function will
+ * create CANCEL request. If no provisional response has been received, the
+ * function will not create CANCEL request (the function will return 
+ * PJ_SUCCESS but the \a p_tdata will contain NULL) because we cannot send
+ * CANCEL before receiving provisional response. If then a provisional
+ * response is received, the invite session will send CANCEL automatically.
+ * 
+ * For both UAC and UAS, if the INVITE session has been answered with final
+ * response, a BYE request will be created.
  *
  * @param inv		The invite session.
  * @param st_code	Status code to be used for terminating the session.
  * @param st_text	Optional status text.
- * @param p_tdata	Pointer to receive the message to be created.
+ * @param p_tdata	Pointer to receive the message to be created. Note
+ *			that it's possible to receive NULL here while the
+ *			function returns PJ_SUCCESS, see the description.
  *
- * @return		PJ_SUCCESS if termination message can be created.
+ * @return		PJ_SUCCESS if termination is initiated.
  */
 PJ_DECL(pj_status_t) pjsip_inv_end_session( pjsip_inv_session *inv,
 					    int st_code,
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-ua/sip_regc.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-ua/sip_regc.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-ua/sip_regc.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-ua/sip_regc.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-ua/sip_replaces.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-ua/sip_replaces.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-ua/sip_replaces.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-ua/sip_replaces.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-ua/sip_xfer.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-ua/sip_xfer.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-ua/sip_xfer.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip-ua/sip_xfer.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/print_util.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/print_util.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/print_util.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/print_util.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_auth.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_auth.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_auth.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_auth.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_auth_aka.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_auth_aka.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_auth_aka.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_auth_aka.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_auth_msg.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_auth_msg.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_auth_msg.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_auth_msg.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_auth_parser.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_auth_parser.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_auth_parser.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_auth_parser.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_autoconf.h.in b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_autoconf.h.in
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_autoconf.h.in
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_autoconf.h.in
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_config.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_config.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_config.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_config.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_dialog.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_dialog.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_dialog.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_dialog.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_endpoint.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_endpoint.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_endpoint.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_endpoint.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_errno.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_errno.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_errno.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_errno.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_event.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_event.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_event.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_event.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_module.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_module.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_module.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_module.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_msg.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_msg.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_msg.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_msg.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_parser.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_parser.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_parser.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_parser.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_private.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_private.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_private.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_private.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_resolve.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_resolve.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_resolve.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_resolve.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_tel_uri.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_tel_uri.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_tel_uri.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_tel_uri.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transaction.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_transaction.h
similarity index 92%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transaction.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_transaction.h
index 98d40f49fa6f63f46bb09fbef7c69b860b9e6591..3c7f1bca4ec5db27d0676b1a8f5a49f21d50a360 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transaction.h
+++ b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_transaction.h
@@ -1,4 +1,4 @@
-/* $Id: sip_transaction.h 2394 2008-12-23 17:27:53Z bennylp $ */
+/* $Id: sip_transaction.h 2798 2009-06-25 10:48:08Z bennylp $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -311,7 +311,6 @@ PJ_DECL(pj_status_t) pjsip_tsx_create_key( pj_pool_t *pool,
 				           const pjsip_method *method,
 				           const pjsip_rx_data *rdata );
 
-
 /**
  * Force terminate transaction.
  *
@@ -330,10 +329,38 @@ PJ_DECL(pj_status_t) pjsip_tsx_terminate( pjsip_transaction *tsx,
  * This operation normally is used for INVITE transaction only, when
  * the transaction is cancelled before any provisional response has been
  * received.
+ *
+ * @param tsx       The transaction.
+ *
+ * @return          PJ_SUCCESS or the appropriate error code.
  */
 PJ_DECL(pj_status_t) pjsip_tsx_stop_retransmit(pjsip_transaction *tsx);
 
 
+/**
+ * Start a timer to terminate transaction after the specified time
+ * has elapsed. This function is only valid for INVITE transaction,
+ * and only before final response is received for the INVITE transaction.
+ * It is normally called after the UAC has sent CANCEL for this
+ * INVITE transaction. 
+ *
+ * The purpose of this function is to terminate the transaction if UAS 
+ * does not send final response to this INVITE transaction even after 
+ * it sends 200/OK to CANCEL (for example when the UAS complies to RFC
+ * 2543).
+ *
+ * Once this timer is set, the transaction will be terminated either when
+ * a final response is received or the timer expires.
+ *
+ * @param tsx       The transaction.
+ * @param millisec  Timeout value in milliseconds.
+ *
+ * @return          PJ_SUCCESS or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsip_tsx_set_timeout(pjsip_transaction *tsx,
+					   unsigned millisec);
+
+
 /**
  * Get the transaction instance in the incoming message. If the message
  * has a corresponding transaction, this function will return non NULL
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transport.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_transport.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transport.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_transport.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transport_loop.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_transport_loop.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transport_loop.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_transport_loop.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transport_tcp.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_transport_tcp.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transport_tcp.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_transport_tcp.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transport_tls.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_transport_tls.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transport_tls.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_transport_tls.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transport_udp.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_transport_udp.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transport_udp.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_transport_udp.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_types.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_types.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_types.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_types.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_ua_layer.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_ua_layer.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_ua_layer.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_ua_layer.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_uri.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_uri.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_uri.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_uri.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_util.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_util.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_util.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_util.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip_auth.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip_auth.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip_auth.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip_auth.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip_simple.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip_simple.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip_simple.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip_simple.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip_ua.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip_ua.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip_ua.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsip_ua.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsua-lib/pjsua.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsua-lib/pjsua.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsua-lib/pjsua.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsua-lib/pjsua.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsua-lib/pjsua_internal.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsua-lib/pjsua_internal.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsua-lib/pjsua_internal.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/include/pjsua-lib/pjsua_internal.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/errno.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/errno.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/errno.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/errno.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/evsub.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/evsub.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/evsub.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/evsub.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/evsub_msg.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/evsub_msg.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/evsub_msg.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/evsub_msg.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/iscomposing.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/iscomposing.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/iscomposing.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/iscomposing.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/pidf.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/pidf.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/pidf.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/pidf.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/presence.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/presence.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/presence.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/presence.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/presence_body.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/presence_body.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/presence_body.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/presence_body.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/publishc.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/publishc.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/publishc.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/publishc.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/rpid.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/rpid.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/rpid.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/rpid.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/xpidf.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/xpidf.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/xpidf.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-simple/xpidf.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-ua/sip_100rel.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-ua/sip_100rel.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-ua/sip_100rel.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-ua/sip_100rel.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-ua/sip_inv.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-ua/sip_inv.c
similarity index 98%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-ua/sip_inv.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-ua/sip_inv.c
index a676e5addaf67ef52d5a2a8dddb2b547a932fb9d..e7391da47bf3931b198b1f8b6353aab6c818136d 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-ua/sip_inv.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-ua/sip_inv.c
@@ -1,4 +1,4 @@
-/* $Id: sip_inv.c 2394 2008-12-23 17:27:53Z bennylp $ */
+/* $Id: sip_inv.c 2811 2009-06-25 13:01:06Z bennylp $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -1367,8 +1367,10 @@ PJ_DEF(pj_status_t) pjsip_inv_invite( pjsip_inv_session *inv,
 	const pjmedia_sdp_session *offer;
 
 	status = pjmedia_sdp_neg_get_neg_local(inv->neg, &offer);
-	if (status != PJ_SUCCESS)
+	if (status != PJ_SUCCESS) {
+	    pjsip_tx_data_dec_ref(tdata);
 	    goto on_return;
+	}
 
 	tdata->msg->body = create_sdp_body(tdata->pool, offer);
     }
@@ -1867,12 +1869,13 @@ PJ_DEF(pj_status_t) pjsip_inv_end_session(  pjsip_inv_session *inv,
 	     */
 	    if (inv->invite_tsx->status_code < 100) {
 
-		pjsip_tsx_stop_retransmit(inv->invite_tsx);
+		/* Do not stop INVITE retransmission, see ticket #506 */
+		//pjsip_tsx_stop_retransmit(inv->invite_tsx);
 		inv->cancelling = PJ_TRUE;
 		inv->pending_cancel = PJ_TRUE;
 		*p_tdata = NULL;
-		PJ_LOG(4, (inv->obj_name, "Stopping retransmission, "
-			   "delaying CANCEL"));
+		PJ_LOG(4, (inv->obj_name, "Delaying CANCEL since no "
+			   "provisional response is received yet"));
 		return PJ_SUCCESS;
 	    }
 
@@ -1884,6 +1887,14 @@ PJ_DEF(pj_status_t) pjsip_inv_end_session(  pjsip_inv_session *inv,
 	    status = pjsip_endpt_create_cancel(inv->dlg->endpt, 
 					       inv->invite_tsx->last_tx,
 					       &tdata);
+	    if (status != PJ_SUCCESS)
+		return status;
+
+	    /* Set timeout for the INVITE transaction, in case UAS is not
+	     * able to respond the INVITE with 487 final response. The 
+	     * timeout value is 64*T1.
+	     */
+	    pjsip_tsx_set_timeout(inv->invite_tsx, 64 * pjsip_cfg()->tsx.t1);
 
 	} else {
 
@@ -2246,11 +2257,16 @@ PJ_DEF(pj_status_t) pjsip_inv_update (	pjsip_inv_session *inv,
 	goto on_error;
     }
 
+    /* Notify negotiator about the new offer. This will fix the offer
+     * with correct SDP origin.
+     */
     status = pjmedia_sdp_neg_modify_local_offer(inv->pool,inv->neg,
 						offer);
     if (status != PJ_SUCCESS)
 	goto on_error;
 
+    /* Retrieve the "fixed" offer from negotiator */
+    pjmedia_sdp_neg_get_neg_local(inv->neg, &offer);
 
     /* Update Contact if required */
     if (new_contact) {
@@ -2464,7 +2480,12 @@ static void inv_respond_incoming_cancel(pjsip_inv_session *inv,
 	if (status == PJ_SUCCESS) {
 	    /* Remove the message body */
 	    tdata->msg->body = NULL;
-	    pjsip_dlg_send_response(inv->dlg, invite_tsx, tdata);
+	    if (inv->options & PJSIP_INV_REQUIRE_100REL) {
+		status = pjsip_100rel_tx_response(inv, tdata);
+	    } else {
+		status = pjsip_dlg_send_response(inv->dlg, invite_tsx, 
+						 tdata);
+	    }
 	}
     }
 
@@ -3345,6 +3366,22 @@ static void inv_on_state_early( pjsip_inv_session *inv, pjsip_event *e)
 	
 	/* Generic handling for UAC tsx completion */
 	handle_uac_tsx_response(inv, e);
+
+    } else if (tsx->role == PJSIP_ROLE_UAS &&
+	       tsx->method.id == PJSIP_BYE_METHOD &&
+	       tsx->status_code < 200 &&
+	       e->body.tsx_state.type == PJSIP_EVENT_RX_MSG)
+    {
+	/* Received BYE before the 2xx/OK response to INVITE.
+	 * Assume that the 2xx/OK response is lost and the BYE
+	 * arrives earlier.
+	 */
+	inv_respond_incoming_bye(inv, tsx, e->body.tsx_state.src.rdata, e);
+
+	/* Set timer just in case we will never get the final response
+	 * for INVITE.
+	 */
+	pjsip_tsx_set_timeout(inv->invite_tsx, 64*pjsip_cfg()->tsx.t1);
     }
 }
 
@@ -3617,9 +3654,19 @@ static void inv_on_state_confirmed( pjsip_inv_session *inv, pjsip_event *e)
 		if (mod_inv.cb.on_create_offer)  {
 		    (*mod_inv.cb.on_create_offer)(inv, &sdp);
 		    if (sdp) {
+			/* Notify negotiator about the new offer. This will
+			 * fix the offer with correct SDP origin.
+			 */
 			status = pjmedia_sdp_neg_modify_local_offer(dlg->pool,
 								    inv->neg,
 								    sdp);
+
+			/* Retrieve the "fixed" offer from negotiator */
+			if (status==PJ_SUCCESS) {
+			    const pjmedia_sdp_session *lsdp = NULL;
+			    pjmedia_sdp_neg_get_neg_local(inv->neg, &lsdp);
+			    sdp = (pjmedia_sdp_session*)lsdp;
+			}
 		    }
 		} 
 		
@@ -3726,6 +3773,9 @@ static void inv_on_state_confirmed( pjsip_inv_session *inv, pjsip_event *e)
 	    if (neg_state == PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER) {
 		pjmedia_sdp_neg_cancel_offer(inv->neg);
 	    }
+
+	    if (tsx == inv->invite_tsx)
+		inv->invite_tsx = NULL;
 	}
 
     } else if (tsx->role == PJSIP_ROLE_UAS &&
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-ua/sip_reg.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-ua/sip_reg.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-ua/sip_reg.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-ua/sip_reg.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-ua/sip_replaces.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-ua/sip_replaces.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-ua/sip_replaces.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-ua/sip_replaces.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-ua/sip_xfer.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-ua/sip_xfer.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-ua/sip_xfer.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip-ua/sip_xfer.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_auth_aka.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_auth_aka.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_auth_aka.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_auth_aka.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_auth_client.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_auth_client.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_auth_client.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_auth_client.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_auth_msg.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_auth_msg.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_auth_msg.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_auth_msg.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_auth_parser.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_auth_parser.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_auth_parser.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_auth_parser.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_auth_server.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_auth_server.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_auth_server.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_auth_server.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_config.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_config.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_config.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_config.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_dialog.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_dialog.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_dialog.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_dialog.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_endpoint.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_endpoint.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_endpoint.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_endpoint.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_errno.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_errno.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_errno.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_errno.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_msg.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_msg.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_msg.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_msg.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_parser.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_parser.c
similarity index 99%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_parser.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_parser.c
index 91f54687874c23ffc62c4a0f3fccc6b34d5d12d1..5c17443208fae224f1bdedf8e1e6e6774df49ab4 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_parser.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_parser.c
@@ -1,4 +1,4 @@
-/* $Id: sip_parser.c 2538 2009-03-23 13:14:26Z bennylp $ */
+/* $Id: sip_parser.c 2802 2009-06-25 11:29:49Z bennylp $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -1588,7 +1588,8 @@ PJ_DEF(pj_status_t) pjsip_parse_status_line( char *buf, pj_size_t size,
     PJ_USE_EXCEPTION;
 
     pj_bzero(status_line, sizeof(*status_line));
-    pj_scan_init(&scanner, buf, size, 0, &on_syntax_error);
+    pj_scan_init(&scanner, buf, size, PJ_SCAN_AUTOSKIP_WS_HEADER, 
+		 &on_syntax_error);
 
     PJ_TRY {
 	int_parse_status_line(&scanner, status_line);
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_resolve.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_resolve.c
similarity index 96%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_resolve.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_resolve.c
index 3c9e610af87da4540fc32d37ecb45a594919ac4f..1f07fe40398701211f86c9dd1417de38edec794c 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_resolve.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_resolve.c
@@ -360,11 +360,17 @@ PJ_DEF(void) pjsip_resolve( pjsip_resolver_t *resolver,
 	       target->addr.port));
 
     if (query->query_type == PJ_DNS_TYPE_SRV) {
-
-	status = pj_dns_srv_resolve(&query->naptr[0].name,
-				    &query->naptr[0].res_type,
-				    query->req.def_port, pool, resolver->res,
-				    PJ_TRUE, query, &srv_resolver_cb, NULL);
+        unsigned option = PJ_TRUE;
+        if (type & PJSIP_TRANSPORT_IPV6) {
+            option |= PJ_DNS_SRV_FALLBACK_GETADDRINFO_IPV6;
+        } else {
+            option |= PJ_DNS_SRV_FALLBACK_GETADDRINFO_IPV4;
+        }
+
+        status = pj_dns_srv_resolve(&query->naptr[0].name,
+        			    &query->naptr[0].res_type,
+        			    query->req.def_port, pool, resolver->res,
+        			    option, query, &srv_resolver_cb, NULL);
 
     } else if (query->query_type == PJ_DNS_TYPE_A) {
 
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_tel_uri.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_tel_uri.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_tel_uri.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_tel_uri.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transaction.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_transaction.c
similarity index 98%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transaction.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_transaction.c
index 50b7cdb70fd960a286afaf233c45d2508b59dc8e..864cd7c67f036e1e15274a61b1e84cd32be7c9c9 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transaction.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_transaction.c
@@ -1,4 +1,4 @@
-/* $Id: sip_transaction.c 2534 2009-03-23 13:09:09Z bennylp $ */
+/* $Id: sip_transaction.c 2798 2009-06-25 10:48:08Z bennylp $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -1502,6 +1502,47 @@ PJ_DEF(pj_status_t) pjsip_tsx_stop_retransmit(pjsip_transaction *tsx)
 }
 
 
+/*
+ * Start a timer to terminate transaction after the specified time
+ * has elapsed. 
+ */
+PJ_DEF(pj_status_t) pjsip_tsx_set_timeout( pjsip_transaction *tsx,
+					   unsigned millisec)
+{
+    struct tsx_lock_data lck;
+    pj_time_val timeout;
+
+    PJ_ASSERT_RETURN(tsx != NULL, PJ_EINVAL);
+    PJ_ASSERT_RETURN(tsx->role == PJSIP_ROLE_UAC &&
+		     tsx->method.id == PJSIP_INVITE_METHOD,
+		     PJ_EINVALIDOP);
+
+    lock_tsx(tsx, &lck);
+
+    /* Transaction must not have got final response */
+    PJ_ASSERT_ON_FAIL(tsx->status_code < 200,
+		    { unlock_tsx(tsx, &lck); return PJ_EINVALIDOP; });
+
+    if (tsx->timeout_timer.id != 0) {
+	pjsip_endpt_cancel_timer(tsx->endpt, &tsx->timeout_timer);
+	tsx->timeout_timer.id = 0;
+    }
+
+    timeout.sec = 0;
+    timeout.msec = millisec;
+    pj_time_val_normalize(&timeout);
+
+    tsx->timeout_timer.id = TIMER_ACTIVE;
+    pjsip_endpt_schedule_timer(tsx->endpt, &tsx->timeout_timer,
+			       &timeout);
+
+
+    unlock_tsx(tsx, &lck);
+
+    return PJ_SUCCESS;
+}
+
+
 /*
  * This function is called by TU to send a message.
  */
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transport.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_transport.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transport.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_transport.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transport_loop.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_transport_loop.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transport_loop.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_transport_loop.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transport_tcp.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_transport_tcp.c
similarity index 97%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transport_tcp.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_transport_tcp.c
index 042f192528cf30f934b634531459801ed42ddb88..c0829cc5d46f1c855ec3dfb4d31e5e8e96801cd7 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transport_tcp.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_transport_tcp.c
@@ -1,4 +1,4 @@
-/* $Id: sip_transport_tcp.c 2394 2008-12-23 17:27:53Z bennylp $ */
+/* $Id: sip_transport_tcp.c 2804 2009-06-25 12:26:15Z bennylp $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -805,33 +805,33 @@ static pj_status_t lis_create_transport(pjsip_tpfactory *factory,
     status = pj_activesock_start_connect(tcp->asock, tcp->base.pool, rem_addr,
 					 sizeof(pj_sockaddr_in));
     if (status == PJ_SUCCESS) {
-	tcp->has_pending_connect = PJ_FALSE;
+	on_connect_complete(tcp->asock, PJ_SUCCESS);
     } else if (status != PJ_EPENDING) {
 	tcp_destroy(&tcp->base, status);
 	return status;
     }
 
-    /* Update (again) local address, just in case local address currently
-     * set is different now that asynchronous connect() is started.
-     */
-    addr_len = sizeof(pj_sockaddr_in);
-    if (pj_sock_getsockname(sock, &local_addr, &addr_len)==PJ_SUCCESS) {
-	pj_sockaddr_in *tp_addr = (pj_sockaddr_in*)&tcp->base.local_addr;
-
-	/* Some systems (like old Win32 perhaps) may not set local address
-	 * properly before socket is fully connected.
+    if (tcp->has_pending_connect) {
+	/* Update (again) local address, just in case local address currently
+	 * set is different now that asynchronous connect() is started.
 	 */
-	if (tp_addr->sin_addr.s_addr != local_addr.sin_addr.s_addr &&
-	    local_addr.sin_addr.s_addr != 0) 
-	{
-	    tp_addr->sin_addr.s_addr = local_addr.sin_addr.s_addr;
-	    tp_addr->sin_port = local_addr.sin_port;
-	    sockaddr_to_host_port(tcp->base.pool, &tcp->base.local_name,
-				  &local_addr);
-	}
-    }
+	addr_len = sizeof(pj_sockaddr_in);
+	if (pj_sock_getsockname(sock, &local_addr, &addr_len)==PJ_SUCCESS) {
+	    pj_sockaddr_in *tp_addr = (pj_sockaddr_in*)&tcp->base.local_addr;
 
-    if (tcp->has_pending_connect) {
+	    /* Some systems (like old Win32 perhaps) may not set local address
+	     * properly before socket is fully connected.
+	     */
+	    if (tp_addr->sin_addr.s_addr != local_addr.sin_addr.s_addr &&
+		local_addr.sin_addr.s_addr != 0) 
+	    {
+		tp_addr->sin_addr.s_addr = local_addr.sin_addr.s_addr;
+		tp_addr->sin_port = local_addr.sin_port;
+		sockaddr_to_host_port(tcp->base.pool, &tcp->base.local_name,
+				      &local_addr);
+	    }
+	}
+	
 	PJ_LOG(4,(tcp->base.obj_name, 
 		  "TCP transport %.*s:%d is connecting to %.*s:%d...",
 		  (int)tcp->base.local_name.host.slen,
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transport_tls_ossl.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_transport_tls_ossl.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transport_tls_ossl.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_transport_tls_ossl.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transport_udp.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_transport_udp.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transport_udp.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_transport_udp.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_ua_layer.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_ua_layer.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_ua_layer.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_ua_layer.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_uri.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_uri.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_uri.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_uri.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_util.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_util.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_util.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_util.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_util_proxy.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_util_proxy.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_util_proxy.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_util_proxy.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_util_statefull.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_util_statefull.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_util_statefull.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_util_statefull.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_acc.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsua-lib/pjsua_acc.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_acc.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsua-lib/pjsua_acc.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_call.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsua-lib/pjsua_call.c
similarity index 99%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_call.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsua-lib/pjsua_call.c
index 55f5d95d7faf853068d88e5d569e89121ad218da..555a6ddd45d0355e19c7fb474dd2251f37418dc2 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_call.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsua-lib/pjsua_call.c
@@ -1,4 +1,4 @@
-/* $Id: pjsua_call.c 2394 2008-12-23 17:27:53Z bennylp $ */
+/* $Id: pjsua_call.c 2815 2009-06-25 13:13:26Z bennylp $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -78,21 +78,6 @@ static pjsip_redirect_op pjsua_call_on_redirected(pjsip_inv_session *inv,
 static pj_status_t create_sdp_of_call_hold(pjsua_call *call,
 					   pjmedia_sdp_session **p_answer);
 
-/* Update SDP version in the offer */
-static void update_sdp_version(pjsua_call *call,
-			       pjmedia_sdp_session *sdp)
-{
-    const pjmedia_sdp_session *old_sdp = NULL;
-    pj_status_t status;
-
-    status = pjmedia_sdp_neg_get_active_local(call->inv->neg, &old_sdp);
-    if (status != PJ_SUCCESS || old_sdp == NULL)
-	return;
-
-    sdp->origin.version = old_sdp->origin.version + 1;
-}
-
-
 /*
  * Callback called by event framework when the xfer subscription state
  * has changed.
@@ -463,6 +448,11 @@ PJ_DEF(pj_status_t) pjsua_call_make_call( pjsua_acc_id acc_id,
 	return status;
     }
 
+    /* Increment the dialog's lock otherwise when invite session creation
+     * fails the dialog will be destroyed prematurely.
+     */
+    pjsip_dlg_inc_lock(dlg);
+
     /* Calculate call's secure level */
     call->secure_level = get_secure_level(acc_id, dest_uri);
 
@@ -553,11 +543,10 @@ PJ_DEF(pj_status_t) pjsua_call_make_call( pjsua_acc_id acc_id,
 	pjsua_perror(THIS_FILE, "Unable to send initial INVITE request", 
 		     status);
 
-	/* Upon failure to send first request, both dialog and invite 
+	/* Upon failure to send first request, the invite 
 	 * session would have been cleared.
 	 */
 	inv = NULL;
-	dlg = NULL;
 	goto on_error;
     }
 
@@ -566,6 +555,7 @@ PJ_DEF(pj_status_t) pjsua_call_make_call( pjsua_acc_id acc_id,
     if (p_call_id)
 	*p_call_id = call_id;
 
+    pjsip_dlg_dec_lock(dlg);
     pj_pool_release(tmp_pool);
     PJSUA_UNLOCK();
 
@@ -573,10 +563,13 @@ PJ_DEF(pj_status_t) pjsua_call_make_call( pjsua_acc_id acc_id,
 
 
 on_error:
+    if (dlg) {
+	/* This may destroy the dialog */
+	pjsip_dlg_dec_lock(dlg);
+    }
+
     if (inv != NULL) {
 	pjsip_inv_terminate(inv, PJSIP_SC_OK, PJ_FALSE);
-    } else if (dlg) {
-	pjsip_dlg_terminate(dlg);
     }
 
     if (call_id != -1) {
@@ -1507,8 +1500,6 @@ PJ_DEF(pj_status_t) pjsua_call_set_hold(pjsua_call_id call_id,
 	return status;
     }
 
-    update_sdp_version(call, sdp);
-
     /* Create re-INVITE with new offer */
     status = pjsip_inv_reinvite( call->inv, NULL, sdp, &tdata);
     if (status != PJ_SUCCESS) {
@@ -1579,8 +1570,6 @@ PJ_DEF(pj_status_t) pjsua_call_reinvite( pjsua_call_id call_id,
 	return status;
     }
 
-    update_sdp_version(call, sdp);
-
     /* Create re-INVITE with new offer */
     status = pjsip_inv_reinvite( call->inv, NULL, sdp, &tdata);
     if (status != PJ_SUCCESS) {
@@ -1638,8 +1627,6 @@ PJ_DEF(pj_status_t) pjsua_call_update( pjsua_call_id call_id,
 	return status;
     }
 
-    update_sdp_version(call, sdp);
-
     /* Create UPDATE with new offer */
     status = pjsip_inv_update(call->inv, NULL, sdp, &tdata);
     if (status != PJ_SUCCESS) {
@@ -3184,7 +3171,10 @@ static pj_status_t create_sdp_of_call_hold(pjsua_call *call,
      * 'inactive' (PJMEDIA_DIR_NONE).
      * (See RFC 3264 Section 8.4 and RFC 4317 Section 3.1)
      */
-    if (call->media_dir != PJMEDIA_DIR_ENCODING) {
+    /* http://trac.pjsip.org/repos/ticket/880 
+       if (call->media_dir != PJMEDIA_DIR_ENCODING) {
+     */
+    if (1) {
 	pjmedia_sdp_attr *attr;
 
 	/* Remove existing directions attributes */
@@ -3193,7 +3183,7 @@ static pj_status_t create_sdp_of_call_hold(pjsua_call *call,
 	pjmedia_sdp_media_remove_all_attr(sdp->media[0], "recvonly");
 	pjmedia_sdp_media_remove_all_attr(sdp->media[0], "inactive");
 
-	if (call->media_dir == PJMEDIA_DIR_ENCODING_DECODING) {
+	if (call->media_dir & PJMEDIA_DIR_ENCODING) {
 	    /* Add sendonly attribute */
 	    attr = pjmedia_sdp_attr_create(pool, "sendonly", NULL);
 	    pjmedia_sdp_media_add_attr(sdp->media[0], attr);
@@ -3309,8 +3299,6 @@ static void pjsua_call_on_create_offer(pjsip_inv_session *inv,
 	return;
     }
 
-    update_sdp_version(call, *offer);
-
     PJSUA_UNLOCK();
 }
 
@@ -3426,7 +3414,7 @@ static void xfer_client_on_evsub_state( pjsip_evsub *sub, pjsip_event *event)
 	    msg = rdata->msg_info.msg;
 	    body = msg->body;
 	    if (!body) {
-		PJ_LOG(4,(THIS_FILE, 
+		PJ_LOG(2,(THIS_FILE, 
 			  "Warning: received NOTIFY without message body"));
 		return;
 	    }
@@ -3435,7 +3423,7 @@ static void xfer_client_on_evsub_state( pjsip_evsub *sub, pjsip_event *event)
 	    if (pj_stricmp2(&body->content_type.type, "message") != 0 ||
 		pj_stricmp2(&body->content_type.subtype, "sipfrag") != 0)
 	    {
-		PJ_LOG(4,(THIS_FILE, 
+		PJ_LOG(2,(THIS_FILE, 
 			  "Warning: received NOTIFY with non message/sipfrag "
 			  "content"));
 		return;
@@ -3445,7 +3433,7 @@ static void xfer_client_on_evsub_state( pjsip_evsub *sub, pjsip_event *event)
 	    status = pjsip_parse_status_line((char*)body->data, body->len, 
 					     &status_line);
 	    if (status != PJ_SUCCESS) {
-		PJ_LOG(4,(THIS_FILE, 
+		PJ_LOG(2,(THIS_FILE, 
 			  "Warning: received NOTIFY with invalid "
 			  "message/sipfrag content"));
 		return;
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_core.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsua-lib/pjsua_core.c
similarity index 99%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_core.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsua-lib/pjsua_core.c
index b5dc17d787fb8b1f02bda76632b5ad0a73860487..2609c9343c712b7ad4f877478eebf8c96feaae4c 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_core.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsua-lib/pjsua_core.c
@@ -1,4 +1,4 @@
-/* $Id: pjsua_core.c 2542 2009-03-23 13:21:01Z bennylp $ */
+/* $Id: pjsua_core.c 2814 2009-06-25 13:11:53Z bennylp $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -643,7 +643,8 @@ PJ_DEF(pj_status_t) pjsua_init( const pjsua_config *ua_cfg,
     /* Initialize logging first so that info/errors can be captured */
     if (log_cfg) {
 	status = pjsua_reconfigure_logging(log_cfg);
-	PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
+	if (status != PJ_SUCCESS)
+	    return status;
     }
 
     /* If nameserver is configured, create DNS resolver instance and
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_im.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsua-lib/pjsua_im.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_im.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsua-lib/pjsua_im.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_media.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsua-lib/pjsua_media.c
similarity index 99%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_media.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsua-lib/pjsua_media.c
index 538f73e5701943695b969009d60f91f8a6fe4964..f312e404bd5a0eea1ca1cb56560ec20c1cba4c40 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_media.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsua-lib/pjsua_media.c
@@ -1,4 +1,4 @@
-/* $Id: pjsua_media.c 2541 2009-03-23 13:19:31Z bennylp $ */
+/* $Id: pjsua_media.c 2813 2009-06-25 13:09:24Z bennylp $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -468,12 +468,16 @@ static void close_snd_timer_cb( pj_timer_heap_t *th,
 {
     PJ_UNUSED_ARG(th);
 
-    PJ_LOG(4,(THIS_FILE,"Closing sound device after idle for %d seconds", 
-	      pjsua_var.media_cfg.snd_auto_close_time));
+    PJSUA_LOCK();
+    if (entry->id) {
+	PJ_LOG(4,(THIS_FILE,"Closing sound device after idle for %d seconds", 
+		  pjsua_var.media_cfg.snd_auto_close_time));
 
-    entry->id = PJ_FALSE;
+	entry->id = PJ_FALSE;
 
-    close_snd_dev();
+	close_snd_dev();
+    }
+    PJSUA_UNLOCK();
 }
 
 
@@ -1605,10 +1609,12 @@ PJ_DEF(pj_status_t) pjsua_conf_connect( pjsua_conf_port_id source,
 					pjsua_conf_port_id sink)
 {
     /* If sound device idle timer is active, cancel it first. */
+    PJSUA_LOCK();
     if (pjsua_var.snd_idle_timer.id) {
 	pjsip_endpt_cancel_timer(pjsua_var.endpt, &pjsua_var.snd_idle_timer);
 	pjsua_var.snd_idle_timer.id = PJ_FALSE;
     }
+    PJSUA_UNLOCK();
 
     /* Create sound port if none is instantiated */
     if (pjsua_var.snd_port==NULL && pjsua_var.null_snd==NULL && 
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_pres.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsua-lib/pjsua_pres.c
similarity index 98%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_pres.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsua-lib/pjsua_pres.c
index 616f2e62793923b598bd85f60d16e34640b48613..8ce1d4d3afe60ef56c358388c8713ff82c5c4487 100644
--- a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_pres.c
+++ b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsua-lib/pjsua_pres.c
@@ -1,4 +1,4 @@
-/* $Id: pjsua_pres.c 2394 2008-12-23 17:27:53Z bennylp $ */
+/* $Id: pjsua_pres.c 2812 2009-06-25 13:05:59Z bennylp $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -389,6 +389,12 @@ PJ_DEF(pj_status_t) pjsua_buddy_del(pjsua_buddy_id buddy_id)
 
     PJSUA_LOCK();
 
+    /* Not interested with further events for this buddy */
+    if (pjsua_var.buddy[buddy_id].sub) {
+	pjsip_evsub_set_mod_data(pjsua_var.buddy[buddy_id].sub, 
+				 pjsua_var.mod.id, NULL);
+    }
+
     /* Remove buddy */
     pjsua_var.buddy[buddy_id].uri.slen = 0;
     pjsua_var.buddy_cnt--;
@@ -1442,13 +1448,21 @@ static void subscribe_buddy_presence(unsigned index)
 	return;
     }
 
+    /* Increment the dialog's lock otherwise when presence session creation
+     * fails the dialog will be destroyed prematurely.
+     */
+    pjsip_dlg_inc_lock(buddy->dlg);
+
     status = pjsip_pres_create_uac( buddy->dlg, &pres_callback, 
 				    PJSIP_EVSUB_NO_EVENT_ID, &buddy->sub);
     if (status != PJ_SUCCESS) {
 	pjsua_var.buddy[index].sub = NULL;
 	pjsua_perror(THIS_FILE, "Unable to create presence client", 
 		     status);
-	pjsip_dlg_terminate(buddy->dlg);
+	/* This should destroy the dialog since there's no session
+	 * referencing it
+	 */
+	pjsip_dlg_dec_lock(buddy->dlg);
 	if (tmp_pool) pj_pool_release(tmp_pool);
 	return;
     }
@@ -1481,6 +1495,7 @@ static void subscribe_buddy_presence(unsigned index)
 
     status = pjsip_pres_initiate(buddy->sub, -1, &tdata);
     if (status != PJ_SUCCESS) {
+	pjsip_dlg_dec_lock(buddy->dlg);
 	if (buddy->sub) {
 	    pjsip_pres_terminate(buddy->sub, PJ_FALSE);
 	}
@@ -1495,6 +1510,7 @@ static void subscribe_buddy_presence(unsigned index)
 
     status = pjsip_pres_send_request(buddy->sub, tdata);
     if (status != PJ_SUCCESS) {
+	pjsip_dlg_dec_lock(buddy->dlg);
 	if (buddy->sub) {
 	    pjsip_pres_terminate(buddy->sub, PJ_FALSE);
 	}
@@ -1505,6 +1521,7 @@ static void subscribe_buddy_presence(unsigned index)
 	return;
     }
 
+    pjsip_dlg_dec_lock(buddy->dlg);
     if (tmp_pool) pj_pool_release(tmp_pool);
 }
 
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/dlg_core_test.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/dlg_core_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/dlg_core_test.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/dlg_core_test.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/dns_test.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/dns_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/dns_test.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/dns_test.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/inv_offer_answer_test.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/inv_offer_answer_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/inv_offer_answer_test.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/inv_offer_answer_test.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/main.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/main.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/main.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/main.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/main_rtems.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/main_rtems.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/main_rtems.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/main_rtems.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/main_win32.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/main_win32.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/main_win32.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/main_win32.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/msg_err_test.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/msg_err_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/msg_err_test.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/msg_err_test.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/msg_logger.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/msg_logger.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/msg_logger.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/msg_logger.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/msg_test.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/msg_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/msg_test.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/msg_test.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/regc_test.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/regc_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/regc_test.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/regc_test.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/test.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/test.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/test.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/test.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/test.h b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/test.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/test.h
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/test.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/transport_loop_test.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/transport_loop_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/transport_loop_test.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/transport_loop_test.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/transport_tcp_test.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/transport_tcp_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/transport_tcp_test.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/transport_tcp_test.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/transport_test.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/transport_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/transport_test.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/transport_test.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/transport_udp_test.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/transport_udp_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/transport_udp_test.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/transport_udp_test.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/tsx_basic_test.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/tsx_basic_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/tsx_basic_test.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/tsx_basic_test.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/tsx_bench.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/tsx_bench.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/tsx_bench.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/tsx_bench.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/tsx_uac_test.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/tsx_uac_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/tsx_uac_test.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/tsx_uac_test.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/tsx_uas_test.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/tsx_uas_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/tsx_uas_test.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/tsx_uas_test.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/txdata_test.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/txdata_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/txdata_test.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/txdata_test.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/uri_test.c b/sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/uri_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/uri_test.c
rename to sflphone-common/libs/pjproject-1.0.3/pjsip/src/test-pjsip/uri_test.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/self-test.mak b/sflphone-common/libs/pjproject-1.0.3/self-test.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/self-test.mak
rename to sflphone-common/libs/pjproject-1.0.3/self-test.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/svn_add b/sflphone-common/libs/pjproject-1.0.3/svn_add
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/svn_add
rename to sflphone-common/libs/pjproject-1.0.3/svn_add
diff --git a/sflphone-common/libs/pjproject-1.0.2/svn_pset b/sflphone-common/libs/pjproject-1.0.3/svn_pset
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/svn_pset
rename to sflphone-common/libs/pjproject-1.0.3/svn_pset
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/cdash/README.TXT b/sflphone-common/libs/pjproject-1.0.3/tests/cdash/README.TXT
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/cdash/README.TXT
rename to sflphone-common/libs/pjproject-1.0.3/tests/cdash/README.TXT
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/cdash/builder.py b/sflphone-common/libs/pjproject-1.0.3/tests/cdash/builder.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/cdash/builder.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/cdash/builder.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/cdash/cfg_gnu.py b/sflphone-common/libs/pjproject-1.0.3/tests/cdash/cfg_gnu.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/cdash/cfg_gnu.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/cdash/cfg_gnu.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/cdash/cfg_msvc.py b/sflphone-common/libs/pjproject-1.0.3/tests/cdash/cfg_msvc.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/cdash/cfg_msvc.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/cdash/cfg_msvc.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/cdash/cfg_site_sample.py b/sflphone-common/libs/pjproject-1.0.3/tests/cdash/cfg_site_sample.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/cdash/cfg_site_sample.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/cdash/cfg_site_sample.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/cdash/cfg_symbian.py b/sflphone-common/libs/pjproject-1.0.3/tests/cdash/cfg_symbian.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/cdash/cfg_symbian.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/cdash/cfg_symbian.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/cdash/inc_test.py b/sflphone-common/libs/pjproject-1.0.3/tests/cdash/inc_test.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/cdash/inc_test.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/cdash/inc_test.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/cdash/main.py b/sflphone-common/libs/pjproject-1.0.3/tests/cdash/main.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/cdash/main.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/cdash/main.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/cdash/starttest_sample.bat b/sflphone-common/libs/pjproject-1.0.3/tests/cdash/starttest_sample.bat
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/cdash/starttest_sample.bat
rename to sflphone-common/libs/pjproject-1.0.3/tests/cdash/starttest_sample.bat
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/README.TXT b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/README.TXT
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/README.TXT
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/README.TXT
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/config_site.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/config_site.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/config_site.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/config_site.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/inc_cfg.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/inc_cfg.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/inc_cfg.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/inc_cfg.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/inc_const.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/inc_const.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/inc_const.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/inc_const.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/inc_sdp.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/inc_sdp.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/inc_sdp.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/inc_sdp.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/inc_sip.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/inc_sip.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/inc_sip.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/inc_sip.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_call.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/mod_call.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_call.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/mod_call.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_media_playrec.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/mod_media_playrec.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_media_playrec.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/mod_media_playrec.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_pesq.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/mod_pesq.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_pesq.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/mod_pesq.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_pres.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/mod_pres.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_pres.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/mod_pres.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_recvfrom.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/mod_recvfrom.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_recvfrom.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/mod_recvfrom.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_run.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/mod_run.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_run.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/mod_run.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_sendto.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/mod_sendto.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_sendto.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/mod_sendto.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/run.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/run.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/run.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/run.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/runall.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/runall.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/runall.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/runall.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/100_simplecall.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/100_simplecall.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/100_simplecall.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/100_simplecall.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_0_1.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/150_srtp_0_1.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_0_1.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/150_srtp_0_1.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_1_0.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/150_srtp_1_0.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_1_0.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/150_srtp_1_0.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_1_1.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/150_srtp_1_1.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_1_1.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/150_srtp_1_1.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_1_2.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/150_srtp_1_2.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_1_2.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/150_srtp_1_2.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_2_1.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/150_srtp_2_1.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_2_1.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/150_srtp_2_1.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_2_2.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/150_srtp_2_2.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_2_2.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/150_srtp_2_2.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/200_tcp.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/200_tcp.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/200_tcp.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/200_tcp.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/300_ice_0_1.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/300_ice_0_1.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/300_ice_0_1.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/300_ice_0_1.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/300_ice_1_0.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/300_ice_1_0.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/300_ice_1_0.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/300_ice_1_0.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/300_ice_1_1.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/300_ice_1_1.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/300_ice_1_1.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/300_ice_1_1.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/301_ice_public_a.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/301_ice_public_a.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/301_ice_public_a.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/301_ice_public_a.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/301_ice_public_b.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/301_ice_public_b.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/301_ice_public_b.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/301_ice_public_b.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/305_ice_comp_1_2.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/305_ice_comp_1_2.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/305_ice_comp_1_2.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/305_ice_comp_1_2.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/305_ice_comp_2_1.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/305_ice_comp_2_1.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/305_ice_comp_2_1.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/305_ice_comp_2_1.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/350_prack_a.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/350_prack_a.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/350_prack_a.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/350_prack_a.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/350_prack_b.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/350_prack_b.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/350_prack_b.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-call/350_prack_b.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_16.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_11_16.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_16.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_11_16.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_22.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_11_22.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_22.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_11_22.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_32.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_11_32.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_32.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_11_32.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_44.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_11_44.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_44.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_11_44.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_48.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_11_48.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_48.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_11_48.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_8.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_11_8.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_8.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_11_8.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_11.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_8_11.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_11.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_8_11.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_16.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_8_16.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_16.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_8_16.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_22.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_8_22.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_22.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_8_22.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_32.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_8_32.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_32.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_8_32.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_44.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_8_44.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_44.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_8_44.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_48.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_8_48.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_48.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-media-playrec/100_resample_lf_8_48.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/100_defaults.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/100_defaults.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/100_defaults.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/100_defaults.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/101_defaults.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/101_defaults.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/101_defaults.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/101_defaults.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_g711a.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_g711a.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_g711a.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_g711a.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_g711u.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_g711u.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_g711u.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_g711u.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_g722.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_g722.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_g722.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_g722.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_gsm.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_gsm.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_gsm.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_gsm.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_ilbc.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_ilbc.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_ilbc.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_ilbc.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_l16_16000.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_l16_16000.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_l16_16000.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_l16_16000.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_l16_16000_stereo.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_l16_16000_stereo.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_l16_16000_stereo.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_l16_16000_stereo.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_l16_8000.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_l16_8000.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_l16_8000.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_l16_8000.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_l16_8000_stereo.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_l16_8000_stereo.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_l16_8000_stereo.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_l16_8000_stereo.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_speex_16000.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_speex_16000.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_speex_16000.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_speex_16000.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_speex_8000.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_speex_8000.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_speex_8000.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/200_codec_speex_8000.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_g711a.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_g711a.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_g711a.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_g711a.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_g711u.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_g711u.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_g711u.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_g711u.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_g722.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_g722.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_g722.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_g722.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_gsm.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_gsm.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_gsm.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_gsm.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_ilbc.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_ilbc.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_ilbc.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_ilbc.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_l16_16000.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_l16_16000.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_l16_16000.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_l16_16000.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_l16_16000_stereo.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_l16_16000_stereo.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_l16_16000_stereo.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_l16_16000_stereo.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_l16_8000.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_l16_8000.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_l16_8000.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_l16_8000.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_l16_8000_stereo.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_l16_8000_stereo.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_l16_8000_stereo.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_l16_8000_stereo.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_speex_16000.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_speex_16000.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_speex_16000.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_speex_16000.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_speex_8000.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_speex_8000.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_speex_8000.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pesq/201_codec_speex_8000.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pres/100_peertopeer.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pres/100_peertopeer.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pres/100_peertopeer.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pres/100_peertopeer.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pres/200_publish.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pres/200_publish.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pres/200_publish.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-pres/200_publish.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/200_reg_good_enocredentiall.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/200_reg_good_enocredentiall.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/200_reg_good_enocredentiall.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/200_reg_good_enocredentiall.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/201_reg_good_ok.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/201_reg_good_ok.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/201_reg_good_ok.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/201_reg_good_ok.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/202_reg_good_ok_wildcard.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/202_reg_good_ok_wildcard.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/202_reg_good_ok_wildcard.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/202_reg_good_ok_wildcard.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/205_reg_good_no_realm.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/205_reg_good_no_realm.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/205_reg_good_no_realm.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/205_reg_good_no_realm.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/206_reg_good_efailedcredential.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/206_reg_good_efailedcredential.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/206_reg_good_efailedcredential.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/206_reg_good_efailedcredential.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/208_reg_good_retry_nonce_ok.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/208_reg_good_retry_nonce_ok.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/208_reg_good_retry_nonce_ok.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/208_reg_good_retry_nonce_ok.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/215_reg_good_multi_ok.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/215_reg_good_multi_ok.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/215_reg_good_multi_ok.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/215_reg_good_multi_ok.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/220_reg_good_ims_ok.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/220_reg_good_ims_ok.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/220_reg_good_ims_ok.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/220_reg_good_ims_ok.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/230_reg_bad_fail_stale_true.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/230_reg_bad_fail_stale_true.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/230_reg_bad_fail_stale_true.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/230_reg_bad_fail_stale_true.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/231_reg_bad_fail_stale_false_nonce_changed.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/231_reg_bad_fail_stale_false_nonce_changed.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/231_reg_bad_fail_stale_false_nonce_changed.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/231_reg_bad_fail_stale_false_nonce_changed.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/234_reg_bad_stale_ok.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/234_reg_bad_stale_ok.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/234_reg_bad_stale_ok.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-recvfrom/234_reg_bad_stale_ok.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-run/100_simple.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-run/100_simple.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-run/100_simple.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-run/100_simple.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-run/200_register.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-run/200_register.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-run/200_register.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-run/200_register.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_1.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_1.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_1.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_1.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_2.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_2.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_2.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_2.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_3.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_3.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_3.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_3.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_4.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_4.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_4.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_4.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_5.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_5.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_5.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_5.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/100_simplecall.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/100_simplecall.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/100_simplecall.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/100_simplecall.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/110_tel_uri.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/110_tel_uri.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/110_tel_uri.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/110_tel_uri.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/120_sdp_with_video_dynamic_1.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/120_sdp_with_video_dynamic_1.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/120_sdp_with_video_dynamic_1.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/120_sdp_with_video_dynamic_1.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/120_sdp_with_video_dynamic_2.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/120_sdp_with_video_dynamic_2.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/120_sdp_with_video_dynamic_2.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/120_sdp_with_video_dynamic_2.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/121_sdp_with_video_static_1.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/121_sdp_with_video_static_1.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/121_sdp_with_video_static_1.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/121_sdp_with_video_static_1.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/121_sdp_with_video_static_2.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/121_sdp_with_video_static_2.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/121_sdp_with_video_static_2.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/121_sdp_with_video_static_2.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/122_sdp_with_unknown_dynamic_1.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/122_sdp_with_unknown_dynamic_1.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/122_sdp_with_unknown_dynamic_1.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/122_sdp_with_unknown_dynamic_1.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/122_sdp_with_unknown_dynamic_2.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/122_sdp_with_unknown_dynamic_2.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/122_sdp_with_unknown_dynamic_2.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/122_sdp_with_unknown_dynamic_2.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/123_sdp_with_unknown_static_1.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/123_sdp_with_unknown_static_1.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/123_sdp_with_unknown_static_1.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/123_sdp_with_unknown_static_1.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/123_sdp_with_unknown_static_2.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/123_sdp_with_unknown_static_2.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/123_sdp_with_unknown_static_2.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/123_sdp_with_unknown_static_2.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/124_sdp_with_unknown_static_unknown_transport.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/124_sdp_with_unknown_static_unknown_transport.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/124_sdp_with_unknown_static_unknown_transport.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/124_sdp_with_unknown_static_unknown_transport.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_0.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_0.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_0.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_0.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_1.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_1.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_1.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_1.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_2.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_2.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_2.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_2.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_3.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_3.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_3.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_3.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_4.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_4.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_4.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_4.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/150_err_extension.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/150_err_extension.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/150_err_extension.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/150_err_extension.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/151_err_sdp_video.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/151_err_sdp_video.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/151_err_sdp_video.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/151_err_sdp_video.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/152_err_sdp_no_media.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/152_err_sdp_no_media.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/152_err_sdp_no_media.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/152_err_sdp_no_media.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/153_err_sdp_unsupported_codec.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/153_err_sdp_unsupported_codec.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/153_err_sdp_unsupported_codec.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/153_err_sdp_unsupported_codec.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/155_err_sdp_bad_syntax.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/155_err_sdp_bad_syntax.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/155_err_sdp_bad_syntax.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/155_err_sdp_bad_syntax.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/156_err_sdp_bad_net_type.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/156_err_sdp_bad_net_type.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/156_err_sdp_bad_net_type.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/156_err_sdp_bad_net_type.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/157_err_sdp_bad_addr_type.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/157_err_sdp_bad_addr_type.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/157_err_sdp_bad_addr_type.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/157_err_sdp_bad_addr_type.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/158_err_sdp_bad_transport_type.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/158_err_sdp_bad_transport_type.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/158_err_sdp_bad_transport_type.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/158_err_sdp_bad_transport_type.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/159_no_rport.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/159_no_rport.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/159_no_rport.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/159_no_rport.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/159_no_rport_nit.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/159_no_rport_nit.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/159_no_rport_nit.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/159_no_rport_nit.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/160_err_duplicate_replaces.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/160_err_duplicate_replaces.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/160_err_duplicate_replaces.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/160_err_duplicate_replaces.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/161_err_replaces_dlg_not_found.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/161_err_replaces_dlg_not_found.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/161_err_replaces_dlg_not_found.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/161_err_replaces_dlg_not_found.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/200_ice_no_ice.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/200_ice_no_ice.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/200_ice_no_ice.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/200_ice_no_ice.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/200_ice_success_1.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/200_ice_success_1.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/200_ice_success_1.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/200_ice_success_1.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/200_ice_success_2.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/200_ice_success_2.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/200_ice_success_2.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/200_ice_success_2.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/200_ice_success_3.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/200_ice_success_3.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/200_ice_success_3.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/200_ice_success_3.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/200_ice_success_4.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/200_ice_success_4.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/200_ice_success_4.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/200_ice_success_4.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/201_ice_mismatch_1.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/201_ice_mismatch_1.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/201_ice_mismatch_1.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/201_ice_mismatch_1.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/201_ice_mismatch_2.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/201_ice_mismatch_2.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/201_ice_mismatch_2.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/201_ice_mismatch_2.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/201_ice_mismatch_3.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/201_ice_mismatch_3.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/201_ice_mismatch_3.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/201_ice_mismatch_3.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_crypto_case_insensitive.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/300_srtp_crypto_case_insensitive.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_crypto_case_insensitive.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/300_srtp_crypto_case_insensitive.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_duplicated_crypto_tag.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/300_srtp_duplicated_crypto_tag.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_duplicated_crypto_tag.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/300_srtp_duplicated_crypto_tag.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_invalid_crypto_tag_non_numeric.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/300_srtp_invalid_crypto_tag_non_numeric.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_invalid_crypto_tag_non_numeric.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/300_srtp_invalid_crypto_tag_non_numeric.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_invalid_crypto_tag_zero.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/300_srtp_receive_crypto_tag_zero.py
similarity index 66%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_invalid_crypto_tag_zero.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/300_srtp_receive_crypto_tag_zero.py
index 1fc2b53d6002cf045ed9effc4edd7ebdd551f76d..1276573b14b33724ddda1a37033d796204688619 100644
--- a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_invalid_crypto_tag_zero.py
+++ b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/300_srtp_receive_crypto_tag_zero.py
@@ -1,4 +1,4 @@
-# $Id: 300_srtp_invalid_crypto_tag_zero.py 2036 2008-06-20 17:43:55Z nanang $
+# $Id: 300_srtp_receive_crypto_tag_zero.py 2794 2009-06-24 16:00:36Z nanang $
 import inc_sip as sip
 import inc_sdp as sdp
 
@@ -21,6 +21,6 @@ args = "--null-audio --auto-answer 200 --max-calls 1 --use-srtp 1 --srtp-secure
 include = []
 exclude = []
 
-sendto_cfg = sip.SendtoCfg( "caller has used invalid crypto tag (zero), callee must not accept the call", 
-			    pjsua_args=args, sdp=sdp, resp_code=406, 
+sendto_cfg = sip.SendtoCfg( "caller has used crypto tag zero, callee must accept the call", 
+			    pjsua_args=args, sdp=sdp, resp_code=200, 
 			    resp_inc=include, resp_exc=exclude)
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_1.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_1.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_1.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_1.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_2.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_2.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_2.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_2.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_3.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_3.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_3.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_3.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/301_srtp0_recv_avp.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/301_srtp0_recv_avp.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/301_srtp0_recv_avp.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/301_srtp0_recv_avp.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/301_srtp0_recv_savp.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/301_srtp0_recv_savp.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/301_srtp0_recv_savp.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/301_srtp0_recv_savp.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/310_srtp1_no_crypto.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/310_srtp1_no_crypto.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/310_srtp1_no_crypto.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/310_srtp1_no_crypto.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/311_srtp1_recv_avp.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/311_srtp1_recv_avp.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/311_srtp1_recv_avp.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/311_srtp1_recv_avp.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/312_srtp1_recv_savp.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/312_srtp1_recv_savp.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/312_srtp1_recv_savp.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/312_srtp1_recv_savp.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/313_srtp1_unsupported_crypto.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/313_srtp1_unsupported_crypto.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/313_srtp1_unsupported_crypto.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/313_srtp1_unsupported_crypto.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/320_srtp2_no_crypto.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/320_srtp2_no_crypto.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/320_srtp2_no_crypto.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/320_srtp2_no_crypto.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/320_srtp_with_unknown_media_1.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/320_srtp_with_unknown_media_1.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/320_srtp_with_unknown_media_1.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/320_srtp_with_unknown_media_1.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/320_srtp_with_unknown_media_2.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/320_srtp_with_unknown_media_2.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/320_srtp_with_unknown_media_2.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/320_srtp_with_unknown_media_2.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/320_srtp_with_unknown_transport_1.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/320_srtp_with_unknown_transport_1.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/320_srtp_with_unknown_transport_1.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/320_srtp_with_unknown_transport_1.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/320_srtp_with_unknown_transport_2.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/320_srtp_with_unknown_transport_2.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/320_srtp_with_unknown_transport_2.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/320_srtp_with_unknown_transport_2.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/321_srtp2_recv_avp.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/321_srtp2_recv_avp.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/321_srtp2_recv_avp.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/321_srtp2_recv_avp.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/322_srtp2_recv_savp.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/322_srtp2_recv_savp.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/322_srtp2_recv_savp.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/322_srtp2_recv_savp.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/323_srtp2_unsupported_crypto.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/323_srtp2_unsupported_crypto.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/323_srtp2_unsupported_crypto.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/323_srtp2_unsupported_crypto.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/330_srtp_prefer_rtp_savp.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/330_srtp_prefer_rtp_savp.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/330_srtp_prefer_rtp_savp.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/330_srtp_prefer_rtp_savp.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/331_srtp_prefer_rtp_avp.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/331_srtp_prefer_rtp_avp.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/331_srtp_prefer_rtp_avp.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/331_srtp_prefer_rtp_avp.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/360_non_sip_uri.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/360_non_sip_uri.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/360_non_sip_uri.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/360_non_sip_uri.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/361_non_sip_uri.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/361_non_sip_uri.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/361_non_sip_uri.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/361_non_sip_uri.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/362_non_sip_uri.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/362_non_sip_uri.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/362_non_sip_uri.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/362_non_sip_uri.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/363_non_sip_uri_subscribe.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/363_non_sip_uri_subscribe.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/363_non_sip_uri_subscribe.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/363_non_sip_uri_subscribe.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/364_non_sip_uri_subscribe.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/364_non_sip_uri_subscribe.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/364_non_sip_uri_subscribe.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/364_non_sip_uri_subscribe.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/400_fmtp_g7221_with_bitrate.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/400_fmtp_g7221_with_bitrate.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/400_fmtp_g7221_with_bitrate.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/400_fmtp_g7221_with_bitrate.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_24000.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_24000.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_24000.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_24000.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_32000.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_32000.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_32000.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_32000.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/410_fmtp_amrnb_offer_octet_align.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/410_fmtp_amrnb_offer_octet_align.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/410_fmtp_amrnb_offer_octet_align.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/410_fmtp_amrnb_offer_octet_align.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/411_fmtp_amrnb_offer_band_eff.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/411_fmtp_amrnb_offer_band_eff.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/411_fmtp_amrnb_offer_band_eff.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/411_fmtp_amrnb_offer_band_eff.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/412_fmtp_amrnb_offer_band_eff2.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/412_fmtp_amrnb_offer_band_eff2.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/412_fmtp_amrnb_offer_band_eff2.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/412_fmtp_amrnb_offer_band_eff2.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/500_pres_subscribe_with_bad_event.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/500_pres_subscribe_with_bad_event.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/500_pres_subscribe_with_bad_event.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/500_pres_subscribe_with_bad_event.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/999_asterisk_err.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/999_asterisk_err.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/999_asterisk_err.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/999_asterisk_err.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/999_message_no_body.py b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/999_message_no_body.py
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/999_message_no_body.py
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sendto/999_message_no_body.py
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sipp/inv_401_retry_after_100.xml b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sipp/inv_401_retry_after_100.xml
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sipp/inv_401_retry_after_100.xml
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sipp/inv_401_retry_after_100.xml
diff --git a/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sipp/uas-cancel-no-final.xml b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sipp/uas-cancel-no-final.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e96f2a37402b7187a1e8c95e3ec9cc1427252150
--- /dev/null
+++ b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sipp/uas-cancel-no-final.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE scenario SYSTEM "sipp.dtd">
+
+<scenario name="Basic UAS responder">
+  <recv request="INVITE" crlf="true">
+  </recv>
+
+  <send>
+    <![CDATA[
+
+      SIP/2.0 100 Trying
+      [last_Via:]
+      [last_From:]
+      [last_To:]
+      [last_Call-ID:]
+      [last_CSeq:]
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <send>
+    <![CDATA[
+
+      SIP/2.0 180 Ringing
+      [last_Via:]
+      [last_From:]
+      [last_To:];tag=[call_number]
+      [last_Call-ID:]
+      [last_CSeq:]
+      Contact: <sip:192.168.0.15>
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <!-- Wait for CANCEL -->
+  <recv request="CANCEL" crlf="true">
+  </recv>
+
+  <send>
+    <![CDATA[
+      SIP/2.0 200 OK
+      [last_Via:]
+      [last_From:]
+      [last_To:]
+      [last_Call-ID:]
+      [last_CSeq:]
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+
+  <!-- definition of the response time repartition table (unit is ms)   -->
+  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
+
+  <!-- definition of the call length repartition table (unit is ms)     -->
+  <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
+
+</scenario>
+
diff --git a/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sipp/uas-early-bye.xml b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sipp/uas-early-bye.xml
new file mode 100644
index 0000000000000000000000000000000000000000..216b8b45bf706d8e5fe437a467c238c4d0a83f22
--- /dev/null
+++ b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sipp/uas-early-bye.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE scenario SYSTEM "sipp.dtd">
+
+<scenario name="Early BYE">
+  <recv request="INVITE" crlf="true">
+    <action>
+	<ereg regexp=".*" search_in="hdr" header="From" assign_to="3"/>
+	<ereg regexp="sip:(.*)>" search_in="hdr" header="Contact" assign_to="4,5"/>
+        <assign assign_to="4" variable="5" />
+    </action>
+  </recv>
+
+  <send>
+    <![CDATA[
+      SIP/2.0 100 Trying
+      [last_Via:]
+      [last_From:]
+      [last_To:]
+      [last_Call-ID:]
+      [last_CSeq:]
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <send>
+    <![CDATA[
+
+      SIP/2.0 180 Ringing
+      [last_Via:]
+      [last_From:]
+      [last_To:];tag=[call_number]
+      [last_Call-ID:]
+      [last_CSeq:]
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <send retrans="500">
+    <![CDATA[
+
+      BYE sip:[$5] SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port]
+      From: sipp  <sip:sipp@[local_ip]:[local_port]>;tag=[call_number]
+      To[$3]
+      Call-ID: [call_id]
+      Cseq: 1 BYE
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+   <recv response="200">
+   </recv>
+
+
+  <!-- definition of the response time repartition table (unit is ms)   -->
+  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
+
+  <!-- definition of the call length repartition table (unit is ms)     -->
+  <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
+
+</scenario>
+
diff --git a/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sipp/uas-forked-200.xml b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sipp/uas-forked-200.xml
new file mode 100644
index 0000000000000000000000000000000000000000..229f7d89d8cb682b14deb05633eb98508090cfc6
--- /dev/null
+++ b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sipp/uas-forked-200.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE scenario SYSTEM "sipp.dtd">
+
+<!-- This program is free software; you can redistribute it and/or      -->
+<!-- modify it under the terms of the GNU General Public License as     -->
+<!-- published by the Free Software Foundation; either version 2 of the -->
+<!-- License, or (at your option) any later version.                    -->
+<!--                                                                    -->
+<!-- This program is distributed in the hope that it will be useful,    -->
+<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of     -->
+<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the      -->
+<!-- GNU General Public License for more details.                       -->
+<!--                                                                    -->
+<!-- You should have received a copy of the GNU General Public License  -->
+<!-- along with this program; if not, write to the                      -->
+<!-- Free Software Foundation, Inc.,                                    -->
+<!-- 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA             -->
+<!--                                                                    -->
+<!--                 Sipp default 'uas' scenario.                       -->
+<!--                                                                    -->
+
+<scenario name="Forked INVITE, one of them require PRACK">
+  <recv request="INVITE" crlf="true">
+   <action>
+    <ereg regexp="branch=([0-9a-zA-Z]*)"
+          search_in="hdr"
+	  header="Via"
+          assign_to="1,2"/>
+    <assign assign_to="1" variable="2"/>
+    </action>
+  </recv>
+
+  <send>
+    <![CDATA[
+      SIP/2.0 100 Trying
+      [last_Via:]
+      [last_From:]
+      [last_To:];tag=[call_number]
+      [last_Call-ID:]
+      [last_CSeq:]
+    ]]>
+  </send>
+
+  <!-- Call leg 1: 200/OK -->
+  <send>
+    <![CDATA[
+      SIP/2.0 200 OK
+      Via: SIP/2.0/UDP 127.0.0.1;received=127.0.0.1;rport=5080;branch=[$2]
+      [last_From:]
+      [last_To:];tag=UA_1
+      [last_Call-ID:]
+      [last_CSeq:]
+      Contact: <sip:UA_1@[local_ip]:[local_port]>
+      Content-Type: application/sdp
+
+      v=0
+      o=- 3442013205 3442013205 IN IP4 192.168.0.13
+      s=pjsip
+      c=IN IP4 192.168.0.13
+      t=0 0
+      m=audio 4002 RTP/AVP 0
+      a=rtpmap:0 PCMU/8000
+    ]]>
+  </send>
+
+  <!-- Call leg 2: 200/OK -->
+  <send>
+    <![CDATA[
+      SIP/2.0 200 OK
+      Via: SIP/2.0/UDP 127.0.0.1;received=127.0.0.1;rport=5080;branch=[$2]
+      [last_From:]
+      [last_To:];tag=UA_2
+      [last_Call-ID:]
+      [last_CSeq:]
+      Contact: <sip:UA_2@[local_ip]:[local_port]>
+      Content-Type: application/sdp
+
+      v=0
+      o=- 3442013205 3442013205 IN IP4 192.168.0.13
+      s=pjsip
+      c=IN IP4 192.168.0.13
+      t=0 0
+      m=audio 4002 RTP/AVP 0
+      a=rtpmap:0 PCMU/8000
+    ]]>
+  </send>
+
+  <!-- Receive ACK -->
+  <recv request="ACK"
+        optional="false"
+        rtd="true"
+        crlf="true">
+  </recv>
+
+  <!-- Receive BYE -->
+  <recv request="BYE" crlf="true">
+  </recv>
+
+  <!-- Send 200/OK to BYE -->
+  <send>
+    <![CDATA[
+      SIP/2.0 200 OK
+      [last_Via:]
+      [last_From:]
+      [last_To:]
+      [last_Call-ID:]
+      [last_CSeq:]
+    ]]>
+  </send>
+
+
+
+  <!-- Receive ACK -->
+  <recv request="ACK"
+        optional="false"
+        rtd="true"
+        crlf="true">
+  </recv>
+
+  <!-- Receive BYE -->
+  <recv request="BYE" crlf="true">
+  </recv>
+
+  <!-- Send 200/OK to BYE -->
+  <send>
+    <![CDATA[
+      SIP/2.0 200 OK
+      [last_Via:]
+      [last_From:]
+      [last_To:]
+      [last_Call-ID:]
+      [last_CSeq:]
+    ]]>
+  </send>
+
+  <!-- definition of the response time repartition table (unit is ms)   -->
+  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
+
+  <!-- definition of the call length repartition table (unit is ms)     -->
+  <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
+
+</scenario>
+
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sipp/uas-template.xml b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sipp/uas-template.xml
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sipp/uas-template.xml
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/scripts-sipp/uas-template.xml
diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/tools/cmp_wav.c b/sflphone-common/libs/pjproject-1.0.3/tests/pjsua/tools/cmp_wav.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/tests/pjsua/tools/cmp_wav.c
rename to sflphone-common/libs/pjproject-1.0.3/tests/pjsua/tools/cmp_wav.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/README.txt b/sflphone-common/libs/pjproject-1.0.3/third_party/README.txt
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/README.txt
rename to sflphone-common/libs/pjproject-1.0.3/third_party/README.txt
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/Makefile b/sflphone-common/libs/pjproject-1.0.3/third_party/build/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/Makefile
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/Makefile
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/gsm/Makefile b/sflphone-common/libs/pjproject-1.0.3/third_party/build/gsm/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/gsm/Makefile
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/gsm/Makefile
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/gsm/config.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/gsm/config.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/gsm/config.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/gsm/config.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/gsm/libgsmcodec.dsp b/sflphone-common/libs/pjproject-1.0.3/third_party/build/gsm/libgsmcodec.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/gsm/libgsmcodec.dsp
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/gsm/libgsmcodec.dsp
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/gsm/libgsmcodec.vcp b/sflphone-common/libs/pjproject-1.0.3/third_party/build/gsm/libgsmcodec.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/gsm/libgsmcodec.vcp
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/gsm/libgsmcodec.vcp
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/gsm/libgsmcodec.vcproj b/sflphone-common/libs/pjproject-1.0.3/third_party/build/gsm/libgsmcodec.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/gsm/libgsmcodec.vcproj
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/gsm/libgsmcodec.vcproj
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/ilbc/Makefile b/sflphone-common/libs/pjproject-1.0.3/third_party/build/ilbc/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/ilbc/Makefile
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/ilbc/Makefile
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/ilbc/libilbccodec.dsp b/sflphone-common/libs/pjproject-1.0.3/third_party/build/ilbc/libilbccodec.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/ilbc/libilbccodec.dsp
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/ilbc/libilbccodec.dsp
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/ilbc/libilbccodec.vcp b/sflphone-common/libs/pjproject-1.0.3/third_party/build/ilbc/libilbccodec.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/ilbc/libilbccodec.vcp
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/ilbc/libilbccodec.vcp
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/ilbc/libilbccodec.vcproj b/sflphone-common/libs/pjproject-1.0.3/third_party/build/ilbc/libilbccodec.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/ilbc/libilbccodec.vcproj
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/ilbc/libilbccodec.vcproj
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/os-auto.mak.in b/sflphone-common/libs/pjproject-1.0.3/third_party/build/os-auto.mak.in
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/os-auto.mak.in
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/os-auto.mak.in
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/os-darwinos.mak b/sflphone-common/libs/pjproject-1.0.3/third_party/build/os-darwinos.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/os-darwinos.mak
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/os-darwinos.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/os-linux.mak b/sflphone-common/libs/pjproject-1.0.3/third_party/build/os-linux.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/os-linux.mak
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/os-linux.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/os-win32.mak b/sflphone-common/libs/pjproject-1.0.3/third_party/build/os-win32.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/os-win32.mak
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/os-win32.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/Makefile b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/Makefile
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/Makefile
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/libportaudio.dsp b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/libportaudio.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/libportaudio.dsp
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/libportaudio.dsp
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/libportaudio.vcp b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/libportaudio.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/libportaudio.vcp
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/libportaudio.vcp
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/libportaudio.vcproj b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/libportaudio.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/libportaudio.vcproj
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/libportaudio.vcproj
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/os-auto.mak.in b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/os-auto.mak.in
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/os-auto.mak.in
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/os-auto.mak.in
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/os-linux.mak b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/os-linux.mak
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/os-linux.mak
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/os-linux.mak
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_allocation.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_allocation.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_allocation.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_allocation.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_allocation.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_allocation.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_allocation.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_allocation.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_converters.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_converters.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_converters.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_converters.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_converters.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_converters.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_converters.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_converters.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_cpuload.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_cpuload.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_cpuload.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_cpuload.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_cpuload.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_cpuload.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_cpuload.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_cpuload.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_debugprint.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_debugprint.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_debugprint.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_debugprint.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_debugprint.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_debugprint.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_debugprint.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_debugprint.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_dither.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_dither.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_dither.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_dither.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_dither.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_dither.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_dither.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_dither.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_endianness.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_endianness.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_endianness.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_endianness.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_front.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_front.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_front.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_front.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_hostapi.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_hostapi.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_hostapi.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_hostapi.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_linux_alsa.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_linux_alsa.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_linux_alsa.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_linux_alsa.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_linux_alsa.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_linux_alsa.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_linux_alsa.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_linux_alsa.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_core.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_core.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_core.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_core.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_blocking.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_core_blocking.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_blocking.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_core_blocking.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_blocking.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_core_blocking.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_blocking.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_core_blocking.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_internal.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_core_internal.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_internal.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_core_internal.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_old.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_core_old.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_old.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_core_old.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_utilities.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_core_utilities.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_utilities.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_core_utilities.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_utilities.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_core_utilities.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_utilities.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_core_utilities.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_hostapis.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_hostapis.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_hostapis.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_mac_hostapis.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_process.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_process.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_process.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_process.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_process.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_process.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_process.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_process.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_ringbuffer.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_ringbuffer.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_ringbuffer.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_ringbuffer.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_ringbuffer.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_ringbuffer.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_ringbuffer.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_ringbuffer.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_skeleton.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_skeleton.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_skeleton.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_skeleton.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_stream.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_stream.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_stream.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_stream.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_stream.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_stream.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_stream.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_stream.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_trace.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_trace.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_trace.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_trace.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_trace.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_trace.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_trace.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_trace.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_types.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_types.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_types.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_types.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_unix_hostapis.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_unix_hostapis.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_unix_hostapis.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_unix_hostapis.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_unix_oss.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_unix_oss.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_unix_oss.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_unix_oss.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_unix_util.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_unix_util.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_unix_util.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_unix_util.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_unix_util.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_unix_util.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_unix_util.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_unix_util.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_util.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_util.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_util.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_util.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_hostapis.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_win_hostapis.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_hostapis.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_win_hostapis.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_util.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_win_util.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_util.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_win_util.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_waveformat.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_win_waveformat.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_waveformat.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_win_waveformat.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_waveformat.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_win_waveformat.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_waveformat.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_win_waveformat.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_wmme.c b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_win_wmme.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_wmme.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_win_wmme.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_wmme.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_win_wmme.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_wmme.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/pa_win_wmme.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/portaudio.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/portaudio.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/portaudio.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/portaudio/src/portaudio.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/Makefile b/sflphone-common/libs/pjproject-1.0.3/third_party/build/resample/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/Makefile
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/resample/Makefile
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/config.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/resample/config.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/config.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/resample/config.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/libresample.dsp b/sflphone-common/libs/pjproject-1.0.3/third_party/build/resample/libresample.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/libresample.dsp
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/resample/libresample.dsp
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/libresample.vcp b/sflphone-common/libs/pjproject-1.0.3/third_party/build/resample/libresample.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/libresample.vcp
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/resample/libresample.vcp
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/libresample.vcproj b/sflphone-common/libs/pjproject-1.0.3/third_party/build/resample/libresample.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/libresample.vcproj
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/resample/libresample.vcproj
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/libresample_dll.dsp b/sflphone-common/libs/pjproject-1.0.3/third_party/build/resample/libresample_dll.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/libresample_dll.dsp
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/resample/libresample_dll.dsp
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/libresample_dll.vcproj b/sflphone-common/libs/pjproject-1.0.3/third_party/build/resample/libresample_dll.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/libresample_dll.vcproj
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/resample/libresample_dll.vcproj
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/samplerate/README.txt b/sflphone-common/libs/pjproject-1.0.3/third_party/build/samplerate/README.txt
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/samplerate/README.txt
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/samplerate/README.txt
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/samplerate/Static.msvc b/sflphone-common/libs/pjproject-1.0.3/third_party/build/samplerate/Static.msvc
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/samplerate/Static.msvc
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/samplerate/Static.msvc
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/samplerate/libsamplerate_static.dsp b/sflphone-common/libs/pjproject-1.0.3/third_party/build/samplerate/libsamplerate_static.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/samplerate/libsamplerate_static.dsp
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/samplerate/libsamplerate_static.dsp
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/Makefile b/sflphone-common/libs/pjproject-1.0.3/third_party/build/speex/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/Makefile
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/speex/Makefile
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/config.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/speex/config.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/config.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/speex/config.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/libspeex.dsp b/sflphone-common/libs/pjproject-1.0.3/third_party/build/speex/libspeex.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/libspeex.dsp
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/speex/libspeex.dsp
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/libspeex.vcp b/sflphone-common/libs/pjproject-1.0.3/third_party/build/speex/libspeex.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/libspeex.vcp
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/speex/libspeex.vcp
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/libspeex.vcproj b/sflphone-common/libs/pjproject-1.0.3/third_party/build/speex/libspeex.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/libspeex.vcproj
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/speex/libspeex.vcproj
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/speex/speex_config_types.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/speex/speex/speex_config_types.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/speex/speex_config_types.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/speex/speex/speex_config_types.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/srtp/Makefile b/sflphone-common/libs/pjproject-1.0.3/third_party/build/srtp/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/srtp/Makefile
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/srtp/Makefile
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/srtp/libsrtp.dsp b/sflphone-common/libs/pjproject-1.0.3/third_party/build/srtp/libsrtp.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/srtp/libsrtp.dsp
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/srtp/libsrtp.dsp
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/srtp/libsrtp.vcp b/sflphone-common/libs/pjproject-1.0.3/third_party/build/srtp/libsrtp.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/srtp/libsrtp.vcp
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/srtp/libsrtp.vcp
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/srtp/libsrtp.vcproj b/sflphone-common/libs/pjproject-1.0.3/third_party/build/srtp/libsrtp.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/srtp/libsrtp.vcproj
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/srtp/libsrtp.vcproj
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/build/srtp/srtp_config.h b/sflphone-common/libs/pjproject-1.0.3/third_party/build/srtp/srtp_config.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/build/srtp/srtp_config.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/build/srtp/srtp_config.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/COPYRIGHT b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/COPYRIGHT
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/COPYRIGHT
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/COPYRIGHT
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/ChangeLog b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/ChangeLog
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/ChangeLog
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/ChangeLog
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/INSTALL b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/INSTALL
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/INSTALL
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/INSTALL
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/MACHINES b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/MACHINES
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/MACHINES
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/MACHINES
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/MANIFEST b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/MANIFEST
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/MANIFEST
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/MANIFEST
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/Makefile b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/Makefile
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/Makefile
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/README b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/README
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/README
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/README
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/add-test/add_test.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/add-test/add_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/add-test/add_test.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/add-test/add_test.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/add-test/add_test.dta b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/add-test/add_test.dta
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/add-test/add_test.dta
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/add-test/add_test.dta
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/config.h b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/inc/config.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/config.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/inc/config.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/gsm.h b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/inc/gsm.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/gsm.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/inc/gsm.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/private.h b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/inc/private.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/private.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/inc/private.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/proto.h b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/inc/proto.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/proto.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/inc/proto.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/toast.h b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/inc/toast.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/toast.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/inc/toast.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/unproto.h b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/inc/unproto.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/unproto.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/inc/unproto.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/man/gsm.3 b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/man/gsm.3
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/man/gsm.3
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/man/gsm.3
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/man/gsm_explode.3 b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/man/gsm_explode.3
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/man/gsm_explode.3
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/man/gsm_explode.3
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/man/gsm_option.3 b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/man/gsm_option.3
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/man/gsm_option.3
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/man/gsm_option.3
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/man/gsm_print.3 b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/man/gsm_print.3
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/man/gsm_print.3
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/man/gsm_print.3
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/add.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/add.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/add.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/add.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/code.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/code.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/code.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/code.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/debug.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/debug.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/debug.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/debug.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/decode.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/decode.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/decode.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/decode.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_create.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/gsm_create.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_create.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/gsm_create.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_decode.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/gsm_decode.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_decode.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/gsm_decode.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_destroy.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/gsm_destroy.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_destroy.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/gsm_destroy.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_encode.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/gsm_encode.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_encode.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/gsm_encode.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_explode.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/gsm_explode.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_explode.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/gsm_explode.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_implode.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/gsm_implode.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_implode.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/gsm_implode.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_option.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/gsm_option.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_option.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/gsm_option.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_print.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/gsm_print.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_print.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/gsm_print.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/long_term.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/long_term.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/long_term.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/long_term.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/lpc.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/lpc.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/lpc.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/lpc.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/preprocess.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/preprocess.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/preprocess.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/preprocess.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/rpe.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/rpe.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/rpe.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/rpe.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/short_term.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/short_term.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/short_term.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/short_term.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/table.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/table.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/table.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/table.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/toast.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/toast.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/toast.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/toast.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/toast_alaw.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/toast_alaw.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/toast_alaw.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/toast_alaw.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/toast_audio.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/toast_audio.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/toast_audio.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/toast_audio.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/toast_lin.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/toast_lin.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/toast_lin.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/toast_lin.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/toast_ulaw.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/toast_ulaw.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/toast_ulaw.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/src/toast_ulaw.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/bitter.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/bitter.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/bitter.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/bitter.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/bitter.dta b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/bitter.dta
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/bitter.dta
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/bitter.dta
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/ginger.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/ginger.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/ginger.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/ginger.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/sour.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/sour.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/sour.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/sour.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/sour1.dta b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/sour1.dta
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/sour1.dta
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/sour1.dta
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/sour2.dta b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/sour2.dta
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/sour2.dta
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/sour2.dta
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/sweet.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/sweet.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/sweet.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/sweet.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/taste.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/taste.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/taste.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/taste.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/taste.h b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/taste.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/taste.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tls/taste.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/cod2lin.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tst/cod2lin.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/cod2lin.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tst/cod2lin.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/cod2txt.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tst/cod2txt.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/cod2txt.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tst/cod2txt.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/gsm2cod.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tst/gsm2cod.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/gsm2cod.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tst/gsm2cod.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/lin2cod.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tst/lin2cod.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/lin2cod.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tst/lin2cod.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/lin2txt.c b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tst/lin2txt.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/lin2txt.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tst/lin2txt.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/run b/sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tst/run
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/run
rename to sflphone-common/libs/pjproject-1.0.3/third_party/gsm/tst/run
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/FrameClassify.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/FrameClassify.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/FrameClassify.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/FrameClassify.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/FrameClassify.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/FrameClassify.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/FrameClassify.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/FrameClassify.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/LPCdecode.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/LPCdecode.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/LPCdecode.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/LPCdecode.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/LPCdecode.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/LPCdecode.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/LPCdecode.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/LPCdecode.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/LPCencode.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/LPCencode.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/LPCencode.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/LPCencode.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/LPCencode.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/LPCencode.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/LPCencode.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/LPCencode.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/StateConstructW.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/StateConstructW.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/StateConstructW.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/StateConstructW.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/StateConstructW.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/StateConstructW.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/StateConstructW.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/StateConstructW.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/StateSearchW.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/StateSearchW.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/StateSearchW.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/StateSearchW.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/StateSearchW.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/StateSearchW.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/StateSearchW.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/StateSearchW.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/anaFilter.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/anaFilter.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/anaFilter.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/anaFilter.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/anaFilter.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/anaFilter.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/anaFilter.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/anaFilter.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/constants.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/constants.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/constants.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/constants.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/constants.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/constants.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/constants.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/constants.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/createCB.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/createCB.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/createCB.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/createCB.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/createCB.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/createCB.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/createCB.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/createCB.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/doCPLC.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/doCPLC.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/doCPLC.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/doCPLC.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/doCPLC.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/doCPLC.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/doCPLC.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/doCPLC.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/enhancer.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/enhancer.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/enhancer.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/enhancer.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/enhancer.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/enhancer.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/enhancer.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/enhancer.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/filter.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/filter.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/filter.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/filter.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/filter.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/filter.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/filter.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/filter.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/gainquant.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/gainquant.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/gainquant.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/gainquant.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/gainquant.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/gainquant.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/gainquant.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/gainquant.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/getCBvec.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/getCBvec.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/getCBvec.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/getCBvec.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/getCBvec.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/getCBvec.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/getCBvec.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/getCBvec.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/helpfun.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/helpfun.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/helpfun.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/helpfun.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/helpfun.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/helpfun.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/helpfun.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/helpfun.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/hpInput.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/hpInput.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/hpInput.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/hpInput.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/hpInput.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/hpInput.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/hpInput.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/hpInput.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/hpOutput.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/hpOutput.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/hpOutput.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/hpOutput.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/hpOutput.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/hpOutput.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/hpOutput.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/hpOutput.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iCBConstruct.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iCBConstruct.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iCBConstruct.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iCBConstruct.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iCBConstruct.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iCBConstruct.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iCBConstruct.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iCBConstruct.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iCBSearch.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iCBSearch.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iCBSearch.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iCBSearch.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iCBSearch.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iCBSearch.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iCBSearch.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iCBSearch.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_decode.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iLBC_decode.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_decode.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iLBC_decode.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_decode.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iLBC_decode.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_decode.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iLBC_decode.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_define.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iLBC_define.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_define.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iLBC_define.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_encode.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iLBC_encode.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_encode.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iLBC_encode.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_encode.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iLBC_encode.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_encode.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iLBC_encode.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_test.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iLBC_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_test.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/iLBC_test.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/lsf.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/lsf.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/lsf.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/lsf.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/lsf.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/lsf.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/lsf.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/lsf.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/packing.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/packing.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/packing.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/packing.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/packing.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/packing.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/packing.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/packing.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/syntFilter.c b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/syntFilter.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/syntFilter.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/syntFilter.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/syntFilter.h b/sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/syntFilter.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/syntFilter.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/ilbc/syntFilter.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/mp3/BladeMP3EncDLL.h b/sflphone-common/libs/pjproject-1.0.3/third_party/mp3/BladeMP3EncDLL.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/mp3/BladeMP3EncDLL.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/mp3/BladeMP3EncDLL.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/mp3/mp3_port.h b/sflphone-common/libs/pjproject-1.0.3/third_party/mp3/mp3_port.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/mp3/mp3_port.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/mp3/mp3_port.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/mp3/mp3_writer.c b/sflphone-common/libs/pjproject-1.0.3/third_party/mp3/mp3_writer.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/mp3/mp3_writer.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/mp3/mp3_writer.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/Doxyfile b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/Doxyfile
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/Doxyfile
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/Doxyfile
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/LICENSE.txt b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/LICENSE.txt
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/LICENSE.txt
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/LICENSE.txt
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/README.txt b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/README.txt
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/README.txt
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/README.txt
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/SConstruct b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/SConstruct
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/SConstruct
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/SConstruct
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/dev-cpp/Makefile-dll b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/dev-cpp/Makefile-dll
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/dev-cpp/Makefile-dll
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/dev-cpp/Makefile-dll
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/dev-cpp/Makefile-static b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/dev-cpp/Makefile-static
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/dev-cpp/Makefile-static
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/dev-cpp/Makefile-static
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/dev-cpp/portaudio-dll.dev b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/dev-cpp/portaudio-dll.dev
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/dev-cpp/portaudio-dll.dev
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/dev-cpp/portaudio-dll.dev
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/dev-cpp/portaudio-static.dev b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/dev-cpp/portaudio-static.dev
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/dev-cpp/portaudio-static.dev
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/dev-cpp/portaudio-static.dev
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/dev-cpp/readme.txt b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/dev-cpp/readme.txt
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/dev-cpp/readme.txt
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/dev-cpp/readme.txt
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/portaudio.def b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/msvc/portaudio.def
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/portaudio.def
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/msvc/portaudio.def
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/portaudio.dsp b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/msvc/portaudio.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/portaudio.dsp
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/msvc/portaudio.dsp
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/portaudio.dsw b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/msvc/portaudio.dsw
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/portaudio.dsw
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/msvc/portaudio.dsw
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/portaudio.sln b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/msvc/portaudio.sln
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/portaudio.sln
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/msvc/portaudio.sln
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/portaudio.vcproj b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/msvc/portaudio.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/portaudio.vcproj
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/msvc/portaudio.vcproj
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/readme.txt b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/msvc/readme.txt
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/readme.txt
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/msvc/readme.txt
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/scons/SConscript_common b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/scons/SConscript_common
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/scons/SConscript_common
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/scons/SConscript_common
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/scons/SConscript_opts b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/scons/SConscript_opts
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/scons/SConscript_opts
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/build/scons/SConscript_opts
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/config.guess b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/config.guess
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/config.guess
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/config.guess
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/config.sub b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/config.sub
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/config.sub
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/config.sub
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/configure b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/configure
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/configure
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/configure
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/configure.in b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/configure.in
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/configure.in
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/configure.in
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/depcomp b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/depcomp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/depcomp
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/depcomp
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/fixdir.bat b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/fixdir.bat
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/fixdir.bat
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/fixdir.bat
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/fixfile.bat b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/fixfile.bat
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/fixfile.bat
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/fixfile.bat
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_asio.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/include/pa_asio.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_asio.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/include/pa_asio.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_jack.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/include/pa_jack.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_jack.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/include/pa_jack.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_linux_alsa.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/include/pa_linux_alsa.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_linux_alsa.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/include/pa_linux_alsa.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_mac_core.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/include/pa_mac_core.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_mac_core.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/include/pa_mac_core.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_win_ds.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/include/pa_win_ds.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_win_ds.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/include/pa_win_ds.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_win_waveformat.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/include/pa_win_waveformat.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_win_waveformat.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/include/pa_win_waveformat.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_win_wmme.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/include/pa_win_wmme.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_win_wmme.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/include/pa_win_wmme.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/portaudio.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/include/portaudio.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/portaudio.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/include/portaudio.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/index.html b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/index.html
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/index.html
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/index.html
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/install-sh b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/install-sh
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/install-sh
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/install-sh
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/ltmain.sh b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/ltmain.sh
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/ltmain.sh
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/ltmain.sh
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/missing b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/missing
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/missing
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/missing
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/README.txt b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/pablio/README.txt
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/README.txt
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/pablio/README.txt
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/pablio.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/pablio/pablio.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/pablio.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/pablio/pablio.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/pablio.def b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/pablio/pablio.def
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/pablio.def
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/pablio/pablio.def
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/pablio.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/pablio/pablio.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/pablio.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/pablio/pablio.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/test_rw.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/pablio/test_rw.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/test_rw.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/pablio/test_rw.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/test_rw_echo.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/pablio/test_rw_echo.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/test_rw_echo.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/pablio/test_rw_echo.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/test_w_saw.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/pablio/test_w_saw.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/test_w_saw.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/pablio/test_w_saw.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/test_w_saw8.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/pablio/test_w_saw8.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/test_w_saw8.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/pablio/test_w_saw8.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/portaudio-2.0.pc.in b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/portaudio-2.0.pc.in
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/portaudio-2.0.pc.in
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/portaudio-2.0.pc.in
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/SConscript b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/SConscript
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/SConscript
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/SConscript
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_allocation.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_allocation.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_allocation.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_allocation.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_allocation.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_allocation.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_allocation.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_allocation.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_converters.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_converters.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_converters.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_converters.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_converters.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_converters.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_converters.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_converters.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_cpuload.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_cpuload.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_cpuload.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_cpuload.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_cpuload.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_cpuload.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_cpuload.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_cpuload.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_debugprint.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_debugprint.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_debugprint.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_debugprint.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_debugprint.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_debugprint.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_debugprint.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_debugprint.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_dither.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_dither.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_dither.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_dither.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_dither.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_dither.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_dither.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_dither.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_endianness.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_endianness.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_endianness.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_endianness.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_front.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_front.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_front.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_front.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_hostapi.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_hostapi.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_hostapi.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_hostapi.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_memorybarrier.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_memorybarrier.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_memorybarrier.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_memorybarrier.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_process.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_process.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_process.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_process.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_process.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_process.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_process.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_process.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_ringbuffer.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_ringbuffer.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_ringbuffer.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_ringbuffer.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_ringbuffer.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_ringbuffer.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_ringbuffer.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_ringbuffer.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_skeleton.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_skeleton.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_skeleton.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_skeleton.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_stream.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_stream.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_stream.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_stream.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_stream.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_stream.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_stream.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_stream.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_trace.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_trace.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_trace.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_trace.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_trace.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_trace.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_trace.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_trace.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_types.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_types.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_types.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_types.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_util.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_util.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_util.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/common/pa_util.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/alsa/pa_linux_alsa.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/alsa/pa_linux_alsa.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/alsa/pa_linux_alsa.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/alsa/pa_linux_alsa.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asihpi/pa_linux_asihpi.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/asihpi/pa_linux_asihpi.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asihpi/pa_linux_asihpi.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/asihpi/pa_linux_asihpi.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/ASIO-README.txt b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/asio/ASIO-README.txt
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/ASIO-README.txt
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/asio/ASIO-README.txt
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/Callback_adaptation_.pdf b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/asio/Callback_adaptation_.pdf
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/Callback_adaptation_.pdf
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/asio/Callback_adaptation_.pdf
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/Pa_ASIO.pdf b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/asio/Pa_ASIO.pdf
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/Pa_ASIO.pdf
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/asio/Pa_ASIO.pdf
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/iasiothiscallresolver.cpp b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/asio/iasiothiscallresolver.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/iasiothiscallresolver.cpp
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/asio/iasiothiscallresolver.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/iasiothiscallresolver.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/asio/iasiothiscallresolver.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/iasiothiscallresolver.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/asio/iasiothiscallresolver.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/pa_asio.cpp b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/asio/pa_asio.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/pa_asio.cpp
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/asio/pa_asio.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/notes.txt b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/coreaudio/notes.txt
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/notes.txt
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/coreaudio/notes.txt
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_internal.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_internal.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_internal.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_internal.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_old.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_old.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_old.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_old.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/dsound/pa_win_ds.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/dsound/pa_win_ds.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/dsound/pa_win_ds.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/dsound/pa_win_ds.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/jack/pa_jack.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/jack/pa_jack.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/jack/pa_jack.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/jack/pa_jack.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/oss/low_latency_tip.txt b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/oss/low_latency_tip.txt
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/oss/low_latency_tip.txt
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/oss/low_latency_tip.txt
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/oss/pa_unix_oss.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/oss/pa_unix_oss.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/oss/pa_unix_oss.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/oss/pa_unix_oss.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/oss/recplay.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/oss/recplay.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/oss/recplay.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/oss/recplay.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/wasapi/pa_win_wasapi.cpp b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/wasapi/pa_win_wasapi.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/wasapi/pa_win_wasapi.cpp
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/wasapi/pa_win_wasapi.cpp
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/wdmks/pa_win_wdmks.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/wdmks/pa_win_wdmks.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/wdmks/pa_win_wdmks.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/wdmks/pa_win_wdmks.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/wdmks/readme.txt b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/wdmks/readme.txt
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/wdmks/readme.txt
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/wdmks/readme.txt
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/wmme/pa_win_wmme.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/wmme/pa_win_wmme.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/wmme/pa_win_wmme.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/hostapi/wmme/pa_win_wmme.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/unix/pa_unix_hostapis.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/unix/pa_unix_hostapis.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/unix/pa_unix_hostapis.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/unix/pa_unix_hostapis.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/unix/pa_unix_util.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/unix/pa_unix_util.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/unix/pa_unix_util.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/unix/pa_unix_util.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/unix/pa_unix_util.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/unix/pa_unix_util.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/unix/pa_unix_util.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/unix/pa_unix_util.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_win_hostapis.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/win/pa_win_hostapis.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_win_hostapis.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/win/pa_win_hostapis.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_win_util.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/win/pa_win_util.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_win_util.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/win/pa_win_util.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_win_waveformat.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/win/pa_win_waveformat.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_win_waveformat.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/win/pa_win_waveformat.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_win_wdmks_utils.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/win/pa_win_wdmks_utils.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_win_wdmks_utils.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/win/pa_win_wdmks_utils.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_win_wdmks_utils.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/win/pa_win_wdmks_utils.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_win_wdmks_utils.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/win/pa_win_wdmks_utils.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_x86_plain_converters.c b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/win/pa_x86_plain_converters.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_x86_plain_converters.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/win/pa_x86_plain_converters.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_x86_plain_converters.h b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/win/pa_x86_plain_converters.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_x86_plain_converters.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/src/os/win/pa_x86_plain_converters.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/testcvs/changeme.txt b/sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/testcvs/changeme.txt
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/testcvs/changeme.txt
rename to sflphone-common/libs/pjproject-1.0.3/third_party/portaudio/testcvs/changeme.txt
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/resample/COPYING b/sflphone-common/libs/pjproject-1.0.3/third_party/resample/COPYING
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/resample/COPYING
rename to sflphone-common/libs/pjproject-1.0.3/third_party/resample/COPYING
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/resample/README.resample b/sflphone-common/libs/pjproject-1.0.3/third_party/resample/README.resample
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/resample/README.resample
rename to sflphone-common/libs/pjproject-1.0.3/third_party/resample/README.resample
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/resample/include/resamplesubs.h b/sflphone-common/libs/pjproject-1.0.3/third_party/resample/include/resamplesubs.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/resample/include/resamplesubs.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/resample/include/resamplesubs.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/largefilter.h b/sflphone-common/libs/pjproject-1.0.3/third_party/resample/src/largefilter.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/largefilter.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/resample/src/largefilter.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/libresample_dll.c b/sflphone-common/libs/pjproject-1.0.3/third_party/resample/src/libresample_dll.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/libresample_dll.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/resample/src/libresample_dll.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/resample.h b/sflphone-common/libs/pjproject-1.0.3/third_party/resample/src/resample.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/resample.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/resample/src/resample.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/resamplesubs.c b/sflphone-common/libs/pjproject-1.0.3/third_party/resample/src/resamplesubs.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/resamplesubs.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/resample/src/resamplesubs.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/smallfilter.h b/sflphone-common/libs/pjproject-1.0.3/third_party/resample/src/smallfilter.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/smallfilter.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/resample/src/smallfilter.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/stddefs.h b/sflphone-common/libs/pjproject-1.0.3/third_party/resample/src/stddefs.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/stddefs.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/resample/src/stddefs.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/AUTHORS b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/AUTHORS
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/AUTHORS
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/AUTHORS
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/COPYING b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/COPYING
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/COPYING
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/COPYING
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_bits.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_bits.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_bits.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_bits.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_buffer.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_buffer.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_buffer.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_buffer.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_callbacks.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_callbacks.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_callbacks.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_callbacks.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_config_types.h.in b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_config_types.h.in
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_config_types.h.in
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_config_types.h.in
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_echo.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_echo.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_echo.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_echo.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_header.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_header.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_header.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_header.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_jitter.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_jitter.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_jitter.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_jitter.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_preprocess.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_preprocess.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_preprocess.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_preprocess.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_resampler.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_resampler.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_resampler.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_resampler.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_stereo.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_stereo.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_stereo.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_stereo.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_types.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_types.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_types.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/include/speex/speex_types.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/_kiss_fft_guts.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/_kiss_fft_guts.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/_kiss_fft_guts.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/_kiss_fft_guts.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/arch.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/arch.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/arch.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/arch.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/bits.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/bits.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/bits.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/bits.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/buffer.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/buffer.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/buffer.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/buffer.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/cb_search.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/cb_search.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/cb_search.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/cb_search.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/cb_search.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/cb_search.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/cb_search.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/cb_search.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/cb_search_arm4.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/cb_search_arm4.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/cb_search_arm4.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/cb_search_arm4.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/cb_search_bfin.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/cb_search_bfin.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/cb_search_bfin.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/cb_search_bfin.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/cb_search_sse.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/cb_search_sse.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/cb_search_sse.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/cb_search_sse.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/echo_diagnostic.m b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/echo_diagnostic.m
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/echo_diagnostic.m
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/echo_diagnostic.m
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_10_16_table.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/exc_10_16_table.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_10_16_table.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/exc_10_16_table.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_10_32_table.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/exc_10_32_table.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_10_32_table.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/exc_10_32_table.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_20_32_table.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/exc_20_32_table.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_20_32_table.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/exc_20_32_table.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_5_256_table.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/exc_5_256_table.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_5_256_table.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/exc_5_256_table.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_5_64_table.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/exc_5_64_table.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_5_64_table.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/exc_5_64_table.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_8_128_table.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/exc_8_128_table.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_8_128_table.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/exc_8_128_table.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fftwrap.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/fftwrap.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fftwrap.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/fftwrap.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fftwrap.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/fftwrap.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fftwrap.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/fftwrap.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filterbank.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/filterbank.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filterbank.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/filterbank.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filterbank.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/filterbank.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filterbank.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/filterbank.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filters.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/filters.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filters.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/filters.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filters.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/filters.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filters.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/filters.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filters_arm4.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/filters_arm4.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filters_arm4.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/filters_arm4.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filters_bfin.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/filters_bfin.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filters_bfin.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/filters_bfin.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filters_sse.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/filters_sse.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filters_sse.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/filters_sse.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fixed_arm4.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/fixed_arm4.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fixed_arm4.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/fixed_arm4.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fixed_arm5e.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/fixed_arm5e.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fixed_arm5e.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/fixed_arm5e.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fixed_bfin.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/fixed_bfin.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fixed_bfin.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/fixed_bfin.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fixed_debug.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/fixed_debug.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fixed_debug.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/fixed_debug.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fixed_generic.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/fixed_generic.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fixed_generic.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/fixed_generic.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/gain_table.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/gain_table.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/gain_table.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/gain_table.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/gain_table_lbr.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/gain_table_lbr.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/gain_table_lbr.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/gain_table_lbr.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/hexc_10_32_table.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/hexc_10_32_table.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/hexc_10_32_table.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/hexc_10_32_table.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/hexc_table.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/hexc_table.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/hexc_table.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/hexc_table.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/high_lsp_tables.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/high_lsp_tables.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/high_lsp_tables.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/high_lsp_tables.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/jitter.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/jitter.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/jitter.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/jitter.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/kiss_fft.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/kiss_fft.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/kiss_fft.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/kiss_fft.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/kiss_fft.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/kiss_fft.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/kiss_fft.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/kiss_fft.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/kiss_fftr.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/kiss_fftr.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/kiss_fftr.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/kiss_fftr.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/kiss_fftr.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/kiss_fftr.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/kiss_fftr.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/kiss_fftr.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lpc.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/lpc.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lpc.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/lpc.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lpc.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/lpc.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lpc.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/lpc.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lpc_bfin.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/lpc_bfin.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lpc_bfin.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/lpc_bfin.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lsp.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/lsp.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lsp.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/lsp.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lsp.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/lsp.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lsp.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/lsp.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lsp_bfin.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/lsp_bfin.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lsp_bfin.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/lsp_bfin.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lsp_tables_nb.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/lsp_tables_nb.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lsp_tables_nb.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/lsp_tables_nb.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/ltp.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/ltp.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/ltp.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/ltp.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/ltp.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/ltp.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/ltp.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/ltp.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/ltp_arm4.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/ltp_arm4.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/ltp_arm4.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/ltp_arm4.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/ltp_bfin.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/ltp_bfin.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/ltp_bfin.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/ltp_bfin.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/ltp_sse.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/ltp_sse.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/ltp_sse.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/ltp_sse.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/math_approx.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/math_approx.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/math_approx.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/math_approx.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/mdf.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/mdf.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/mdf.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/mdf.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/misc_bfin.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/misc_bfin.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/misc_bfin.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/misc_bfin.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/modes.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/modes.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/modes.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/modes.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/modes.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/modes.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/modes.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/modes.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/modes_wb.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/modes_wb.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/modes_wb.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/modes_wb.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/nb_celp.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/nb_celp.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/nb_celp.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/nb_celp.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/nb_celp.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/nb_celp.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/nb_celp.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/nb_celp.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/os_support.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/os_support.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/os_support.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/os_support.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/preprocess.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/preprocess.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/preprocess.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/preprocess.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/pseudofloat.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/pseudofloat.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/pseudofloat.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/pseudofloat.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/quant_lsp.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/quant_lsp.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/quant_lsp.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/quant_lsp.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/quant_lsp.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/quant_lsp.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/quant_lsp.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/quant_lsp.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/quant_lsp_bfin.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/quant_lsp_bfin.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/quant_lsp_bfin.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/quant_lsp_bfin.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/resample.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/resample.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/resample.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/resample.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/resample_sse.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/resample_sse.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/resample_sse.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/resample_sse.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/sb_celp.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/sb_celp.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/sb_celp.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/sb_celp.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/sb_celp.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/sb_celp.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/sb_celp.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/sb_celp.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/scal.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/scal.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/scal.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/scal.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/smallft.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/smallft.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/smallft.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/smallft.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/smallft.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/smallft.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/smallft.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/smallft.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/speex.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/speex.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/speex.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/speex.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/speex_callbacks.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/speex_callbacks.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/speex_callbacks.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/speex_callbacks.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/speex_header.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/speex_header.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/speex_header.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/speex_header.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/stack_alloc.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/stack_alloc.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/stack_alloc.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/stack_alloc.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/stereo.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/stereo.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/stereo.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/stereo.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testdenoise.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/testdenoise.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testdenoise.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/testdenoise.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testecho.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/testecho.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testecho.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/testecho.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testenc.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/testenc.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testenc.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/testenc.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testenc_uwb.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/testenc_uwb.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testenc_uwb.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/testenc_uwb.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testenc_wb.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/testenc_wb.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testenc_wb.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/testenc_wb.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testjitter.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/testjitter.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testjitter.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/testjitter.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testresample.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/testresample.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testresample.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/testresample.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vbr.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vbr.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vbr.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vbr.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vbr.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vbr.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vbr.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vbr.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vorbis_psy.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vorbis_psy.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vorbis_psy.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vorbis_psy.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vorbis_psy.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vorbis_psy.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vorbis_psy.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vorbis_psy.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vq.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vq.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vq.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vq.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vq.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vq.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vq.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vq.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vq_arm4.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vq_arm4.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vq_arm4.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vq_arm4.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vq_bfin.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vq_bfin.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vq_bfin.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vq_bfin.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vq_sse.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vq_sse.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vq_sse.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/vq_sse.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/window.c b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/window.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/window.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/libspeex/window.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/symbian/config.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/symbian/config.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/symbian/config.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/symbian/config.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/speex/win32/config.h b/sflphone-common/libs/pjproject-1.0.3/third_party/speex/win32/config.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/speex/win32/config.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/speex/win32/config.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/CHANGES b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/CHANGES
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/CHANGES
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/CHANGES
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/LICENSE b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/LICENSE
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/LICENSE
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/LICENSE
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/README b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/README
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/README
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/README
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/TODO b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/TODO
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/TODO
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/TODO
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/VERSION b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/VERSION
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/VERSION
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/VERSION
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/config.guess b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/config.guess
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/config.guess
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/config.guess
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/config.h_win32vc7 b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/config.h_win32vc7
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/config.h_win32vc7
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/config.h_win32vc7
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/config.hw b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/config.hw
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/config.hw
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/config.hw
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/config.sub b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/config.sub
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/config.sub
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/config.sub
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/config_in.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/config_in.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/config_in.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/config_in.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/configure b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/configure
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/configure
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/configure
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/configure.in b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/configure.in
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/configure.in
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/configure.in
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/Makefile b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/Makefile
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/Makefile
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/VERSION b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/VERSION
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/VERSION
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/VERSION
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/ae_xfm/xfm.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/ae_xfm/xfm.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/ae_xfm/xfm.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/ae_xfm/xfm.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/cipher/aes.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/cipher/aes.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/cipher/aes.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/cipher/aes.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/cipher/aes_cbc.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/cipher/aes_cbc.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/cipher/aes_cbc.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/cipher/aes_cbc.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/cipher/aes_icm.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/cipher/aes_icm.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/cipher/aes_icm.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/cipher/aes_icm.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/cipher/cipher.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/cipher/cipher.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/cipher/cipher.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/cipher/cipher.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/cipher/null_cipher.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/cipher/null_cipher.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/cipher/null_cipher.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/cipher/null_cipher.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/hash/auth.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/hash/auth.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/hash/auth.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/hash/auth.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/hash/hmac.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/hash/hmac.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/hash/hmac.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/hash/hmac.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/hash/null_auth.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/hash/null_auth.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/hash/null_auth.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/hash/null_auth.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/hash/sha1.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/hash/sha1.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/hash/sha1.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/hash/sha1.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/aes.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/aes.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/aes.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/aes.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/aes_cbc.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/aes_cbc.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/aes_cbc.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/aes_cbc.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/aes_icm.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/aes_icm.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/aes_icm.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/aes_icm.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/alloc.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/alloc.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/alloc.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/alloc.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/auth.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/auth.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/auth.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/auth.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/cipher.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/cipher.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/cipher.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/cipher.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/crypto.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/crypto.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/crypto.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/crypto.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/crypto_kernel.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/crypto_kernel.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/crypto_kernel.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/crypto_kernel.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/crypto_math.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/crypto_math.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/crypto_math.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/crypto_math.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/crypto_types.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/crypto_types.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/crypto_types.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/crypto_types.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/cryptoalg.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/cryptoalg.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/cryptoalg.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/cryptoalg.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/datatypes.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/datatypes.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/datatypes.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/datatypes.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/err.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/err.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/err.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/err.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/gf2_8.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/gf2_8.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/gf2_8.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/gf2_8.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/hmac.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/hmac.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/hmac.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/hmac.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/integers.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/integers.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/integers.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/integers.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/kernel_compat.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/kernel_compat.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/kernel_compat.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/kernel_compat.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/key.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/key.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/key.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/key.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/null_auth.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/null_auth.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/null_auth.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/null_auth.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/null_cipher.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/null_cipher.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/null_cipher.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/null_cipher.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/prng.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/prng.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/prng.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/prng.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/rand_source.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/rand_source.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/rand_source.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/rand_source.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/rdb.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/rdb.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/rdb.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/rdb.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/rdbx.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/rdbx.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/rdbx.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/rdbx.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/sha1.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/sha1.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/sha1.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/sha1.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/stat.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/stat.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/stat.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/stat.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/xfm.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/xfm.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/xfm.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/include/xfm.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/kernel/alloc.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/kernel/alloc.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/kernel/alloc.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/kernel/alloc.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/kernel/crypto_kernel.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/kernel/crypto_kernel.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/kernel/crypto_kernel.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/kernel/crypto_kernel.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/kernel/err.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/kernel/err.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/kernel/err.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/kernel/err.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/kernel/key.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/kernel/key.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/kernel/key.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/kernel/key.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/math/datatypes.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/math/datatypes.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/math/datatypes.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/math/datatypes.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/math/gf2_8.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/math/gf2_8.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/math/gf2_8.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/math/gf2_8.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/math/math.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/math/math.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/math/math.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/math/math.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/math/stat.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/math/stat.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/math/stat.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/math/stat.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/replay/rdb.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/replay/rdb.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/replay/rdb.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/replay/rdb.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/replay/rdbx.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/replay/rdbx.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/replay/rdbx.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/replay/rdbx.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/replay/ut_sim.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/replay/ut_sim.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/replay/ut_sim.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/replay/ut_sim.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/rng/ctr_prng.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/rng/ctr_prng.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/rng/ctr_prng.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/rng/ctr_prng.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/rng/prng.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/rng/prng.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/rng/prng.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/rng/prng.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/rng/rand_linux_kernel.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/rng/rand_linux_kernel.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/rng/rand_linux_kernel.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/rng/rand_linux_kernel.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/rng/rand_source.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/rng/rand_source.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/rng/rand_source.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/rng/rand_source.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/aes_calc.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/aes_calc.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/aes_calc.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/aes_calc.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/auth_driver.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/auth_driver.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/auth_driver.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/auth_driver.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/cipher_driver.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/cipher_driver.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/cipher_driver.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/cipher_driver.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/datatypes_driver.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/datatypes_driver.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/datatypes_driver.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/datatypes_driver.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/env.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/env.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/env.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/env.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/kernel_driver.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/kernel_driver.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/kernel_driver.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/kernel_driver.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/rand_gen.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/rand_gen.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/rand_gen.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/rand_gen.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/sha1_driver.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/sha1_driver.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/sha1_driver.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/sha1_driver.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/stat_driver.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/stat_driver.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/stat_driver.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/crypto/test/stat_driver.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/getopt_s.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/include/getopt_s.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/getopt_s.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/include/getopt_s.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/rtp.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/include/rtp.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/rtp.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/include/rtp.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/rtp_priv.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/include/rtp_priv.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/rtp_priv.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/include/rtp_priv.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/srtp.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/include/srtp.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/srtp.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/include/srtp.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/srtp_priv.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/include/srtp_priv.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/srtp_priv.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/include/srtp_priv.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/ut_sim.h b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/include/ut_sim.h
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/ut_sim.h
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/include/ut_sim.h
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/install-sh b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/install-sh
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/install-sh
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/install-sh
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/pjlib/srtp_err.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/pjlib/srtp_err.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/pjlib/srtp_err.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/pjlib/srtp_err.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/srtp.def b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/srtp.def
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/srtp.def
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/srtp.def
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/srtp.vcproj b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/srtp.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/srtp.vcproj
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/srtp.vcproj
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/srtp/srtp.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/srtp/srtp.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/srtp/srtp.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/srtp/srtp.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/srtp7.sln b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/srtp7.sln
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/srtp7.sln
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/srtp7.sln
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/srtp7.vcproj b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/srtp7.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/srtp7.vcproj
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/srtp7.vcproj
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/tables/aes_tables.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/tables/aes_tables.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/tables/aes_tables.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/tables/aes_tables.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/dtls_srtp_driver.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/dtls_srtp_driver.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/dtls_srtp_driver.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/dtls_srtp_driver.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/getopt_s.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/getopt_s.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/getopt_s.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/getopt_s.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/lfsr.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/lfsr.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/lfsr.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/lfsr.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/rdbx_driver.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/rdbx_driver.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/rdbx_driver.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/rdbx_driver.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/replay_driver.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/replay_driver.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/replay_driver.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/replay_driver.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/roc_driver.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/roc_driver.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/roc_driver.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/roc_driver.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/rtp.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/rtp.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/rtp.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/rtp.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/rtpw.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/rtpw.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/rtpw.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/rtpw.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/rtpw_test.sh b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/rtpw_test.sh
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/rtpw_test.sh
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/rtpw_test.sh
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/srtp_driver.c b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/srtp_driver.c
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/srtp_driver.c
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/test/srtp_driver.c
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/timing b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/timing
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/timing
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/timing
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/undos.sh b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/undos.sh
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/undos.sh
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/undos.sh
diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/update.sh b/sflphone-common/libs/pjproject-1.0.3/third_party/srtp/update.sh
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/third_party/srtp/update.sh
rename to sflphone-common/libs/pjproject-1.0.3/third_party/srtp/update.sh
diff --git a/sflphone-common/libs/pjproject-1.0.2/user.mak.sample b/sflphone-common/libs/pjproject-1.0.3/user.mak.sample
similarity index 100%
rename from sflphone-common/libs/pjproject-1.0.2/user.mak.sample
rename to sflphone-common/libs/pjproject-1.0.3/user.mak.sample
diff --git a/sflphone-common/po/README b/sflphone-common/po/README
deleted file mode 100644
index a3629ea2350c1299b40bca4e1fa38c8fef45441b..0000000000000000000000000000000000000000
--- a/sflphone-common/po/README
+++ /dev/null
@@ -1,6 +0,0 @@
-If we need to update sflphone.pot file, do the following steps:
-
-xgettext -k_ -o sflphone.pot ../../sflphone-client-gnome/src/*.c ../../sflphone-client-gnome/src/config/*.c ../../sflphone-client-gnome/src/dbus/*.c ../../sflphone-client-gnome/src/contacts/*.c
-
-Then make && sudo make install
-
diff --git a/sflphone-common/po/de.po b/sflphone-common/po/de.po
deleted file mode 100644
index 0cc3e2d8012ecbc7e454c023882b58875ad7c06c..0000000000000000000000000000000000000000
--- a/sflphone-common/po/de.po
+++ /dev/null
@@ -1,876 +0,0 @@
-# German translation of SFLphone.
-# Copyright (C) 2008 The Free Software Foundation, Inc.
-# This file is distributed under the GNU General Public License Version 3.
-#
-# Sven Werlen <sven.werlen@savoirfairelinux.com>, 2009.
-msgid ""
-msgstr ""
-"Project-Id-Version: sflphone\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-12 18:05-0400\n"
-"PO-Revision-Date: 2009-01-08 10:46-0500\n"
-"Last-Translator: Sven Werlen <sven.werlen@savoirfairelinux.com>\n"
-"Language-Team: SavoirFaire Linux Inc <sflphoneteam@savoirfairelinux.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 0.2\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:175
-msgid "Registered"
-msgstr "registriert"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:178
-msgid "Not Registered"
-msgstr "nicht registriert"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:181
-msgid "Trying..."
-msgstr "Am versuchen..."
-
-#: ../../sflphone-client-gnome/src/accountlist.c:184
-#: ../../sflphone-client-gnome/src/sflnotify.c:131
-#: ../../sflphone-client-gnome/src/sflnotify.c:148
-msgid "Error"
-msgstr "Fehler"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:187
-msgid "Bad authentification"
-msgstr "Falsche Authentifizierung"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:190
-msgid "Network unreachable"
-msgstr "Kein Netzwerk"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:193
-msgid "Host unreachable"
-msgstr "Host unerreichbar"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:196
-msgid "Stun configuration error"
-msgstr "Stun: Konfigurationsfehler"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:199
-msgid "Stun server invalid"
-msgstr "Ungültiger Stun Server"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:202
-msgid "Invalid"
-msgstr "Ungültig"
-
-#: ../../sflphone-client-gnome/src/actions.c:55
-#: ../../sflphone-client-gnome/src/sflnotify.c:94
-#, c-format
-msgid "%d voice mails"
-msgstr "%d Voice Nachrichten"
-
-#: ../../sflphone-client-gnome/src/actions.c:57
-#, c-format
-msgid "%d voice mail"
-msgstr "%d Voice Nachricht"
-
-#: ../../sflphone-client-gnome/src/actions.c:81
-#, c-format
-msgid "Using %s (%s)"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/actions.c:87
-msgid "No registered account"
-msgstr "Kein registriertes Konto"
-
-#: ../../sflphone-client-gnome/src/actions.c:232
-msgid ""
-"Unable to connect to the SFLphone server.\n"
-"Make sure the daemon is running."
-msgstr ""
-"SFLphone Server kann nicht verbunden werden. Stellen Sie sicher, dass der "
-"Dämon läuft."
-
-#: ../../sflphone-client-gnome/src/actions.c:807
-#, c-format
-msgid "IP call - %s"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/actions.c:810
-#, c-format
-msgid "Using %s (%s) - Codec: %s"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/actions.c:900
-#, 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>Fehler: Kein Audio-Codec gefunden.\n"
-"\n"
-"</b> SFL Audio-Codecs müssen in <i>%s</i> oder <b>.sflphone</b> Ihres HOME-"
-"Verzeichniss ( <i>%s</i> ) gespeichert werden."
-
-#: ../../sflphone-client-gnome/src/assistant.c:35
-#, c-format
-msgid ""
-"This assistant is now finished.\n"
-"You can at any time check your registration state or modify your accounts "
-"parameters in the Options/Accounts window.\n"
-"\n"
-"Alias :    %s\n"
-"Server :   %s\n"
-"Username : %s\n"
-msgstr ""
-"Assistent vollendet.\n"
-"\n"
-"Sie können jederzeit Ihres Registrierungsstatus überprüfen oder Ihre "
-"Kontoparameter ändern (Optionen/Konten).\n"
-"\n"
-"Alias :    %s\n"
-"Server :   %s\n"
-"Benutzername : %s\n"
-
-#: ../../sflphone-client-gnome/src/assistant.c:159
-msgid "SFLphone account configuration wizard"
-msgstr "SFLphone Konto (Konfigurationsassistent)"
-
-#: ../../sflphone-client-gnome/src/assistant.c:185
-msgid "Welcome to SFLphone!"
-msgstr "Wilkommen zu SFLphone!"
-
-#: ../../sflphone-client-gnome/src/assistant.c:186
-msgid "This installation wizard will help you configure an account."
-msgstr ""
-"The Installationsassistent wird Ihnen helfen, ein Konto zu konfigurieren."
-
-#: ../../sflphone-client-gnome/src/assistant.c:200
-msgid "VoIP Protocols"
-msgstr "VoIP Protokoll"
-
-#: ../../sflphone-client-gnome/src/assistant.c:200
-msgid "Select an account type:"
-msgstr "Kontotyp auswählen:"
-
-#: ../../sflphone-client-gnome/src/assistant.c:218
-msgid "Account"
-msgstr "Konto"
-
-#: ../../sflphone-client-gnome/src/assistant.c:218
-msgid "Please select one of the following option:"
-msgstr "Bitte eine Option auswählen:"
-
-#: ../../sflphone-client-gnome/src/assistant.c:220
-msgid "Create a free SIP/IAX2 account on sflphone.org"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/assistant.c:222
-msgid "Register an existing SIP or IAX2 account"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/assistant.c:235
-msgid "SIP account configuration"
-msgstr "Konfiguration des SIP-Konto"
-
-#: ../../sflphone-client-gnome/src/assistant.c:235
-#: ../../sflphone-client-gnome/src/assistant.c:331
-msgid "Please fill the following information:"
-msgstr "Folgende Informationen bitte ausfühlen:"
-
-#: ../../sflphone-client-gnome/src/assistant.c:243
-#: ../../sflphone-client-gnome/src/assistant.c:339
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:153
-msgid "_Alias"
-msgstr "_Alias"
-
-#: ../../sflphone-client-gnome/src/assistant.c:251
-#: ../../sflphone-client-gnome/src/assistant.c:347
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:189
-msgid "_Host name"
-msgstr "_Hostname"
-
-#: ../../sflphone-client-gnome/src/assistant.c:259
-#: ../../sflphone-client-gnome/src/assistant.c:355
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:197
-msgid "_User name"
-msgstr "_Benutzername"
-
-#: ../../sflphone-client-gnome/src/assistant.c:275
-#: ../../sflphone-client-gnome/src/assistant.c:370
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:212
-msgid "_Password"
-msgstr "_Passwort"
-
-#: ../../sflphone-client-gnome/src/assistant.c:293
-#: ../../sflphone-client-gnome/src/assistant.c:386
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:228
-msgid "_Voicemail number"
-msgstr "_Voicemail Nummer"
-
-#: ../../sflphone-client-gnome/src/assistant.c:308
-msgid "Optional Email Address "
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/assistant.c:308
-msgid "This email address will be use to send your voicemail messages"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/assistant.c:316
-msgid "_Email"
-msgstr "_Email"
-
-#: ../../sflphone-client-gnome/src/assistant.c:331
-msgid "IAX2 account configuration"
-msgstr "Konfiguration des IAX2 Konto"
-
-#: ../../sflphone-client-gnome/src/assistant.c:404
-#: ../../sflphone-client-gnome/src/config/configwindow.c:855
-msgid "Network Address Translation"
-msgstr "Network Address Translation (NAT)"
-
-#: ../../sflphone-client-gnome/src/assistant.c:404
-msgid "You should probably enable this if you are behind a firewall."
-msgstr "Sie sollten dieses einschalten, falls Sie hinter einer Firewall sind."
-
-#: ../../sflphone-client-gnome/src/assistant.c:413
-#: ../../sflphone-client-gnome/src/config/configwindow.c:532
-msgid "E_nable STUN"
-msgstr "STUN Ei_nschalten"
-
-#: ../../sflphone-client-gnome/src/assistant.c:420
-msgid "_STUN server"
-msgstr "_STUN Server"
-
-#: ../../sflphone-client-gnome/src/assistant.c:434
-msgid "Account Registration"
-msgstr "Konto Registrierung"
-
-#: ../../sflphone-client-gnome/src/assistant.c:434
-msgid "Congratulations!"
-msgstr "Gratulation!"
-
-#: ../../sflphone-client-gnome/src/errors.c:29
-msgid ""
-"ALSA notification\n"
-"\n"
-"Error while opening playback device"
-msgstr ""
-"ALSA Benachrichtigung\n"
-"\n"
-"Fehler während Öffnen des \"playback device\""
-
-#: ../../sflphone-client-gnome/src/errors.c:32
-msgid ""
-"ALSA notification\n"
-"\n"
-"Error while opening capture device"
-msgstr ""
-"ALSA Benachrichtigung\n"
-"\n"
-"Fehler während Öffnen des \"capture device\""
-
-#: ../../sflphone-client-gnome/src/errors.c:35
-msgid ""
-"Pulseaudio notification\n"
-"\n"
-"Pulseaudio is not running"
-msgstr ""
-"Pulseaudio Benachrichtigung\n"
-"\n"
-"Pulseaudio nicht gestartet"
-
-#: ../../sflphone-client-gnome/src/mainwindow.c:70
-msgid "There is one call in progress."
-msgstr "Laufender Anruf."
-
-#: ../../sflphone-client-gnome/src/mainwindow.c:74
-msgid "There are calls in progress."
-msgstr "Laufende Anrufe."
-
-#: ../../sflphone-client-gnome/src/mainwindow.c:83
-msgid "Do you still want to quit?"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/mainwindow.c:296
-msgid "SFLphone Error"
-msgstr "SFLphone Fehler"
-
-#: ../../sflphone-client-gnome/src/menus.c:134
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
-msgstr "SFLphone ist ein VoIP Client (kompatibel mit SIP und IAX2 Protokolle)"
-
-#: ../../sflphone-client-gnome/src/menus.c:137
-msgid "About SFLphone"
-msgstr "Über SFLphone"
-
-#: ../../sflphone-client-gnome/src/menus.c:161
-msgid "_Help"
-msgstr "_Hilfe"
-
-#: ../../sflphone-client-gnome/src/menus.c:296
-#: ../../sflphone-client-gnome/src/menus.c:962
-msgid "_New call"
-msgstr "_Neuer Anruf"
-
-#: ../../sflphone-client-gnome/src/menus.c:308
-#: ../../sflphone-client-gnome/src/menus.c:794
-msgid "_Pick up"
-msgstr "_Abnehmen"
-
-#: ../../sflphone-client-gnome/src/menus.c:318
-#: ../../sflphone-client-gnome/src/menus.c:806
-msgid "_Hang up"
-msgstr "A_uflegen"
-
-#: ../../sflphone-client-gnome/src/menus.c:328
-#: ../../sflphone-client-gnome/src/menus.c:818
-msgid "On _Hold"
-msgstr "in _Warteschleife"
-
-#: ../../sflphone-client-gnome/src/menus.c:340
-#: ../../sflphone-client-gnome/src/menus.c:830
-msgid "_Record"
-msgstr "_Gespräch aufzeichnen"
-
-#: ../../sflphone-client-gnome/src/menus.c:354
-msgid "_Account creation wizard"
-msgstr "SFLphone _Konto (Konfigurationsassistent)"
-
-#: ../../sflphone-client-gnome/src/menus.c:384
-msgid "_Call"
-msgstr "_Anruf"
-
-#: ../../sflphone-client-gnome/src/menus.c:552
-#, fuzzy
-msgid "Clear _history"
-msgstr "Liste der vorherigen Anrufen _leeren"
-
-#: ../../sflphone-client-gnome/src/menus.c:564
-msgid "_Accounts"
-msgstr "_Konten"
-
-#: ../../sflphone-client-gnome/src/menus.c:579
-msgid "_Edit"
-msgstr "_Editieren"
-
-#: ../../sflphone-client-gnome/src/menus.c:640
-msgid "_Dialpad"
-msgstr "_Wählscheibe"
-
-#: ../../sflphone-client-gnome/src/menus.c:652
-msgid "_Volume controls"
-msgstr "Lautstärke Kontrollen"
-
-#: ../../sflphone-client-gnome/src/menus.c:670
-msgid "_View"
-msgstr "_Anzeigen"
-
-#: ../../sflphone-client-gnome/src/menus.c:890
-msgid "_Call back"
-msgstr "_zurückrufen"
-
-#: ../../sflphone-client-gnome/src/menus.c:1070
-msgid "Edit phone"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/menus.c:1081
-msgid "Edit the phone number before making a call"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:71
-#: ../../sflphone-client-gnome/src/sflnotify.c:91
-#, c-format
-msgid "%s account: %s"
-msgstr "%s Konto: %s"
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:75
-#, c-format
-msgid "<i>From:</i> %s"
-msgstr "<i>Von:</i> %s"
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:111
-#, c-format
-msgid "Calling with %s account <i>%s</i>"
-msgstr "Mit %s Konto <i>%s</i> anrufen"
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:115
-msgid "Current account"
-msgstr "Aktuelles Konto"
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:130
-msgid "You haven't setup any accounts"
-msgstr "Sie haben noch kein Konto eingestellt"
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:147
-msgid "You have no registered accounts"
-msgstr "Sie haben noch kein registriertes Konto"
-
-#: ../../sflphone-client-gnome/src/sliders.c:161
-msgid "Speakers volume"
-msgstr "Lautsprecher Lautstärke"
-
-#: ../../sflphone-client-gnome/src/sliders.c:163
-msgid "Mic volume"
-msgstr "Mikro Lautstärke"
-
-#: ../../sflphone-client-gnome/src/statusicon.c:91
-msgid "_Show main window"
-msgstr "_Hauptfenster anzeigen"
-
-#: ../../sflphone-client-gnome/src/statusicon.c:124
-#, c-format
-msgid "SFLphone - %i accounts configured"
-msgstr "SFLphone - %i Konten konfiguriert"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:50
-#, c-format
-msgid "\"Voicemail\" <%s>"
-msgstr "\"Voicemail\" <%s>"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:168
-#: ../../sflphone-client-gnome/src/toolbar.c:170
-msgid "Place a call"
-msgstr "Anrufen"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:177
-#: ../../sflphone-client-gnome/src/toolbar.c:179
-msgid "Pick up"
-msgstr "Abnehmen"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:187
-#: ../../sflphone-client-gnome/src/toolbar.c:189
-msgid "Hang up"
-msgstr "Auflegen"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:197
-#: ../../sflphone-client-gnome/src/toolbar.c:199
-msgid "Off Hold"
-msgstr "Aus Warteschleife"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:208
-#: ../../sflphone-client-gnome/src/toolbar.c:210
-msgid "On Hold"
-msgstr "In Warteschleife"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:221
-#: ../../sflphone-client-gnome/src/toolbar.c:223
-msgid "Transfer"
-msgstr "Weiterleiten"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:233
-#: ../../sflphone-client-gnome/src/toolbar.c:235
-msgid "History"
-msgstr "Vorherige Anrufe"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:244
-#: ../../sflphone-client-gnome/src/toolbar.c:246
-msgid "Address book"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/toolbar.c:252
-#: ../../sflphone-client-gnome/src/toolbar.c:256
-msgid "Voicemail"
-msgstr "Voicemail"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:264
-msgid "Record a call"
-msgstr "Gespräch aufzeichnen"
-
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:113
-msgid "Account settings"
-msgstr "Kontoeinstellungen"
-
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:125
-msgid "Account Parameters"
-msgstr "Kontoparameter"
-
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:147
-msgid "_Enable this account"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:161
-msgid "_Protocol"
-msgstr "_Protokoll"
-
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:179
-msgid "Unknown"
-msgstr "unbekannt"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../../sflphone-client-gnome/src/config/configwindow.c:721
-msgid "General"
-msgstr "Allgemein"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:312
-msgid "_Use Evolution address books"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:319
-msgid "Download limit:"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:327
-msgid "cards"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:333
-msgid "_Display contact photo if available"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:341
-msgid "Fields from Evolution's address books"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:345
-msgid "_Business phone"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:351
-msgid "_Home phone"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:357
-msgid "_Mobile phone"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:364
-msgid "Address Books"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:368
-msgid "Select which Evolution address books to use:"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:404
-#: ../../sflphone-client-gnome/src/config/audioconf.c:576
-msgid "Name"
-msgstr "Name"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:155
-#, c-format
-msgid "audio device index for output = %d"
-msgstr "\"Audio device index\" für Ausgabe = %d"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:581
-msgid "Frequency"
-msgstr "Frequenz"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:586
-msgid "Bitrate"
-msgstr "Bitrate"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:591
-msgid "Bandwidth"
-msgstr "Bandbreite"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:662
-msgid "ALSA plugin"
-msgstr "ALSA Plugin"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:684
-msgid "Output"
-msgstr "Ausgabe"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:706
-msgid "Input"
-msgstr "Eingabe"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:741
-msgid "_Voice Activity Detection"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:751
-msgid "_Noise Reduction (Narrow-Band Companding)"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:780
-msgid "Sound Manager"
-msgstr "Sound Manager"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:783
-#, fuzzy
-msgid "_Pulseaudio"
-msgstr "Pulseaudio"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:788
-#, fuzzy
-msgid "_ALSA"
-msgstr "ALSA"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:795
-msgid "ALSA configuration"
-msgstr "ALSA Konfiguration"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:812
-msgid "Codecs"
-msgstr "Codecs"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:835
-msgid "Ringtones"
-msgstr "Klingeltöne"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:841
-msgid "_Enable ringtones"
-msgstr "Klingeltöne _einschalten"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:847
-msgid "Choose a ringtone"
-msgstr "Klingelton auswählen"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:853
-msgid "Audio Files"
-msgstr "Audio Dateien"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:418
-msgid "Protocol"
-msgstr "Protokoll"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:425
-msgid "Status"
-msgstr "Status"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:528
-msgid "Stun parameters will apply to each SIP account created."
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:536
-msgid "Enable it if you are behind a firewall"
-msgstr "Einschalten falls Sie hinter einer Firewall sind"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:544
-msgid "Format: name.server:port"
-msgstr "Format: Name.Server:Port"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:589
-msgid "Desktop Notifications"
-msgstr "Desktopbenachrichtigungen"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:593
-msgid "_Enable notifications"
-msgstr "Benachrichtigungen _einschalten"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:599
-msgid "Enable voicemail _notifications"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:611
-msgid "System Tray Icon"
-msgstr "Benachrichtigungsfeld (\"System Tray\") Icon"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:614
-msgid "_Popup main window on incoming call"
-msgstr "Hauptfenster anzeigen wenn eingehendes Gespräch"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:619
-msgid "Ne_ver popup main window"
-msgstr "_Hauptfenster nie anzeigen"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:623
-msgid "Hide SFLphone window on _startup"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:629
-msgid "Calls History"
-msgstr "Liste der vorherigen Anrufen"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:632
-msgid "_Keep my history for at least"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:643
-msgid " days"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:647
-msgid "PulseAudio sound server"
-msgstr "PulseAudio Sound Server"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:650
-msgid "_Mute other applications during a call"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:664
-msgid "SIP Port"
-msgstr "SIP Port"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:677
-msgid "Port:"
-msgstr "Port:"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:725
-#, fuzzy
-msgid "Recordings folder"
-msgstr "Tonaufnahmen"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:731
-msgid "Select a folder"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:765
-msgid "Preferences"
-msgstr "Einstellungen"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:785
-msgid "General Settings"
-msgstr "Allgemeine Einstellungen"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:790
-msgid "Audio Settings"
-msgstr "Audio Einstellungen"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:795
-msgid "Recordings"
-msgstr "Tonaufnahmen"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:800
-msgid "Address Book"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:805
-msgid "Hooks"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:832
-msgid "Accounts"
-msgstr "Konten"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:844
-msgid "Configured Accounts"
-msgstr "Konfigurierten Konten"
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:130
-msgid "URL Passing"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:135
-msgid "Custom commands on incoming calls with URL,"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:138
-#, c-format
-msgid "%s will be replaced with the passed URL."
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:141
-msgid "Trigger on specific _SIP header"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:150
-msgid "Trigger on _IAX2 URL"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:155
-msgid "Command to _run: "
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:165
-msgid "Phone Number Rewriting"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:169
-msgid "_Prefix dialed numbers with:"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:55
-msgid ""
-"Search all\n"
-"Click here to change the search type"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:67
-msgid ""
-"Search by missed call\n"
-"Click here to change the search type"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:79
-msgid ""
-"Search by incoming call\n"
-"Click here to change the search type"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:91
-msgid ""
-"Search by outgoing call\n"
-"Click here to change the search type"
-msgstr ""
-
-#~ msgid "Accept"
-#~ msgstr "Annehmen"
-
-#~ msgid "Refuse"
-#~ msgstr "Ablehnen"
-
-#~ msgid "Ignore"
-#~ msgstr "Ignorieren"
-
-#~ msgid "<small>Missed call</small>"
-#~ msgstr "<small>Anruf verpasst</small>"
-
-#~ msgid "<small>Duration:</small> %s"
-#~ msgstr "<small>Dauer:</small> %s"
-
-#~ msgid "_History size limit"
-#~ msgstr "Max. _Anzahl von vorherigen Anrufen"
-
-#~ msgid "Search history"
-#~ msgstr "In vorherigen Anrufen suchen"
-
-#~ msgid "Search contact"
-#~ msgstr "Adressbuch Suche"
-
-#~ msgid "Registered to %s (%s)"
-#~ msgstr "zu %s (%s) registriert"
-
-#~ msgid "%s account- %s             %s"
-#~ msgstr "%s Konto- %s             %s"
-
-#~ msgid "_Enable"
-#~ msgstr "_Einschalten"
-
-#~ msgid "_Notify voice mails"
-#~ msgstr "_Benachrichtigung für Voice Nachrichten"
-
-#~ msgid "_Start hidden"
-#~ msgstr "_Unsichtbar beim Start"
-
-#~ msgid "_Maximum number of calls"
-#~ msgstr "_maximale Anzahl von Anrufen"
-
-#~ msgid "_Control running applications volume"
-#~ msgstr "Lautstärke für laufende Anwendungen _einstellen"
-
-#~ msgid "Account previously setup"
-#~ msgstr "Zuvor eingestellte Konten"
-
-#~ msgid "_SIP protocol"
-#~ msgstr "_SIP protokoll"
-
-#~ msgid "_IAX2 protocol"
-#~ msgstr "_IAX2 protokoll"
-
-#~ msgid "Search"
-#~ msgstr "Suchen"
-
-#~ msgid "_Enabled"
-#~ msgstr "_Aktiv"
-
-#~ msgid "%s account- %s"
-#~ msgstr "%s Konto- %s"
-
-#~ msgid "_Account Assistant"
-#~ msgstr "_Konto Setup Assistent"
-
-#~ msgid "Setup Accounts"
-#~ msgstr "Konten einstellen"
-
-#~ msgid "Search Parameters"
-#~ msgstr "Parametersuche"
-
-#~ msgid "Maximum result number for a request: "
-#~ msgstr "Maximale Anzahl der Resultaten per Abfrage: "
-
-#~ msgid "_STUN Server"
-#~ msgstr "_STUN Server"
-
-#~ msgid "Apply"
-#~ msgstr "übernehmen"
diff --git a/sflphone-common/po/es.po b/sflphone-common/po/es.po
deleted file mode 100644
index d23b86974a3753c8e12c4590a899267c5e329c68..0000000000000000000000000000000000000000
--- a/sflphone-common/po/es.po
+++ /dev/null
@@ -1,840 +0,0 @@
-# Spanish translation of SFLphone.
-# Copyright (C) 2008 2009 The Free Software Foundation, Inc.
-# This file is distributed under the GNU General Public License Version 3.
-#
-# Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>, 2008.
-#
-# POT-Creation-Date: 2007-01-13 01:39+0100\n
-msgid ""
-msgstr ""
-"Project-Id-Version: SFLphone 0.9.4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-12 18:05-0400\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"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:175
-msgid "Registered"
-msgstr "Registrado"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:178
-msgid "Not Registered"
-msgstr "No registrado"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:181
-msgid "Trying..."
-msgstr "Intentando..."
-
-#: ../../sflphone-client-gnome/src/accountlist.c:184
-#: ../../sflphone-client-gnome/src/sflnotify.c:131
-#: ../../sflphone-client-gnome/src/sflnotify.c:148
-msgid "Error"
-msgstr "Error"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:187
-msgid "Bad authentification"
-msgstr "Autenticación erronea"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:190
-msgid "Network unreachable"
-msgstr "Red Inaccesible"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:193
-msgid "Host unreachable"
-msgstr "_Parte del servidor"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:196
-msgid "Stun configuration error"
-msgstr "Error de configuración Stun"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:199
-msgid "Stun server invalid"
-msgstr "Servidor stun inválido"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:202
-msgid "Invalid"
-msgstr "Inválido"
-
-#: ../../sflphone-client-gnome/src/actions.c:55
-#: ../../sflphone-client-gnome/src/sflnotify.c:94
-#, c-format
-msgid "%d voice mails"
-msgstr "%d mensajes de voz"
-
-#: ../../sflphone-client-gnome/src/actions.c:57
-#, c-format
-msgid "%d voice mail"
-msgstr "%d mensaje de voz"
-
-#: ../../sflphone-client-gnome/src/actions.c:81
-#, c-format
-msgid "Using %s (%s)"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/actions.c:87
-msgid "No registered account"
-msgstr "No tiene ninguna cuenta registrada"
-
-#: ../../sflphone-client-gnome/src/actions.c:232
-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."
-
-#: ../../sflphone-client-gnome/src/actions.c:807
-#, c-format
-msgid "IP call - %s"
-msgstr "Llamada IP - %s"
-
-#: ../../sflphone-client-gnome/src/actions.c:810
-#, c-format
-msgid "Using %s (%s) - Codec: %s"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/actions.c:900
-#, 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> )"
-
-#: ../../sflphone-client-gnome/src/assistant.c:35
-#, c-format
-msgid ""
-"This assistant is now finished.\n"
-"You can at any time check your registration state or modify your accounts "
-"parameters in the Options/Accounts window.\n"
-"\n"
-"Alias :    %s\n"
-"Server :   %s\n"
-"Username : %s\n"
-msgstr ""
-"Ese asistante ha finalizado.\n"
-"Puede comprobar en cualquier momento su estado de registro o modificar la "
-"configuración de sus cuentas en la ventana de Opciones/Cuentas.\n"
-"\n"
-"Alias :    %s\n"
-"Server :   %s\n"
-"Username : %s\n"
-
-#: ../../sflphone-client-gnome/src/assistant.c:159
-msgid "SFLphone account configuration wizard"
-msgstr "Asistente de configuración de cuentas de SFLphone"
-
-#: ../../sflphone-client-gnome/src/assistant.c:185
-msgid "Welcome to SFLphone!"
-msgstr "¡Bienvenido a SFLphone!"
-
-#: ../../sflphone-client-gnome/src/assistant.c:186
-msgid "This installation wizard will help you configure an account."
-msgstr "Este asistente de instalación le ayudará a configurar una cuenta."
-
-#: ../../sflphone-client-gnome/src/assistant.c:200
-msgid "VoIP Protocols"
-msgstr "Protocolos VoIP"
-
-#: ../../sflphone-client-gnome/src/assistant.c:200
-msgid "Select an account type:"
-msgstr "Escoja un tipo de cuenta:"
-
-#: ../../sflphone-client-gnome/src/assistant.c:218
-msgid "Account"
-msgstr "Cuenta"
-
-#: ../../sflphone-client-gnome/src/assistant.c:218
-msgid "Please select one of the following option:"
-msgstr "Por favor, elija una de las siguientes opciones:"
-
-#: ../../sflphone-client-gnome/src/assistant.c:220
-msgid "Create a free SIP/IAX2 account on sflphone.org"
-msgstr "Crear una cuenta SIP/IAX2 gratis en sflphone.org"
-
-#: ../../sflphone-client-gnome/src/assistant.c:222
-msgid "Register an existing SIP or IAX2 account"
-msgstr "Registrar una cuenta SIP o IAX2 existente"
-
-#: ../../sflphone-client-gnome/src/assistant.c:235
-msgid "SIP account configuration"
-msgstr "Configuración de cuenta SIP"
-
-#: ../../sflphone-client-gnome/src/assistant.c:235
-#: ../../sflphone-client-gnome/src/assistant.c:331
-msgid "Please fill the following information:"
-msgstr "Por favor, rellene la siguiente información:"
-
-#: ../../sflphone-client-gnome/src/assistant.c:243
-#: ../../sflphone-client-gnome/src/assistant.c:339
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:153
-msgid "_Alias"
-msgstr "_Alias"
-
-#: ../../sflphone-client-gnome/src/assistant.c:251
-#: ../../sflphone-client-gnome/src/assistant.c:347
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:189
-msgid "_Host name"
-msgstr "_Nombre de equipo"
-
-#: ../../sflphone-client-gnome/src/assistant.c:259
-#: ../../sflphone-client-gnome/src/assistant.c:355
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:197
-msgid "_User name"
-msgstr "_Usuario"
-
-#: ../../sflphone-client-gnome/src/assistant.c:275
-#: ../../sflphone-client-gnome/src/assistant.c:370
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:212
-msgid "_Password"
-msgstr "_Contraseña"
-
-#: ../../sflphone-client-gnome/src/assistant.c:293
-#: ../../sflphone-client-gnome/src/assistant.c:386
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:228
-msgid "_Voicemail number"
-msgstr "_Número de buzón de voz"
-
-#: ../../sflphone-client-gnome/src/assistant.c:308
-msgid "Optional Email Address "
-msgstr "Dirección de correo opcional "
-
-#: ../../sflphone-client-gnome/src/assistant.c:308
-msgid "This email address will be use to send your voicemail messages"
-msgstr "Esta dirección de correo se usará para mandar sus mensajes de voz"
-
-#: ../../sflphone-client-gnome/src/assistant.c:316
-msgid "_Email"
-msgstr "_Correo"
-
-#: ../../sflphone-client-gnome/src/assistant.c:331
-msgid "IAX2 account configuration"
-msgstr "Configuración de cuenta IAX2"
-
-#: ../../sflphone-client-gnome/src/assistant.c:404
-#: ../../sflphone-client-gnome/src/config/configwindow.c:855
-msgid "Network Address Translation"
-msgstr "Conversión de Dirección de Red (NAT)"
-
-#: ../../sflphone-client-gnome/src/assistant.c:404
-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."
-
-#: ../../sflphone-client-gnome/src/assistant.c:413
-#: ../../sflphone-client-gnome/src/config/configwindow.c:532
-msgid "E_nable STUN"
-msgstr "A_ctivar STUN"
-
-#: ../../sflphone-client-gnome/src/assistant.c:420
-msgid "_STUN server"
-msgstr "_Servidor STUN"
-
-#: ../../sflphone-client-gnome/src/assistant.c:434
-msgid "Account Registration"
-msgstr "Registro de cuenta"
-
-#: ../../sflphone-client-gnome/src/assistant.c:434
-msgid "Congratulations!"
-msgstr "¡Enhorabuena!"
-
-#: ../../sflphone-client-gnome/src/errors.c:29
-msgid ""
-"ALSA notification\n"
-"\n"
-"Error while opening playback device"
-msgstr ""
-"<b>Notificación ALSA</b>\n"
-"\n"
-"Error al abrir el dispositivo de reproducción"
-
-#: ../../sflphone-client-gnome/src/errors.c:32
-msgid ""
-"ALSA notification\n"
-"\n"
-"Error while opening capture device"
-msgstr ""
-"<b>Notificación ALSA</b>\n"
-"\n"
-"Error al abrir el dispositivo de captura"
-
-#: ../../sflphone-client-gnome/src/errors.c:35
-msgid ""
-"Pulseaudio notification\n"
-"\n"
-"Pulseaudio is not running"
-msgstr ""
-"<b>Notificación de Pulseaudio</b>\n"
-"\n"
-"Pulseaudio no está funcionando"
-
-#: ../../sflphone-client-gnome/src/mainwindow.c:70
-msgid "There is one call in progress."
-msgstr "No hay llamada en curso"
-
-#: ../../sflphone-client-gnome/src/mainwindow.c:74
-msgid "There are calls in progress."
-msgstr "Hay llamadas en curso."
-
-#: ../../sflphone-client-gnome/src/mainwindow.c:83
-msgid "Do you still want to quit?"
-msgstr "Sin embargo quiere parar ?"
-
-#: ../../sflphone-client-gnome/src/mainwindow.c:296
-msgid "SFLphone Error"
-msgstr "SFLphone Error"
-
-#: ../../sflphone-client-gnome/src/menus.c:134
-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-client-gnome/src/menus.c:137
-msgid "About SFLphone"
-msgstr "Sobre SFLphone"
-
-#: ../../sflphone-client-gnome/src/menus.c:161
-msgid "_Help"
-msgstr "_Ayuda"
-
-#: ../../sflphone-client-gnome/src/menus.c:296
-#: ../../sflphone-client-gnome/src/menus.c:962
-msgid "_New call"
-msgstr "_Nueva llamada"
-
-#: ../../sflphone-client-gnome/src/menus.c:308
-#: ../../sflphone-client-gnome/src/menus.c:794
-msgid "_Pick up"
-msgstr "_Descolgar"
-
-#: ../../sflphone-client-gnome/src/menus.c:318
-#: ../../sflphone-client-gnome/src/menus.c:806
-msgid "_Hang up"
-msgstr "_Colgar"
-
-#: ../../sflphone-client-gnome/src/menus.c:328
-#: ../../sflphone-client-gnome/src/menus.c:818
-msgid "On _Hold"
-msgstr "En _Espera"
-
-#: ../../sflphone-client-gnome/src/menus.c:340
-#: ../../sflphone-client-gnome/src/menus.c:830
-msgid "_Record"
-msgstr "_Recordar"
-
-#: ../../sflphone-client-gnome/src/menus.c:354
-msgid "_Account creation wizard"
-msgstr "Asistente de configuración de cuentas"
-
-#: ../../sflphone-client-gnome/src/menus.c:384
-msgid "_Call"
-msgstr "_Llamar"
-
-#: ../../sflphone-client-gnome/src/menus.c:552
-#, fuzzy
-msgid "Clear _history"
-msgstr "_Limpiar historial"
-
-#: ../../sflphone-client-gnome/src/menus.c:564
-msgid "_Accounts"
-msgstr "_Cuentas"
-
-#: ../../sflphone-client-gnome/src/menus.c:579
-msgid "_Edit"
-msgstr "_Editar"
-
-#: ../../sflphone-client-gnome/src/menus.c:640
-msgid "_Dialpad"
-msgstr "_Teclado numérico"
-
-#: ../../sflphone-client-gnome/src/menus.c:652
-msgid "_Volume controls"
-msgstr "_Controles de volumen"
-
-#: ../../sflphone-client-gnome/src/menus.c:670
-msgid "_View"
-msgstr "_Ver"
-
-#: ../../sflphone-client-gnome/src/menus.c:890
-msgid "_Call back"
-msgstr "_Llamar"
-
-#: ../../sflphone-client-gnome/src/menus.c:1070
-msgid "Edit phone"
-msgstr "Editar teléfono"
-
-#: ../../sflphone-client-gnome/src/menus.c:1081
-msgid "Edit the phone number before making a call"
-msgstr "Editar el número de teléfono antes de llamar"
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:71
-#: ../../sflphone-client-gnome/src/sflnotify.c:91
-#, c-format
-msgid "%s account: %s"
-msgstr "%s cuenta: %s"
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:75
-#, c-format
-msgid "<i>From:</i> %s"
-msgstr "<i>De:</i> %s"
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:111
-#, c-format
-msgid "Calling with %s account <i>%s</i>"
-msgstr "Llamando con la cuenta %s <i>%s</i>"
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:115
-msgid "Current account"
-msgstr "Cuenta actual"
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:130
-msgid "You haven't setup any accounts"
-msgstr "No ha configurado cuentas"
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:147
-msgid "You have no registered accounts"
-msgstr "No tiene ninguna cuenta registrada"
-
-#: ../../sflphone-client-gnome/src/sliders.c:161
-msgid "Speakers volume"
-msgstr "Volumen de altavoces"
-
-#: ../../sflphone-client-gnome/src/sliders.c:163
-msgid "Mic volume"
-msgstr "Volumen del micrófono"
-
-#: ../../sflphone-client-gnome/src/statusicon.c:91
-msgid "_Show main window"
-msgstr "Mostrar ventana principal"
-
-#: ../../sflphone-client-gnome/src/statusicon.c:124
-#, c-format
-msgid "SFLphone - %i accounts configured"
-msgstr "SFLphone - %i cuentas configuradas"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:50
-#, c-format
-msgid "\"Voicemail\" <%s>"
-msgstr "\"Mensaje\" <%s>"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:168
-#: ../../sflphone-client-gnome/src/toolbar.c:170
-msgid "Place a call"
-msgstr "Llamar"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:177
-#: ../../sflphone-client-gnome/src/toolbar.c:179
-msgid "Pick up"
-msgstr "Descolgar"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:187
-#: ../../sflphone-client-gnome/src/toolbar.c:189
-msgid "Hang up"
-msgstr "Colgar"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:197
-#: ../../sflphone-client-gnome/src/toolbar.c:199
-msgid "Off Hold"
-msgstr "Seguir"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:208
-#: ../../sflphone-client-gnome/src/toolbar.c:210
-msgid "On Hold"
-msgstr "Retener"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:221
-#: ../../sflphone-client-gnome/src/toolbar.c:223
-msgid "Transfer"
-msgstr "Transferir"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:233
-#: ../../sflphone-client-gnome/src/toolbar.c:235
-msgid "History"
-msgstr "Historia de Llamada"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:244
-#: ../../sflphone-client-gnome/src/toolbar.c:246
-msgid "Address book"
-msgstr "Libreta de contactos"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:252
-#: ../../sflphone-client-gnome/src/toolbar.c:256
-msgid "Voicemail"
-msgstr "Mensaje de voz"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:264
-msgid "Record a call"
-msgstr "Grabar una llamada"
-
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:113
-msgid "Account settings"
-msgstr "Configuración de cuentas"
-
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:125
-msgid "Account Parameters"
-msgstr "Parámetros de cuenta"
-
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:147
-msgid "_Enable this account"
-msgstr "_Habilitar esta cuenta"
-
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:161
-msgid "_Protocol"
-msgstr "_Protocolo"
-
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:179
-msgid "Unknown"
-msgstr "Desconocido"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../../sflphone-client-gnome/src/config/configwindow.c:721
-msgid "General"
-msgstr "General"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:312
-msgid "_Use Evolution address books"
-msgstr "_Usar libreta de contactos de Evolution"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:319
-msgid "Download limit:"
-msgstr "Límite de descarga"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:327
-msgid "cards"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:333
-msgid "_Display contact photo if available"
-msgstr "_Mostrar fotos de contactos, si está disponible"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:341
-#, fuzzy
-msgid "Fields from Evolution's address books"
-msgstr "Usar los siguientes campos de la libreta de direcciones de Evolution:"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:345
-msgid "_Business phone"
-msgstr "_Numero de teléfono profesional"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:351
-msgid "_Home phone"
-msgstr "_Numero de teléfono personal"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:357
-msgid "_Mobile phone"
-msgstr "_Número de movil"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:364
-msgid "Address Books"
-msgstr "Libreta de direcciones"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:368
-msgid "Select which Evolution address books to use:"
-msgstr "Seleccione las libretas de direcciones de Evolution a usar:"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:404
-#: ../../sflphone-client-gnome/src/config/audioconf.c:576
-msgid "Name"
-msgstr "Nombre"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:155
-#, c-format
-msgid "audio device index for output = %d"
-msgstr "índice del dispositivo de salida de audio = %d"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:581
-msgid "Frequency"
-msgstr "Frecuencia"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:586
-msgid "Bitrate"
-msgstr "Tasa de transferencia"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:591
-msgid "Bandwidth"
-msgstr "Ancho de banda"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:662
-msgid "ALSA plugin"
-msgstr "Plugin ALSA"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:684
-msgid "Output"
-msgstr "Salida"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:706
-msgid "Input"
-msgstr "Entrada"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:741
-msgid "_Voice Activity Detection"
-msgstr "_Detección de actividad de voz"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:751
-msgid "_Noise Reduction (Narrow-Band Companding)"
-msgstr "_Reducción de ruido"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:780
-msgid "Sound Manager"
-msgstr "Gestor de audio"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:783
-#, fuzzy
-msgid "_Pulseaudio"
-msgstr "Pulseaudio"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:788
-#, fuzzy
-msgid "_ALSA"
-msgstr "ALSA"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:795
-msgid "ALSA configuration"
-msgstr "Configuración de ALSA"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:812
-msgid "Codecs"
-msgstr "Códecs"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:835
-msgid "Ringtones"
-msgstr "Tonos de llamada"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:841
-msgid "_Enable ringtones"
-msgstr "_Habilitar tonos de llamada"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:847
-msgid "Choose a ringtone"
-msgstr "Elija un tono de llmada"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:853
-msgid "Audio Files"
-msgstr "Archivos de Audio"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:418
-msgid "Protocol"
-msgstr "Protocolo"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:425
-msgid "Status"
-msgstr "Estado"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:528
-msgid "Stun parameters will apply to each SIP account created."
-msgstr "Parámetros de stun se aplicarán a cada cuenta SIP creada."
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:536
-msgid "Enable it if you are behind a firewall"
-msgstr "Actívelo si está detrás de un cortafuegos"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:544
-msgid "Format: name.server:port"
-msgstr "Formato: nombre.servidor:puerto"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:589
-msgid "Desktop Notifications"
-msgstr "Notificación de escritorio"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:593
-msgid "_Enable notifications"
-msgstr "_Habilitar notificaciones"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:599
-msgid "Enable voicemail _notifications"
-msgstr "Habilitar _notificaciones de mensajes de voz"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:611
-msgid "System Tray Icon"
-msgstr "Icono de bandeja del sistema"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:614
-msgid "_Popup main window on incoming call"
-msgstr "_Popup ventana principal al recibir llamadas"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:619
-msgid "Ne_ver popup main window"
-msgstr "_Nunca mostrar ventana principal"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:623
-msgid "Hide SFLphone window on _startup"
-msgstr "Esconder SFLphone en el arranque"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:629
-msgid "Calls History"
-msgstr "Historial de llamadas"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:632
-msgid "_Keep my history for at least"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:643
-msgid " days"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:647
-msgid "PulseAudio sound server"
-msgstr "Servidor de sonido Pulseaudio"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:650
-#, fuzzy
-msgid "_Mute other applications during a call"
-msgstr "Silenciar el resto de aplicaciones durante una llamada"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:664
-msgid "SIP Port"
-msgstr "Puerto SIP"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:677
-msgid "Port:"
-msgstr "Puerto:"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:725
-#, fuzzy
-msgid "Recordings folder"
-msgstr "Directorio de Grabaciones"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:731
-msgid "Select a folder"
-msgstr "Seleccione un directorio"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:765
-msgid "Preferences"
-msgstr "Preferencias"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:785
-msgid "General Settings"
-msgstr "Configuración general"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:790
-msgid "Audio Settings"
-msgstr "Configuración de audio"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:795
-msgid "Recordings"
-msgstr "Grabaciones"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:800
-msgid "Address Book"
-msgstr "Libreta de direcciones"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:805
-msgid "Hooks"
-msgstr "Disparadores"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:832
-msgid "Accounts"
-msgstr "Cuentas"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:844
-msgid "Configured Accounts"
-msgstr "Cuentas Configuradas"
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:130
-msgid "URL Passing"
-msgstr "Paso de URL"
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:135
-msgid "Custom commands on incoming calls with URL,"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:138
-#, c-format
-msgid "%s will be replaced with the passed URL."
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:141
-msgid "Trigger on specific _SIP header"
-msgstr "Evento desencadenado con una cabecera _SIP específica"
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:150
-msgid "Trigger on _IAX2 URL"
-msgstr "Evento desencadenado con una URL _IAX2"
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:155
-#, fuzzy
-msgid "Command to _run: "
-msgstr "_Orden a ejecutar: "
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:165
-msgid "Phone Number Rewriting"
-msgstr "Reescritura de número de teléfono"
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:169
-msgid "_Prefix dialed numbers with:"
-msgstr "_prefijar los números marcados con:"
-
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:55
-msgid ""
-"Search all\n"
-"Click here to change the search type"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:67
-msgid ""
-"Search by missed call\n"
-"Click here to change the search type"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:79
-msgid ""
-"Search by incoming call\n"
-"Click here to change the search type"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:91
-msgid ""
-"Search by outgoing call\n"
-"Click here to change the search type"
-msgstr ""
-
-#~ msgid "Accept"
-#~ msgstr "Aceptar"
-
-#~ msgid "Refuse"
-#~ msgstr "Rechazar"
-
-#~ msgid "Ignore"
-#~ msgstr "Ignorar"
-
-#~ msgid "<small>Missed call</small>"
-#~ msgstr "<small>Llamada fallida</small>"
-
-#~ msgid "<small>Duration:</small> %s"
-#~ msgstr "<small>Duración:</small> %s"
-
-#~ msgid "Fields"
-#~ msgstr "Campos"
-
-#~ msgid "_History size limit"
-#~ msgstr "Límite de tamaño de _historial"
-
-#~ msgid ""
-#~ "SFLphone can run custom commands if incoming calls come with an URL "
-#~ "attached.\n"
-#~ "In this case, %s will be replaced with the passed URL."
-#~ msgstr ""
-#~ "SFLphone puede ejecutar órdenes personalizadas si las llamadas entrantes "
-#~ "incluyen una URL.\n"
-#~ "En este caso, %s se remplazará por la URL."
-
-#~ msgid "Search history"
-#~ msgstr "Historial de búsquedas"
-
-#~ msgid "Search contact"
-#~ msgstr "_Buscar contacto"
-
-#~ msgid "Registered to %s (%s)"
-#~ msgstr "Registrado en %s (%s)"
-
-#~ msgid "%s account- %s             %s"
-#~ msgstr "%s cuenta- %s             %s"
diff --git a/sflphone-common/po/fr.po b/sflphone-common/po/fr.po
deleted file mode 100644
index 00f01e79b6dfb7900d21bc86dda72d4b25baac44..0000000000000000000000000000000000000000
--- a/sflphone-common/po/fr.po
+++ /dev/null
@@ -1,874 +0,0 @@
-# French translation of SFLphone.
-# Copyright (C) 2008 2009 The Free Software Foundation, Inc.
-# This file is distributed under the GNU General Public License Version 3.
-#
-# Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>, 2008.
-#
-# POT-Creation-Date: 2008-01-13 01:39+0100\n
-msgid ""
-msgstr ""
-"Project-Id-Version: SFLphone 0.9.4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-12 18:05-0400\n"
-"PO-Revision-Date: 2008-03-31 14:15\n"
-"Last-Translator: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>\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"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:175
-msgid "Registered"
-msgstr "Enregistré"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:178
-msgid "Not Registered"
-msgstr "Non Enregistré"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:181
-msgid "Trying..."
-msgstr "En cours..."
-
-#: ../../sflphone-client-gnome/src/accountlist.c:184
-#: ../../sflphone-client-gnome/src/sflnotify.c:131
-#: ../../sflphone-client-gnome/src/sflnotify.c:148
-msgid "Error"
-msgstr "Erreur"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:187
-msgid "Bad authentification"
-msgstr "Erreur d'authentification"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:190
-msgid "Network unreachable"
-msgstr "Réseau non trouvé"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:193
-msgid "Host unreachable"
-msgstr "Serveur introuvable"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:196
-msgid "Stun configuration error"
-msgstr "Erreur de configuration Stun"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:199
-msgid "Stun server invalid"
-msgstr "Serveur Stun invalide"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:202
-msgid "Invalid"
-msgstr "Non valide"
-
-#: ../../sflphone-client-gnome/src/actions.c:55
-#: ../../sflphone-client-gnome/src/sflnotify.c:94
-#, c-format
-msgid "%d voice mails"
-msgstr "%d messages vocaux"
-
-#: ../../sflphone-client-gnome/src/actions.c:57
-#, c-format
-msgid "%d voice mail"
-msgstr "%d message vocal"
-
-#: ../../sflphone-client-gnome/src/actions.c:81
-#, c-format
-msgid "Using %s (%s)"
-msgstr "Utilise %s (%s)"
-
-#: ../../sflphone-client-gnome/src/actions.c:87
-msgid "No registered account"
-msgstr "Aucun compte enregistré"
-
-#: ../../sflphone-client-gnome/src/actions.c:232
-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-client-gnome/src/actions.c:807
-#, c-format
-msgid "IP call - %s"
-msgstr "Appel IP - %s"
-
-#: ../../sflphone-client-gnome/src/actions.c:810
-#, c-format
-msgid "Using %s (%s) - Codec: %s"
-msgstr "Utilise %s (%s) - Codec: %s"
-
-#: ../../sflphone-client-gnome/src/actions.c:900
-#, 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-client-gnome/src/assistant.c:35
-#, c-format
-msgid ""
-"This assistant is now finished.\n"
-"You can at any time check your registration state or modify your accounts "
-"parameters in the Options/Accounts window.\n"
-"\n"
-"Alias :    %s\n"
-"Server :   %s\n"
-"Username : %s\n"
-msgstr ""
-"Cet assistant est maintenant terminé.\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.\n"
-"\n"
-"Alias :    %s\n"
-"Serveur :   %s\n"
-"Nom d'usager : %s\n"
-
-#: ../../sflphone-client-gnome/src/assistant.c:159
-msgid "SFLphone account configuration wizard"
-msgstr "Assistant de configuration de compte"
-
-#: ../../sflphone-client-gnome/src/assistant.c:185
-msgid "Welcome to SFLphone!"
-msgstr "Bienvenue dans SFLphone"
-
-#: ../../sflphone-client-gnome/src/assistant.c:186
-msgid "This installation wizard will help you configure an account."
-msgstr "Cet assistant va vous guider dans la configuration d'un compte. "
-
-#: ../../sflphone-client-gnome/src/assistant.c:200
-msgid "VoIP Protocols"
-msgstr "Protocoles VoIP"
-
-#: ../../sflphone-client-gnome/src/assistant.c:200
-msgid "Select an account type:"
-msgstr "Choisissez un type de compte:"
-
-#: ../../sflphone-client-gnome/src/assistant.c:218
-msgid "Account"
-msgstr "Compte"
-
-#: ../../sflphone-client-gnome/src/assistant.c:218
-msgid "Please select one of the following option:"
-msgstr "Veuillez remplir les champs suivants:"
-
-#: ../../sflphone-client-gnome/src/assistant.c:220
-msgid "Create a free SIP/IAX2 account on sflphone.org"
-msgstr "Créer un compte SIP/IAX2 gratuit sur sflphone.org"
-
-#: ../../sflphone-client-gnome/src/assistant.c:222
-msgid "Register an existing SIP or IAX2 account"
-msgstr "Enregistrer un compte SIP ou IAX2 existant"
-
-#: ../../sflphone-client-gnome/src/assistant.c:235
-msgid "SIP account configuration"
-msgstr "Configuration d'un compte SIP"
-
-#: ../../sflphone-client-gnome/src/assistant.c:235
-#: ../../sflphone-client-gnome/src/assistant.c:331
-msgid "Please fill the following information:"
-msgstr "Veuillez remplir les champs suivants:"
-
-#: ../../sflphone-client-gnome/src/assistant.c:243
-#: ../../sflphone-client-gnome/src/assistant.c:339
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:153
-msgid "_Alias"
-msgstr "A_lias"
-
-#: ../../sflphone-client-gnome/src/assistant.c:251
-#: ../../sflphone-client-gnome/src/assistant.c:347
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:189
-msgid "_Host name"
-msgstr "_Serveur"
-
-#: ../../sflphone-client-gnome/src/assistant.c:259
-#: ../../sflphone-client-gnome/src/assistant.c:355
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:197
-msgid "_User name"
-msgstr "Usa_ger"
-
-#: ../../sflphone-client-gnome/src/assistant.c:275
-#: ../../sflphone-client-gnome/src/assistant.c:370
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:212
-msgid "_Password"
-msgstr "_Mot de passe"
-
-#: ../../sflphone-client-gnome/src/assistant.c:293
-#: ../../sflphone-client-gnome/src/assistant.c:386
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:228
-msgid "_Voicemail number"
-msgstr "_Boite vocale #"
-
-#: ../../sflphone-client-gnome/src/assistant.c:308
-msgid "Optional Email Address "
-msgstr "Courriel optionnel"
-
-#: ../../sflphone-client-gnome/src/assistant.c:308
-msgid "This email address will be use to send your voicemail messages"
-msgstr "Vos messages vocaux seront envoyés par courriel à cette adresse "
-
-#: ../../sflphone-client-gnome/src/assistant.c:316
-msgid "_Email"
-msgstr "_Email"
-
-#: ../../sflphone-client-gnome/src/assistant.c:331
-msgid "IAX2 account configuration"
-msgstr "Configuration d'un compte IAX2"
-
-#: ../../sflphone-client-gnome/src/assistant.c:404
-#: ../../sflphone-client-gnome/src/config/configwindow.c:855
-msgid "Network Address Translation"
-msgstr "Traduction d'adresse réseau (NAT)"
-
-#: ../../sflphone-client-gnome/src/assistant.c:404
-msgid "You should probably enable this if you are behind a firewall."
-msgstr ""
-"Vous devriez probablement activer cette option si vous vous trouvez derrière "
-"un pare-feu."
-
-#: ../../sflphone-client-gnome/src/assistant.c:413
-#: ../../sflphone-client-gnome/src/config/configwindow.c:532
-msgid "E_nable STUN"
-msgstr "A_ctiver STUN"
-
-#: ../../sflphone-client-gnome/src/assistant.c:420
-msgid "_STUN server"
-msgstr "S_erveur STUN"
-
-#: ../../sflphone-client-gnome/src/assistant.c:434
-msgid "Account Registration"
-msgstr "Enregistrement du compte"
-
-#: ../../sflphone-client-gnome/src/assistant.c:434
-msgid "Congratulations!"
-msgstr "Félicitations!"
-
-#: ../../sflphone-client-gnome/src/errors.c:29
-msgid ""
-"ALSA notification\n"
-"\n"
-"Error while opening playback device"
-msgstr ""
-"Notification ALSA\n"
-"\n"
-"Erreur lors de l'ouverture du périphérique de sortie"
-
-#: ../../sflphone-client-gnome/src/errors.c:32
-msgid ""
-"ALSA notification\n"
-"\n"
-"Error while opening capture device"
-msgstr ""
-"Notification ALSA\n"
-"\n"
-"Erreur lors de l'ouverture du périphérique d'entrée"
-
-#: ../../sflphone-client-gnome/src/errors.c:35
-msgid ""
-"Pulseaudio notification\n"
-"\n"
-"Pulseaudio is not running"
-msgstr ""
-"Notification Pulseaudio\n"
-"\n"
-"Pulseaudio n'est pas lancé"
-
-#: ../../sflphone-client-gnome/src/mainwindow.c:70
-msgid "There is one call in progress."
-msgstr "Vous avez un appel en cours."
-
-#: ../../sflphone-client-gnome/src/mainwindow.c:74
-msgid "There are calls in progress."
-msgstr "Vous avez des appels en cours."
-
-#: ../../sflphone-client-gnome/src/mainwindow.c:83
-msgid "Do you still want to quit?"
-msgstr "Voulez-vous quitter?"
-
-#: ../../sflphone-client-gnome/src/mainwindow.c:296
-msgid "SFLphone Error"
-msgstr "Erreur SFLphone"
-
-#: ../../sflphone-client-gnome/src/menus.c:134
-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-client-gnome/src/menus.c:137
-msgid "About SFLphone"
-msgstr "A propos de SFLphone"
-
-#: ../../sflphone-client-gnome/src/menus.c:161
-msgid "_Help"
-msgstr "A_ide"
-
-#: ../../sflphone-client-gnome/src/menus.c:296
-#: ../../sflphone-client-gnome/src/menus.c:962
-msgid "_New call"
-msgstr "_Nouvel appel"
-
-#: ../../sflphone-client-gnome/src/menus.c:308
-#: ../../sflphone-client-gnome/src/menus.c:794
-msgid "_Pick up"
-msgstr "_Décrocher"
-
-#: ../../sflphone-client-gnome/src/menus.c:318
-#: ../../sflphone-client-gnome/src/menus.c:806
-msgid "_Hang up"
-msgstr "_Raccrocher"
-
-#: ../../sflphone-client-gnome/src/menus.c:328
-#: ../../sflphone-client-gnome/src/menus.c:818
-msgid "On _Hold"
-msgstr "_Mettre en attente"
-
-#: ../../sflphone-client-gnome/src/menus.c:340
-#: ../../sflphone-client-gnome/src/menus.c:830
-msgid "_Record"
-msgstr "Enregistrer"
-
-#: ../../sflphone-client-gnome/src/menus.c:354
-msgid "_Account creation wizard"
-msgstr "_Assistant de création de compte"
-
-#: ../../sflphone-client-gnome/src/menus.c:384
-msgid "_Call"
-msgstr "_Actions"
-
-#: ../../sflphone-client-gnome/src/menus.c:552
-msgid "Clear _history"
-msgstr "Effacer l'_historique"
-
-#: ../../sflphone-client-gnome/src/menus.c:564
-msgid "_Accounts"
-msgstr "Co_mptes"
-
-#: ../../sflphone-client-gnome/src/menus.c:579
-msgid "_Edit"
-msgstr "_Editer"
-
-#: ../../sflphone-client-gnome/src/menus.c:640
-msgid "_Dialpad"
-msgstr "_Clavier"
-
-#: ../../sflphone-client-gnome/src/menus.c:652
-msgid "_Volume controls"
-msgstr "Contrôle du _volume"
-
-#: ../../sflphone-client-gnome/src/menus.c:670
-msgid "_View"
-msgstr "A_ffichage"
-
-#: ../../sflphone-client-gnome/src/menus.c:890
-msgid "_Call back"
-msgstr "_Rappeler"
-
-#: ../../sflphone-client-gnome/src/menus.c:1070
-msgid "Edit phone"
-msgstr "Éditer numéro"
-
-#: ../../sflphone-client-gnome/src/menus.c:1081
-msgid "Edit the phone number before making a call"
-msgstr "Éditer le numéro de téléphone avant d'appeler"
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:71
-#: ../../sflphone-client-gnome/src/sflnotify.c:91
-#, c-format
-msgid "%s account: %s"
-msgstr "Compte %s: %s"
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:75
-#, c-format
-msgid "<i>From:</i> %s"
-msgstr "<i>De:</i> %s"
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:111
-#, c-format
-msgid "Calling with %s account <i>%s</i>"
-msgstr "Appel avec le compte %s <i>%s</i>"
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:115
-msgid "Current account"
-msgstr "Compte courant"
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:130
-msgid "You haven't setup any accounts"
-msgstr "Vous n'avez aucun compte configuré"
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:147
-msgid "You have no registered accounts"
-msgstr "Vous n'avez aucun compte enregistré"
-
-#: ../../sflphone-client-gnome/src/sliders.c:161
-msgid "Speakers volume"
-msgstr "Volume des hauts-parleurs"
-
-#: ../../sflphone-client-gnome/src/sliders.c:163
-msgid "Mic volume"
-msgstr "Volume du micro"
-
-#: ../../sflphone-client-gnome/src/statusicon.c:91
-msgid "_Show main window"
-msgstr "_Afficher la fenêtre principale"
-
-#: ../../sflphone-client-gnome/src/statusicon.c:124
-#, c-format
-msgid "SFLphone - %i accounts configured"
-msgstr "SFLphone - %i comptes configurés"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:50
-#, c-format
-msgid "\"Voicemail\" <%s>"
-msgstr "\"Boite vocale\" <%s>"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:168
-#: ../../sflphone-client-gnome/src/toolbar.c:170
-msgid "Place a call"
-msgstr "Appeler"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:177
-#: ../../sflphone-client-gnome/src/toolbar.c:179
-msgid "Pick up"
-msgstr "Décrocher"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:187
-#: ../../sflphone-client-gnome/src/toolbar.c:189
-msgid "Hang up"
-msgstr "Raccrocher"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:197
-#: ../../sflphone-client-gnome/src/toolbar.c:199
-msgid "Off Hold"
-msgstr "Reprendre"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:208
-#: ../../sflphone-client-gnome/src/toolbar.c:210
-msgid "On Hold"
-msgstr "Mettre en attente"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:221
-#: ../../sflphone-client-gnome/src/toolbar.c:223
-msgid "Transfer"
-msgstr "Transférer"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:233
-#: ../../sflphone-client-gnome/src/toolbar.c:235
-msgid "History"
-msgstr "Historique"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:244
-#: ../../sflphone-client-gnome/src/toolbar.c:246
-msgid "Address book"
-msgstr "Carnet d'adresse"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:252
-#: ../../sflphone-client-gnome/src/toolbar.c:256
-msgid "Voicemail"
-msgstr "Boite vocale"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:264
-msgid "Record a call"
-msgstr "_Enregistrer un appel"
-
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:113
-msgid "Account settings"
-msgstr "Configuration des comptes"
-
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:125
-msgid "Account Parameters"
-msgstr "Paramètres du Compte"
-
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:147
-msgid "_Enable this account"
-msgstr "Activer ce compte"
-
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:161
-msgid "_Protocol"
-msgstr "P_rotocole"
-
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:179
-msgid "Unknown"
-msgstr "Inconnu"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../../sflphone-client-gnome/src/config/configwindow.c:721
-msgid "General"
-msgstr "Général"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:312
-msgid "_Use Evolution address books"
-msgstr "_Utiliser les carnets d'adresse d'Évolution"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:319
-msgid "Download limit:"
-msgstr "Limite de _téléchargement:"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:327
-msgid "cards"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:333
-msgid "_Display contact photo if available"
-msgstr "_Afficher la photo si disponible"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:341
-msgid "Fields from Evolution's address books"
-msgstr "Utiliser les champs suivants des carnets d'adresse d'Évolution"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:345
-msgid "_Business phone"
-msgstr "Tél du _bureau"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:351
-msgid "_Home phone"
-msgstr "Tél du _domicile"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:357
-msgid "_Mobile phone"
-msgstr "Tél _portable"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:364
-msgid "Address Books"
-msgstr "Carnets d'adresse"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:368
-msgid "Select which Evolution address books to use:"
-msgstr "Sélectionner quels carnets d'adresse d'Évolution utiliser:"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:404
-#: ../../sflphone-client-gnome/src/config/audioconf.c:576
-msgid "Name"
-msgstr "Nom"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:155
-#, c-format
-msgid "audio device index for output = %d"
-msgstr "index du device audio de sortie = %d"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:581
-msgid "Frequency"
-msgstr "Fréquence"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:586
-msgid "Bitrate"
-msgstr "Bitrate"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:591
-msgid "Bandwidth"
-msgstr "Bande passante"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:662
-msgid "ALSA plugin"
-msgstr "Greffon ALSA"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:684
-msgid "Output"
-msgstr "Sortie"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:706
-msgid "Input"
-msgstr "Entrée"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:741
-msgid "_Voice Activity Detection"
-msgstr "Détection de l'activité de la voix"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:751
-msgid "_Noise Reduction (Narrow-Band Companding)"
-msgstr "Réduction du bruit (Compresseur extenseur LBR)"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:780
-msgid "Sound Manager"
-msgstr "Interface Audio"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:783
-msgid "_Pulseaudio"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:788
-msgid "_ALSA"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:795
-msgid "ALSA configuration"
-msgstr "Configuration ALSA"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:812
-msgid "Codecs"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:835
-msgid "Ringtones"
-msgstr "Sonneries"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:841
-msgid "_Enable ringtones"
-msgstr "_Activer les sonneries"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:847
-msgid "Choose a ringtone"
-msgstr "Sélectionner une sonnerie"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:853
-msgid "Audio Files"
-msgstr "Fichier Audio"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:418
-msgid "Protocol"
-msgstr "Protocole"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:425
-msgid "Status"
-msgstr "Statut"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:528
-msgid "Stun parameters will apply to each SIP account created."
-msgstr "Les paramètres STUN sont appliqués à tous les comptes SIP créés"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:536
-msgid "Enable it if you are behind a firewall"
-msgstr "À activer si vous êtes derrière un pare-feu, puis redémarrez SFLphone"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:544
-msgid "Format: name.server:port"
-msgstr "Format: nom.serveur:port"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:589
-msgid "Desktop Notifications"
-msgstr "Notifications de Bureau"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:593
-msgid "_Enable notifications"
-msgstr "_Activer les notifications"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:599
-msgid "Enable voicemail _notifications"
-msgstr "Activer les notifications de boîte _vocale"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:611
-msgid "System Tray Icon"
-msgstr "Icône dans la barre des tâches"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:614
-msgid "_Popup main window on incoming call"
-msgstr "Faire apparaître la fenêtre _principale lors d'appel entrant"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:619
-msgid "Ne_ver popup main window"
-msgstr "Ne _jamais afficher la fenêtre principale"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:623
-msgid "Hide SFLphone window on _startup"
-msgstr "_Cacher la fenêtre de SFLphone au démarrage"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:629
-msgid "Calls History"
-msgstr "Historique des appels"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:632
-msgid "_Keep my history for at least"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:643
-msgid " days"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:647
-msgid "PulseAudio sound server"
-msgstr "Serveur de son PulseAudio"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:650
-msgid "_Mute other applications during a call"
-msgstr "Éteindre le _son des autres applications lors d'un appel"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:664
-msgid "SIP Port"
-msgstr "Port SIP"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:677
-msgid "Port:"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:725
-msgid "Recordings folder"
-msgstr "Dossier pour les enregistrements"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:731
-msgid "Select a folder"
-msgstr "Choisissez un dossier"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:765
-msgid "Preferences"
-msgstr "Préférences"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:785
-msgid "General Settings"
-msgstr "Préférences"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:790
-msgid "Audio Settings"
-msgstr "Paramètres Audio"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:795
-msgid "Recordings"
-msgstr "Enregistrements"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:800
-msgid "Address Book"
-msgstr "Carnet d'adresse"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:805
-msgid "Hooks"
-msgstr "Ancrage"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:832
-msgid "Accounts"
-msgstr "Comptes"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:844
-msgid "Configured Accounts"
-msgstr "Comptes Configurés"
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:130
-msgid "URL Passing"
-msgstr "Passage d'URL"
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:135
-msgid "Custom commands on incoming calls with URL,"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:138
-#, c-format
-msgid "%s will be replaced with the passed URL."
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:141
-msgid "Trigger on specific _SIP header"
-msgstr "Déclencher sur un entête _SIP spécifique"
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:150
-msgid "Trigger on _IAX2 URL"
-msgstr "Déclencher en _IAX2"
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:155
-msgid "Command to _run: "
-msgstr "Commande à _exécuter: "
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:165
-msgid "Phone Number Rewriting"
-msgstr "Rééecriture du numéro"
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:169
-msgid "_Prefix dialed numbers with:"
-msgstr "_Préfixer les numéros composés par:"
-
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:55
-msgid ""
-"Search all\n"
-"Click here to change the search type"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:67
-msgid ""
-"Search by missed call\n"
-"Click here to change the search type"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:79
-msgid ""
-"Search by incoming call\n"
-"Click here to change the search type"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:91
-msgid ""
-"Search by outgoing call\n"
-"Click here to change the search type"
-msgstr ""
-
-#~ msgid "Accept"
-#~ msgstr "Accepter"
-
-#~ msgid "Refuse"
-#~ msgstr "Refuser"
-
-#~ msgid "Ignore"
-#~ msgstr "Ignorer"
-
-#~ msgid "<small>Missed call</small>"
-#~ msgstr "<small>Appel manqué</small>"
-
-#~ msgid "<small>Duration:</small> %s"
-#~ msgstr "<small>Durée:</small> %s"
-
-#~ msgid "Fields"
-#~ msgstr "Champs"
-
-#~ msgid "_History size limit"
-#~ msgstr "_Taille limite de l'historique"
-
-#~ msgid ""
-#~ "SFLphone can run custom commands if incoming calls come with an URL "
-#~ "attached.\n"
-#~ "In this case, %s will be replaced with the passed URL."
-#~ msgstr ""
-#~ "SFLphone peut exécuter des commandes lors d'appels entrants qui ont un "
-#~ "URL associé.\n"
-#~ "Dans ce cas, %s sera remplacé par l'URL en question."
-
-#~ msgid "Search history"
-#~ msgstr "Rechercher"
-
-#~ msgid "Search contact"
-#~ msgstr "Rechercher un contact"
-
-#~ msgid "Registered to %s (%s)"
-#~ msgstr "Connecté avec %s (%s)"
-
-#~ msgid "%s account- %s             %s"
-#~ msgstr "compte %s- %s             %s"
-
-#~ msgid "Books"
-#~ msgstr "Carnets d'adresse"
-
-#~ msgid "_Enable"
-#~ msgstr "_Activer"
-
-#~ msgid "_Notify voice mails"
-#~ msgstr "_Notifier les messages vocaux"
-
-#~ msgid "_Start hidden"
-#~ msgstr "_Démarrer caché"
-
-#~ msgid "_Maximum number of calls"
-#~ msgstr "N_ombre maximum d'appels"
-
-#~ msgid "_Control running applications volume"
-#~ msgstr "_Autoriser à modifier le volume des autres applications"
-
-#~ msgid "Account previously setup"
-#~ msgstr "Liste des comptes existants"
-
-#~ msgid "URL argument"
-#~ msgstr "Argument URL"
-
-#~ msgid "_SIP protocol"
-#~ msgstr "_Protocole SIP"
-
-#~ msgid "_SIP Header: "
-#~ msgstr "En-tête SIP: "
-
-#~ msgid "_IAX2 protocol"
-#~ msgstr "_Protocole IAX2"
-
-#~ msgid "_Add phone number prefix"
-#~ msgstr "Ajouter un préfixe au numéro"
-
-#~ msgid "_Prepend: "
-#~ msgstr "Préfixe: "
diff --git a/sflphone-common/po/ru.po b/sflphone-common/po/ru.po
deleted file mode 100644
index 9cc3d5c8977fe4521a5b35a6d37e1173c95063d1..0000000000000000000000000000000000000000
--- a/sflphone-common/po/ru.po
+++ /dev/null
@@ -1,914 +0,0 @@
-# Russian Translation.
-# Copyright (C) 2009 Savoir-Faire Linux Inc.
-# This file is distributed under the same license as the sflphone package.
-# Hussein Abdallah <hussein.abdallah@savoirfairelinux.com>.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: SFLphone 0.9.6\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-12 18:05-0400\n"
-"PO-Revision-Date: 2009-06-08 10:19 GMT-5\n"
-"Last-Translator: HUSSEIN ABDALLAH <hussein.abdallah@savoirfairelinux.com>\n"
-"Language-Team:  Savoir-Faire Linux Inc <sflphoneteam@savoirfairelinux.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:175
-msgid "Registered"
-msgstr "Зарегистрирован"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:178
-msgid "Not Registered"
-msgstr "Не зарегистрирован"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:181
-msgid "Trying..."
-msgstr "Пробует подключиться..."
-
-#: ../../sflphone-client-gnome/src/accountlist.c:184
-#: ../../sflphone-client-gnome/src/sflnotify.c:131
-#: ../../sflphone-client-gnome/src/sflnotify.c:148
-msgid "Error"
-msgstr "Ошибка"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:187
-msgid "Bad authentification"
-msgstr "Неправильная идентификация"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:190
-msgid "Network unreachable"
-msgstr "Сеть недоступна"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:193
-msgid "Host unreachable"
-msgstr "Хост недоступен"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:196
-msgid "Stun configuration error"
-msgstr "Ошибка настройки Stun"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:199
-msgid "Stun server invalid"
-msgstr "Недействительный Stun-сервер"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:202
-msgid "Invalid"
-msgstr "Недействительный"
-
-#: ../../sflphone-client-gnome/src/actions.c:55
-#: ../../sflphone-client-gnome/src/sflnotify.c:94
-#, c-format
-msgid "%d voice mails"
-msgstr "%d речевые сообщения"
-
-#: ../../sflphone-client-gnome/src/actions.c:57
-#, c-format
-msgid "%d voice mail"
-msgstr "%d речевое сообщение"
-
-#: ../../sflphone-client-gnome/src/actions.c:81
-#, c-format
-msgid "Using %s (%s)"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/actions.c:87
-msgid "No registered account"
-msgstr "У вас нет зарегистрированных аккаунтов"
-
-#: ../../sflphone-client-gnome/src/actions.c:232
-msgid ""
-"Unable to connect to the SFLphone server.\n"
-"Make sure the daemon is running."
-msgstr ""
-"Невозможно подключиться к SFLphone-серверу.\n"
-"Проверьте если демон работает."
-
-#: ../../sflphone-client-gnome/src/actions.c:807
-#, c-format
-msgid "IP call - %s"
-msgstr "IP звонок  - %s"
-
-#: ../../sflphone-client-gnome/src/actions.c:810
-#, c-format
-msgid "Using %s (%s) - Codec: %s"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/actions.c:900
-#, 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>Ошибка: звуковые кодеки не найдены.\n"
-"\n"
-"</b> Звуковые кодеки SFL должны находиться в <i>%s</i> или в <b>.sflphone</"
-"b> каталоге в вашем домашнем каталоге( <i>%s</i> )"
-
-#: ../../sflphone-client-gnome/src/assistant.c:35
-#, c-format
-msgid ""
-"This assistant is now finished.\n"
-"You can at any time check your registration state or modify your accounts "
-"parameters in the Options/Accounts window.\n"
-"\n"
-"Alias :    %s\n"
-"Server :   %s\n"
-"Username : %s\n"
-msgstr ""
-"Мастер закончил настройку.\n"
-" Вы можете в любое время проверить статус регистрации или изменить "
-"параметры  ваших аккаунтов в меню Правка / Аккаунты.\n"
-"Псевдоним : %s\n"
-"Сервер : %s\n"
-"Пользователь : %s\n"
-
-#: ../../sflphone-client-gnome/src/assistant.c:159
-msgid "SFLphone account configuration wizard"
-msgstr "Мастер настройки SFLphone"
-
-#: ../../sflphone-client-gnome/src/assistant.c:185
-msgid "Welcome to SFLphone!"
-msgstr "Добро пожаловать в SFLphone!"
-
-#: ../../sflphone-client-gnome/src/assistant.c:186
-msgid "This installation wizard will help you configure an account."
-msgstr "Этот мастер установки поможет вам настроить ваш аккаунт."
-
-#: ../../sflphone-client-gnome/src/assistant.c:200
-msgid "VoIP Protocols"
-msgstr "VoIP-протоколы"
-
-#: ../../sflphone-client-gnome/src/assistant.c:200
-msgid "Select an account type:"
-msgstr "Выберите тип аккаунта:"
-
-#: ../../sflphone-client-gnome/src/assistant.c:218
-msgid "Account"
-msgstr "Аккаунты"
-
-#: ../../sflphone-client-gnome/src/assistant.c:218
-msgid "Please select one of the following option:"
-msgstr "Введите пожалуйста следующие данные:"
-
-#: ../../sflphone-client-gnome/src/assistant.c:220
-msgid "Create a free SIP/IAX2 account on sflphone.org"
-msgstr "Создать бесплатный SIP/IAX2-аккаунт на sflphone.org"
-
-#: ../../sflphone-client-gnome/src/assistant.c:222
-msgid "Register an existing SIP or IAX2 account"
-msgstr "Зарегистрировать существующий SIP или IAX2 аккаунт"
-
-#: ../../sflphone-client-gnome/src/assistant.c:235
-msgid "SIP account configuration"
-msgstr "Настройка SIP-аккаунта"
-
-#: ../../sflphone-client-gnome/src/assistant.c:235
-#: ../../sflphone-client-gnome/src/assistant.c:331
-msgid "Please fill the following information:"
-msgstr "Введите пожалуйста следующие данные"
-
-#: ../../sflphone-client-gnome/src/assistant.c:243
-#: ../../sflphone-client-gnome/src/assistant.c:339
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:153
-msgid "_Alias"
-msgstr "_Псевдоним"
-
-#: ../../sflphone-client-gnome/src/assistant.c:251
-#: ../../sflphone-client-gnome/src/assistant.c:347
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:189
-msgid "_Host name"
-msgstr "Имя или IP-адрес _сервера"
-
-#: ../../sflphone-client-gnome/src/assistant.c:259
-#: ../../sflphone-client-gnome/src/assistant.c:355
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:197
-msgid "_User name"
-msgstr "Имя или _номер пользователя"
-
-#: ../../sflphone-client-gnome/src/assistant.c:275
-#: ../../sflphone-client-gnome/src/assistant.c:370
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:212
-msgid "_Password"
-msgstr "Па_роль"
-
-#: ../../sflphone-client-gnome/src/assistant.c:293
-#: ../../sflphone-client-gnome/src/assistant.c:386
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:228
-msgid "_Voicemail number"
-msgstr "Номер _автоответчика #"
-
-#: ../../sflphone-client-gnome/src/assistant.c:308
-msgid "Optional Email Address "
-msgstr "Электронный адрес (необязательный) "
-
-#: ../../sflphone-client-gnome/src/assistant.c:308
-msgid "This email address will be use to send your voicemail messages"
-msgstr "Этот электронный адрес будет использоваться для речевых сообщений"
-
-#: ../../sflphone-client-gnome/src/assistant.c:316
-msgid "_Email"
-msgstr "_Адрес эл. почты"
-
-#: ../../sflphone-client-gnome/src/assistant.c:331
-msgid "IAX2 account configuration"
-msgstr "Настройка IAX2-аккаунта"
-
-#: ../../sflphone-client-gnome/src/assistant.c:404
-#: ../../sflphone-client-gnome/src/config/configwindow.c:855
-msgid "Network Address Translation"
-msgstr "Network Address Translation"
-
-#: ../../sflphone-client-gnome/src/assistant.c:404
-msgid "You should probably enable this if you are behind a firewall."
-msgstr "Вы наверное должны это включить если вы находитесь за сетевым экраном."
-
-#: ../../sflphone-client-gnome/src/assistant.c:413
-#: ../../sflphone-client-gnome/src/config/configwindow.c:532
-msgid "E_nable STUN"
-msgstr "Включить STUN"
-
-#: ../../sflphone-client-gnome/src/assistant.c:420
-msgid "_STUN server"
-msgstr "_STUN-сервер"
-
-#: ../../sflphone-client-gnome/src/assistant.c:434
-msgid "Account Registration"
-msgstr "Регистрация аккаунта"
-
-#: ../../sflphone-client-gnome/src/assistant.c:434
-msgid "Congratulations!"
-msgstr "Поздравляем!"
-
-#: ../../sflphone-client-gnome/src/errors.c:29
-msgid ""
-"ALSA notification\n"
-"\n"
-"Error while opening playback device"
-msgstr ""
-"<b>ALSA-nпредупреждение</b>\n"
-"\n"
-"Ошибка во время активирования устройства проигрывания"
-
-#: ../../sflphone-client-gnome/src/errors.c:32
-msgid ""
-"ALSA notification\n"
-"\n"
-"Error while opening capture device"
-msgstr ""
-"<b>ALSA-nпредупреждение</b>\n"
-"\n"
-"Ошибка во время активирования устройства входа"
-
-#: ../../sflphone-client-gnome/src/errors.c:35
-msgid ""
-"Pulseaudio notification\n"
-"\n"
-"Pulseaudio is not running"
-msgstr ""
-"<b>Предупреждение Pulseaudio</b>\n"
-"\n"
-"Pulseaudio не работает"
-
-#: ../../sflphone-client-gnome/src/mainwindow.c:70
-msgid "There is one call in progress."
-msgstr "Звонок ещё не окончен."
-
-#: ../../sflphone-client-gnome/src/mainwindow.c:74
-msgid "There are calls in progress."
-msgstr "Несколько звонков ещё не окончены."
-
-#: ../../sflphone-client-gnome/src/mainwindow.c:83
-msgid "Do you still want to quit?"
-msgstr "Вы уверенны что хотите выйти?"
-
-#: ../../sflphone-client-gnome/src/mainwindow.c:296
-msgid "SFLphone Error"
-msgstr "Ошибка SFLphone."
-
-#: ../../sflphone-client-gnome/src/menus.c:134
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
-msgstr "SFLphone - SIP и IAX2-совместимый VoIP-клиент "
-
-#: ../../sflphone-client-gnome/src/menus.c:137
-msgid "About SFLphone"
-msgstr "О SFLphone"
-
-#: ../../sflphone-client-gnome/src/menus.c:161
-msgid "_Help"
-msgstr "_Помощь"
-
-#: ../../sflphone-client-gnome/src/menus.c:296
-#: ../../sflphone-client-gnome/src/menus.c:962
-msgid "_New call"
-msgstr "_Новый звонок"
-
-#: ../../sflphone-client-gnome/src/menus.c:308
-#: ../../sflphone-client-gnome/src/menus.c:794
-msgid "_Pick up"
-msgstr "_Взять трубку"
-
-#: ../../sflphone-client-gnome/src/menus.c:318
-#: ../../sflphone-client-gnome/src/menus.c:806
-msgid "_Hang up"
-msgstr "_Положить трубку"
-
-#: ../../sflphone-client-gnome/src/menus.c:328
-#: ../../sflphone-client-gnome/src/menus.c:818
-msgid "On _Hold"
-msgstr "_Удержать звонок"
-
-#: ../../sflphone-client-gnome/src/menus.c:340
-#: ../../sflphone-client-gnome/src/menus.c:830
-msgid "_Record"
-msgstr "Записать"
-
-#: ../../sflphone-client-gnome/src/menus.c:354
-msgid "_Account creation wizard"
-msgstr "Мастер настройки SFLphone"
-
-#: ../../sflphone-client-gnome/src/menus.c:384
-msgid "_Call"
-msgstr "_Звонок"
-
-#: ../../sflphone-client-gnome/src/menus.c:552
-#, fuzzy
-msgid "Clear _history"
-msgstr "_Стереть журнал"
-
-#: ../../sflphone-client-gnome/src/menus.c:564
-msgid "_Accounts"
-msgstr "_Аккаунты"
-
-#: ../../sflphone-client-gnome/src/menus.c:579
-msgid "_Edit"
-msgstr "_Правка"
-
-#: ../../sflphone-client-gnome/src/menus.c:640
-msgid "_Dialpad"
-msgstr "_Клавиатура"
-
-#: ../../sflphone-client-gnome/src/menus.c:652
-msgid "_Volume controls"
-msgstr "_Настройки громкости"
-
-#: ../../sflphone-client-gnome/src/menus.c:670
-msgid "_View"
-msgstr "_Вид"
-
-#: ../../sflphone-client-gnome/src/menus.c:890
-msgid "_Call back"
-msgstr "_Перезвонить"
-
-#: ../../sflphone-client-gnome/src/menus.c:1070
-#, fuzzy
-msgid "Edit phone"
-msgstr "_Мобильный телефон"
-
-#: ../../sflphone-client-gnome/src/menus.c:1081
-msgid "Edit the phone number before making a call"
-msgstr "Изменить номер телефона перед звонком"
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:71
-#: ../../sflphone-client-gnome/src/sflnotify.c:91
-#, c-format
-msgid "%s account: %s"
-msgstr "%s аккаунт: %s"
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:75
-#, c-format
-msgid "<i>From:</i> %s"
-msgstr "<i>От:</i> %s"
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:111
-#, c-format
-msgid "Calling with %s account <i>%s</i>"
-msgstr "Звонок с аккаунтом %s <i>%s</i>"
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:115
-msgid "Current account"
-msgstr "Нынешний аккаунт"
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:130
-msgid "You haven't setup any accounts"
-msgstr "Вы не настроили ни одного аккаунта"
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:147
-msgid "You have no registered accounts"
-msgstr "У вас нет зарегистрированных аккаунтов"
-
-#: ../../sflphone-client-gnome/src/sliders.c:161
-msgid "Speakers volume"
-msgstr "Громкость"
-
-#: ../../sflphone-client-gnome/src/sliders.c:163
-msgid "Mic volume"
-msgstr "Громкость микрофона"
-
-#: ../../sflphone-client-gnome/src/statusicon.c:91
-msgid "_Show main window"
-msgstr "_Показать главное окно"
-
-#: ../../sflphone-client-gnome/src/statusicon.c:124
-#, c-format
-msgid "SFLphone - %i accounts configured"
-msgstr "SFLphone - Зарегистрировано %i аккаунтов"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:50
-#, c-format
-msgid "\"Voicemail\" <%s>"
-msgstr "\"Автоответчик\" <%s>"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:168
-#: ../../sflphone-client-gnome/src/toolbar.c:170
-msgid "Place a call"
-msgstr "Позвонить"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:177
-#: ../../sflphone-client-gnome/src/toolbar.c:179
-msgid "Pick up"
-msgstr "Взять трубку"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:187
-#: ../../sflphone-client-gnome/src/toolbar.c:189
-msgid "Hang up"
-msgstr "Положить трубку"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:197
-#: ../../sflphone-client-gnome/src/toolbar.c:199
-msgid "Off Hold"
-msgstr "Снова взять"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:208
-#: ../../sflphone-client-gnome/src/toolbar.c:210
-msgid "On Hold"
-msgstr "Удержать звонок"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:221
-#: ../../sflphone-client-gnome/src/toolbar.c:223
-msgid "Transfer"
-msgstr "Переслать звонок на другой номер"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:233
-#: ../../sflphone-client-gnome/src/toolbar.c:235
-msgid "History"
-msgstr "Журнал"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:244
-#: ../../sflphone-client-gnome/src/toolbar.c:246
-msgid "Address book"
-msgstr "Адресная книга"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:252
-#: ../../sflphone-client-gnome/src/toolbar.c:256
-msgid "Voicemail"
-msgstr "Автоответчик"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:264
-msgid "Record a call"
-msgstr "Записать переговор"
-
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:113
-msgid "Account settings"
-msgstr "Настройки аккаунта"
-
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:125
-msgid "Account Parameters"
-msgstr "Параметры аккаунта"
-
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:147
-msgid "_Enable this account"
-msgstr "_Включить"
-
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:161
-msgid "_Protocol"
-msgstr "Пр_отокол"
-
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:179
-msgid "Unknown"
-msgstr "Неизвестный"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../../sflphone-client-gnome/src/config/configwindow.c:721
-msgid "General"
-msgstr "Общие настройки"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:312
-msgid "_Use Evolution address books"
-msgstr "_Использовать адресную книгу Evolution"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:319
-msgid "Download limit:"
-msgstr "Ограничение скорости скачивания:"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:327
-msgid "cards"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:333
-msgid "_Display contact photo if available"
-msgstr "_Показать фотографию контакта (если имеется):"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:341
-#, fuzzy
-msgid "Fields from Evolution's address books"
-msgstr "Исполоьзовать следующие поля из адресной книги Evolution:"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:345
-msgid "_Business phone"
-msgstr "_Рабочий телефон"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:351
-msgid "_Home phone"
-msgstr "_Домашний телефон"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:357
-msgid "_Mobile phone"
-msgstr "_Мобильный телефон"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:364
-msgid "Address Books"
-msgstr "Адресная книга"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:368
-msgid "Select which Evolution address books to use:"
-msgstr "Выбрать адресную книгу Evolution:"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:404
-#: ../../sflphone-client-gnome/src/config/audioconf.c:576
-msgid "Name"
-msgstr "Имя"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:155
-#, c-format
-msgid "audio device index for output = %d"
-msgstr "Индекс звукового устройства = %d"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:581
-msgid "Frequency"
-msgstr "Частота"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:586
-msgid "Bitrate"
-msgstr "Битрейт"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:591
-msgid "Bandwidth"
-msgstr "Пропускная способность"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:662
-msgid "ALSA plugin"
-msgstr "ALSA-плагин"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:684
-msgid "Output"
-msgstr "Выход"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:706
-msgid "Input"
-msgstr "Вход"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:741
-msgid "_Voice Activity Detection"
-msgstr "Включить детектор тишины"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:751
-msgid "_Noise Reduction (Narrow-Band Companding)"
-msgstr "Шумоподавление"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:780
-msgid "Sound Manager"
-msgstr "Менеджер звука"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:783
-#, fuzzy
-msgid "_Pulseaudio"
-msgstr "Pulseaudio"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:788
-#, fuzzy
-msgid "_ALSA"
-msgstr "ALSA"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:795
-msgid "ALSA configuration"
-msgstr "Настройка ALSA"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:812
-msgid "Codecs"
-msgstr "Кодеки"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:835
-msgid "Ringtones"
-msgstr "Звонки"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:841
-msgid "_Enable ringtones"
-msgstr "Включить звонок"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:847
-msgid "Choose a ringtone"
-msgstr "Выберите звонок"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:853
-msgid "Audio Files"
-msgstr "Звуковые файлы"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:418
-msgid "Protocol"
-msgstr "Протокол"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:425
-msgid "Status"
-msgstr "Статус"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:528
-msgid "Stun parameters will apply to each SIP account created."
-msgstr "STUN-параметры будут эффективны для каждого созданного SIP-аккаунта"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:536
-msgid "Enable it if you are behind a firewall"
-msgstr ""
-"Включите это если вы находитесь за сетевым экраном и потом перезагрузите "
-"SFLphone"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:544
-msgid "Format: name.server:port"
-msgstr "Формат: имя.сервер:порт"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:589
-msgid "Desktop Notifications"
-msgstr "Извещения на рабочем столе"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:593
-msgid "_Enable notifications"
-msgstr "Включить звонок"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:599
-msgid "Enable voicemail _notifications"
-msgstr "Включить предупреждения о речевых сообщениях"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:611
-msgid "System Tray Icon"
-msgstr "System Tray Icon"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:614
-msgid "_Popup main window on incoming call"
-msgstr "_Показать главное окно при входящем звонке"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:619
-msgid "Ne_ver popup main window"
-msgstr "Никогда не показывать главное окно"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:623
-msgid "Hide SFLphone window on _startup"
-msgstr "Спрятать окно SFLphone при пуске"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:629
-msgid "Calls History"
-msgstr "Журнал звонков"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:632
-msgid "_Keep my history for at least"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:643
-msgid " days"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:647
-msgid "PulseAudio sound server"
-msgstr "Сервер звука PulseAudio"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:650
-#, fuzzy
-msgid "_Mute other applications during a call"
-msgstr "Приглушать звук других програм во время звонка"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:664
-msgid "SIP Port"
-msgstr "SIP-порт"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:677
-msgid "Port:"
-msgstr "Порт:"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:725
-#, fuzzy
-msgid "Recordings folder"
-msgstr "Папка для записи переговоров"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:731
-msgid "Select a folder"
-msgstr "Выберите папку"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:765
-msgid "Preferences"
-msgstr "Предпочтения"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:785
-msgid "General Settings"
-msgstr "Общие настройки"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:790
-msgid "Audio Settings"
-msgstr "Настройки звука"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:795
-msgid "Recordings"
-msgstr "Запись"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:800
-msgid "Address Book"
-msgstr "Адресная книга"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:805
-msgid "Hooks"
-msgstr "перехватчики (hooks)"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:832
-msgid "Accounts"
-msgstr "Аккаунты"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:844
-msgid "Configured Accounts"
-msgstr "Нынешний аккаунт"
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:130
-msgid "URL Passing"
-msgstr "Передача URL"
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:135
-msgid "Custom commands on incoming calls with URL,"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:138
-#, c-format
-msgid "%s will be replaced with the passed URL."
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:141
-msgid "Trigger on specific _SIP header"
-msgstr "Запустить при определëнном SIP-заголовке"
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:150
-msgid "Trigger on _IAX2 URL"
-msgstr "Запустить при наличии URL _IAX2"
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:155
-#, fuzzy
-msgid "Command to _run: "
-msgstr "_Выполнить команду:"
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:165
-msgid "Phone Number Rewriting"
-msgstr "Переписка номера телефона"
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:169
-msgid "_Prefix dialed numbers with:"
-msgstr "Добавить перед на набранными номерами:"
-
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:55
-msgid ""
-"Search all\n"
-"Click here to change the search type"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:67
-msgid ""
-"Search by missed call\n"
-"Click here to change the search type"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:79
-msgid ""
-"Search by incoming call\n"
-"Click here to change the search type"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:91
-msgid ""
-"Search by outgoing call\n"
-"Click here to change the search type"
-msgstr ""
-
-#~ msgid "Accept"
-#~ msgstr "Согласиться"
-
-#~ msgid "Refuse"
-#~ msgstr "Отказаться"
-
-#~ msgid "Ignore"
-#~ msgstr "Пропустить"
-
-#~ msgid "<small>Missed call</small>"
-#~ msgstr "<small>Пропущенный звонок</small>"
-
-#~ msgid "<small>Duration:</small> %s"
-#~ msgstr "<small>Время:</small> %s"
-
-#~ msgid "Fields"
-#~ msgstr "Поля"
-
-#~ msgid "_History size limit"
-#~ msgstr "Ограничение размера журнала"
-
-#~ msgid ""
-#~ "SFLphone can run custom commands if incoming calls come with an URL "
-#~ "attached.\n"
-#~ "In this case, %s will be replaced with the passed URL."
-#~ msgstr ""
-#~ "SFLphone может выполнять комманды если входящие звонки имеют URL.\n"
-#~ "В этом случае %s будет заменена на переданную URL."
-
-#~ msgid "Search history"
-#~ msgstr "_Стереть журнал"
-
-#~ msgid "Search contact"
-#~ msgstr "_Искать контакт"
-
-#, fuzzy
-#~ msgid "Registered to %s (%s)"
-#~ msgstr "Зарегистрирован"
-
-#, fuzzy
-#~ msgid "%s account- %s             %s"
-#~ msgstr "%s аккаунт- %s"
-
-#, fuzzy
-#~ msgid "Books"
-#~ msgstr "перехватчики (hooks)"
-
-#~ msgid "_Enable"
-#~ msgstr "_Включить"
-
-#~ msgid "_Notify voice mails"
-#~ msgstr "_Предупредить о новых речевых сообщениях"
-
-#~ msgid "_Start hidden"
-#~ msgstr "_Начать спрятанным"
-
-#~ msgid "_Maximum number of calls"
-#~ msgstr "_Максимальное количество звонков"
-
-#~ msgid "_Control running applications volume"
-#~ msgstr "_Начать спрятанным "
-
-#, fuzzy
-#~ msgid "Account previously setup"
-#~ msgstr "Существующие аккаунты"
-
-#~ msgid "URL argument"
-#~ msgstr "URL аргумент"
-
-#~ msgid "_SIP protocol"
-#~ msgstr "Пр_отокол"
-
-#~ msgid "_SIP Header: "
-#~ msgstr "_SIP Заголовок"
-
-#~ msgid "_IAX2 protocol"
-#~ msgstr "Пр_отокол"
-
-#~ msgid "Search"
-#~ msgstr "Поиск"
-
-#~ msgid "_Enabled"
-#~ msgstr "_Включен"
-
-#~ msgid "%s account- %s"
-#~ msgstr "%s аккаунт- %s"
-
-#~ msgid "Noise reduction"
-#~ msgstr "Уменьшение шума"
-
-#~ msgid "_Destination folder"
-#~ msgstr "Папка назна_чения"
-
-#~ msgid "_Account Assistant"
-#~ msgstr "_Мастер настройки аккаунтов"
-
-#~ msgid "Setup Accounts"
-#~ msgstr "Настроить аккаунты"
-
-#~ msgid "Search Parameters"
-#~ msgstr "Параметры аккаунта"
-
-#~ msgid "Maximum result number for a request: "
-#~ msgstr "Максимальное количество звонков"
-
-#~ msgid "Search for and display: "
-#~ msgstr "Найти и показать: "
-
-#~ msgid "_STUN Server"
-#~ msgstr "_STUN-сервер"
-
-#~ msgid "Apply"
-#~ msgstr "Применить"
-
-#~ msgid "Enabled"
-#~ msgstr "Включен"
diff --git a/sflphone-common/po/sflphone.pot b/sflphone-common/po/sflphone.pot
deleted file mode 100644
index 4d624badbeb9cc691b461a8c420062ad13745a1d..0000000000000000000000000000000000000000
--- a/sflphone-common/po/sflphone.pot
+++ /dev/null
@@ -1,766 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-12 18:05-0400\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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:175
-msgid "Registered"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/accountlist.c:178
-msgid "Not Registered"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/accountlist.c:181
-msgid "Trying..."
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/accountlist.c:184
-#: ../../sflphone-client-gnome/src/sflnotify.c:131
-#: ../../sflphone-client-gnome/src/sflnotify.c:148
-msgid "Error"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/accountlist.c:187
-msgid "Bad authentification"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/accountlist.c:190
-msgid "Network unreachable"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/accountlist.c:193
-msgid "Host unreachable"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/accountlist.c:196
-msgid "Stun configuration error"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/accountlist.c:199
-msgid "Stun server invalid"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/accountlist.c:202
-msgid "Invalid"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/actions.c:55
-#: ../../sflphone-client-gnome/src/sflnotify.c:94
-#, c-format
-msgid "%d voice mails"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/actions.c:57
-#, c-format
-msgid "%d voice mail"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/actions.c:81
-#, c-format
-msgid "Using %s (%s)"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/actions.c:87
-msgid "No registered account"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/actions.c:232
-msgid ""
-"Unable to connect to the SFLphone server.\n"
-"Make sure the daemon is running."
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/actions.c:807
-#, c-format
-msgid "IP call - %s"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/actions.c:810
-#, c-format
-msgid "Using %s (%s) - Codec: %s"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/actions.c:900
-#, 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-client-gnome/src/assistant.c:35
-#, c-format
-msgid ""
-"This assistant is now finished.\n"
-"You can at any time check your registration state or modify your accounts "
-"parameters in the Options/Accounts window.\n"
-"\n"
-"Alias :    %s\n"
-"Server :   %s\n"
-"Username : %s\n"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/assistant.c:159
-msgid "SFLphone account configuration wizard"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/assistant.c:185
-msgid "Welcome to SFLphone!"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/assistant.c:186
-msgid "This installation wizard will help you configure an account."
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/assistant.c:200
-msgid "VoIP Protocols"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/assistant.c:200
-msgid "Select an account type:"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/assistant.c:218
-msgid "Account"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/assistant.c:218
-msgid "Please select one of the following option:"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/assistant.c:220
-msgid "Create a free SIP/IAX2 account on sflphone.org"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/assistant.c:222
-msgid "Register an existing SIP or IAX2 account"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/assistant.c:235
-msgid "SIP account configuration"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/assistant.c:235
-#: ../../sflphone-client-gnome/src/assistant.c:331
-msgid "Please fill the following information:"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/assistant.c:243
-#: ../../sflphone-client-gnome/src/assistant.c:339
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:153
-msgid "_Alias"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/assistant.c:251
-#: ../../sflphone-client-gnome/src/assistant.c:347
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:189
-msgid "_Host name"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/assistant.c:259
-#: ../../sflphone-client-gnome/src/assistant.c:355
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:197
-msgid "_User name"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/assistant.c:275
-#: ../../sflphone-client-gnome/src/assistant.c:370
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:212
-msgid "_Password"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/assistant.c:293
-#: ../../sflphone-client-gnome/src/assistant.c:386
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:228
-msgid "_Voicemail number"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/assistant.c:308
-msgid "Optional Email Address "
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/assistant.c:308
-msgid "This email address will be use to send your voicemail messages"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/assistant.c:316
-msgid "_Email"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/assistant.c:331
-msgid "IAX2 account configuration"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/assistant.c:404
-#: ../../sflphone-client-gnome/src/config/configwindow.c:855
-msgid "Network Address Translation"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/assistant.c:404
-msgid "You should probably enable this if you are behind a firewall."
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/assistant.c:413
-#: ../../sflphone-client-gnome/src/config/configwindow.c:532
-msgid "E_nable STUN"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/assistant.c:420
-msgid "_STUN server"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/assistant.c:434
-msgid "Account Registration"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/assistant.c:434
-msgid "Congratulations!"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/errors.c:29
-msgid ""
-"ALSA notification\n"
-"\n"
-"Error while opening playback device"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/errors.c:32
-msgid ""
-"ALSA notification\n"
-"\n"
-"Error while opening capture device"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/errors.c:35
-msgid ""
-"Pulseaudio notification\n"
-"\n"
-"Pulseaudio is not running"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/mainwindow.c:70
-msgid "There is one call in progress."
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/mainwindow.c:74
-msgid "There are calls in progress."
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/mainwindow.c:83
-msgid "Do you still want to quit?"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/mainwindow.c:296
-msgid "SFLphone Error"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/menus.c:134
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/menus.c:137
-msgid "About SFLphone"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/menus.c:161
-msgid "_Help"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/menus.c:296
-#: ../../sflphone-client-gnome/src/menus.c:962
-msgid "_New call"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/menus.c:308
-#: ../../sflphone-client-gnome/src/menus.c:794
-msgid "_Pick up"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/menus.c:318
-#: ../../sflphone-client-gnome/src/menus.c:806
-msgid "_Hang up"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/menus.c:328
-#: ../../sflphone-client-gnome/src/menus.c:818
-msgid "On _Hold"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/menus.c:340
-#: ../../sflphone-client-gnome/src/menus.c:830
-msgid "_Record"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/menus.c:354
-msgid "_Account creation wizard"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/menus.c:384
-msgid "_Call"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/menus.c:552
-msgid "Clear _history"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/menus.c:564
-msgid "_Accounts"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/menus.c:579
-msgid "_Edit"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/menus.c:640
-msgid "_Dialpad"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/menus.c:652
-msgid "_Volume controls"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/menus.c:670
-msgid "_View"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/menus.c:890
-msgid "_Call back"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/menus.c:1070
-msgid "Edit phone"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/menus.c:1081
-msgid "Edit the phone number before making a call"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:71
-#: ../../sflphone-client-gnome/src/sflnotify.c:91
-#, c-format
-msgid "%s account: %s"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:75
-#, c-format
-msgid "<i>From:</i> %s"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:111
-#, c-format
-msgid "Calling with %s account <i>%s</i>"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:115
-msgid "Current account"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:130
-msgid "You haven't setup any accounts"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:147
-msgid "You have no registered accounts"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/sliders.c:161
-msgid "Speakers volume"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/sliders.c:163
-msgid "Mic volume"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/statusicon.c:91
-msgid "_Show main window"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/statusicon.c:124
-#, c-format
-msgid "SFLphone - %i accounts configured"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/toolbar.c:50
-#, c-format
-msgid "\"Voicemail\" <%s>"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/toolbar.c:168
-#: ../../sflphone-client-gnome/src/toolbar.c:170
-msgid "Place a call"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/toolbar.c:177
-#: ../../sflphone-client-gnome/src/toolbar.c:179
-msgid "Pick up"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/toolbar.c:187
-#: ../../sflphone-client-gnome/src/toolbar.c:189
-msgid "Hang up"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/toolbar.c:197
-#: ../../sflphone-client-gnome/src/toolbar.c:199
-msgid "Off Hold"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/toolbar.c:208
-#: ../../sflphone-client-gnome/src/toolbar.c:210
-msgid "On Hold"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/toolbar.c:221
-#: ../../sflphone-client-gnome/src/toolbar.c:223
-msgid "Transfer"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/toolbar.c:233
-#: ../../sflphone-client-gnome/src/toolbar.c:235
-msgid "History"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/toolbar.c:244
-#: ../../sflphone-client-gnome/src/toolbar.c:246
-msgid "Address book"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/toolbar.c:252
-#: ../../sflphone-client-gnome/src/toolbar.c:256
-msgid "Voicemail"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/toolbar.c:264
-msgid "Record a call"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:113
-msgid "Account settings"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:125
-msgid "Account Parameters"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:147
-msgid "_Enable this account"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:161
-msgid "_Protocol"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:179
-msgid "Unknown"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../../sflphone-client-gnome/src/config/configwindow.c:721
-msgid "General"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:312
-msgid "_Use Evolution address books"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:319
-msgid "Download limit:"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:327
-msgid "cards"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:333
-msgid "_Display contact photo if available"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:341
-msgid "Fields from Evolution's address books"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:345
-msgid "_Business phone"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:351
-msgid "_Home phone"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:357
-msgid "_Mobile phone"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:364
-msgid "Address Books"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:368
-msgid "Select which Evolution address books to use:"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:404
-#: ../../sflphone-client-gnome/src/config/audioconf.c:576
-msgid "Name"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:155
-#, c-format
-msgid "audio device index for output = %d"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:581
-msgid "Frequency"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:586
-msgid "Bitrate"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:591
-msgid "Bandwidth"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:662
-msgid "ALSA plugin"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:684
-msgid "Output"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:706
-msgid "Input"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:741
-msgid "_Voice Activity Detection"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:751
-msgid "_Noise Reduction (Narrow-Band Companding)"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:780
-msgid "Sound Manager"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:783
-msgid "_Pulseaudio"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:788
-msgid "_ALSA"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:795
-msgid "ALSA configuration"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:812
-msgid "Codecs"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:835
-msgid "Ringtones"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:841
-msgid "_Enable ringtones"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:847
-msgid "Choose a ringtone"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:853
-msgid "Audio Files"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:418
-msgid "Protocol"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:425
-msgid "Status"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:528
-msgid "Stun parameters will apply to each SIP account created."
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:536
-msgid "Enable it if you are behind a firewall"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:544
-msgid "Format: name.server:port"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:589
-msgid "Desktop Notifications"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:593
-msgid "_Enable notifications"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:599
-msgid "Enable voicemail _notifications"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:611
-msgid "System Tray Icon"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:614
-msgid "_Popup main window on incoming call"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:619
-msgid "Ne_ver popup main window"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:623
-msgid "Hide SFLphone window on _startup"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:629
-msgid "Calls History"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:632
-msgid "_Keep my history for at least"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:643
-msgid " days"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:647
-msgid "PulseAudio sound server"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:650
-msgid "_Mute other applications during a call"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:664
-msgid "SIP Port"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:677
-msgid "Port:"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:725
-msgid "Recordings folder"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:731
-msgid "Select a folder"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:765
-msgid "Preferences"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:785
-msgid "General Settings"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:790
-msgid "Audio Settings"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:795
-msgid "Recordings"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:800
-msgid "Address Book"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:805
-msgid "Hooks"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:832
-msgid "Accounts"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:844
-msgid "Configured Accounts"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:130
-msgid "URL Passing"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:135
-msgid "Custom commands on incoming calls with URL,"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:138
-#, c-format
-msgid "%s will be replaced with the passed URL."
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:141
-msgid "Trigger on specific _SIP header"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:150
-msgid "Trigger on _IAX2 URL"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:155
-msgid "Command to _run: "
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:165
-msgid "Phone Number Rewriting"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:169
-msgid "_Prefix dialed numbers with:"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:55
-msgid ""
-"Search all\n"
-"Click here to change the search type"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:67
-msgid ""
-"Search by missed call\n"
-"Click here to change the search type"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:79
-msgid ""
-"Search by incoming call\n"
-"Click here to change the search type"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:91
-msgid ""
-"Search by outgoing call\n"
-"Click here to change the search type"
-msgstr ""
diff --git a/sflphone-common/po/zh_CN.po b/sflphone-common/po/zh_CN.po
deleted file mode 100644
index 0347cfcfed711a7e67e8a9718e8b1214b64fb0d0..0000000000000000000000000000000000000000
--- a/sflphone-common/po/zh_CN.po
+++ /dev/null
@@ -1,905 +0,0 @@
-# Chinese translation of SFLphone.
-# Copyright (C) 2008 The Free Software Foundation, Inc.
-# This file is distributed under the GNU General Public License Version 3.
-#
-# Yun Liu <yun.liu@savoirfairelinux.com>, 2008.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: SFLphone 0.9.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-12 18:05-0400\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"
-"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"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:175
-msgid "Registered"
-msgstr "已注册"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:178
-msgid "Not Registered"
-msgstr "未注册"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:181
-msgid "Trying..."
-msgstr "正在连接..."
-
-#: ../../sflphone-client-gnome/src/accountlist.c:184
-#: ../../sflphone-client-gnome/src/sflnotify.c:131
-#: ../../sflphone-client-gnome/src/sflnotify.c:148
-msgid "Error"
-msgstr "注册失败"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:187
-msgid "Bad authentification"
-msgstr "认证错误"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:190
-msgid "Network unreachable"
-msgstr "网络连接失败"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:193
-msgid "Host unreachable"
-msgstr "服务器连接失败"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:196
-msgid "Stun configuration error"
-msgstr "Stun配置有误"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:199
-msgid "Stun server invalid"
-msgstr "Stun服务器无效"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:202
-msgid "Invalid"
-msgstr "无效"
-
-#: ../../sflphone-client-gnome/src/actions.c:55
-#: ../../sflphone-client-gnome/src/sflnotify.c:94
-#, c-format
-msgid "%d voice mails"
-msgstr "%d 个语音信息"
-
-#: ../../sflphone-client-gnome/src/actions.c:57
-#, c-format
-msgid "%d voice mail"
-msgstr "%d 个语音信息"
-
-#: ../../sflphone-client-gnome/src/actions.c:81
-#, c-format
-msgid "Using %s (%s)"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/actions.c:87
-msgid "No registered account"
-msgstr "未发现已注册帐户"
-
-#: ../../sflphone-client-gnome/src/actions.c:232
-msgid ""
-"Unable to connect to the SFLphone server.\n"
-"Make sure the daemon is running."
-msgstr ""
-"连接SFLphone服务器失败.\n"
-"请检查daemon是否还在运行."
-
-#: ../../sflphone-client-gnome/src/actions.c:807
-#, c-format
-msgid "IP call - %s"
-msgstr "IP 电话 - %s"
-
-#: ../../sflphone-client-gnome/src/actions.c:810
-#, c-format
-msgid "Using %s (%s) - Codec: %s"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/actions.c:900
-#, 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>错误：无法找到codecs编码文件.\n"
-"\n"
-"</b> SFL声音codecs文件应位于<i>%s</i> 或 位于主目录( <i>%s</i> )的<b>."
-"sflphone</b>目录下"
-
-#: ../../sflphone-client-gnome/src/assistant.c:35
-#, c-format
-msgid ""
-"This assistant is now finished.\n"
-"You can at any time check your registration state or modify your accounts "
-"parameters in the Options/Accounts window.\n"
-"\n"
-"Alias :    %s\n"
-"Server :   %s\n"
-"Username : %s\n"
-msgstr ""
-"配置完成.\n"
-"你可以随时在 选项/帐户 窗口中查看注册状态或者修改帐户参数.\n"
-"\n"
-"别名:     %s\n"
-"服务器:   %s\n"
-"用户名:   %s\n"
-
-#: ../../sflphone-client-gnome/src/assistant.c:159
-msgid "SFLphone account configuration wizard"
-msgstr "SFLphone 帐户设置向导"
-
-#: ../../sflphone-client-gnome/src/assistant.c:185
-msgid "Welcome to SFLphone!"
-msgstr "欢迎使用SFLphone!"
-
-#: ../../sflphone-client-gnome/src/assistant.c:186
-msgid "This installation wizard will help you configure an account."
-msgstr "安装向导将帮助您配置帐户"
-
-#: ../../sflphone-client-gnome/src/assistant.c:200
-msgid "VoIP Protocols"
-msgstr "VoIP协议"
-
-#: ../../sflphone-client-gnome/src/assistant.c:200
-msgid "Select an account type:"
-msgstr "选择帐户类型:"
-
-#: ../../sflphone-client-gnome/src/assistant.c:218
-msgid "Account"
-msgstr "帐户"
-
-#: ../../sflphone-client-gnome/src/assistant.c:218
-msgid "Please select one of the following option:"
-msgstr "请选择以下选项中的一个:"
-
-#: ../../sflphone-client-gnome/src/assistant.c:220
-msgid "Create a free SIP/IAX2 account on sflphone.org"
-msgstr "在sflphone.org上创建免费的SIP/IAX2帐户"
-
-#: ../../sflphone-client-gnome/src/assistant.c:222
-msgid "Register an existing SIP or IAX2 account"
-msgstr "注册已存在的SIP或IAX2帐户"
-
-#: ../../sflphone-client-gnome/src/assistant.c:235
-msgid "SIP account configuration"
-msgstr "SIP帐户配置"
-
-#: ../../sflphone-client-gnome/src/assistant.c:235
-#: ../../sflphone-client-gnome/src/assistant.c:331
-msgid "Please fill the following information:"
-msgstr "请填写以下信息:"
-
-#: ../../sflphone-client-gnome/src/assistant.c:243
-#: ../../sflphone-client-gnome/src/assistant.c:339
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:153
-msgid "_Alias"
-msgstr "别名(A)"
-
-#: ../../sflphone-client-gnome/src/assistant.c:251
-#: ../../sflphone-client-gnome/src/assistant.c:347
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:189
-msgid "_Host name"
-msgstr "主机名(H)"
-
-#: ../../sflphone-client-gnome/src/assistant.c:259
-#: ../../sflphone-client-gnome/src/assistant.c:355
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:197
-msgid "_User name"
-msgstr "用户名(U)"
-
-#: ../../sflphone-client-gnome/src/assistant.c:275
-#: ../../sflphone-client-gnome/src/assistant.c:370
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:212
-msgid "_Password"
-msgstr "密码(P)"
-
-#: ../../sflphone-client-gnome/src/assistant.c:293
-#: ../../sflphone-client-gnome/src/assistant.c:386
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:228
-msgid "_Voicemail number"
-msgstr "语音信箱号码(V)"
-
-#: ../../sflphone-client-gnome/src/assistant.c:308
-msgid "Optional Email Address "
-msgstr "可选邮件地址 "
-
-#: ../../sflphone-client-gnome/src/assistant.c:308
-msgid "This email address will be use to send your voicemail messages"
-msgstr "这个邮件地址将被用来发送您的语音邮箱消息"
-
-#: ../../sflphone-client-gnome/src/assistant.c:316
-msgid "_Email"
-msgstr " 邮件(E)"
-
-#: ../../sflphone-client-gnome/src/assistant.c:331
-msgid "IAX2 account configuration"
-msgstr "IAX2帐户配置"
-
-#: ../../sflphone-client-gnome/src/assistant.c:404
-#: ../../sflphone-client-gnome/src/config/configwindow.c:855
-msgid "Network Address Translation"
-msgstr "网络地址解析"
-
-#: ../../sflphone-client-gnome/src/assistant.c:404
-msgid "You should probably enable this if you are behind a firewall."
-msgstr "如果你使用网络使用防火墙，你很有可能需要设定此项."
-
-#: ../../sflphone-client-gnome/src/assistant.c:413
-#: ../../sflphone-client-gnome/src/config/configwindow.c:532
-msgid "E_nable STUN"
-msgstr "使用STUN(n)"
-
-#: ../../sflphone-client-gnome/src/assistant.c:420
-msgid "_STUN server"
-msgstr "STUN服务器(S)"
-
-#: ../../sflphone-client-gnome/src/assistant.c:434
-msgid "Account Registration"
-msgstr "帐户注册"
-
-#: ../../sflphone-client-gnome/src/assistant.c:434
-msgid "Congratulations!"
-msgstr "恭喜！"
-
-#: ../../sflphone-client-gnome/src/errors.c:29
-msgid ""
-"ALSA notification\n"
-"\n"
-"Error while opening playback device"
-msgstr ""
-"ALSA提示\n"
-"\n"
-"打开回放设备时出错"
-
-#: ../../sflphone-client-gnome/src/errors.c:32
-msgid ""
-"ALSA notification\n"
-"\n"
-"Error while opening capture device"
-msgstr ""
-"ALSA提示\n"
-"\n"
-"打开采集设备时出错"
-
-#: ../../sflphone-client-gnome/src/errors.c:35
-msgid ""
-"Pulseaudio notification\n"
-"\n"
-"Pulseaudio is not running"
-msgstr ""
-"Pulseaudio提示\n"
-"\n"
-"Pulseaudio未运行"
-
-#: ../../sflphone-client-gnome/src/mainwindow.c:70
-msgid "There is one call in progress."
-msgstr "有一个电话正在处理"
-
-#: ../../sflphone-client-gnome/src/mainwindow.c:74
-msgid "There are calls in progress."
-msgstr "有电话正在处理中"
-
-#: ../../sflphone-client-gnome/src/mainwindow.c:83
-msgid "Do you still want to quit?"
-msgstr "确认要退出?"
-
-#: ../../sflphone-client-gnome/src/mainwindow.c:296
-msgid "SFLphone Error"
-msgstr "SFLphone出错"
-
-#: ../../sflphone-client-gnome/src/menus.c:134
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
-msgstr "SFLphone是一个VoIP客户端，它兼容SIP和IAX2协议."
-
-#: ../../sflphone-client-gnome/src/menus.c:137
-msgid "About SFLphone"
-msgstr "关于SFLphone"
-
-#: ../../sflphone-client-gnome/src/menus.c:161
-msgid "_Help"
-msgstr "帮助(H)"
-
-#: ../../sflphone-client-gnome/src/menus.c:296
-#: ../../sflphone-client-gnome/src/menus.c:962
-msgid "_New call"
-msgstr "新电话(N)"
-
-#: ../../sflphone-client-gnome/src/menus.c:308
-#: ../../sflphone-client-gnome/src/menus.c:794
-msgid "_Pick up"
-msgstr "拨出(P)"
-
-#: ../../sflphone-client-gnome/src/menus.c:318
-#: ../../sflphone-client-gnome/src/menus.c:806
-msgid "_Hang up"
-msgstr "放下(H)"
-
-#: ../../sflphone-client-gnome/src/menus.c:328
-#: ../../sflphone-client-gnome/src/menus.c:818
-msgid "On _Hold"
-msgstr "保持(H)"
-
-#: ../../sflphone-client-gnome/src/menus.c:340
-#: ../../sflphone-client-gnome/src/menus.c:830
-msgid "_Record"
-msgstr "记录(R)"
-
-#: ../../sflphone-client-gnome/src/menus.c:354
-msgid "_Account creation wizard"
-msgstr "帐户创建向导"
-
-#: ../../sflphone-client-gnome/src/menus.c:384
-msgid "_Call"
-msgstr "电话"
-
-#: ../../sflphone-client-gnome/src/menus.c:552
-#, fuzzy
-msgid "Clear _history"
-msgstr "清空历史记录(C)"
-
-#: ../../sflphone-client-gnome/src/menus.c:564
-msgid "_Accounts"
-msgstr "帐户(A)"
-
-#: ../../sflphone-client-gnome/src/menus.c:579
-msgid "_Edit"
-msgstr "编辑(E)"
-
-#: ../../sflphone-client-gnome/src/menus.c:640
-msgid "_Dialpad"
-msgstr "拨号面板"
-
-#: ../../sflphone-client-gnome/src/menus.c:652
-msgid "_Volume controls"
-msgstr "音量控制(V)"
-
-#: ../../sflphone-client-gnome/src/menus.c:670
-msgid "_View"
-msgstr "查看(V)"
-
-#: ../../sflphone-client-gnome/src/menus.c:890
-msgid "_Call back"
-msgstr "回叫(C)"
-
-#: ../../sflphone-client-gnome/src/menus.c:1070
-msgid "Edit phone"
-msgstr "编辑电话"
-
-#: ../../sflphone-client-gnome/src/menus.c:1081
-msgid "Edit the phone number before making a call"
-msgstr "拨出电话前编辑电话号码"
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:71
-#: ../../sflphone-client-gnome/src/sflnotify.c:91
-#, c-format
-msgid "%s account: %s"
-msgstr "%s 帐户: %s"
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:75
-#, c-format
-msgid "<i>From:</i> %s"
-msgstr "<i>拨入方：</i> %s"
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:111
-#, c-format
-msgid "Calling with %s account <i>%s</i>"
-msgstr "使用%s帐户<i>%s</i>呼叫"
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:115
-msgid "Current account"
-msgstr "当前帐户"
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:130
-msgid "You haven't setup any accounts"
-msgstr "你没有设置任何帐户"
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:147
-msgid "You have no registered accounts"
-msgstr "未发现已注册帐户"
-
-#: ../../sflphone-client-gnome/src/sliders.c:161
-msgid "Speakers volume"
-msgstr "扬声器音量"
-
-#: ../../sflphone-client-gnome/src/sliders.c:163
-msgid "Mic volume"
-msgstr "话筒音量"
-
-#: ../../sflphone-client-gnome/src/statusicon.c:91
-msgid "_Show main window"
-msgstr "显示主窗口(S)"
-
-#: ../../sflphone-client-gnome/src/statusicon.c:124
-#, c-format
-msgid "SFLphone - %i accounts configured"
-msgstr "SFLphone - %i 个帐户已配置"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:50
-#, c-format
-msgid "\"Voicemail\" <%s>"
-msgstr "\"语音邮件\" <%s>"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:168
-#: ../../sflphone-client-gnome/src/toolbar.c:170
-msgid "Place a call"
-msgstr "拨号"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:177
-#: ../../sflphone-client-gnome/src/toolbar.c:179
-msgid "Pick up"
-msgstr "接电话"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:187
-#: ../../sflphone-client-gnome/src/toolbar.c:189
-msgid "Hang up"
-msgstr "放电话"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:197
-#: ../../sflphone-client-gnome/src/toolbar.c:199
-msgid "Off Hold"
-msgstr "恢复通话"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:208
-#: ../../sflphone-client-gnome/src/toolbar.c:210
-msgid "On Hold"
-msgstr "待机"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:221
-#: ../../sflphone-client-gnome/src/toolbar.c:223
-msgid "Transfer"
-msgstr "转接"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:233
-#: ../../sflphone-client-gnome/src/toolbar.c:235
-msgid "History"
-msgstr "历史"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:244
-#: ../../sflphone-client-gnome/src/toolbar.c:246
-msgid "Address book"
-msgstr "地址簿"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:252
-#: ../../sflphone-client-gnome/src/toolbar.c:256
-msgid "Voicemail"
-msgstr "语音信箱"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:264
-msgid "Record a call"
-msgstr "记录通话"
-
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:113
-msgid "Account settings"
-msgstr "帐户设置"
-
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:125
-msgid "Account Parameters"
-msgstr "帐户相关参数"
-
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:147
-msgid "_Enable this account"
-msgstr "启用该账户(E)"
-
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:161
-msgid "_Protocol"
-msgstr "协议(P)"
-
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:179
-msgid "Unknown"
-msgstr "未知"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../../sflphone-client-gnome/src/config/configwindow.c:721
-msgid "General"
-msgstr "常用配置"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:312
-msgid "_Use Evolution address books"
-msgstr "使用Evolution地址薄(U)"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:319
-msgid "Download limit:"
-msgstr "下载上限:"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:327
-msgid "cards"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:333
-msgid "_Display contact photo if available"
-msgstr "如果可行则显示联系人照片(D)"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:341
-#, fuzzy
-msgid "Fields from Evolution's address books"
-msgstr "使用Evolution地址薄中的如下字段:"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:345
-msgid "_Business phone"
-msgstr "商务电话(B)"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:351
-msgid "_Home phone"
-msgstr "家庭电话(H)"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:357
-msgid "_Mobile phone"
-msgstr "移动电话(M)"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:364
-msgid "Address Books"
-msgstr "地址簿"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:368
-msgid "Select which Evolution address books to use:"
-msgstr "选择使用如下Evolution地址薄:"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:404
-#: ../../sflphone-client-gnome/src/config/audioconf.c:576
-msgid "Name"
-msgstr "名称"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:155
-#, c-format
-msgid "audio device index for output = %d"
-msgstr "音频设备输出索引 ＝ %d"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:581
-msgid "Frequency"
-msgstr "频率"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:586
-msgid "Bitrate"
-msgstr "比率"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:591
-msgid "Bandwidth"
-msgstr "带宽"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:662
-msgid "ALSA plugin"
-msgstr "ALSA插件"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:684
-msgid "Output"
-msgstr "输出"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:706
-msgid "Input"
-msgstr "输入"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:741
-msgid "_Voice Activity Detection"
-msgstr "声音状态检测(V)"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:751
-msgid "_Noise Reduction (Narrow-Band Companding)"
-msgstr "降噪处理-窄频压缩(N)"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:780
-msgid "Sound Manager"
-msgstr "音频管理器"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:783
-#, fuzzy
-msgid "_Pulseaudio"
-msgstr "Pulseaudio"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:788
-#, fuzzy
-msgid "_ALSA"
-msgstr "ALSA"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:795
-msgid "ALSA configuration"
-msgstr "ALSA 配置"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:812
-msgid "Codecs"
-msgstr "Codecs编码"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:835
-msgid "Ringtones"
-msgstr "铃声"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:841
-msgid "_Enable ringtones"
-msgstr "启用铃声(E)"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:847
-msgid "Choose a ringtone"
-msgstr "选择铃声"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:853
-msgid "Audio Files"
-msgstr "音频文件"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:418
-msgid "Protocol"
-msgstr "协议"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:425
-msgid "Status"
-msgstr "状态"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:528
-msgid "Stun parameters will apply to each SIP account created."
-msgstr "Stun参数将应用于每一个注册的SIP帐户"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:536
-msgid "Enable it if you are behind a firewall"
-msgstr "当使用防火墙时,启用该项"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:544
-msgid "Format: name.server:port"
-msgstr "格式：name.server:port"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:589
-msgid "Desktop Notifications"
-msgstr "桌面提示"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:593
-msgid "_Enable notifications"
-msgstr "启用提示(E)"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:599
-msgid "Enable voicemail _notifications"
-msgstr "启用语音邮箱提示(n)"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:611
-msgid "System Tray Icon"
-msgstr "系统托盘图标"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:614
-msgid "_Popup main window on incoming call"
-msgstr "来电时弹出主窗口(P)"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:619
-msgid "Ne_ver popup main window"
-msgstr "从不弹出主窗口(v)"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:623
-msgid "Hide SFLphone window on _startup"
-msgstr "在启动时隐藏SFLphone主窗口"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:629
-msgid "Calls History"
-msgstr "拨号历史"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:632
-msgid "_Keep my history for at least"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:643
-msgid " days"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:647
-msgid "PulseAudio sound server"
-msgstr "PulseAudio服务器"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:650
-#, fuzzy
-msgid "_Mute other applications during a call"
-msgstr "当有来电时静音其它应用程序(c)"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:664
-msgid "SIP Port"
-msgstr "SIP端口号"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:677
-msgid "Port:"
-msgstr "端口:"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:725
-#, fuzzy
-msgid "Recordings folder"
-msgstr "记录文件夹(R)"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:731
-msgid "Select a folder"
-msgstr "选择文件夹"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:765
-msgid "Preferences"
-msgstr "属性"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:785
-msgid "General Settings"
-msgstr "常用配置"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:790
-msgid "Audio Settings"
-msgstr "音频配置"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:795
-msgid "Recordings"
-msgstr "记录"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:800
-msgid "Address Book"
-msgstr "地址簿"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:805
-msgid "Hooks"
-msgstr "钩键"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:832
-msgid "Accounts"
-msgstr "帐户"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:844
-msgid "Configured Accounts"
-msgstr "已配置帐户"
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:130
-msgid "URL Passing"
-msgstr "传输URL"
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:135
-msgid "Custom commands on incoming calls with URL,"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:138
-#, c-format
-msgid "%s will be replaced with the passed URL."
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:141
-msgid "Trigger on specific _SIP header"
-msgstr "激活指定的SIP头(S)"
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:150
-msgid "Trigger on _IAX2 URL"
-msgstr "激活IAX2 URL(I)"
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:155
-#, fuzzy
-msgid "Command to _run: "
-msgstr "运行命令(C):"
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:165
-msgid "Phone Number Rewriting"
-msgstr "重设电话号码"
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:169
-msgid "_Prefix dialed numbers with:"
-msgstr "号码前缀:"
-
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:55
-msgid ""
-"Search all\n"
-"Click here to change the search type"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:67
-msgid ""
-"Search by missed call\n"
-"Click here to change the search type"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:79
-msgid ""
-"Search by incoming call\n"
-"Click here to change the search type"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:91
-msgid ""
-"Search by outgoing call\n"
-"Click here to change the search type"
-msgstr ""
-
-#~ msgid "Accept"
-#~ msgstr "接受"
-
-#~ msgid "Refuse"
-#~ msgstr "拒绝"
-
-#~ msgid "Ignore"
-#~ msgstr "忽略"
-
-#~ msgid "<small>Missed call</small>"
-#~ msgstr "<small>未接电话</small>"
-
-#~ msgid "<small>Duration:</small> %s"
-#~ msgstr "<small>时长:</small> %s"
-
-#~ msgid "Fields"
-#~ msgstr "字段"
-
-#~ msgid "_History size limit"
-#~ msgstr "历史记录上限(H)"
-
-#~ msgid ""
-#~ "SFLphone can run custom commands if incoming calls come with an URL "
-#~ "attached.\n"
-#~ "In this case, %s will be replaced with the passed URL."
-#~ msgstr ""
-#~ "当来电有附加的URL时,SFLphone可运行客户命令.\n"
-#~ "在此情况下,传输的URL会被替换成%s."
-
-#~ msgid "Search history"
-#~ msgstr "查找历史记录"
-
-#~ msgid "Search contact"
-#~ msgstr "查找联系人(S)"
-
-#~ msgid "Registered to %s (%s)"
-#~ msgstr "注册到 %s (%s)"
-
-#~ msgid "%s account- %s             %s"
-#~ msgstr "%s 帐户- %s             %s"
-
-#~ msgid "Books"
-#~ msgstr "钩键"
-
-#~ msgid "_Enable"
-#~ msgstr "启用(E)"
-
-#~ msgid "_Notify voice mails"
-#~ msgstr "通知语音邮件(N)"
-
-#~ msgid "_Start hidden"
-#~ msgstr "启动时隐藏(S)"
-
-#~ msgid "_Maximum number of calls"
-#~ msgstr "最大拨号数(M)"
-
-#~ msgid "_Control running applications volume"
-#~ msgstr "控制正在运行的应用程序的音量(C)"
-
-#~ msgid "Account previously setup"
-#~ msgstr "帐户以前设置"
-
-#~ msgid "URL argument"
-#~ msgstr "URL参数"
-
-#~ msgid "_SIP protocol"
-#~ msgstr "SIP 协议(S)"
-
-#~ msgid "_SIP Header: "
-#~ msgstr "SIP消息头(S):"
-
-#~ msgid "_IAX2 protocol"
-#~ msgstr "IAX2 协议(I)"
-
-#~ msgid "Search"
-#~ msgstr "查找"
-
-#~ msgid "_Enabled"
-#~ msgstr "启用(E)"
-
-#~ msgid "%s account- %s"
-#~ msgstr "%s 帐户- %s"
-
-#~ msgid "Noise reduction"
-#~ msgstr "降噪"
-
-#~ msgid "_Destination folder"
-#~ msgstr "目标文件夹(D)"
-
-#~ msgid "_Account Assistant"
-#~ msgstr "帐户向导(A)"
-
-#~ msgid "Setup Accounts"
-#~ msgstr "设定帐户"
-
-#~ msgid "Search Parameters"
-#~ msgstr "查找相关参数"
-
-#~ msgid "Maximum result number for a request: "
-#~ msgstr "最大拨号数"
-
-#~ msgid "Search for and display: "
-#~ msgstr "查找并显示:"
-
-#~ msgid "_STUN Server"
-#~ msgstr "STUN服务器(S)"
-
-#~ msgid "Apply"
-#~ msgstr "应用"
diff --git a/sflphone-common/po/zh_HK.po b/sflphone-common/po/zh_HK.po
deleted file mode 100644
index 2df95b89a9afc094bd3c61ee5762b0bf3baad932..0000000000000000000000000000000000000000
--- a/sflphone-common/po/zh_HK.po
+++ /dev/null
@@ -1,904 +0,0 @@
-# Chinese translation of SFLphone.
-# Copyright (C) 2008 The Free Software Foundation, Inc.
-# This file is distributed under the GNU General Public License Version 3.
-#
-# Yun Liu <yun.liu@savoirfairelinux.com>, 2008.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: SFLphone 0.9.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-12 18:05-0400\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"
-"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"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:175
-msgid "Registered"
-msgstr "已註冊"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:178
-msgid "Not Registered"
-msgstr "未註冊"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:181
-msgid "Trying..."
-msgstr "正在連接..."
-
-#: ../../sflphone-client-gnome/src/accountlist.c:184
-#: ../../sflphone-client-gnome/src/sflnotify.c:131
-#: ../../sflphone-client-gnome/src/sflnotify.c:148
-msgid "Error"
-msgstr "註冊失敗"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:187
-msgid "Bad authentification"
-msgstr "認證錯誤"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:190
-msgid "Network unreachable"
-msgstr "網路連線失敗"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:193
-msgid "Host unreachable"
-msgstr "伺服器連線失敗"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:196
-msgid "Stun configuration error"
-msgstr "Stun配置有誤"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:199
-msgid "Stun server invalid"
-msgstr "Stun伺服器無效"
-
-#: ../../sflphone-client-gnome/src/accountlist.c:202
-msgid "Invalid"
-msgstr "無效"
-
-#: ../../sflphone-client-gnome/src/actions.c:55
-#: ../../sflphone-client-gnome/src/sflnotify.c:94
-#, c-format
-msgid "%d voice mails"
-msgstr "%d 個語音郵件"
-
-#: ../../sflphone-client-gnome/src/actions.c:57
-#, c-format
-msgid "%d voice mail"
-msgstr "%d 個語音郵件"
-
-#: ../../sflphone-client-gnome/src/actions.c:81
-#, c-format
-msgid "Using %s (%s)"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/actions.c:87
-msgid "No registered account"
-msgstr "未發現已註冊帳戶"
-
-#: ../../sflphone-client-gnome/src/actions.c:232
-msgid ""
-"Unable to connect to the SFLphone server.\n"
-"Make sure the daemon is running."
-msgstr ""
-"連接SFLphone伺服器失敗.\n"
-"請核查daemon是否正在運行."
-
-#: ../../sflphone-client-gnome/src/actions.c:807
-#, c-format
-msgid "IP call - %s"
-msgstr "IP電話- %s"
-
-#: ../../sflphone-client-gnome/src/actions.c:810
-#, c-format
-msgid "Using %s (%s) - Codec: %s"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/actions.c:900
-#, 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>錯誤：無法找到音訊編碼檔案.\n"
-"\n"
-"</b> SFL聲音編碼檔案應該位于<i>%s</i> 或者位于主目錄( <i>%s</i> )的<b>."
-"sflphone</b>目錄下"
-
-#: ../../sflphone-client-gnome/src/assistant.c:35
-#, c-format
-msgid ""
-"This assistant is now finished.\n"
-"You can at any time check your registration state or modify your accounts "
-"parameters in the Options/Accounts window.\n"
-"\n"
-"Alias :    %s\n"
-"Server :   %s\n"
-"Username : %s\n"
-msgstr ""
-"配置完成.\n"
-"你可以隨時在 選項/帳戶 中查看註冊狀態或者修改帳戶信息\n"
-"別稱:         %s\n"
-"伺服器:       %s\n"
-"使用者名稱:   %s\n"
-
-#: ../../sflphone-client-gnome/src/assistant.c:159
-msgid "SFLphone account configuration wizard"
-msgstr "SFLphone 帳戶設置向導"
-
-#: ../../sflphone-client-gnome/src/assistant.c:185
-msgid "Welcome to SFLphone!"
-msgstr "歡迎使用SFLphone!"
-
-#: ../../sflphone-client-gnome/src/assistant.c:186
-msgid "This installation wizard will help you configure an account."
-msgstr "安裝向導將幫助您配置帳戶"
-
-#: ../../sflphone-client-gnome/src/assistant.c:200
-msgid "VoIP Protocols"
-msgstr "VoIP協議"
-
-#: ../../sflphone-client-gnome/src/assistant.c:200
-msgid "Select an account type:"
-msgstr "選擇帳戶類型:"
-
-#: ../../sflphone-client-gnome/src/assistant.c:218
-msgid "Account"
-msgstr "帳戶"
-
-#: ../../sflphone-client-gnome/src/assistant.c:218
-msgid "Please select one of the following option:"
-msgstr "請選擇以下選項中的一個:"
-
-#: ../../sflphone-client-gnome/src/assistant.c:220
-msgid "Create a free SIP/IAX2 account on sflphone.org"
-msgstr "在sflphone.org上創建免費的SIP/IAX2帳戶"
-
-#: ../../sflphone-client-gnome/src/assistant.c:222
-msgid "Register an existing SIP or IAX2 account"
-msgstr "註冊已存在的SIP或IAX2帳戶"
-
-#: ../../sflphone-client-gnome/src/assistant.c:235
-msgid "SIP account configuration"
-msgstr "SIP帳戶配置"
-
-#: ../../sflphone-client-gnome/src/assistant.c:235
-#: ../../sflphone-client-gnome/src/assistant.c:331
-msgid "Please fill the following information:"
-msgstr "請填寫如下信息:"
-
-#: ../../sflphone-client-gnome/src/assistant.c:243
-#: ../../sflphone-client-gnome/src/assistant.c:339
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:153
-msgid "_Alias"
-msgstr "別稱(A)"
-
-#: ../../sflphone-client-gnome/src/assistant.c:251
-#: ../../sflphone-client-gnome/src/assistant.c:347
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:189
-msgid "_Host name"
-msgstr "主机名稱(H)"
-
-#: ../../sflphone-client-gnome/src/assistant.c:259
-#: ../../sflphone-client-gnome/src/assistant.c:355
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:197
-msgid "_User name"
-msgstr "使用者名稱(U)"
-
-#: ../../sflphone-client-gnome/src/assistant.c:275
-#: ../../sflphone-client-gnome/src/assistant.c:370
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:212
-msgid "_Password"
-msgstr "密碼(P)"
-
-#: ../../sflphone-client-gnome/src/assistant.c:293
-#: ../../sflphone-client-gnome/src/assistant.c:386
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:228
-msgid "_Voicemail number"
-msgstr "語音郵箱(V)"
-
-#: ../../sflphone-client-gnome/src/assistant.c:308
-msgid "Optional Email Address "
-msgstr "可選郵件地址 "
-
-#: ../../sflphone-client-gnome/src/assistant.c:308
-msgid "This email address will be use to send your voicemail messages"
-msgstr "這個郵件地址將被用來發送您的語音郵箱消息"
-
-#: ../../sflphone-client-gnome/src/assistant.c:316
-msgid "_Email"
-msgstr "郵件(E)"
-
-#: ../../sflphone-client-gnome/src/assistant.c:331
-msgid "IAX2 account configuration"
-msgstr "IAX2帳戶配置"
-
-#: ../../sflphone-client-gnome/src/assistant.c:404
-#: ../../sflphone-client-gnome/src/config/configwindow.c:855
-msgid "Network Address Translation"
-msgstr "網路地址分析"
-
-#: ../../sflphone-client-gnome/src/assistant.c:404
-msgid "You should probably enable this if you are behind a firewall."
-msgstr "如果你使用網路防火牆，你很有可能需要設定該項."
-
-#: ../../sflphone-client-gnome/src/assistant.c:413
-#: ../../sflphone-client-gnome/src/config/configwindow.c:532
-msgid "E_nable STUN"
-msgstr "啟用STUN(n)"
-
-#: ../../sflphone-client-gnome/src/assistant.c:420
-msgid "_STUN server"
-msgstr "STUN伺服器(S)"
-
-#: ../../sflphone-client-gnome/src/assistant.c:434
-msgid "Account Registration"
-msgstr "帳戶註冊"
-
-#: ../../sflphone-client-gnome/src/assistant.c:434
-msgid "Congratulations!"
-msgstr "恭喜！"
-
-#: ../../sflphone-client-gnome/src/errors.c:29
-msgid ""
-"ALSA notification\n"
-"\n"
-"Error while opening playback device"
-msgstr ""
-"ALSA提示\n"
-"\n"
-"打開回放設備時出錯"
-
-#: ../../sflphone-client-gnome/src/errors.c:32
-msgid ""
-"ALSA notification\n"
-"\n"
-"Error while opening capture device"
-msgstr ""
-"ALSA提示\n"
-"\n"
-"打開采集設備時出錯"
-
-#: ../../sflphone-client-gnome/src/errors.c:35
-msgid ""
-"Pulseaudio notification\n"
-"\n"
-"Pulseaudio is not running"
-msgstr ""
-"Pulseaudio提示\n"
-"\n"
-"Pulseaudio未運行"
-
-#: ../../sflphone-client-gnome/src/mainwindow.c:70
-msgid "There is one call in progress."
-msgstr "有一個電話正在處理中."
-
-#: ../../sflphone-client-gnome/src/mainwindow.c:74
-msgid "There are calls in progress."
-msgstr "有電話正在處理中."
-
-#: ../../sflphone-client-gnome/src/mainwindow.c:83
-msgid "Do you still want to quit?"
-msgstr "確認要退出?"
-
-#: ../../sflphone-client-gnome/src/mainwindow.c:296
-msgid "SFLphone Error"
-msgstr "SFLphone 出錯"
-
-#: ../../sflphone-client-gnome/src/menus.c:134
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
-msgstr "SFLphone是一個VoIP客戶端，它兼容SIP和IAX2协议."
-
-#: ../../sflphone-client-gnome/src/menus.c:137
-msgid "About SFLphone"
-msgstr "有關SFLphone"
-
-#: ../../sflphone-client-gnome/src/menus.c:161
-msgid "_Help"
-msgstr "幫助(H)"
-
-#: ../../sflphone-client-gnome/src/menus.c:296
-#: ../../sflphone-client-gnome/src/menus.c:962
-msgid "_New call"
-msgstr "新電話(N)"
-
-#: ../../sflphone-client-gnome/src/menus.c:308
-#: ../../sflphone-client-gnome/src/menus.c:794
-msgid "_Pick up"
-msgstr "撥出(P)"
-
-#: ../../sflphone-client-gnome/src/menus.c:318
-#: ../../sflphone-client-gnome/src/menus.c:806
-msgid "_Hang up"
-msgstr "放下(H)"
-
-#: ../../sflphone-client-gnome/src/menus.c:328
-#: ../../sflphone-client-gnome/src/menus.c:818
-msgid "On _Hold"
-msgstr "待机"
-
-#: ../../sflphone-client-gnome/src/menus.c:340
-#: ../../sflphone-client-gnome/src/menus.c:830
-msgid "_Record"
-msgstr "記錄(R)"
-
-#: ../../sflphone-client-gnome/src/menus.c:354
-msgid "_Account creation wizard"
-msgstr "帳戶創建向導(A)"
-
-#: ../../sflphone-client-gnome/src/menus.c:384
-msgid "_Call"
-msgstr "電話"
-
-#: ../../sflphone-client-gnome/src/menus.c:552
-#, fuzzy
-msgid "Clear _history"
-msgstr "清空曆史記錄(C)"
-
-#: ../../sflphone-client-gnome/src/menus.c:564
-msgid "_Accounts"
-msgstr "帳戶(A)"
-
-#: ../../sflphone-client-gnome/src/menus.c:579
-msgid "_Edit"
-msgstr "編輯(E)"
-
-#: ../../sflphone-client-gnome/src/menus.c:640
-msgid "_Dialpad"
-msgstr "撥號面板"
-
-#: ../../sflphone-client-gnome/src/menus.c:652
-msgid "_Volume controls"
-msgstr "音量控制(V)"
-
-#: ../../sflphone-client-gnome/src/menus.c:670
-msgid "_View"
-msgstr "查看(V)"
-
-#: ../../sflphone-client-gnome/src/menus.c:890
-msgid "_Call back"
-msgstr "回叫(C)"
-
-#: ../../sflphone-client-gnome/src/menus.c:1070
-msgid "Edit phone"
-msgstr "編輯電話"
-
-#: ../../sflphone-client-gnome/src/menus.c:1081
-msgid "Edit the phone number before making a call"
-msgstr "撥出電話前編輯電話號碼"
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:71
-#: ../../sflphone-client-gnome/src/sflnotify.c:91
-#, c-format
-msgid "%s account: %s"
-msgstr "%s 帳戶: %s"
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:75
-#, c-format
-msgid "<i>From:</i> %s"
-msgstr "<i>撥入方：</i> %s"
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:111
-#, c-format
-msgid "Calling with %s account <i>%s</i>"
-msgstr "使用%s帳戶<i>%s</i>呼叫"
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:115
-msgid "Current account"
-msgstr "當前帳戶"
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:130
-msgid "You haven't setup any accounts"
-msgstr "你沒有設置任何帳戶"
-
-#: ../../sflphone-client-gnome/src/sflnotify.c:147
-msgid "You have no registered accounts"
-msgstr "未發現已註冊帳戶"
-
-#: ../../sflphone-client-gnome/src/sliders.c:161
-msgid "Speakers volume"
-msgstr "揚聲器音量"
-
-#: ../../sflphone-client-gnome/src/sliders.c:163
-msgid "Mic volume"
-msgstr "話筒音量"
-
-#: ../../sflphone-client-gnome/src/statusicon.c:91
-msgid "_Show main window"
-msgstr "顯示主窗口(S)"
-
-#: ../../sflphone-client-gnome/src/statusicon.c:124
-#, c-format
-msgid "SFLphone - %i accounts configured"
-msgstr "SFLphone - %i 個帳戶已配置"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:50
-#, c-format
-msgid "\"Voicemail\" <%s>"
-msgstr "\"語音郵件\" <%s>"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:168
-#: ../../sflphone-client-gnome/src/toolbar.c:170
-msgid "Place a call"
-msgstr "打電話"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:177
-#: ../../sflphone-client-gnome/src/toolbar.c:179
-msgid "Pick up"
-msgstr "接電話"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:187
-#: ../../sflphone-client-gnome/src/toolbar.c:189
-msgid "Hang up"
-msgstr "放電話"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:197
-#: ../../sflphone-client-gnome/src/toolbar.c:199
-msgid "Off Hold"
-msgstr "恢复通話"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:208
-#: ../../sflphone-client-gnome/src/toolbar.c:210
-msgid "On Hold"
-msgstr "待机"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:221
-#: ../../sflphone-client-gnome/src/toolbar.c:223
-msgid "Transfer"
-msgstr "轉接"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:233
-#: ../../sflphone-client-gnome/src/toolbar.c:235
-msgid "History"
-msgstr "歷史"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:244
-#: ../../sflphone-client-gnome/src/toolbar.c:246
-msgid "Address book"
-msgstr "地址簿"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:252
-#: ../../sflphone-client-gnome/src/toolbar.c:256
-msgid "Voicemail"
-msgstr "語音郵件"
-
-#: ../../sflphone-client-gnome/src/toolbar.c:264
-msgid "Record a call"
-msgstr "記錄通話"
-
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:113
-msgid "Account settings"
-msgstr "帳戶設置"
-
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:125
-msgid "Account Parameters"
-msgstr "帳戶相關參數"
-
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:147
-msgid "_Enable this account"
-msgstr "啟用該賬戶(E)"
-
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:161
-msgid "_Protocol"
-msgstr "協議(P)"
-
-#: ../../sflphone-client-gnome/src/config/accountwindow.c:179
-msgid "Unknown"
-msgstr "未知"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../../sflphone-client-gnome/src/config/configwindow.c:721
-msgid "General"
-msgstr "常用配置"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:312
-msgid "_Use Evolution address books"
-msgstr "使用Evolution地址薄(U)"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:319
-msgid "Download limit:"
-msgstr "下載上限:"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:327
-msgid "cards"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:333
-msgid "_Display contact photo if available"
-msgstr "如果可以則顯示聯繫人照片(D)"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:341
-#, fuzzy
-msgid "Fields from Evolution's address books"
-msgstr "使用Evolution地址薄中的如下字段:"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:345
-msgid "_Business phone"
-msgstr "商務電話(B)"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:351
-msgid "_Home phone"
-msgstr "家庭電話(H)"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:357
-msgid "_Mobile phone"
-msgstr "移動電話(M)"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:364
-msgid "Address Books"
-msgstr "地址簿"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:368
-msgid "Select which Evolution address books to use:"
-msgstr "選擇使用如下Evolution地址薄:"
-
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:404
-#: ../../sflphone-client-gnome/src/config/audioconf.c:576
-msgid "Name"
-msgstr "名稱"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:155
-#, c-format
-msgid "audio device index for output = %d"
-msgstr "音訊設備輸出索引 ＝ %d"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:581
-msgid "Frequency"
-msgstr "顰律"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:586
-msgid "Bitrate"
-msgstr "比率"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:591
-msgid "Bandwidth"
-msgstr "顰寬"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:662
-msgid "ALSA plugin"
-msgstr "ALSA插件"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:684
-msgid "Output"
-msgstr "輸出"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:706
-msgid "Input"
-msgstr "輸入"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:741
-msgid "_Voice Activity Detection"
-msgstr "聲音狀態檢測(V)"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:751
-msgid "_Noise Reduction (Narrow-Band Companding)"
-msgstr "降噪處理-窄頻壓縮(N)"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:780
-msgid "Sound Manager"
-msgstr "聲音管理器"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:783
-#, fuzzy
-msgid "_Pulseaudio"
-msgstr "Pulseaudio"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:788
-#, fuzzy
-msgid "_ALSA"
-msgstr "ALSA"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:795
-msgid "ALSA configuration"
-msgstr "ALSA 配置"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:812
-msgid "Codecs"
-msgstr "編碼"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:835
-msgid "Ringtones"
-msgstr "鈴聲"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:841
-msgid "_Enable ringtones"
-msgstr "啟動鈴聲(E)"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:847
-msgid "Choose a ringtone"
-msgstr "鈴聲選擇"
-
-#: ../../sflphone-client-gnome/src/config/audioconf.c:853
-msgid "Audio Files"
-msgstr "音訊檔案"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:418
-msgid "Protocol"
-msgstr "協議"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:425
-msgid "Status"
-msgstr "狀態"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:528
-msgid "Stun parameters will apply to each SIP account created."
-msgstr "Stun參數將應用於每一個註冊的SIP帳戶"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:536
-msgid "Enable it if you are behind a firewall"
-msgstr "當使用防火牆時，需要設定此項"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:544
-msgid "Format: name.server:port"
-msgstr "格式：name.server:port"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:589
-msgid "Desktop Notifications"
-msgstr "桌面提示"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:593
-msgid "_Enable notifications"
-msgstr "啟動提示(E)"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:599
-msgid "Enable voicemail _notifications"
-msgstr "啟用語音郵箱提示(n)"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:611
-msgid "System Tray Icon"
-msgstr "系統托盤圖標"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:614
-msgid "_Popup main window on incoming call"
-msgstr "來電話時彈出主視窗(P)"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:619
-msgid "Ne_ver popup main window"
-msgstr "從不彈出主視窗(v)"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:623
-msgid "Hide SFLphone window on _startup"
-msgstr "在啟動時隱藏SFLphone主窗口"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:629
-msgid "Calls History"
-msgstr "打電話歷史"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:632
-msgid "_Keep my history for at least"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:643
-msgid " days"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:647
-msgid "PulseAudio sound server"
-msgstr "PulseAudio聲音伺服器"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:650
-#, fuzzy
-msgid "_Mute other applications during a call"
-msgstr "當有來電時靜音其它應用程序(c)"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:664
-msgid "SIP Port"
-msgstr "SIP端口"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:677
-msgid "Port:"
-msgstr "端口:"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:725
-#, fuzzy
-msgid "Recordings folder"
-msgstr "記錄文件夾(R)"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:731
-msgid "Select a folder"
-msgstr "選擇文件夾"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:765
-msgid "Preferences"
-msgstr "屬性"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:785
-msgid "General Settings"
-msgstr "常用配置"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:790
-msgid "Audio Settings"
-msgstr "音訊配置"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:795
-msgid "Recordings"
-msgstr "記錄"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:800
-msgid "Address Book"
-msgstr "地址簿"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:805
-msgid "Hooks"
-msgstr "鉤鍵"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:832
-msgid "Accounts"
-msgstr "帳戶"
-
-#: ../../sflphone-client-gnome/src/config/configwindow.c:844
-msgid "Configured Accounts"
-msgstr "已配置帳戶"
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:130
-msgid "URL Passing"
-msgstr "傳輸URL"
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:135
-msgid "Custom commands on incoming calls with URL,"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:138
-#, c-format
-msgid "%s will be replaced with the passed URL."
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:141
-msgid "Trigger on specific _SIP header"
-msgstr "激活指定的SIP頭(S)"
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:150
-msgid "Trigger on _IAX2 URL"
-msgstr "激活IAX2 URL(I)"
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:155
-#, fuzzy
-msgid "Command to _run: "
-msgstr "運行命令(C):"
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:165
-msgid "Phone Number Rewriting"
-msgstr "重設電話號碼"
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:169
-msgid "_Prefix dialed numbers with:"
-msgstr "號碼前綴:"
-
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:55
-msgid ""
-"Search all\n"
-"Click here to change the search type"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:67
-msgid ""
-"Search by missed call\n"
-"Click here to change the search type"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:79
-msgid ""
-"Search by incoming call\n"
-"Click here to change the search type"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:91
-msgid ""
-"Search by outgoing call\n"
-"Click here to change the search type"
-msgstr ""
-
-#~ msgid "Accept"
-#~ msgstr "接受"
-
-#~ msgid "Refuse"
-#~ msgstr "拒絕"
-
-#~ msgid "Ignore"
-#~ msgstr "忽略"
-
-#~ msgid "<small>Missed call</small>"
-#~ msgstr "<small>未接電話</small>"
-
-#~ msgid "<small>Duration:</small> %s"
-#~ msgstr "<small>時長:</small> %s"
-
-#~ msgid "Fields"
-#~ msgstr "字段"
-
-#~ msgid "_History size limit"
-#~ msgstr "歷史記錄上限(H)"
-
-#~ msgid ""
-#~ "SFLphone can run custom commands if incoming calls come with an URL "
-#~ "attached.\n"
-#~ "In this case, %s will be replaced with the passed URL."
-#~ msgstr ""
-#~ "當來電有附加的URL時,SFLphone可運行客戶命令.\n"
-#~ "在此情況下,傳輸的URL會被替換成%s."
-
-#~ msgid "Search history"
-#~ msgstr "搜尋歷史記錄"
-
-#~ msgid "Search contact"
-#~ msgstr "搜尋聯繫人(S)"
-
-#~ msgid "Registered to %s (%s)"
-#~ msgstr "註冊到 %s (%s)"
-
-#~ msgid "%s account- %s             %s"
-#~ msgstr "%s 帳戶- %s\t\t%s"
-
-#~ msgid "Books"
-#~ msgstr "鉤鍵"
-
-#~ msgid "_Enable"
-#~ msgstr "啟用(E)"
-
-#~ msgid "_Notify voice mails"
-#~ msgstr "語音郵件通知(N)"
-
-#~ msgid "_Start hidden"
-#~ msgstr "啟動時隱藏(S)"
-
-#~ msgid "_Maximum number of calls"
-#~ msgstr "最大打出電話數目(M)"
-
-#~ msgid "_Control running applications volume"
-#~ msgstr "控制正在運行中的應用程式的音量(C)"
-
-#~ msgid "Account previously setup"
-#~ msgstr "帳戶以前設定"
-
-#~ msgid "URL argument"
-#~ msgstr "URL參數"
-
-#~ msgid "_SIP protocol"
-#~ msgstr "SIP 協議(S)"
-
-#~ msgid "_SIP Header: "
-#~ msgstr "SIP消息頭(S):"
-
-#~ msgid "_IAX2 protocol"
-#~ msgstr "IAX2 協議(I)"
-
-#~ msgid "Search"
-#~ msgstr "搜尋"
-
-#~ msgid "_Enabled"
-#~ msgstr "啟用(E)"
-
-#~ msgid "%s account- %s"
-#~ msgstr "%s 帳戶- %s"
-
-#~ msgid "Noise reduction"
-#~ msgstr "降噪"
-
-#~ msgid "_Destination folder"
-#~ msgstr "目標文件夾(D)"
-
-#~ msgid "_Account Assistant"
-#~ msgstr "帳戶向導(A)"
-
-#~ msgid "Setup Accounts"
-#~ msgstr "設定帳戶"
-
-#~ msgid "Search Parameters"
-#~ msgstr "搜尋相關參數"
-
-#~ msgid "Maximum result number for a request: "
-#~ msgstr "最大打出電話數目"
-
-#~ msgid "Search for and display: "
-#~ msgstr "搜尋並顯示:"
-
-#~ msgid "_STUN Server"
-#~ msgstr "STUN伺服器(S)"
-
-#~ msgid "Apply"
-#~ msgstr "套用"
diff --git a/sflphone-common/src/audio/audiortp.cpp b/sflphone-common/src/audio/audiortp.cpp
index b16147e9e8cd96d762d23daf0a1a23453c0fccc1..2f0005241bb689bd35cbf1f9ef0a7fcc065ed91c 100644
--- a/sflphone-common/src/audio/audiortp.cpp
+++ b/sflphone-common/src/audio/audiortp.cpp
@@ -110,7 +110,6 @@ AudioRtp::closeRtpSession ()
     // This will make RTP threads finish.
     _debug ("AudioRtp::Stopping rtp session\n");
 
-
     try {
         delete _RTXThread;
         _RTXThread = 0;
@@ -119,22 +118,11 @@ AudioRtp::closeRtpSession ()
         throw;
     }
 
-    // AudioLayer* audiolayer = Manager::instance().getAudioDriver();
-    // audiolayer->stopStream();
-
     _debug ("AudioRtp::Audio rtp stopped\n");
 
     return true;
 }
 
-
-AudioRtpRTX*
-AudioRtp::getRTX()
-{
-    return _RTXThread;
-}
-
-
 void
 AudioRtp::setRecording()
 {
@@ -144,10 +132,6 @@ AudioRtp::setRecording()
 
 }
 
-
-
-
-
 ////////////////////////////////////////////////////////////////////////////////
 // AudioRtpRTX Class                                                          //
 ////////////////////////////////////////////////////////////////////////////////
@@ -382,23 +366,18 @@ AudioRtpRTX::processDataEncode()
     if (_audiocodec->getClockRate() != _layerSampleRate) {
 
         int nb_sample_up = nbSample;
-        // _debug("_nbSample audiolayer->getMic(): %i \n", nbSample);
+         //_debug("_nbSample audiolayer->getMic(): %i \n", nbSample);
 
         // Store the length of the mic buffer in samples for recording
         _nSamplesMic = nbSample;
 
-
-        // int nbSamplesMax = _layerFrameSize * _audiocodec->getClockRate() / 1000;
         nbSample = reSampleData (micData , micDataConverted, _audiocodec->getClockRate(), nb_sample_up, DOWN_SAMPLING);
 
         compSize = _audiocodec->codecEncode (micDataEncoded, micDataConverted, nbSample*sizeof (int16));
 
     } else {
         // no resampling required
-
-        // int nbSamplesMax = _codecFrameSize;
         compSize = _audiocodec->codecEncode (micDataEncoded, micData, nbSample*sizeof (int16));
-
     }
 
     return compSize;
@@ -486,7 +465,6 @@ AudioRtpRTX::sendSessionFromMic (int timestamp)
 
     int compSize = processDataEncode();
 
-    _debug ("compSize: %i ", compSize);
     // putData put the data on RTP queue, sendImmediate bypass this queue
     _session->putData (timestamp, micDataEncoded, compSize);
     // _session->sendImmediate(timestamp, micDataEncoded, compSize);
diff --git a/sflphone-common/src/audio/audiortp.h b/sflphone-common/src/audio/audiortp.h
index e40f7a39798c0f154afdf32de62418d81b2b7055..49330c2fd8a90781baadef125d3ada416dec4697 100644
--- a/sflphone-common/src/audio/audiortp.h
+++ b/sflphone-common/src/audio/audiortp.h
@@ -256,11 +256,6 @@ class AudioRtp {
      */
     bool closeRtpSession( void );
 
-    /**
-     * Return a pointer to the RTP thead
-     */
-    AudioRtpRTX* getRTX();
-
     /**
      * Start recording
      */
@@ -268,6 +263,10 @@ class AudioRtp {
 
     friend class RtpTest;
 
+    /**
+     * 
+     */ 
+    inline AudioRtpRTX * getAudioRtpRtxThread(void) { return _RTXThread; }
   private:
     // copy constructor
     AudioRtp(const AudioRtp& rh);
diff --git a/sflphone-common/src/audio/audiostream.cpp b/sflphone-common/src/audio/audiostream.cpp
index 8054c1e10ea9bb01056a214127dec0eb77b40029..877c1327b98e525e99142ffb24fb77604e9875a5 100644
--- a/sflphone-common/src/audio/audiostream.cpp
+++ b/sflphone-common/src/audio/audiostream.cpp
@@ -23,18 +23,21 @@
 static pa_channel_map channel_map ;
 
 
-AudioStream::AudioStream (pa_context* context, int type, std::string desc, double vol UNUSED)
-        : _audiostream (NULL), _streamType (type), _streamDescription (desc), flag (PA_STREAM_AUTO_TIMING_UPDATE), sample_spec(), _volume()
+AudioStream::AudioStream (PulseLayerType * driver)
+        : _audiostream (NULL),
+         _context (driver->context),
+         _streamType (driver->type), 
+         _streamDescription (driver->description), 
+         _volume(),
+         _mainloop(driver->mainloop),
+         flag (PA_STREAM_AUTO_TIMING_UPDATE), 
+         sample_spec()
 {
     sample_spec.format = PA_SAMPLE_S16LE;
     sample_spec.rate = 44100;
     sample_spec.channels = 1;
     channel_map.channels = 1;
     pa_cvolume_set (&_volume , 1 , PA_VOLUME_NORM) ;  // * vol / 100 ;
-
-    _context = context;
-
-    // connectStream();
 }
 
 AudioStream::~AudioStream()
@@ -53,16 +56,52 @@ AudioStream::connectStream()
     return true;
 }
 
+static void success_cb(pa_stream *s, int success, void *userdata) {
+
+    assert(s);
+    
+    pa_threaded_mainloop * mainloop = (pa_threaded_mainloop *) userdata;
+             
+    pa_threaded_mainloop_signal(mainloop, 0);
+}
+
+
+bool
+AudioStream::drainStream(void) {    
+    if (_audiostream) {
+        _debug("Draining stream\n");
+        pa_operation * operation;
+        
+        pa_threaded_mainloop_lock(_mainloop);
+        
+        if ((operation = pa_stream_drain(_audiostream, success_cb, _mainloop))) {    
+            while (pa_operation_get_state(operation) != PA_OPERATION_DONE) {
+                if (!_context || pa_context_get_state(_context) != PA_CONTEXT_READY || !_audiostream || pa_stream_get_state(_audiostream) != PA_STREAM_READY) {
+                    _debug("Connection died: %s\n", _context ? pa_strerror(pa_context_errno(_context)) : "NULL");
+                    pa_operation_unref(operation);
+                    break;
+                } else {
+                    pa_threaded_mainloop_wait(_mainloop);
+                }
+            }
+        }
+        
+        pa_threaded_mainloop_unlock(_mainloop);
+    }
+}
+
 bool
 AudioStream::disconnectStream (void)
 {
-    ost::MutexLock guard (_mutex);
-
     _debug ("Destroy audio streams\n");
-    pa_stream_disconnect (_audiostream);
-    pa_stream_unref (_audiostream);
-
-    _audiostream = NULL;
+    
+    pa_threaded_mainloop_lock(_mainloop);
+    if(_audiostream) {
+        pa_stream_disconnect (_audiostream);
+        pa_stream_unref (_audiostream);
+        _audiostream = NULL;
+    }
+    pa_threaded_mainloop_unlock(_mainloop);
 
     return true;
 }
@@ -70,13 +109,16 @@ AudioStream::disconnectStream (void)
 
 
 void
-AudioStream::stream_state_callback (pa_stream* s, void* user_data UNUSED)
+AudioStream::stream_state_callback (pa_stream* s, void* user_data)
 {
-
-
+    pa_threaded_mainloop *m;
+    
     _debug ("AudioStream::stream_state_callback :: The state of the stream changed\n");
     assert (s);
 
+    m = (pa_threaded_mainloop*) user_data;
+    assert(m);
+
     switch (pa_stream_get_state (s)) {
 
         case PA_STREAM_CREATING:
@@ -85,7 +127,6 @@ AudioStream::stream_state_callback (pa_stream* s, void* user_data UNUSED)
 
         case PA_STREAM_TERMINATED:
             _debug ("Stream is terminating...\n");
-            PulseLayer::streamState++;
             break;
 
         case PA_STREAM_READY:
@@ -162,7 +203,7 @@ AudioStream::createStream (pa_context* c)
         _debug ("Stream type unknown \n");
     }
 
-    pa_stream_set_state_callback (s , stream_state_callback, NULL);
+    pa_stream_set_state_callback (s , stream_state_callback, _mainloop);
 
     free (attributes);
 
diff --git a/sflphone-common/src/audio/audiostream.h b/sflphone-common/src/audio/audiostream.h
index f21e4b0d27654a5efa5f28e919de6817de075d0b..692ed623799620d7955a79c4ec340c65de29835b 100644
--- a/sflphone-common/src/audio/audiostream.h
+++ b/sflphone-common/src/audio/audiostream.h
@@ -27,6 +27,7 @@
 #include "ringbuffer.h"
 #include "audioloop.h"
 
+
 #include <cc++/thread.h>
 
 /**
@@ -38,16 +39,23 @@ enum STREAM_TYPE {
   UPLOAD_STREAM
 };
 
+struct PulseLayerType {
+    pa_context * context;
+    pa_threaded_mainloop * mainloop;
+    
+    std::string description;
+    
+    int type;
+    double volume;
+};
 
 class AudioStream {
   public:
     /**
      * Constructor
-     * @param context The pulseaudio context
-     * @param type    The type of audio stream
-     * @param desc    The stream name
+     * @param context The PulseLayerType structure containing various information.
      */ 
-    AudioStream(pa_context* context , int type, std::string desc, double vol);
+    AudioStream(PulseLayerType * driver);
     
     /**
      * Destructor
@@ -75,6 +83,11 @@ class AudioStream {
      */
     bool connectStream();
 
+    /**
+     * Drain the given stream. 
+     */
+    bool drainStream(void);
+    
     /**
      * Disconnect the pulseaudio stream
      */
@@ -166,6 +179,8 @@ class AudioStream {
     pa_sample_spec sample_spec ;
     pa_cvolume _volume;
 
+    pa_threaded_mainloop * _mainloop;
+    
     ost::Mutex _mutex;
 
 };
diff --git a/sflphone-common/src/audio/pulselayer.cpp b/sflphone-common/src/audio/pulselayer.cpp
index 9d586d2041301be4440f6631b55335459a95c87c..09d8bcad8a66eff9a47d18b8440f948aa49bbb94 100644
--- a/sflphone-common/src/audio/pulselayer.cpp
+++ b/sflphone-common/src/audio/pulselayer.cpp
@@ -21,8 +21,6 @@
 
 int framesPerBuffer = 2048;
 
-int PulseLayer::streamState;
-
 static  void audioCallback (pa_stream* s, size_t bytes, void* userdata)
 {
     assert (s && bytes);
@@ -39,7 +37,6 @@ PulseLayer::PulseLayer (ManagerImpl* manager)
         , playback()
         , record()
 {
-    PulseLayer::streamState = 0;
     _debug ("PulseLayer::Pulse audio constructor: Create context\n");
 
 }
@@ -48,30 +45,37 @@ PulseLayer::PulseLayer (ManagerImpl* manager)
 PulseLayer::~PulseLayer (void)
 {
     closeLayer ();
-
-    // pa_context_disconnect( context );
-    // pa_context_unref( context );
 }
 
 bool
 PulseLayer::closeLayer (void)
 {
     _debug ("PulseLayer::closeLayer :: Destroy pulselayer\n");
-
+    
+    // Commenting the line below will make the 
+    // PulseLayer to close immediately, not 
+    // waiting for the playback buffer to be 
+    // emptied. It should not hurt. 
+    playback->drainStream();
+
+    if(m) {
+        pa_threaded_mainloop_stop(m);
+    }
+    
     playback->disconnectStream();
     record->disconnectStream();
-
-    while (PulseLayer::streamState != 2);
-
-    PulseLayer::streamState = 0;
-
-    //TODO  Remove this ugly hack
-    sleep (2);
-
-    pa_context_disconnect (context);
-
-    pa_context_unref (context);
-
+        
+    if(context) {
+        pa_context_disconnect (context);
+        pa_context_unref (context);
+        context = NULL;
+    }
+   
+    if(m) { 
+        pa_threaded_mainloop_free (m);
+        m = NULL;
+    }
+    
     return true;
 }
 
@@ -167,18 +171,29 @@ bool PulseLayer::createStreams (pa_context* c)
 {
     _debug ("PulseLayer::createStreams \n");
 
-    playback = new AudioStream (c, PLAYBACK_STREAM, PLAYBACK_STREAM_NAME, _manager->getSpkrVolume());
+    PulseLayerType * playbackParam = new PulseLayerType();
+    playbackParam->context = c;
+    playbackParam->type = PLAYBACK_STREAM;
+    playbackParam->description = PLAYBACK_STREAM_NAME;
+    playbackParam->volume = _manager->getSpkrVolume();
+    playbackParam->mainloop = m;
+    
+    playback = new AudioStream (playbackParam);
     playback->connectStream();
     pa_stream_set_write_callback (playback->pulseStream(), audioCallback, this);
-    // pa_stream_set_overflow_callback( playback->pulseStream() , overflow , this);
-    // pa_stream_set_suspended_callback( playback->pulseStream(), stream_suspended_callback, this);
-
-    record = new AudioStream (c, CAPTURE_STREAM, CAPTURE_STREAM_NAME , _manager->getMicVolume());
+    delete playbackParam;
+
+    PulseLayerType * recordParam = new PulseLayerType();
+    recordParam->context = c;
+    recordParam->type = CAPTURE_STREAM;
+    recordParam->description = CAPTURE_STREAM_NAME;
+    recordParam->volume = _manager->getMicVolume();
+    recordParam->mainloop = m;
+    
+    record = new AudioStream (recordParam);
     record->connectStream();
     pa_stream_set_read_callback (record->pulseStream() , audioCallback, this);
-    // pa_stream_set_underflow_callback( record->pulseStream() , underflow , this);
-    // pa_stream_set_suspended_callback(record->pulseStream(), stream_suspended_callback, this);
-
+    delete recordParam;
 
     pa_threaded_mainloop_signal (m , 0);
 
diff --git a/sflphone-common/src/audio/pulselayer.h b/sflphone-common/src/audio/pulselayer.h
index 698cc9bf6b68b6ff7009b35efcccba3c664d2729..8c1fa083842f9990b73f141730cf849146655280 100644
--- a/sflphone-common/src/audio/pulselayer.h
+++ b/sflphone-common/src/audio/pulselayer.h
@@ -197,7 +197,6 @@ class PulseLayer : public AudioLayer {
     // private:
 
 public: 
-    static int streamState;
 
     friend class AudioLayerTest;
 };
diff --git a/sflphone-common/src/call.cpp b/sflphone-common/src/call.cpp
index d2cb79ae39f3e66e02fcda3e5fe5f681580a13ef..0e7ee9f795fd50b67d7bebcc12f278949206144c 100644
--- a/sflphone-common/src/call.cpp
+++ b/sflphone-common/src/call.cpp
@@ -86,13 +86,29 @@ std::string
 Call::getStateStr ()
 {
     CallState state = getState();
-    _debug ("getStateStr , state = %d\n", state);
+    ConnectionState connection = getConnectionState ();
+    CallType type = _type;
     std::string state_str;
 
     switch (state) {
 
         case Active:
-            state_str = "CURRENT";
+
+            switch (connection) {
+
+                case Ringing:
+                    (type == Incoming) ? state_str = "INCOMING":state_str = "RINGING";
+                    break;
+
+                case Connected:
+                    state_str = "CURRENT";
+                    break;
+
+                default:
+                    state_str = "CURRENT";
+                    break;
+            }
+
             break;
 
         case Hold:
@@ -104,7 +120,22 @@ Call::getStateStr ()
             break;
 
         case Inactive:
-            state_str = "INACTIVE";
+
+            switch (connection) {
+
+                case Ringing:
+                    (type == Incoming) ? state_str = "INCOMING":state_str = "RINGING";
+                    break;
+
+                case Connected:
+                    state_str = "CURRENT";
+                    break;
+
+                default:
+                    state_str = "INACTIVE";
+                    break;
+            }
+
             break;
 
         case Refused:
diff --git a/sflphone-common/src/config/config.cpp b/sflphone-common/src/config/config.cpp
index 9c6bb914baf03d73aaa73f94d6f6b2b5340730e5..4f8c02c8de554f762e1963133d452c67122e1654 100644
--- a/sflphone-common/src/config/config.cpp
+++ b/sflphone-common/src/config/config.cpp
@@ -22,6 +22,9 @@
 #include "../global.h"
 #include <fstream>
 #include <cstdlib>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
 
 namespace Conf
 {
@@ -255,7 +258,11 @@ ConfigTree::saveConfigTree (const std::string& fileName)
     }
 
     file.close();
-
+    
+    if(chmod(fileName.c_str(), S_IRUSR | S_IWUSR)) {
+        _debug("Failed to set permission on configuration file because: %s\n",strerror(errno));
+    }
+    
     return true;
 }
 
@@ -267,7 +274,7 @@ int
 ConfigTree::populateFromFile (const std::string& fileName)
 {
     bool out = false;
-
+    
     if (fileName.empty()) {
         return 0;
     }
@@ -332,7 +339,11 @@ ConfigTree::populateFromFile (const std::string& fileName)
     }
 
     file.close();
-
+    
+    if(chmod(fileName.c_str(), S_IRUSR | S_IWUSR)) {
+        _debug("Failed to set permission on configuration file because: %s\n",strerror(errno));
+    }
+    
     return 1;
 }
 
diff --git a/sflphone-common/src/config/config.h b/sflphone-common/src/config/config.h
index 0872889486659d2a7db64634106f36fcb58ce3a0..0fa75a24acd2e580d1ddb457179f8091507f6d3b 100644
--- a/sflphone-common/src/config/config.h
+++ b/sflphone-common/src/config/config.h
@@ -155,7 +155,7 @@ class ConfigTree
          * List of sections. Each sections has an ItemList as child
          */
         SectionMap _sections;
-
+        
         friend class ConfigTreeIterator;
 
     public:
diff --git a/sflphone-common/src/global.h b/sflphone-common/src/global.h
index d08d9ce8524dddad65ddb2831421baf27eaa2d62..a6053980b86bb7f1947ff03ca7b9da1f55dee94c 100644
--- a/sflphone-common/src/global.h
+++ b/sflphone-common/src/global.h
@@ -32,7 +32,7 @@
 #include <map>
 #include <vector>
 
-#define SFLPHONED_VERSION "0.9.6~beta"		/** Version number */
+#define SFLPHONED_VERSION "0.9.6~rc1"		/** Version number */
 
 #define HOMEDIR	(getenv ("HOME"))		/** Home directory */
 
diff --git a/sflphone-common/src/managerimpl.cpp b/sflphone-common/src/managerimpl.cpp
index 7a49b2c04a3948237400173cfd5e3859ec6f01c7..0b020633f33d574497ca97173bc1ae83586adeb2 100644
--- a/sflphone-common/src/managerimpl.cpp
+++ b/sflphone-common/src/managerimpl.cpp
@@ -1293,7 +1293,7 @@ ManagerImpl::createSettingsPath (void)
 {
     _path = std::string (HOMEDIR) + DIR_SEPARATOR_STR + "." + PROGDIR;
 
-    if (mkdir (_path.data(), 0755) != 0) {
+    if (mkdir (_path.data(), 0600) != 0) {
         // If directory	creation failed
         if (errno != EEXIST) {
             _debug ("Cannot create directory: %s\n", strerror (errno));
@@ -1952,31 +1952,7 @@ void ManagerImpl::setAudioManager (const int32_t& api)
 
     switchAudioManager();
     return;
-
-    /*
-        int manager;
-
-        _debug(" ManagerImpl::setAudioManager :: %i \n",api);
-
-        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
@@ -2234,11 +2210,15 @@ void ManagerImpl::setMicVolume (unsigned short mic_vol)
 
 void ManagerImpl::setSipPort (int port)
 {
+    _debug("Setting to new port %d\n", port);
+    setConfig(PREFERENCES, CONFIG_SIP_PORT, port);
+    
+    this->restartPJSIP ();
 }
 
 int ManagerImpl::getSipPort (void)
 {
-    return 5060;
+    return getConfigInt (PREFERENCES , CONFIG_SIP_PORT);
 }
 
 
diff --git a/sflphone-common/src/samplerateconverter.cpp b/sflphone-common/src/samplerateconverter.cpp
index ccdb09da238437baf77d8273298b7774f603368b..f7425a14ac4dd85fd952f1d8f8b411b886e48ee0 100644
--- a/sflphone-common/src/samplerateconverter.cpp
+++ b/sflphone-common/src/samplerateconverter.cpp
@@ -82,6 +82,20 @@ void SamplerateConverter::init (void)
     _floatBufferUpSpkr = new float32[nbSamplesMax];
 }
 
+void
+SamplerateConverter::Short2FloatArray (const short *in, float *out, int len)
+{
+    // factor is 1/(2^15), used to rescale the short int range to the
+    // [-1.0 - 1.0] float range.
+#define S2F_FACTOR .000030517578125f;
+
+    while (len) {
+        len--;
+        out[len] = (float) in[len] * S2F_FACTOR;
+    }
+}
+
+
 //TODO Add ifdef for int16 or float32 type
 int SamplerateConverter::upsampleData (SFLDataFormat* dataIn , SFLDataFormat* dataOut, int samplerate1 , int samplerate2 , int nbSamples)
 {
@@ -99,7 +113,9 @@ int SamplerateConverter::upsampleData (SFLDataFormat* dataIn , SFLDataFormat* da
         src_data.src_ratio = upsampleFactor;
         src_data.end_of_input = 0; // More data will come
         //_debug("upsample %d %d %f %d\n" , src_data.input_frames , src_data.output_frames, src_data.src_ratio , nbSamples);
-        src_short_to_float_array (dataIn , _floatBufferDownSpkr, nbSamples);
+        // Override libsamplerate conversion function
+        Short2FloatArray (dataIn , _floatBufferDownSpkr, nbSamples);
+        //src_short_to_float_array (dataIn , _floatBufferDownSpkr, nbSamples);
         //_debug("upsample %d %f %d\n" ,  src_data.output_frames, src_data.src_ratio , nbSamples);
         src_process (_src_state_spkr, &src_data);
         //_debug("upsample %d %d %d\n" , samplerate1, samplerate2 , nbSamples);
@@ -128,7 +144,9 @@ int SamplerateConverter::downsampleData (SFLDataFormat* dataIn , SFLDataFormat*
         src_data.src_ratio = downsampleFactor;
         src_data.end_of_input = 0; // More data will come
         //_debug("downsample %d %f %d\n" ,  src_data.output_frames, src_data.src_ratio , nbSamples);
-        src_short_to_float_array (dataIn, _floatBufferUpMic, nbSamples);
+        // Override libsamplerate conversion function
+        Short2FloatArray (dataIn , _floatBufferUpMic, nbSamples);
+        //src_short_to_float_array (dataIn, _floatBufferUpMic, nbSamples);
         //_debug("downsample %d %f %d\n" ,  src_data.output_frames, src_data.src_ratio , nbSamples);
         src_process (_src_state_mic, &src_data);
         //_debug("downsample %d %f %d\n" ,  src_data.output_frames, src_data.src_ratio , nbSamples);
diff --git a/sflphone-common/src/samplerateconverter.h b/sflphone-common/src/samplerateconverter.h
index f6423197fadcf268ae851fd0f1d9c88167ffddd2..d4d37035e0c008f68c35ed3f7d87f3eb185e681b 100644
--- a/sflphone-common/src/samplerateconverter.h
+++ b/sflphone-common/src/samplerateconverter.h
@@ -26,63 +26,72 @@
 #include "manager.h"
 
 class SamplerateConverter {
-  public:
-    /** Constructor */
-    SamplerateConverter( void );
-    SamplerateConverter( int freq , int fs );
-    /** Destructor */
-    ~SamplerateConverter( void );
-
-    /** 
-     * Upsample from the samplerate1 to the samplerate2
-     * @param data  The data buffer
-     * @param SamplerateConverter1 The lower sample rate
-     * @param SamplerateConverter2 The higher sample rate
-     * @param nbSamples	  The number of samples to process
-     * @return int The number of samples after the operation
-     */
-    int upsampleData( SFLDataFormat* dataIn , SFLDataFormat* dataOut , int samplerate1 , int samplerate2 , int nbSamples );
-
-    /**
-     * Downsample from the samplerate1 to the samplerate2
-     * @param data  The data buffer
-     * @param SamplerateConverter1 The lower sample rate
-     * @param SamplerateConverter2 The higher sample rate
-     * @param nbSamples	  The number of samples to process
-     * @return int The number of samples after the operation
-     */
-    int downsampleData( SFLDataFormat* dataIn , SFLDataFormat* dataOut , int samplerate1 , int samplerate2 , int nbSamples );
-
-    int getFrequence( void ) { return _frequence; }
-
-    int getFramesize( void ) { return _framesize; } 
-
-  private:
-    // Copy Constructor
-    SamplerateConverter(const SamplerateConverter& rh);
-
-    // Assignment Operator
-    SamplerateConverter& operator=( const SamplerateConverter& rh);
-    
-    void init( void );
-
-    /** Audio layer caracteristics */
-    int _frequence;
-    int _framesize;
-
-    /** Downsampled/Upsampled float buffers for the mic data processing */
-    float32* _floatBufferDownMic;
-    float32* _floatBufferUpMic;
-    /** libSamplerateConverter converter for outgoing voice */
-    SRC_STATE*    _src_state_mic;
-
-    /** Downsampled/Upsampled float buffers for the speaker data processing */
-    float32* _floatBufferDownSpkr;
-    float32* _floatBufferUpSpkr;
-    /** libSamplerateConverter converter for incoming voice */
-    SRC_STATE*    _src_state_spkr;
-    /** libSamplerateConverter error */
-    int _src_err;
+	public:
+		/** Constructor */
+		SamplerateConverter( void );
+		SamplerateConverter( int freq , int fs );
+		/** Destructor */
+		~SamplerateConverter( void );
+
+		/** 
+		 * Upsample from the samplerate1 to the samplerate2
+		 * @param data  The data buffer
+		 * @param SamplerateConverter1 The lower sample rate
+		 * @param SamplerateConverter2 The higher sample rate
+		 * @param nbSamples	  The number of samples to process
+		 * @return int The number of samples after the operation
+		 */
+		int upsampleData( SFLDataFormat* dataIn , SFLDataFormat* dataOut , int samplerate1 , int samplerate2 , int nbSamples );
+
+		/**
+		 * Downsample from the samplerate1 to the samplerate2
+		 * @param data  The data buffer
+		 * @param SamplerateConverter1 The lower sample rate
+		 * @param SamplerateConverter2 The higher sample rate
+		 * @param nbSamples	  The number of samples to process
+		 * @return int The number of samples after the operation
+		 */
+		int downsampleData( SFLDataFormat* dataIn , SFLDataFormat* dataOut , int samplerate1 , int samplerate2 , int nbSamples );
+
+		int getFrequence( void ) { return _frequence; }
+
+		int getFramesize( void ) { return _framesize; } 
+
+		/**
+		 * Convert short table to floats for audio processing
+		 * @param in the input (short) array
+		 * @param out The resulting (float) array
+		 * @param len The number of elements in both tables
+		 */
+		void Short2FloatArray (const short *in, float *out, int len);
+
+
+	private:
+		// Copy Constructor
+		SamplerateConverter(const SamplerateConverter& rh);
+
+		// Assignment Operator
+		SamplerateConverter& operator=( const SamplerateConverter& rh);
+
+		void init( void );
+
+		/** Audio layer caracteristics */
+		int _frequence;
+		int _framesize;
+
+		/** Downsampled/Upsampled float buffers for the mic data processing */
+		float32* _floatBufferDownMic;
+		float32* _floatBufferUpMic;
+		/** libSamplerateConverter converter for outgoing voice */
+		SRC_STATE*    _src_state_mic;
+
+		/** Downsampled/Upsampled float buffers for the speaker data processing */
+		float32* _floatBufferDownSpkr;
+		float32* _floatBufferUpSpkr;
+		/** libSamplerateConverter converter for incoming voice */
+		SRC_STATE*    _src_state_spkr;
+		/** libSamplerateConverter error */
+		int _src_err;
 };
 
 #endif //_SAMPLE_RATE_H
diff --git a/sflphone-common/src/sdp.cpp b/sflphone-common/src/sdp.cpp
index 1a4005d4c722e06fa23ba7e58e18a2674a182820..8c79cb36dd98489ccf568fc3bf27e12335a36aff 100644
--- a/sflphone-common/src/sdp.cpp
+++ b/sflphone-common/src/sdp.cpp
@@ -180,7 +180,6 @@ int Sdp::receiving_initial_offer (pjmedia_sdp_session* remote)
     // pjmedia_sdp_neg_create_w_remote_offer with the remote offer, and by providing the local offer ( optional )
 
     pj_status_t status;
-    pjmedia_sdp_neg_state state;
 
     _debug ("Receiving initial offer\n");
 
@@ -195,18 +194,73 @@ int Sdp::receiving_initial_offer (pjmedia_sdp_session* remote)
     }
 
     // Retrieve some useful remote information
-    this->fetch_media_transport_info_from_remote_sdp (remote);
+    this->set_media_transport_info_from_remote_sdp (remote);
 
     status = pjmedia_sdp_neg_create_w_remote_offer (_pool,
              get_local_sdp_session(), remote, &_negociator);
 
-    state = pjmedia_sdp_neg_get_state (_negociator);
-
     PJ_ASSERT_RETURN (status == PJ_SUCCESS, 1);
 
     return PJ_SUCCESS;
 }
 
+pj_status_t Sdp::check_sdp_answer(pjsip_inv_session *inv, pjsip_rx_data *rdata) 
+{
+    static const pj_str_t str_application = { "application", 11 };
+    static const pj_str_t str_sdp = { "sdp", 3 };
+    pj_status_t status;
+    pjsip_msg * message = NULL;
+    pjmedia_sdp_session * remote_sdp = NULL;
+    
+    if (pjmedia_sdp_neg_get_state(inv->neg) == PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER) {
+    
+        message = rdata->msg_info.msg;
+    
+        if(message == NULL) {
+            _debug("No message");
+            return PJMEDIA_SDP_EINSDP;
+        }
+
+        if (message->body == NULL) {
+            _debug("Empty message body\n");
+            return PJMEDIA_SDP_EINSDP;
+        }
+
+        if (pj_stricmp(&message->body->content_type.type, &str_application) || pj_stricmp(&message->body->content_type.subtype, &str_sdp)) {
+            _debug("Incoming Message does not contain SDP\n");
+            return PJMEDIA_SDP_EINSDP;
+        }
+
+        // Parse the SDP body.
+        status = pjmedia_sdp_parse(rdata->tp_info.pool, (char*)message->body->data, message->body->len, &remote_sdp);
+        if (status == PJ_SUCCESS) {
+            status = pjmedia_sdp_validate(remote_sdp);
+        }
+
+        if (status != PJ_SUCCESS) {
+            _debug("SDP cannot be validated\n");
+            return PJMEDIA_SDP_EINSDP;
+        }
+    
+        // This is an answer
+        _debug("Got SDP answer %s\n", pjsip_rx_data_get_info(rdata));
+        status = pjmedia_sdp_neg_set_remote_answer(inv->pool, inv->neg, remote_sdp);
+        
+        if (status != PJ_SUCCESS) {
+            _debug("An error occured while processing remote answer %s\n", pjsip_rx_data_get_info(rdata));
+            return PJMEDIA_SDP_EINSDP;
+        }
+        
+        // Prefer our codecs to remote when possible
+        pjmedia_sdp_neg_set_prefer_remote_codec_order(inv->neg, 0);
+        
+        status = pjmedia_sdp_neg_negotiate(inv->pool, inv->neg, 0);
+        _debug("Negotiation returned with status %d PJ_SUCCESS being %d\n", status, PJ_SUCCESS); 
+    }
+    
+    return status;
+}
+
 void Sdp::sdp_add_protocol (void)
 {
     this->_local_offer->origin.version = 0;
@@ -298,7 +352,7 @@ void Sdp::clean_session_media()
     _session_media.clear();
 }
 
-void Sdp::set_negociated_offer (const pjmedia_sdp_session *sdp)
+void Sdp::set_negotiated_sdp (const pjmedia_sdp_session *sdp)
 {
 
     int nb_media, nb_codecs;
@@ -308,14 +362,11 @@ void Sdp::set_negociated_offer (const pjmedia_sdp_session *sdp)
     std::string type, dir;
     CodecsMap codecs_list;
     CodecsMap::iterator iter;
-    AudioCodec *codec_to_add;
     pjmedia_sdp_attr *attribute;
     pjmedia_sdp_rtpmap *rtpmap;
 
     _negociated_offer = (pjmedia_sdp_session*) sdp;
 
-    //this->fetch_remote_ip_from_sdp ((pjmedia_sdp_session*)sdp);
-
     codecs_list = Manager::instance().getCodecDescriptorMap().getCodecsMap();
 
     // retrieve the media information
@@ -358,7 +409,7 @@ AudioCodec* Sdp::get_session_media (void)
     AudioCodec *codec = NULL;
     std::vector<sdpMedia*> media_list;
 
-    _debug ("sdp line 314 - get_session_media ()\n");
+    _debug ("sdp line %d - get_session_media ()\n", __LINE__);
 
     media_list = get_session_media_list ();
     nb_media = media_list.size();
@@ -470,17 +521,15 @@ std::string Sdp::convert_int_to_string (int value)
     return result.str();
 }
 
-void Sdp::fetch_remote_ip_from_sdp (pjmedia_sdp_session *r_sdp)
+void Sdp::set_remote_ip_from_sdp (const pjmedia_sdp_session *r_sdp)
 {
 
-    std::string remote_ip;
-
-    remote_ip = r_sdp->conn->addr.ptr;
+    std::string remote_ip(r_sdp->conn->addr.ptr, r_sdp->conn->addr.slen);
     _debug ("            Remote IP from fetching SDP: %s\n", remote_ip.c_str());
     this->set_remote_ip (remote_ip);
 }
 
-void Sdp::fetch_remote_audio_port_from_sdp (pjmedia_sdp_media *r_media)
+void Sdp::set_remote_audio_port_from_sdp (pjmedia_sdp_media *r_media)
 {
 
     int remote_port;
@@ -490,7 +539,7 @@ void Sdp::fetch_remote_audio_port_from_sdp (pjmedia_sdp_media *r_media)
     this->set_remote_audio_port (remote_port);
 }
 
-void Sdp::fetch_media_transport_info_from_remote_sdp (pjmedia_sdp_session *remote_sdp)
+void Sdp::set_media_transport_info_from_remote_sdp (const pjmedia_sdp_session *remote_sdp)
 {
 
     _debug ("Fetching media from sdp\n");
@@ -504,12 +553,12 @@ void Sdp::fetch_media_transport_info_from_remote_sdp (pjmedia_sdp_session *remot
         return;
     }
 
-    this->fetch_remote_audio_port_from_sdp (r_media);
+    this->set_remote_audio_port_from_sdp (r_media);
 
-    this->fetch_remote_ip_from_sdp (remote_sdp);
+    this->set_remote_ip_from_sdp (remote_sdp);
 }
 
-void Sdp::get_remote_sdp_media_from_offer (pjmedia_sdp_session* remote_sdp, pjmedia_sdp_media** r_media)
+void Sdp::get_remote_sdp_media_from_offer (const pjmedia_sdp_session* remote_sdp, pjmedia_sdp_media** r_media)
 {
     int count, i;
 
diff --git a/sflphone-common/src/sdp.h b/sflphone-common/src/sdp.h
index 3a0eee5c6e67f4ed7c90757d21368bf2539d1598..fcd28db15eabc1aabfc0b0d91292829037572204 100644
--- a/sflphone-common/src/sdp.h
+++ b/sflphone-common/src/sdp.h
@@ -25,6 +25,8 @@
 #include <pjmedia/sdp_neg.h>
 #include <pjsip/sip_transport.h>
 #include <pjlib.h>
+#include <pjsip_ua.h>
+#include <pjmedia/errno.h>
 #include <pj/pool.h>
 #include <pj/assert.h>
 
@@ -97,6 +99,17 @@ class Sdp {
          */
         int receiving_initial_offer( pjmedia_sdp_session* remote );
         
+        /*
+         * On receiving a message, check if it contains SDP and negotiate. Should be used for
+         * SDP answer and offer but currently is only used for answer.
+         * SDP negociator instance with the remote offer.
+         *
+         * @param inv       The  the invitation
+         * @param rdata     The remote data
+         */
+        
+        pj_status_t check_sdp_answer(pjsip_inv_session *inv, pjsip_rx_data *rdata);
+        
         /*
          * Remove all media in the session media vector.
          */
@@ -138,7 +151,7 @@ class Sdp {
          *
          * @param sdp   the negociated offer
          */
-        void set_negociated_offer( const pjmedia_sdp_session *sdp );
+        void set_negotiated_sdp ( const pjmedia_sdp_session *sdp );
 
         /*
          * Attribute the specified port to every medias provided
@@ -179,7 +192,7 @@ class Sdp {
          */
         unsigned int get_remote_audio_port() { return _remote_audio_port; }
 
-        void fetch_media_transport_info_from_remote_sdp (pjmedia_sdp_session *remote_sdp);
+        void set_media_transport_info_from_remote_sdp (const pjmedia_sdp_session *remote_sdp);
 
         std::vector<sdpMedia*> get_session_media_list (void) { return _session_media; }
 
@@ -298,11 +311,11 @@ class Sdp {
 
         std::string convert_int_to_string (int value);
 
-        void fetch_remote_ip_from_sdp (pjmedia_sdp_session *r_sdp);
+        void set_remote_ip_from_sdp (const pjmedia_sdp_session *r_sdp);
         
-        void fetch_remote_audio_port_from_sdp (pjmedia_sdp_media *r_media);
+        void set_remote_audio_port_from_sdp (pjmedia_sdp_media *r_media);
 
-        void get_remote_sdp_media_from_offer (pjmedia_sdp_session* r_sdp, pjmedia_sdp_media** r_media);
+        void get_remote_sdp_media_from_offer (const pjmedia_sdp_session* r_sdp, pjmedia_sdp_media** r_media);
 
 //////////////////////////////////////////////////////////////////3
 ////////////////////////////////////////////////////////////////////
diff --git a/sflphone-common/src/sipvoiplink.cpp b/sflphone-common/src/sipvoiplink.cpp
index 6d8d8f4b964a7754c4ce4baa051be474303c00ad..6d01264343029c39b7af4ba873e1fde3a681e84c 100644
--- a/sflphone-common/src/sipvoiplink.cpp
+++ b/sflphone-common/src/sipvoiplink.cpp
@@ -217,6 +217,8 @@ bool SIPVoIPLink::init()
     if (initDone())
         return false;
 
+    _regPort = Manager::instance().getSipPort();
+    
     /* Instanciate the C++ thread */
     _evThread = new EventThread (this);
 
@@ -341,8 +343,8 @@ int SIPVoIPLink::sendRegister (AccountID id)
     account = dynamic_cast<SIPAccount *> (Manager::instance().getAccount (id));
     hostname = account->getHostname();
     username = account->getUsername();
-    password = account->getPassword();
-
+    password = account->getPassword(); 
+    
     _mutexSIP.enterMutex();
 
     /* Get the client registration information for this particular account */
@@ -503,7 +505,6 @@ SIPVoIPLink::newOutgoingCall (const CallID& id, const std::string& toUrl)
 
     SIPCall* call = new SIPCall (id, Call::Outgoing, _pool);
 
-
     if (call) {
         account = dynamic_cast<SIPAccount *> (Manager::instance().getAccount (Manager::instance().getAccountFromCall (id)));
 
@@ -520,7 +521,6 @@ SIPVoIPLink::newOutgoingCall (const CallID& id, const std::string& toUrl)
 
         setCallAudioLocal (call, getLocalIPAddress(), useStun(), getStunServer());
 
-
         try {
             _debug ("CREATE NEW RTP SESSION FROM NEWOUTGOINGCALL\n");
             _audiortp->createNewSession (call);
@@ -528,9 +528,6 @@ SIPVoIPLink::newOutgoingCall (const CallID& id, const std::string& toUrl)
             _debug ("Failed to create rtp thread from newOutGoingCall\n");
         }
 
-
-
-
         call->initRecFileName();
 
         _debug ("Try to make a call to: %s with call ID: %s\n", toUrl.data(), id.data());
@@ -545,16 +542,9 @@ SIPVoIPLink::newOutgoingCall (const CallID& id, const std::string& toUrl)
         }
 
         if (SIPOutgoingInvite (call)) {
-
             call->setConnectionState (Call::Progressing);
             call->setState (Call::Active);
             addCall (call);
-
-            // _audiortp->start();
-
-            // call->setAudioStart ( true );
-
-
         } else {
             delete call;
             call = 0;
@@ -567,8 +557,6 @@ SIPVoIPLink::newOutgoingCall (const CallID& id, const std::string& toUrl)
 bool
 SIPVoIPLink::answer (const CallID& id)
 {
-
-    int i;
     SIPCall *call;
     pj_status_t status;
     pjsip_tx_data *tdata;
@@ -608,8 +596,6 @@ SIPVoIPLink::answer (const CallID& id)
         call->setConnectionState (Call::Connected);
         call->setState (Call::Active);
 
-        ;
-
         return true;
     } else {
         // Create and send a 488/Not acceptable here
@@ -624,6 +610,7 @@ SIPVoIPLink::answer (const CallID& id)
         _debug ("SIPVoIPLink::answer: fail terminate call %s \n",call->getCallId().c_str());
         terminateOneCall (call->getCallId());
         removeCall (call->getCallId());
+        _audiortp->closeRtpSession ();
         return false;
     }
 }
@@ -841,17 +828,8 @@ SIPVoIPLink::offhold (const CallID& id)
     if (status != PJ_SUCCESS)
         return false;
 
-    // Enable audio
-    _debug ("* SIP Info: Starting AudioRTP when offhold\n");
-
     call->setState (Call::Active);
 
-    // it's sure that this is the current call id...
-
-    _audiortp->start();
-
-    call->setAudioStart (true);
-
     return true;
 }
 
@@ -914,7 +892,7 @@ SIPVoIPLink::transfer (const CallID& id, const std::string& to)
      */
     pjsip_evsub_set_mod_data (sub, getModId(), this);
 
-    _debug ("SIP port listener = %i ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", _localExternPort);
+    _debug ("SIP port listener = %i", _localExternPort);
 
     /*
      * Create REFER request.
@@ -1211,39 +1189,25 @@ SIPVoIPLink::SIPCheckUrl (const std::string& url UNUSED)
 void
 SIPVoIPLink::SIPCallServerFailure (SIPCall *call)
 {
-    //if (!event->response) { return; }
-    //switch(event->response->status_code) {
-    //case SIP_SERVICE_UNAVAILABLE: // 500
-    //case SIP_BUSY_EVRYWHERE:     // 600
-    //case SIP_DECLINE:             // 603
-    //SIPCall* call = findSIPCallWithCid(event->cid);
     if (call != 0) {
         _debug ("Server error!\n");
         CallID id = call->getCallId();
         Manager::instance().callFailure (id);
         terminateOneCall (id);
         removeCall (id);
+        _audiortp->closeRtpSession();
     }
-
-    //break;
-    //}
 }
 
 void
 SIPVoIPLink::SIPCallClosed (SIPCall *call)
 {
-
-
-    // it was without did before
-    //SIPCall* call = findSIPCallWithCid(event->cid);
     if (!call) {
         return;
     }
 
     CallID id = call->getCallId();
 
-    //call->setDid(event->did);
-
     if (Manager::instance().isCurrentCall (id)) {
         call->setAudioStart (false);
         _debug ("* SIP Info: Stopping AudioRTP when closing\n");
@@ -1261,9 +1225,6 @@ SIPVoIPLink::SIPCallClosed (SIPCall *call)
 void
 SIPVoIPLink::SIPCallReleased (SIPCall *call)
 {
-    // do cleanup if exists
-    // only cid because did is always 0 in these case..
-    //SIPCall* call = findSIPCallWithCid(event->cid);
     if (!call) {
         return;
     }
@@ -1287,51 +1248,16 @@ SIPVoIPLink::SIPCallAnswered (SIPCall *call, pjsip_rx_data *rdata)
 
     _debug ("SIPCallAnswered\n");
 
-    pjmedia_sdp_session *r_sdp;
-
     if (!call) {
         _debug ("! SIP Failure: unknown call\n");
         return;
     }
 
     if (call->getConnectionState() != Call::Connected) {
-        _debug ("Get remote SDP from offer\n");
-        get_remote_sdp_from_offer (rdata, &r_sdp);
-
-        if (r_sdp==NULL) {
-            _debug ("SIP Failure: no remote sdp session\n");
-            return;
-        }
-
-        _debug ("Get remote media information from offer\n");
-
-        call->getLocalSDP()->fetch_media_transport_info_from_remote_sdp (r_sdp);
-
-        // _audiortp->getRTX()->setRtpSessionRemoteIp();
-
         _debug ("Update call state , id = %s\n", call->getCallId().c_str());
         call->setConnectionState (Call::Connected);
         call->setState (Call::Active);
-
         Manager::instance().peerAnsweredCall (call->getCallId());
-
-        if (Manager::instance().isCurrentCall (call->getCallId())) {
-            /*
-            _debug("CREATE NEW RTP SESSION FROM SIPCALLANSWERED\n");
-            try {
-                _audiortp->createNewSession (call);
-                call->setAudioStart(true);
-            } catch (...) {
-                _debug("Failed to create rtp thread from answer\n");
-            }
-            */
-
-            call->setAudioStart (true);
-
-            _audiortp->start();
-
-        }
-
     } else {
         _debug ("* SIP Info: Answering call (on/off hold to send ACK)\n");
     }
@@ -1405,7 +1331,6 @@ bool SIPVoIPLink::new_ip_to_ip_call (const CallID& id, const std::string& to)
             _debug ("! SIP Failure: Unable to create RTP Session  in SIPVoIPLink::new_ip_to_ip_call (%s:%d)\n", __FILE__, __LINE__);
         }
 
-
         // Generate the contact URI
         // uri_contact << "<" << uri_from << ":" << call->getLocalSDP()->get_local_extern_audio_port() << ">";
         uri_contact << "<" << uri_from << ":" << _localExternPort << ">";
@@ -1450,10 +1375,6 @@ bool SIPVoIPLink::new_ip_to_ip_call (const CallID& id, const std::string& to)
         call->setState (Call::Active);
         addCall (call);
 
-        // _audiortp->start();
-
-        // call->setAudioStart ( true );
-
         return true;
     } else
         return false;
@@ -1489,7 +1410,6 @@ bool get_dns_server_addresses (std::vector<std::string> *servers)
         nameservers.push_back (inet_ntoa (address));
     }
 
-    //nameservers.push_back ("192.168.50.3");
     *servers = nameservers;
 
     return true;
@@ -1501,8 +1421,6 @@ pj_status_t SIPVoIPLink::enable_dns_srv_resolver (pjsip_endpoint *endpt, pj_dns_
     pj_status_t status;
     pj_dns_resolver *resv;
     std::vector <std::string> dns_servers;
-    pj_uint16_t port = 5353;
-    pjsip_resolver_t *res;
     int scount, i;
 
     // Create the DNS resolver instance
@@ -1780,13 +1698,10 @@ int SIPVoIPLink::createUDPServer (void)
     pj_sockaddr_in bound_addr;
     pjsip_host_port a_name;
     char tmpIP[32];
-    pj_sock_t sock;
-
 
     // Init bound address to ANY
     pj_memset (&bound_addr, 0, sizeof (bound_addr));
 
-
     bound_addr.sin_addr.s_addr = pj_htonl (PJ_INADDR_ANY);
     bound_addr.sin_port = pj_htons ( (pj_uint16_t) _localPort);
     bound_addr.sin_family = PJ_AF_INET;
@@ -1813,10 +1728,6 @@ int SIPVoIPLink::createUDPServer (void)
     return PJ_SUCCESS;
 }
 
-
-
-
-
 bool SIPVoIPLink::loadSIPLocalIP()
 {
 
@@ -1940,7 +1851,6 @@ void set_voicemail_info (AccountID account, pjsip_msg_body *body)
 
 void SIPVoIPLink::handle_reinvite (SIPCall *call)
 {
-
     // Close the previous RTP session
     _audiortp->closeRtpSession ();
     call->setAudioStart (false);
@@ -1952,30 +1862,19 @@ void SIPVoIPLink::handle_reinvite (SIPCall *call)
     } catch (...) {
         _debug ("! SIP Failure: Unable to create RTP Session (%s:%d)\n", __FILE__, __LINE__);
     }
-
-    _audiortp->start();
-
-    call->setAudioStart (true);
-
-
 }
 
-
-/*******************************/
-/*   CALLBACKS IMPLEMENTATION  */
-/*******************************/
-
+// This callback is called when the invite session state has changed
 void call_on_state_changed (pjsip_inv_session *inv, pjsip_event *e)
 {
-
     _debug ("--------------------- call_on_state_changed --------------------- %i\n", inv->state);
 
     SIPCall *call;
     AccountID accId;
     SIPVoIPLink *link;
     pjsip_rx_data *rdata;
-
-
+    pj_status_t status;
+    
     /* Retrieve the call information */
     call = reinterpret_cast<SIPCall*> (inv->mod_data[_mod_ua.id]);
 
@@ -1985,7 +1884,7 @@ void call_on_state_changed (pjsip_inv_session *inv, pjsip_event *e)
     //Retrieve the body message
     rdata = e->body.tsx_state.src.rdata;
 
-
+    
     /* If this is an outgoing INVITE that was created because of
      * REFER/transfer, send NOTIFY to transferer.
      */
@@ -2046,105 +1945,89 @@ void call_on_state_changed (pjsip_inv_session *inv, pjsip_event *e)
                 }
             }
         }
-    } else {
+        
+        return;
+    }
+    
+    // The call is ringing - We need to handle this case only on outgoing call
+    if (inv->state == PJSIP_INV_STATE_EARLY && e->body.tsx_state.tsx->role == PJSIP_ROLE_UAC) {
+        call->setConnectionState (Call::Ringing);
+        Manager::instance().peerRingingCall (call->getCallId());
+    } 
+    // After 2xx is sent/received.
+    else if (inv->state == PJSIP_INV_STATE_CONNECTING) {
+        status = call->getLocalSDP()->check_sdp_answer (inv, rdata);    
+        if (status != PJ_SUCCESS) {
+            _debug("Failed to check_incoming_sdp in call_on_state_changed\n");
+            return;
+        }
+    }
+    // After we sent or received a ACK - The connection is established
+    else if (inv->state == PJSIP_INV_STATE_CONFIRMED) {
 
-        // The call is ringing - We need to handle this case only on outgoing call
-        if (inv->state == PJSIP_INV_STATE_EARLY && e->body.tsx_state.tsx->role == PJSIP_ROLE_UAC) {
-            call->setConnectionState (Call::Ringing);
-            Manager::instance().peerRingingCall (call->getCallId());
+        /* If the call is a direct IP-to-IP call */
+        if (call->getCallConfiguration () == Call::IPtoIP) {
+            link = SIPVoIPLink::instance ("");
+        } else {
+            accId = Manager::instance().getAccountFromCall (call->getCallId());
+            link = dynamic_cast<SIPVoIPLink *> (Manager::instance().getAccountLink (accId));
         }
 
-        // We receive a ACK - The connection is established
-        else if (inv->state == PJSIP_INV_STATE_CONFIRMED) {
+        if (link)
+            link->SIPCallAnswered (call, rdata);
+    }
+    else if (inv->state == PJSIP_INV_STATE_DISCONNECTED) {
+        _debug ("------------------- Call disconnected ---------------------\n");
+        _debug ("State: %i, Disconnection cause: %i\n", inv->state, inv->cause);
 
-            /* If the call is a direct IP-to-IP call */
-            if (call->getCallConfiguration () == Call::IPtoIP) {
-                link = SIPVoIPLink::instance ("");
-            } else {
+        switch (inv->cause) {
+                /* The call terminates normally - BYE / CANCEL */
+            case PJSIP_SC_OK:
+            case PJSIP_SC_DECLINE:
+            case PJSIP_SC_REQUEST_TERMINATED:
                 accId = Manager::instance().getAccountFromCall (call->getCallId());
                 link = dynamic_cast<SIPVoIPLink *> (Manager::instance().getAccountLink (accId));
-            }
-
-            if (link)
-                link->SIPCallAnswered (call, rdata);
-        }
-
-        else if (inv->state == PJSIP_INV_STATE_DISCONNECTED) {
-            int count = 0;
-            _debug ("------------------- Call disconnected ---------------------\n");
-            _debug ("State: %i, Disconnection cause: %i\n", inv->state, inv->cause);
-
-            switch (inv->cause) {
-                    /* The call terminates normally - BYE / CANCEL */
-
-                case PJSIP_SC_OK:
-
-                case PJSIP_SC_DECLINE:
-
-                case PJSIP_SC_REQUEST_TERMINATED:
-
-                    accId = Manager::instance().getAccountFromCall (call->getCallId());
-                    link = dynamic_cast<SIPVoIPLink *> (Manager::instance().getAccountLink (accId));
-
-                    if (link) {
-                        link->SIPCallClosed (call);
-                    }
-
-                    break;
-
-                    /* The call connection failed */
-
-                case PJSIP_SC_NOT_FOUND:            /* peer not found */
-
-                case PJSIP_SC_REQUEST_TIMEOUT:      /* request timeout */
 
-                case PJSIP_SC_NOT_ACCEPTABLE_HERE:  /* no compatible codecs */
-
-                case PJSIP_SC_NOT_ACCEPTABLE_ANYWHERE:
-
-                case PJSIP_SC_UNSUPPORTED_MEDIA_TYPE:
-
-                case PJSIP_SC_UNAUTHORIZED:
-
-                case PJSIP_SC_REQUEST_PENDING:
-                    accId = Manager::instance().getAccountFromCall (call->getCallId());
-                    link = dynamic_cast<SIPVoIPLink *> (Manager::instance().getAccountLink (accId));
+                if (link) {
+                    link->SIPCallClosed (call);
+                }
 
-                    if (link) {
-                        link->SIPCallServerFailure (call);
-                    }
+                break;
+             /* The call connection failed */
+            case PJSIP_SC_NOT_FOUND:            /* peer not found */
+            case PJSIP_SC_REQUEST_TIMEOUT:      /* request timeout */
+            case PJSIP_SC_NOT_ACCEPTABLE_HERE:  /* no compatible codecs */
+            case PJSIP_SC_NOT_ACCEPTABLE_ANYWHERE:
+            case PJSIP_SC_UNSUPPORTED_MEDIA_TYPE:
+            case PJSIP_SC_UNAUTHORIZED:
+            case PJSIP_SC_REQUEST_PENDING:
+                accId = Manager::instance().getAccountFromCall (call->getCallId());
+                link = dynamic_cast<SIPVoIPLink *> (Manager::instance().getAccountLink (accId));
 
-                    break;
+                if (link) {
+                    link->SIPCallServerFailure (call);
+                }
 
-                default:
-                    _debug ("sipvoiplink.cpp - line 1635 : Unhandled call state. This is probably a bug.\n");
-                    break;
-            }
+                break;
+            default:
+                _debug ("sipvoiplink.cpp - line %d : Unhandled call state. This is probably a bug.\n", __LINE__);
+                break;
         }
-
-
     }
+  
 }
 
+// This callback is called after SDP offer/answer session has completed.
 void call_on_media_update (pjsip_inv_session *inv, pj_status_t status)
 {
-
     _debug ("--------------------- call_on_media_update --------------------- \n");
-
-    AccountID accId;
-    SIPVoIPLink *link;
-
-    const pjmedia_sdp_session *r_sdp;
-    SIPCall *call;
-
-    if (status != PJ_SUCCESS) {
-        _debug ("Error while negociating the offer\n");
-        return;
-    }
-
-    // Get the new sdp, result of the negociation
-    pjmedia_sdp_neg_get_active_local (inv->neg, &r_sdp);
-
+    
+    const pjmedia_sdp_session *local_sdp;
+    const pjmedia_sdp_session *remote_sdp;
+    
+    SIPVoIPLink * link = NULL;
+    SIPCall * call;
+    
     call = reinterpret_cast<SIPCall *> (inv->mod_data[getModId() ]);
 
     if (!call) {
@@ -2152,39 +2035,41 @@ void call_on_media_update (pjsip_inv_session *inv, pj_status_t status)
         return;
     }
 
-    // Clean the resulting sdp offer to create a new one (in case of a reinvite)
-    call->getLocalSDP()->clean_session_media();
-
-    // Set the fresh negociated one
-    call->getLocalSDP()->set_negociated_offer (r_sdp);
-
-    // call->getLocalSDP()->fetch_media_transport_info_from_remote_sdp( r_sdp );
-    // call->getLocalSDP()->fetch_remote_ip_from_sdp( r_sdp );
-    // call->getLocalSDP()->fetch_remote_audio_port_from_sdp( r_sdp );
-
-    accId = Manager::instance().getAccountFromCall (call->getCallId());
-
-    link = dynamic_cast<SIPVoIPLink *> (Manager::instance().getAccountLink (accId));
-
-    if (!link) {
-        _debug ("No Voip Account Link, impossible to init RTP session with SDP info");
+    link = dynamic_cast<SIPVoIPLink *> (Manager::instance().getAccountLink(AccountNULL));
+    if(link == NULL) {
+        _debug ("Failed to get sip link\n");
+        return;
+    }
+    
+    if (status != PJ_SUCCESS) {
+        _debug ("Error while negotiating the offer\n");
+        link->hangup(call->getCallId());
+        Manager::instance().callFailure(call->getCallId());
         return;
     }
 
-    if (call->getState() != Call::Hold) {
-        _debug ("Set media parameters in RTP session\n");
-        // link->_audiortp->getRTX()->setRtpSessionMedia();
-        // link->_audiortp->getRTX()->setRtpSessionRemoteIp();
-
-        // link->_audiortp->start();
+    // Get the new sdp, result of the negotiation
+    pjmedia_sdp_neg_get_active_local  (inv->neg, &local_sdp);
+    pjmedia_sdp_neg_get_active_remote (inv->neg, &remote_sdp);
+        
+    // Clean the resulting sdp offer to create a new one (in case of a reinvite)
+    call->getLocalSDP()->clean_session_media();
+    
+    // Set the fresh negotiated one, no matter if that was an offer or answer.
+    // The local sdp is updated in case of an answer, even if the remote sdp 
+    // is kept internally.
+    call->getLocalSDP()->set_negotiated_sdp (local_sdp);
 
-        // call->setAudioStart ( true );
-        // link->_audiortp->start();
-    } else {
-        _debug ("Didn't set RTP parameters since call is on hold\n");
+    // Set remote ip / port  
+    call->getLocalSDP()->set_media_transport_info_from_remote_sdp (remote_sdp); 
+        
+    try {    
+        call->setAudioStart (true);
+        link->getAudioRtp()->start();
+    } catch(exception& rtpException) {
+        _debug("%s\n", rtpException.what());
     }
 
-
 }
 
 void call_on_forked (pjsip_inv_session *inv, pjsip_event *e)
@@ -2205,11 +2090,8 @@ void call_on_tsx_changed (pjsip_inv_session *inv, pjsip_transaction *tsx, pjsip_
 
 void regc_cb (struct pjsip_regc_cbparam *param)
 {
-
-    //AccountID *id = static_cast<AccountID *> (param->token);
     SIPAccount *account;
 
-    //_debug("UserAgent: Account ID is %s, Register result: %d, Status: %d\n", id->data(), param->status, param->code);
     account = static_cast<SIPAccount *> (param->token);
 
     if (!account)
@@ -2265,11 +2147,10 @@ void regc_cb (struct pjsip_regc_cbparam *param)
 
 }
 
+// Optional function to be called to process incoming request message.
 pj_bool_t
 mod_on_rx_request (pjsip_rx_data *rdata)
 {
-
-
     pj_status_t status;
     pj_str_t reason;
     unsigned options = 0;
@@ -2423,7 +2304,6 @@ mod_on_rx_request (pjsip_rx_data *rdata)
 
     get_remote_sdp_from_offer (rdata, &r_sdp);
 
-// 	_debug("r_sdp = %s\n", r_sdp);
     status = call->getLocalSDP()->receiving_initial_offer (r_sdp);
 
     if (status!=PJ_SUCCESS) {
@@ -2432,7 +2312,6 @@ mod_on_rx_request (pjsip_rx_data *rdata)
         return false;
     }
 
-
     call->setConnectionState (Call::Progressing);
 
     call->setPeerNumber (peerNumber);
@@ -2462,7 +2341,6 @@ mod_on_rx_request (pjsip_rx_data *rdata)
         return true;
     }
 
-
     // Specify media capability during invite session creation
     status = pjsip_inv_create_uas (dialog, rdata, call->getLocalSDP()->get_local_sdp_session(), 0, &inv);
 
@@ -2924,7 +2802,7 @@ void on_rx_offer (pjsip_inv_session *inv, const pjmedia_sdp_session *offer)
 
 
 #ifdef CAN_REINVITE
-    _debug ("reinvite                                                  SIP\n");
+    _debug ("%s (%d): on_rx_offer REINVITE\n", __FILE__, __LINE__);
 
     SIPCall *call;
     pj_status_t status;
diff --git a/sflphone-common/src/sipvoiplink.h b/sflphone-common/src/sipvoiplink.h
index 028fcd8a2fd6173135816df5c1682348813daaa4..3a0387c36ef7f044f3a5952601c6b5f6b27b8bd9 100644
--- a/sflphone-common/src/sipvoiplink.h
+++ b/sflphone-common/src/sipvoiplink.h
@@ -284,8 +284,8 @@ class SIPVoIPLink : public VoIPLink
         /** when we init the listener, how many times we try to bind a port? */
         int _nbTryListenAddr;
 
-        /** Starting sound */
-        AudioRtp* _audiortp;
+        /** Returns a pointer to the AudioRtp object */
+        inline AudioRtp * getAudioRtp(void) { return _audiortp; }
 
         /** Increment the number of SIP account connected to this link */
         void incrementClients (void) { _clients++; }
@@ -363,6 +363,9 @@ class SIPVoIPLink : public VoIPLink
 
         std::string getLocalIP() {return _localExternAddress;}
 
+        /** Starting sound */
+        AudioRtp* _audiortp;
+        
         /** For registration use only */
         int _regPort;
 
diff --git a/tools/build-system/distributions/mandriva/sflphone-common.spec b/tools/build-system/distributions/mandriva/sflphone-common.spec
index 11921a1d76bc92257bd4c53f44c54606aae8debd..6a0bebbcd47b58073296aa3ce257624b1106bb8e 100644
--- a/tools/build-system/distributions/mandriva/sflphone-common.spec
+++ b/tools/build-system/distributions/mandriva/sflphone-common.spec
@@ -59,7 +59,7 @@ Authors:
 %setup -q
 
 %build
-cd libs/pjproject-1.0.2
+cd libs/pjproject-1.0.3
 ./autogen.sh --prefix=%{_prefix}
 make dep
 make clean
@@ -69,13 +69,13 @@ cd -
 make -j
 
 %install
-cd libs/pjproject-1.0.2
+cd libs/pjproject-1.0.3
 make DESTDIR=%{buildroot} install
 cd -
 make DESTDIR=%{buildroot} install
 
 %clean
-cd libs/pjproject-1.0.2
+cd libs/pjproject-1.0.3
 make clean
 cd -
 make clean
diff --git a/tools/build-system/distributions/opensuse/sflphone-common.spec b/tools/build-system/distributions/opensuse/sflphone-common.spec
index cb92f42505eb4a687576a840ece4ffaf45ffdc97..6cd41354c378bfac5a4d0e34b7d23ccab2a46aaf 100644
--- a/tools/build-system/distributions/opensuse/sflphone-common.spec
+++ b/tools/build-system/distributions/opensuse/sflphone-common.spec
@@ -58,23 +58,23 @@ Authors:
 %setup -q
 
 %build
-cd libs/pjproject-1.0.2
+cd libs/pjproject-1.0.3
 ./autogen.sh --prefix=%{_prefix}
 make dep
 make clean
 make
 cd -
-./autogen.sh --prefix=%{_prefix}
+./autogen.sh --prefix=%{_prefix} 
 make -j
 
 %install
-cd libs/pjproject-1.0.2
+cd libs/pjproject-1.0.3
 make DESTDIR=%{buildroot} install
 cd -
 make DESTDIR=%{buildroot} install
 
 %clean
-cd libs/pjproject-1.0.2
+cd libs/pjproject-1.0.3
 make clean
 cd -
 make clean
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/changelog b/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/changelog
index 74a8a2b700a6c771a3ea1e0f1b2a9a80a0aff7e1..2fe7b139d905ffaf0afdd5b11c7d4a424db26adc 100644
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/changelog
+++ b/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/changelog
@@ -1,3 +1,166 @@
+sflphone-client-gnome (0.9.6~rc2-SYSVER) SYSTEM; urgency=low
+
+    ** 0.9.6~rc2 **
+
+  * [#1755] Remove generated file
+  * [#1753] restore ilbc ...
+  * [#1866] Methods getSipPort and setSipPort now have an effect on the
+  * [#1753] make pjsip compile without ilbc. Use ./autogen.sh --disable-
+    ilbc-codec
+  * [#1855] Fix error in russian translation
+  * [#1805] Remove the old flawed signal mechanism which was failing in
+  * [#1855] Refresh translation
+  * Spanish translation finished + po README files updated + echo's in
+    copy-in-clients
+  * [#1850] Yun made the chinese HK-CN translation
+  * [#1848] Fix transfer interface bug
+  * [#1862] At install, kde client installs only french translation file
+  * [#1841] A new fallback mechanism was added to the internal resolver
+    in PJSIP.
+  * Started AccountList model/view
+  * [#1855] Remove po subdir in Makefile.am
+  * [#1855] Fix typo error in sflphone-client-gnome
+  * [#1855] Do not generate Makefile in sflphone-common/po
+  * [#1855] Copy translation files into both clients dirs
+  * [#1855] Remove po dir from sflphone-common
+  * Comments added
+  * [#1860] mailbox->voicemail...
+  * make scripts executable
+  * [#1855] French translation
+  * [#1855] Chinese zh_HK partially filled...
+  * [#1859] An unnamed pipe monitored by poll() was added. When we want
+    to
+  * [#1855] Sven completed the first part of the german translation
+  * [#1855] Cantonese manually filled for already translated, almost
+    equal strings
+  * [#1855] Merge russian translation
+  * [#1855] Spanish manually filled for already translated, almost equal
+    strings
+  * [#1855] Update german translation in ./lang/de
+  * [#1858] This problem was fixed by removing a useless line in
+  * [#1855] merged existing translations in lang/ sflphone.po's
+  * [#1842] [#1843] An attempt at improving the expected behaviour that
+    can't
+  * [#1855] added po folder in gnome client and scripts for copying from
+    common lang folder to clients
+  * [#1853] Edit before call does nothing on call history
+  * Put most language entries possible in common. From 300 to 250
+    entries. Stays underscores problem. Scripts for copy in clients.
+  * commit to merge master
+  * [#1825] Changed "Bad authentification" to "Authentication Failed".
+  * common po files
+  * [#1753] Remove ILBC from pjproject
+
+ -- SFLphone Automatic Build System <team@sflphone.org>  Fri, 17 Jul 2009 19:12:58 -0400
+
+sflphone-client-gnome (0.9.6~rc1-SYSVER) SYSTEM; urgency=low
+
+    ** 0.9.6~rc1 **
+
+  * Update some version number
+  * [#1792] Creates .sflphone directory with permission 600. Also,
+    "chmod 600" after
+  * [#1810] GUI is now notified that the call failed. Also, a segfault
+    was
+  * [#1816] Address book search disabled when disabled address book and
+    enabled it back plus button stays triggered
+  * codeclistmodel + asynchronous loading of address book +
+    enable/disable address book
+  * [#1810] Now checking SDP answer after 200 OK. Still need to
+    implement full
+  * [#1794] Can't use the interface during a call
+  * Updated translation files
+  * Russian translation integrated
+  * Codec list model/view started.
+  * [#1807] Add configure.ac in pjproject-1.0.3
+  * [#1787] closeRtpSession added in some places where it should have
+    been
+  * Use Item class for contacts and accounts
+  * Comments + clean code
+  * [#1794] Improved debug messages
+  * [#1805] Replaced the old and unreliable mecanism that was was
+    waiting for
+  * [#1794] Can't use the interface during a call
+  * [#1787]  For those cases where no registered SIP account is
+    configured
+  * [#1797] Make pjsip compile
+  * [#1787] Minor changes. Removed useless commented line. Changed order
+    of
+  * [#1777] Code indentation
+  * [#1797] Update package generation with new pjsip version
+  * [#1798] Does not hang up when the call is building up
+  * [#1797] Update .gitignore with new pjsip version
+  * [#1797] Remove generated files from repo
+  * [#1797] Main build system now uses pjproject-1.0.3
+  * [#1797] Add pjproject-1.0.3
+  * [#1797] Remove pjproject-1.0.2
+  * [#1796] Computing time optimization (samplerate conversion)
+  * [#1787] _audiortp->start() moved away from offhold(),
+    SIPCallAnswered()
+  * [#1312] Added new states for calls initialized by other clients
+  * [#1795] Crashes when adding a new account, checking it and applying
+  * [#1782] Missing icons
+  * [#1793] KDE client compilation problem
+  * Fake ringtone files can no longer be set.
+  * indentation
+  * [#1312] Able to fetch to differentiate incoming/ringing call state
+  * [#1784] Use DESTDIR variable in po Makefile - fix language file
+    installation
+  * [#1785] Fixed typo
+  * [#1785] Fixed changelog update
+  * [#1759] ./autogen.sh --prefix=/usr --with-debug to use optimization
+    level 0
+  * [#1773] Changed snapshot naming convention
+  * [#1773] Removed gpg agent use, added repository cache cleaning
+  * [#1759] Use optimization level 0 for repository, 2 for packages
+  * [#1777] Code indentation/formatting
+  * Translated new features in french
+  * [#1785] Added missing changelog entry
+  * [#1781] Window title is SFLPhone
+  * [#1777] Add code indentation/formatting in the buil system
+  * [#1774] Can't set voicemail number in KDE account creation wizard
+  * [#1775] Can't modify account information for account created with
+    the wizard
+  * [#1771] Add a "Default" button in context menu to disable chosen
+    prior account
+  * [#1705]
+  * [#1224] Remove generated file from the repo
+  * [#1224] Remove generated file from the repo
+  * [#1762] distclean target should remove kconfig generated files
+    (settings.h, settings.cpp). Rename them?
+  * [#1761] clear history button should really clear history
+  * Dialpad works.
+  * Implemented Dialpad widget instead of building it in main view.
+  * Removed last occurence of the old config dialog, that made the build
+    crash.
+  * [#1755] Do not consider G722 as a dynamic payload elsewhere than in
+    RTP layer
+  * [#1753] Remove ilbc Makefile generation
+  * [#1756] Implement a kde configuration dialog with kconfig xt and
+    kconfigdialog class
+  * [#1755] fix audiocodec folder parsing problem
+  * [#1450] Reinit timestamp comparison in RTP, create session in
+    newOutgoingCall
+  * [#1753] Remove milenage third party code from pjsip
+  * New Config Dialog integrated in GUI.(without codecs)
+  * [#1753] Remove ILBC codec
+  * kconfig started, tr2i18n -> i18n, icons folder, accountList changed
+  * [#1705] Fixed Audio RTP thread creation/start
+  * [#1714] Fix codec negociation result handling
+  * [#1678] Fix audiortp payload setting
+  * [#1678] Put bac putData method in rtp
+  * [#1669] gtk_file_chooser_get_filename() support UTF-8 by default
+  * [#1735] Add conditions to sdp update call if call declined
+  * [#1737] substr of recordings destination folder to remove "file://"
+    should be done in client rather than in daemon
+  * [#1731] Enlarge audio stream buffer size
+  * [#1714] Missing true
+  * [#1317] Fixed Mandriva timeout
+  * [#1317] Changed tag convention
+  * [#1317] Cleaned git-dch
+
+ -- SFLphone Automatic Build System <team@sflphone.org>  Fri, 10 Jul 2009 15:50:26 -0400
+
 sflphone-client-gnome (0.9.6~beta-SYSVER) SYSTEM; urgency=low
 
     ** 0.9.6~beta **
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/changelog b/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/changelog
index 8bff7cae541d2bedaf8140128b1793d947d8f665..b34cd2e6a081edd0a44f3abfafca494a4a7af4ff 100644
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/changelog
+++ b/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/changelog
@@ -1,3 +1,166 @@
+sflphone-client-kde (0.9.6~rc2-SYSVER) SYSTEM; urgency=low
+
+    ** 0.9.6~rc2 **
+
+  * [#1755] Remove generated file
+  * [#1753] restore ilbc ...
+  * [#1866] Methods getSipPort and setSipPort now have an effect on the
+  * [#1753] make pjsip compile without ilbc. Use ./autogen.sh --disable-
+    ilbc-codec
+  * [#1855] Fix error in russian translation
+  * [#1805] Remove the old flawed signal mechanism which was failing in
+  * [#1855] Refresh translation
+  * Spanish translation finished + po README files updated + echo's in
+    copy-in-clients
+  * [#1850] Yun made the chinese HK-CN translation
+  * [#1848] Fix transfer interface bug
+  * [#1862] At install, kde client installs only french translation file
+  * [#1841] A new fallback mechanism was added to the internal resolver
+    in PJSIP.
+  * Started AccountList model/view
+  * [#1855] Remove po subdir in Makefile.am
+  * [#1855] Fix typo error in sflphone-client-gnome
+  * [#1855] Do not generate Makefile in sflphone-common/po
+  * [#1855] Copy translation files into both clients dirs
+  * [#1855] Remove po dir from sflphone-common
+  * Comments added
+  * [#1860] mailbox->voicemail...
+  * make scripts executable
+  * [#1855] French translation
+  * [#1855] Chinese zh_HK partially filled...
+  * [#1859] An unnamed pipe monitored by poll() was added. When we want
+    to
+  * [#1855] Sven completed the first part of the german translation
+  * [#1855] Cantonese manually filled for already translated, almost
+    equal strings
+  * [#1855] Merge russian translation
+  * [#1855] Spanish manually filled for already translated, almost equal
+    strings
+  * [#1855] Update german translation in ./lang/de
+  * [#1858] This problem was fixed by removing a useless line in
+  * [#1855] merged existing translations in lang/ sflphone.po's
+  * [#1842] [#1843] An attempt at improving the expected behaviour that
+    can't
+  * [#1855] added po folder in gnome client and scripts for copying from
+    common lang folder to clients
+  * [#1853] Edit before call does nothing on call history
+  * Put most language entries possible in common. From 300 to 250
+    entries. Stays underscores problem. Scripts for copy in clients.
+  * commit to merge master
+  * [#1825] Changed "Bad authentification" to "Authentication Failed".
+  * common po files
+  * [#1753] Remove ILBC from pjproject
+
+ -- SFLphone Automatic Build System <team@sflphone.org>  Fri, 17 Jul 2009 19:13:11 -0400
+
+sflphone-client-kde (0.9.6~rc1-SYSVER) SYSTEM; urgency=low
+
+    ** 0.9.6~rc1 **
+
+  * Update some version number
+  * [#1792] Creates .sflphone directory with permission 600. Also,
+    "chmod 600" after
+  * [#1810] GUI is now notified that the call failed. Also, a segfault
+    was
+  * [#1816] Address book search disabled when disabled address book and
+    enabled it back plus button stays triggered
+  * codeclistmodel + asynchronous loading of address book +
+    enable/disable address book
+  * [#1810] Now checking SDP answer after 200 OK. Still need to
+    implement full
+  * [#1794] Can't use the interface during a call
+  * Updated translation files
+  * Russian translation integrated
+  * Codec list model/view started.
+  * [#1807] Add configure.ac in pjproject-1.0.3
+  * [#1787] closeRtpSession added in some places where it should have
+    been
+  * Use Item class for contacts and accounts
+  * Comments + clean code
+  * [#1794] Improved debug messages
+  * [#1805] Replaced the old and unreliable mecanism that was was
+    waiting for
+  * [#1794] Can't use the interface during a call
+  * [#1787]  For those cases where no registered SIP account is
+    configured
+  * [#1797] Make pjsip compile
+  * [#1787] Minor changes. Removed useless commented line. Changed order
+    of
+  * [#1777] Code indentation
+  * [#1797] Update package generation with new pjsip version
+  * [#1798] Does not hang up when the call is building up
+  * [#1797] Update .gitignore with new pjsip version
+  * [#1797] Remove generated files from repo
+  * [#1797] Main build system now uses pjproject-1.0.3
+  * [#1797] Add pjproject-1.0.3
+  * [#1797] Remove pjproject-1.0.2
+  * [#1796] Computing time optimization (samplerate conversion)
+  * [#1787] _audiortp->start() moved away from offhold(),
+    SIPCallAnswered()
+  * [#1312] Added new states for calls initialized by other clients
+  * [#1795] Crashes when adding a new account, checking it and applying
+  * [#1782] Missing icons
+  * [#1793] KDE client compilation problem
+  * Fake ringtone files can no longer be set.
+  * indentation
+  * [#1312] Able to fetch to differentiate incoming/ringing call state
+  * [#1784] Use DESTDIR variable in po Makefile - fix language file
+    installation
+  * [#1785] Fixed typo
+  * [#1785] Fixed changelog update
+  * [#1759] ./autogen.sh --prefix=/usr --with-debug to use optimization
+    level 0
+  * [#1773] Changed snapshot naming convention
+  * [#1773] Removed gpg agent use, added repository cache cleaning
+  * [#1759] Use optimization level 0 for repository, 2 for packages
+  * [#1777] Code indentation/formatting
+  * Translated new features in french
+  * [#1785] Added missing changelog entry
+  * [#1781] Window title is SFLPhone
+  * [#1777] Add code indentation/formatting in the buil system
+  * [#1774] Can't set voicemail number in KDE account creation wizard
+  * [#1775] Can't modify account information for account created with
+    the wizard
+  * [#1771] Add a "Default" button in context menu to disable chosen
+    prior account
+  * [#1705]
+  * [#1224] Remove generated file from the repo
+  * [#1224] Remove generated file from the repo
+  * [#1762] distclean target should remove kconfig generated files
+    (settings.h, settings.cpp). Rename them?
+  * [#1761] clear history button should really clear history
+  * Dialpad works.
+  * Implemented Dialpad widget instead of building it in main view.
+  * Removed last occurence of the old config dialog, that made the build
+    crash.
+  * [#1755] Do not consider G722 as a dynamic payload elsewhere than in
+    RTP layer
+  * [#1753] Remove ilbc Makefile generation
+  * [#1756] Implement a kde configuration dialog with kconfig xt and
+    kconfigdialog class
+  * [#1755] fix audiocodec folder parsing problem
+  * [#1450] Reinit timestamp comparison in RTP, create session in
+    newOutgoingCall
+  * [#1753] Remove milenage third party code from pjsip
+  * New Config Dialog integrated in GUI.(without codecs)
+  * [#1753] Remove ILBC codec
+  * kconfig started, tr2i18n -> i18n, icons folder, accountList changed
+  * [#1705] Fixed Audio RTP thread creation/start
+  * [#1714] Fix codec negociation result handling
+  * [#1678] Fix audiortp payload setting
+  * [#1678] Put bac putData method in rtp
+  * [#1669] gtk_file_chooser_get_filename() support UTF-8 by default
+  * [#1735] Add conditions to sdp update call if call declined
+  * [#1737] substr of recordings destination folder to remove "file://"
+    should be done in client rather than in daemon
+  * [#1731] Enlarge audio stream buffer size
+  * [#1714] Missing true
+  * [#1317] Fixed Mandriva timeout
+  * [#1317] Changed tag convention
+  * [#1317] Cleaned git-dch
+
+ -- SFLphone Automatic Build System <team@sflphone.org>  Fri, 10 Jul 2009 15:50:55 -0400
+
 sflphone-client-kde (0.9.6~beta-SYSVER) SYSTEM; urgency=low
 
     ** 0.9.6~beta **
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-common/changelog b/tools/build-system/distributions/ubuntu/debian-sflphone-common/changelog
index 940a00c3b42e7c1e29817d393ac9a180c7aec847..224923a6a915a7f75e8df798a6c1710042acfe62 100644
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-common/changelog
+++ b/tools/build-system/distributions/ubuntu/debian-sflphone-common/changelog
@@ -1,3 +1,166 @@
+sflphone-common (0.9.6~rc2-SYSVER) SYSTEM; urgency=low
+
+    ** 0.9.6~rc2 **
+
+  * [#1755] Remove generated file
+  * [#1753] restore ilbc ...
+  * [#1866] Methods getSipPort and setSipPort now have an effect on the
+  * [#1753] make pjsip compile without ilbc. Use ./autogen.sh --disable-
+    ilbc-codec
+  * [#1855] Fix error in russian translation
+  * [#1805] Remove the old flawed signal mechanism which was failing in
+  * [#1855] Refresh translation
+  * Spanish translation finished + po README files updated + echo's in
+    copy-in-clients
+  * [#1850] Yun made the chinese HK-CN translation
+  * [#1848] Fix transfer interface bug
+  * [#1862] At install, kde client installs only french translation file
+  * [#1841] A new fallback mechanism was added to the internal resolver
+    in PJSIP.
+  * Started AccountList model/view
+  * [#1855] Remove po subdir in Makefile.am
+  * [#1855] Fix typo error in sflphone-client-gnome
+  * [#1855] Do not generate Makefile in sflphone-common/po
+  * [#1855] Copy translation files into both clients dirs
+  * [#1855] Remove po dir from sflphone-common
+  * Comments added
+  * [#1860] mailbox->voicemail...
+  * make scripts executable
+  * [#1855] French translation
+  * [#1855] Chinese zh_HK partially filled...
+  * [#1859] An unnamed pipe monitored by poll() was added. When we want
+    to
+  * [#1855] Sven completed the first part of the german translation
+  * [#1855] Cantonese manually filled for already translated, almost
+    equal strings
+  * [#1855] Merge russian translation
+  * [#1855] Spanish manually filled for already translated, almost equal
+    strings
+  * [#1855] Update german translation in ./lang/de
+  * [#1858] This problem was fixed by removing a useless line in
+  * [#1855] merged existing translations in lang/ sflphone.po's
+  * [#1842] [#1843] An attempt at improving the expected behaviour that
+    can't
+  * [#1855] added po folder in gnome client and scripts for copying from
+    common lang folder to clients
+  * [#1853] Edit before call does nothing on call history
+  * Put most language entries possible in common. From 300 to 250
+    entries. Stays underscores problem. Scripts for copy in clients.
+  * commit to merge master
+  * [#1825] Changed "Bad authentification" to "Authentication Failed".
+  * common po files
+  * [#1753] Remove ILBC from pjproject
+
+ -- SFLphone Automatic Build System <team@sflphone.org>  Fri, 17 Jul 2009 19:12:44 -0400
+
+sflphone-common (0.9.6~rc1-SYSVER) SYSTEM; urgency=low
+
+    ** 0.9.6~rc1 **
+
+  * Update some version number
+  * [#1792] Creates .sflphone directory with permission 600. Also,
+    "chmod 600" after
+  * [#1810] GUI is now notified that the call failed. Also, a segfault
+    was
+  * [#1816] Address book search disabled when disabled address book and
+    enabled it back plus button stays triggered
+  * codeclistmodel + asynchronous loading of address book +
+    enable/disable address book
+  * [#1810] Now checking SDP answer after 200 OK. Still need to
+    implement full
+  * [#1794] Can't use the interface during a call
+  * Updated translation files
+  * Russian translation integrated
+  * Codec list model/view started.
+  * [#1807] Add configure.ac in pjproject-1.0.3
+  * [#1787] closeRtpSession added in some places where it should have
+    been
+  * Use Item class for contacts and accounts
+  * Comments + clean code
+  * [#1794] Improved debug messages
+  * [#1805] Replaced the old and unreliable mecanism that was was
+    waiting for
+  * [#1794] Can't use the interface during a call
+  * [#1787]  For those cases where no registered SIP account is
+    configured
+  * [#1797] Make pjsip compile
+  * [#1787] Minor changes. Removed useless commented line. Changed order
+    of
+  * [#1777] Code indentation
+  * [#1797] Update package generation with new pjsip version
+  * [#1798] Does not hang up when the call is building up
+  * [#1797] Update .gitignore with new pjsip version
+  * [#1797] Remove generated files from repo
+  * [#1797] Main build system now uses pjproject-1.0.3
+  * [#1797] Add pjproject-1.0.3
+  * [#1797] Remove pjproject-1.0.2
+  * [#1796] Computing time optimization (samplerate conversion)
+  * [#1787] _audiortp->start() moved away from offhold(),
+    SIPCallAnswered()
+  * [#1312] Added new states for calls initialized by other clients
+  * [#1795] Crashes when adding a new account, checking it and applying
+  * [#1782] Missing icons
+  * [#1793] KDE client compilation problem
+  * Fake ringtone files can no longer be set.
+  * indentation
+  * [#1312] Able to fetch to differentiate incoming/ringing call state
+  * [#1784] Use DESTDIR variable in po Makefile - fix language file
+    installation
+  * [#1785] Fixed typo
+  * [#1785] Fixed changelog update
+  * [#1759] ./autogen.sh --prefix=/usr --with-debug to use optimization
+    level 0
+  * [#1773] Changed snapshot naming convention
+  * [#1773] Removed gpg agent use, added repository cache cleaning
+  * [#1759] Use optimization level 0 for repository, 2 for packages
+  * [#1777] Code indentation/formatting
+  * Translated new features in french
+  * [#1785] Added missing changelog entry
+  * [#1781] Window title is SFLPhone
+  * [#1777] Add code indentation/formatting in the buil system
+  * [#1774] Can't set voicemail number in KDE account creation wizard
+  * [#1775] Can't modify account information for account created with
+    the wizard
+  * [#1771] Add a "Default" button in context menu to disable chosen
+    prior account
+  * [#1705]
+  * [#1224] Remove generated file from the repo
+  * [#1224] Remove generated file from the repo
+  * [#1762] distclean target should remove kconfig generated files
+    (settings.h, settings.cpp). Rename them?
+  * [#1761] clear history button should really clear history
+  * Dialpad works.
+  * Implemented Dialpad widget instead of building it in main view.
+  * Removed last occurence of the old config dialog, that made the build
+    crash.
+  * [#1755] Do not consider G722 as a dynamic payload elsewhere than in
+    RTP layer
+  * [#1753] Remove ilbc Makefile generation
+  * [#1756] Implement a kde configuration dialog with kconfig xt and
+    kconfigdialog class
+  * [#1755] fix audiocodec folder parsing problem
+  * [#1450] Reinit timestamp comparison in RTP, create session in
+    newOutgoingCall
+  * [#1753] Remove milenage third party code from pjsip
+  * New Config Dialog integrated in GUI.(without codecs)
+  * [#1753] Remove ILBC codec
+  * kconfig started, tr2i18n -> i18n, icons folder, accountList changed
+  * [#1705] Fixed Audio RTP thread creation/start
+  * [#1714] Fix codec negociation result handling
+  * [#1678] Fix audiortp payload setting
+  * [#1678] Put bac putData method in rtp
+  * [#1669] gtk_file_chooser_get_filename() support UTF-8 by default
+  * [#1735] Add conditions to sdp update call if call declined
+  * [#1737] substr of recordings destination folder to remove "file://"
+    should be done in client rather than in daemon
+  * [#1731] Enlarge audio stream buffer size
+  * [#1714] Missing true
+  * [#1317] Fixed Mandriva timeout
+  * [#1317] Changed tag convention
+  * [#1317] Cleaned git-dch
+
+ -- SFLphone Automatic Build System <team@sflphone.org>  Fri, 10 Jul 2009 15:49:56 -0400
+
 sflphone-common (0.9.6~beta-SYSVER) SYSTEM; urgency=low
 
     ** 0.9.6~beta **
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-common/rules b/tools/build-system/distributions/ubuntu/debian-sflphone-common/rules
index d7235ece2b796b4f95933ac297042bd87a12058f..2ca6f99f329b1e55babd80850a265225ac7f4d68 100755
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-common/rules
+++ b/tools/build-system/distributions/ubuntu/debian-sflphone-common/rules
@@ -21,7 +21,7 @@ configure-stamp:
 	dh_testdir
 	# Add here commands to configure the package.
 	./autogen.sh --prefix=/usr
-	cd libs/pjproject-1.0.2; ./autogen.sh --prefix=/usr
+	cd libs/pjproject-1.0.3; ./autogen.sh --prefix=/usr
 	touch configure-stamp
 
 #Architecture 
@@ -31,7 +31,7 @@ build-arch: build-arch-stamp
 build-arch-stamp: configure-stamp 
 
     # Add here commands to compile the arch part of the package.
-	cd libs/pjproject-1.0.2; $(MAKE) dep; $(MAKE) clean; $(MAKE)
+	cd libs/pjproject-1.0.3; $(MAKE) dep; $(MAKE) clean; $(MAKE)
 	cd -; $(MAKE) 
 	touch $@
 
@@ -72,7 +72,7 @@ install-arch:
 	# Add here commands to install the arch part of the package into 
 	# debian/tmp.
 	$(MAKE) DESTDIR=$(CURDIR)/debian/$(package) install
-	cd libs/pjproject-1.0.2; $(MAKE) prefix=$(CURDIR)/debian/$(package)/usr install
+	cd libs/pjproject-1.0.3; $(MAKE) prefix=$(CURDIR)/debian/$(package)/usr install
 	rm -rf $(CURDIR)/debian/$(package)/usr/include
 	dh_install -s
 # Must not depend on anything. This is to be called by