diff --git a/.gitignore b/.gitignore
index 9d0427f272c933f3891723c3433c452f931c40ad..2d5fce88e28e1b93c0dbc6c6355e16b2fcc1e6c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -240,3 +240,15 @@ sflphone-client-gnome/stamp-h1
/tools/build-system/launchpad/*.build
/tools/build-system/launchpad/*.upload
+# telify
+/tools/mozilla-telify-sflphone/debian/mozilla-telify-sflphone
+/tools/mozilla-telify-sflphone/tmp/
+/tools/mozilla-telify-sflphone/*-stamp
+/tools/*.dsc
+/tools/*.tar.gz
+/tools/*.deb
+/tools/*.build
+/tools/*.changes
+/tools/mozilla-telify-sflphone/debian/control
+/tools/mozilla-telify-sflphone/debian/mozilla-telify-sflphone.links
+
diff --git a/lang/da.po b/lang/da.po
deleted file mode 100644
index c0c2ac3dd23b9561302874d2ca6baa7b8b5b4348..0000000000000000000000000000000000000000
--- a/lang/da.po
+++ /dev/null
@@ -1,996 +0,0 @@
-# Danish translation for sflphone
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the sflphone package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: sflphone\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-10-14 11:18-0400\n"
-"PO-Revision-Date: 2009-10-01 14:40+0000\n"
-"Last-Translator: Jonas Fonseca <fonseca@diku.dk>\n"
-"Language-Team: Danish <da@li.org>\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"
-"X-Launchpad-Export-Date: 2009-10-26 15:48+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#: ../sflphone-client-gnome/src/accountlist.c:175
-msgid "Registered"
-msgstr "Registreret"
-
-#: ../sflphone-client-gnome/src/accountlist.c:178
-msgid "Not Registered"
-msgstr "Ikke registreret"
-
-#: ../sflphone-client-gnome/src/accountlist.c:181
-msgid "Trying..."
-msgstr "Forsøger..."
-
-#: ../sflphone-client-gnome/src/accountlist.c:184
-#: ../sflphone-client-gnome/src/sflnotify.c:131
-#: ../sflphone-client-gnome/src/sflnotify.c:148
-msgid "Error"
-msgstr "Fejl"
-
-#: ../sflphone-client-gnome/src/accountlist.c:187
-msgid "Authentication Failed"
-msgstr "Godkendelse mislykkedes"
-
-#: ../sflphone-client-gnome/src/accountlist.c:190
-msgid "Network unreachable"
-msgstr "Netværk kan ikke nås"
-
-#: ../sflphone-client-gnome/src/accountlist.c:193
-msgid "Host unreachable"
-msgstr "Vært kan ikke nås"
-
-#: ../sflphone-client-gnome/src/accountlist.c:196
-msgid "Stun configuration error"
-msgstr "Stun konfigureringsfejl"
-
-#: ../sflphone-client-gnome/src/accountlist.c:199
-msgid "Stun server invalid"
-msgstr "Stun server ugyldig"
-
-#: ../sflphone-client-gnome/src/accountlist.c:202
-msgid "Invalid"
-msgstr "Ugyldig"
-
-#: ../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 indtalt besked"
-msgstr[1] "%d indtalte beskeder"
-
-#: ../sflphone-client-gnome/src/actions.c:83
-#: ../sflphone-client-gnome/src/actions.c:919
-#: ../sflphone-client-gnome/src/actions.c:926
-msgid "Using account"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/actions.c:89
-msgid "No registered accounts"
-msgstr "Ingen registrerede konti"
-
-#: ../sflphone-client-gnome/src/actions.c:268
-msgid ""
-"Unable to connect to the SFLphone server.\n"
-"Make sure the daemon is running."
-msgstr ""
-
-#: ../sflphone-client-gnome/src/actions.c:913
-#, c-format
-msgid "IP call - %s"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/actions.c:922
-msgid "Codec"
-msgstr "Kodning"
-
-#: ../sflphone-client-gnome/src/actions.c:1119
-#, 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/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:73
-msgid "There is one call in progress."
-msgstr ""
-
-#: ../sflphone-client-gnome/src/mainwindow.c:77
-msgid "There are calls in progress."
-msgstr ""
-
-#: ../sflphone-client-gnome/src/mainwindow.c:86
-msgid "Do you still want to quit?"
-msgstr "Vil du stadig afslutte"
-
-#: ../sflphone-client-gnome/src/mainwindow.c:299
-msgid "SFLphone Error"
-msgstr "SFLphone Fejl"
-
-#: ../sflphone-client-gnome/src/mainwindow.c:391
-#, c-format
-msgid "ZRTP is not supported by peer %s\n"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/mainwindow.c:392
-msgid "Secure Communication Unavailable"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/mainwindow.c:393
-#: ../sflphone-client-gnome/src/mainwindow.c:415
-msgid "Continue"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/mainwindow.c:394
-#: ../sflphone-client-gnome/src/mainwindow.c:416
-#: ../sflphone-client-gnome/src/mainwindow.c:430
-msgid "Stop Call"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/mainwindow.c:413
-#, c-format
-msgid ""
-"A %s error forced the call with %s to fall under unencrypted mode.\n"
-"Exact reason: %s\n"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/mainwindow.c:414
-msgid "ZRTP negotiation failed"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/mainwindow.c:427
-#, c-format
-msgid ""
-"%s wants to stop using secure communication. Confirm will resume "
-"conversation without SRTP.\n"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/mainwindow.c:428
-msgid "Confirm Go Clear"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/mainwindow.c:429
-msgid "Confirm"
-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:147
-msgid "You have no registered accounts"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/sflnotify.c:190
-#, c-format
-msgid ""
-"<i>With:</i> %s \n"
-"using %s"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/sflnotify.c:205
-#, c-format
-msgid "%s does not support ZRTP."
-msgstr ""
-
-#: ../sflphone-client-gnome/src/sflnotify.c:220
-#, c-format
-msgid "ZRTP negotiation failed with %s"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/sflnotify.c:235
-#, c-format
-msgid "<i>With:</i> %s"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/sliders.c:162
-msgid "Speakers volume"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/sliders.c:164
-msgid "Mic volume"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/statusicon.c:91
-msgid "_Show main window"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/statusicon.c:126
-msgid "SFLphone"
-msgstr "SFLphone"
-
-#: ../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/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:750
-msgid "Voicemail"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:403
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
-msgstr "SFLphone er en VoIP-klient kompatibel med SIP og AIX2 protokoller"
-
-#: ../sflphone-client-gnome/src/uimanager.c:406
-msgid "About SFLphone"
-msgstr "Om SFLphone"
-
-#: ../sflphone-client-gnome/src/uimanager.c:1028
-msgid "_Pick up"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:1040
-#: ../sflphone-client-gnome/src/uimanager.c:1081
-msgid "_Hang up"
-msgstr "_Læg på"
-
-#: ../sflphone-client-gnome/src/uimanager.c:1052
-#: ../sflphone-client-gnome/src/uimanager.c:1093
-msgid "On _Hold"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:1064
-msgid "_Record"
-msgstr "_Optag"
-
-#: ../sflphone-client-gnome/src/uimanager.c:1154
-msgid "_Call back"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:1226
-msgid "_New call"
-msgstr "_Nyt opkald"
-
-#: ../sflphone-client-gnome/src/uimanager.c:1300
-msgid "Edit phone number"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:1311
-msgid "Edit the phone number before making a call"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:164
-msgid "Account Parameters"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:173
-#: ../sflphone-client-gnome/src/config/assistant.c:294
-#: ../sflphone-client-gnome/src/config/assistant.c:402
-msgid "_Alias"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:181
-msgid "_Protocol"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:199
-msgid "Unknown"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:209
-#: ../sflphone-client-gnome/src/config/assistant.c:302
-#: ../sflphone-client-gnome/src/config/assistant.c:410
-msgid "_Host name"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:217
-#: ../sflphone-client-gnome/src/config/assistant.c:310
-#: ../sflphone-client-gnome/src/config/assistant.c:418
-msgid "_User name"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:234
-#: ../sflphone-client-gnome/src/config/assistant.c:326
-#: ../sflphone-client-gnome/src/config/assistant.c:433
-msgid "_Password"
-msgstr "_Adgangskode"
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:254
-#: ../sflphone-client-gnome/src/config/assistant.c:344
-#: ../sflphone-client-gnome/src/config/assistant.c:449
-msgid "_Voicemail number"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:340
-msgid "Authentication"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:341
-msgid "Secret"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:466
-msgid "Credential"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:501
-msgid "Authentication name"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:512
-msgid "Password"
-msgstr "Adgangskode"
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:535
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:909
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:201
-msgid "Security"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:547
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:213
-msgid "Use TLS transport (sips)"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:552
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:218
-msgid "SRTP key exchange"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:558
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
-msgid "Disabled"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
-msgid "Registration"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:679
-msgid "Registration expire"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
-msgid "_Comply with RFC 3263"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
-msgid "Network"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:707
-msgid "Local address"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:744
-msgid "Local port"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:752
-msgid "Set published address and port:"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:756
-msgid "Using STUN "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:761
-msgid "Same as local parameters"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:764
-msgid "Manually"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:769
-msgid "Published address"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:777
-msgid "Published port"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:785
-msgid "STUN server URL"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
-msgid "Account settings"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
-msgid "Basic"
-msgstr "Grundlæggende"
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:904
-msgid "Advanced"
-msgstr "Advanceret"
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:169
-msgid "Server returned \""
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
-msgid "Protocol"
-msgstr "Protokol"
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:396
-msgid "Status"
-msgstr "Status"
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:474
-msgid "Accounts"
-msgstr "Konti"
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:484
-msgid "Configured Accounts"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:505
-msgid "There "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "is "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "are "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:508
-msgid " active account"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:509
-msgid "s"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:514
-msgid "You have no active account"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:443
-msgid "General"
-msgstr "Generelt"
-
-#: ../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:578
-msgid "Name"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:69
-#, c-format
-msgid "This assistant is now finished."
-msgstr "Denne vejledning er nu fuldført"
-
-#: ../sflphone-client-gnome/src/config/assistant.c:71
-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/config/assistant.c:74
-msgid "Alias"
-msgstr "Alias"
-
-#: ../sflphone-client-gnome/src/config/assistant.c:78
-msgid "Server"
-msgstr "Server"
-
-#: ../sflphone-client-gnome/src/config/assistant.c:82
-msgid "Username"
-msgstr "Brugernavn"
-
-#: ../sflphone-client-gnome/src/config/assistant.c:86
-msgid "Security: "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:88
-msgid "SRTP/ZRTP draft-zimmermann"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:90
-#: ../sflphone-client-gnome/src/config/assistant.c:182
-msgid "None"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:210
-msgid "SFLphone account creation wizard"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:236
-msgid "Welcome to the Account creation wizard of SFLphone!"
-msgstr "Velkommen til kontooperettelsesvejledning for SFLphone"
-
-#: ../sflphone-client-gnome/src/config/assistant.c:237
-msgid "This installation wizard will help you configure an account."
-msgstr ""
-"Denne installeringsvejledning vil hjælpe dig med at konfigurere en konto"
-
-#: ../sflphone-client-gnome/src/config/assistant.c:251
-msgid "VoIP Protocols"
-msgstr "VoIP protokoller"
-
-#: ../sflphone-client-gnome/src/config/assistant.c:251
-msgid "Select an account type"
-msgstr "Vælg en kontotype"
-
-#: ../sflphone-client-gnome/src/config/assistant.c:253
-msgid "SIP (Session Initiation Protocol)"
-msgstr "SIP (Session Initiation Protocol)"
-
-#: ../sflphone-client-gnome/src/config/assistant.c:255
-msgid "IAX2 (InterAsterix Exchange)"
-msgstr "IAX2 (InterAsterix Exchange)"
-
-#: ../sflphone-client-gnome/src/config/assistant.c:269
-msgid "Account"
-msgstr "Konto"
-
-#: ../sflphone-client-gnome/src/config/assistant.c:269
-msgid "Please select one of the following options"
-msgstr "Vælg en af følgende indstillinger"
-
-#: ../sflphone-client-gnome/src/config/assistant.c:271
-msgid "Create a free SIP/IAX2 account on sflphone.org"
-msgstr "Opret en gratis SIP/IAX2 konto hos sflphone.org"
-
-#: ../sflphone-client-gnome/src/config/assistant.c:273
-msgid "Register an existing SIP or IAX2 account"
-msgstr "Registrer en eksisterende SIP eller IAX2 konto"
-
-#: ../sflphone-client-gnome/src/config/assistant.c:286
-msgid "SIP account settings"
-msgstr "SIP kontoindstillinger"
-
-#: ../sflphone-client-gnome/src/config/assistant.c:286
-#: ../sflphone-client-gnome/src/config/assistant.c:394
-msgid "Please fill the following information"
-msgstr "Udfyld venligst følgende information"
-
-#: ../sflphone-client-gnome/src/config/assistant.c:352
-#: ../sflphone-client-gnome/src/config/assistant.c:381
-msgid "Secure communications with _ZRTP"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:365
-msgid "Optional email address"
-msgstr "Valgfri emailadresse"
-
-#: ../sflphone-client-gnome/src/config/assistant.c:365
-msgid "This email address will be used to send your voicemail messages."
-msgstr ""
-"Denne emailadresse vil blive brugt til at sende dig indtalte beskeder"
-
-#: ../sflphone-client-gnome/src/config/assistant.c:373
-msgid "_Email address"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:394
-msgid "IAX2 account settings"
-msgstr "IAX2 kontoindstillinger"
-
-#: ../sflphone-client-gnome/src/config/assistant.c:467
-msgid "Network Address Translation (NAT)"
-msgstr "Network Address Translation (NAT)"
-
-#: ../sflphone-client-gnome/src/config/assistant.c:467
-msgid "You should probably enable this if you are behind a firewall."
-msgstr "Du opfordres til at aktivere dette hvis du er bag en firewall"
-
-#: ../sflphone-client-gnome/src/config/assistant.c:476
-msgid "E_nable STUN"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:483
-msgid "_STUN server"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:497
-msgid "Account Registration"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:497
-msgid "Congratulations!"
-msgstr "Tillykke!"
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:583
-msgid "Frequency"
-msgstr "Frekvens"
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:588
-msgid "Bitrate"
-msgstr "Bithastighed"
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:593
-msgid "Bandwidth"
-msgstr "Båndbredde"
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:673
-msgid "ALSA plugin"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:695
-msgid "Output"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:717
-msgid "Input"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:752
-msgid "_Voice Activity Detection"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:762
-msgid "_Noise Reduction (Narrow-Band Companding)"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:798
-msgid "Sound Manager"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:807
-msgid "_Pulseaudio"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:811
-msgid "_ALSA"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:816
-msgid "_Mute other applications during a call"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:823
-msgid "ALSA settings"
-msgstr "ALSA indstillinger"
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:840
-msgid "Codecs"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:869
-msgid "Recordings"
-msgstr "Optagelser"
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:873
-msgid "Destination folder"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:877
-msgid "Select a folder"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:883
-msgid "Ringtones"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:889
-msgid "_Enable ringtones"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:895
-msgid "Choose a ringtone"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:901
-msgid "Audio Files"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/hooks-config.c:130
-msgid "URL Argument"
-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 "Omskrivning af telefonnummer"
-
-#: ../sflphone-client-gnome/src/config/hooks-config.c:169
-msgid "_Prefix dialed numbers with"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:195
-msgid ""
-"This profile is used when you want to reach a remote peer simply by typing a "
-"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
-"also be used if no account can be matched to an incoming or outgoing call."
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:274
-msgid "SIP Port"
-msgstr "SIP Port"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:281
-msgid "UDP Transport"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:319
-msgid "Desktop Notifications"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:323
-msgid "_Enable notifications"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:329
-msgid "Enable voicemail _notifications"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:341
-msgid "System Tray Icon"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
-msgid "_Popup main window on incoming call"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:349
-msgid "Ne_ver popup main window"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:353
-msgid "Hide SFLphone window on _startup"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:359
-msgid "Calls History"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:362
-msgid "_Keep my history for at least"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:373
-msgid "days"
-msgstr "dage"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:377
-msgid "Configuration File"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:379
-msgid "Store SIP credentials as MD5 hash"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:423
-msgid "Preferences"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:448
-msgid "Audio"
-msgstr "Audio"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
-msgid "Address Book"
-msgstr "Adressebog"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:458
-msgid "Hooks"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:468
-msgid "Direct IP calls"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:38
-msgid "Advanced options for TLS"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:55
-msgid "TLS transport"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:59
-msgid ""
-"TLS transport can be used along with UDP for those calls that would\n"
-"require secure sip transactions (aka SIPS). You can configure a different\n"
-"TLS transport for each account. However, each of them will run on a "
-"dedicated\n"
-"port, different one from each other\n"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:100
-msgid "Certificate of Authority list"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:104
-msgid "Choose a CA list file (optional)"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:115
-msgid "Public endpoint certificate file"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:119
-msgid "Choose a public endpoint certificate (optional)"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:134
-msgid "Choose a private key file (optional)"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:145
-msgid "Password for the private key"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:168
-msgid "TLS protocol method"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:202
-msgid "TLS cipher list"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:211
-msgid "Server name instance for outgoing TLS connection"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:219
-msgid "Negotiation timeout (sec:msec)"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:236
-msgid "Verify incoming certificates, as a server"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:242
-msgid "Verify certificates from answer, as a client"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:248
-msgid "Require certificate for incoming tls connections"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:49
-msgid "ZRTP Options"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:68
-msgid "Send Hello Hash in S_DP"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:74
-msgid "Ask User to Confirm SAS"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:80
-msgid "_Warn if ZRTP not supported"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:86
-msgid "Display SAS once for hold events"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
-msgid "Search all"
-msgstr "Søg alle"
-
-#: ../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 "Klik her for at ændre søgningstypen"
-
-#: ../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/da/da.po b/lang/da/da.po
new file mode 100644
index 0000000000000000000000000000000000000000..1c011969aca5c2afa3b9a4cc76db3e748bcd6bc2
--- /dev/null
+++ b/lang/da/da.po
@@ -0,0 +1,1215 @@
+# Danish translation for sflphone
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the sflphone package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: sflphone\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-12-03 10:22-0500\n"
+"PO-Revision-Date: 2009-11-03 03:52+0000\n"
+"Last-Translator: Jonas Fonseca <fonseca@diku.dk>\n"
+"Language-Team: Danish <da@li.org>\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"
+"X-Launchpad-Export-Date: 2009-12-03 15:32+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: ../sflphone-client-gnome/src/accountlist.c:175
+msgid "Registered"
+msgstr "Registreret"
+
+#: ../sflphone-client-gnome/src/accountlist.c:178
+msgid "Not Registered"
+msgstr "Ikke registreret"
+
+#: ../sflphone-client-gnome/src/accountlist.c:181
+msgid "Trying..."
+msgstr "Forsøger..."
+
+#: ../sflphone-client-gnome/src/accountlist.c:184
+#: ../sflphone-client-gnome/src/sflnotify.c:131
+#: ../sflphone-client-gnome/src/sflnotify.c:148
+msgid "Error"
+msgstr "Fejl"
+
+#: ../sflphone-client-gnome/src/accountlist.c:187
+msgid "Authentication Failed"
+msgstr "Godkendelse mislykkedes"
+
+#: ../sflphone-client-gnome/src/accountlist.c:190
+msgid "Network unreachable"
+msgstr "Netværk kan ikke nås"
+
+#: ../sflphone-client-gnome/src/accountlist.c:193
+msgid "Host unreachable"
+msgstr "Vært kan ikke nås"
+
+#: ../sflphone-client-gnome/src/accountlist.c:196
+msgid "Stun configuration error"
+msgstr "Stun konfigureringsfejl"
+
+#: ../sflphone-client-gnome/src/accountlist.c:199
+msgid "Stun server invalid"
+msgstr "Stun server ugyldig"
+
+#: ../sflphone-client-gnome/src/accountlist.c:202
+msgid "Invalid"
+msgstr "Ugyldig"
+
+#: ../sflphone-client-gnome/src/actions.c:98
+msgid "Using account"
+msgstr "Benytter konto"
+
+#: ../sflphone-client-gnome/src/actions.c:104
+msgid "No registered accounts"
+msgstr "Ingen registrerede konti"
+
+#: ../sflphone-client-gnome/src/actions.c:285
+msgid ""
+"Unable to connect to the SFLphone server.\n"
+"Make sure the daemon is running."
+msgstr ""
+"Forbindelse til SFLphone serveren kan ikke oprettes.\n"
+"Sørg for at server-dæmonen kører."
+
+#: ../sflphone-client-gnome/src/actions.c:589
+#: ../sflphone-client-gnome/src/actions.c:911
+msgid "Direct SIP call"
+msgstr "Direkte IP opkald"
+
+#: ../sflphone-client-gnome/src/actions.c:1103
+#, 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>Fejl: Ingen audio-codec fundet\n"
+"\n"
+"</b>SFL audio-codecs skal installeres i <i>%s</i> eller i mappen <b>."
+"sflphone</b> i dit hjemmekatalog (<i>%s</i>)"
+
+#: ../sflphone-client-gnome/src/errors.c:29
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening playback device"
+msgstr ""
+"ALSA meddelelse\n"
+"\n"
+"Fejl opstod mens afspilningsenhed blev åbnet"
+
+#: ../sflphone-client-gnome/src/errors.c:32
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening capture device"
+msgstr ""
+"ALSA meddelelse\n"
+"\n"
+"Fejl opstod mens optageenhed blev åbnet"
+
+#: ../sflphone-client-gnome/src/errors.c:35
+msgid ""
+"Pulseaudio notification\n"
+"\n"
+"Pulseaudio is not running"
+msgstr ""
+"PulseAudio meddelelse\n"
+"\n"
+"PulseAudio er tilgængelig"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:73
+msgid "There is one call in progress."
+msgstr "Et igangværende opkald eksisterer"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:77
+msgid "There are calls in progress."
+msgstr "Igangværende opkald eksisterer"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:86
+msgid "Do you still want to quit?"
+msgstr "Ønsker du stadig at afslutte"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:298
+msgid "SFLphone Error"
+msgstr "SFLphone fejl"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:392
+#, c-format
+msgid "ZRTP is not supported by peer %s\n"
+msgstr "ZRTP er ikke understøttet af modtageren %s\n"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:393
+msgid "Secure Communication Unavailable"
+msgstr "Sikker kommunikation ikke tilgængelig"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:394
+#: ../sflphone-client-gnome/src/mainwindow.c:416
+msgid "Continue"
+msgstr "Fortsæt"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:395
+#: ../sflphone-client-gnome/src/mainwindow.c:417
+#: ../sflphone-client-gnome/src/mainwindow.c:431
+msgid "Stop Call"
+msgstr "Afslut opkald"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:414
+#, c-format
+msgid ""
+"A %s error forced the call with %s to fall under unencrypted mode.\n"
+"Exact reason: %s\n"
+msgstr ""
+"En \"%s\"-fejl medførte at opkaldet til %s blev ændret til ukrypteret "
+"tilstand.\n"
+"Den præcise årsag: %s\n"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:415
+msgid "ZRTP negotiation failed"
+msgstr "ZRTP-forhandling mislykkedes"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:428
+#, c-format
+msgid ""
+"%s wants to stop using secure communication. Confirm will resume "
+"conversation without SRTP.\n"
+msgstr ""
+"%s ønsker at afslutte brugen af sikker kommunikation. Ved at godkende vil "
+"samtalen fortætte uden SRTP\n"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:429
+msgid "Confirm Go Clear"
+msgstr "Godkend sikkerhedsændring"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:430
+msgid "Confirm"
+msgstr "Godkend"
+
+#: ../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>Fra</i> %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+#, c-format
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] "%d indtalt besked"
+msgstr[1] "%d indtalte beskeder"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:111
+#, c-format
+msgid "Calling with %s account <i>%s</i>"
+msgstr "Kalder op med %s konto <i>%s</i>"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:115
+msgid "Current account"
+msgstr "Nuværende konto"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:130
+msgid "You have no accounts set up"
+msgstr "Du har ingen oprettede konti"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:147
+msgid "You have no registered accounts"
+msgstr "Du har ingen registrerede konti"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:190
+#, c-format
+msgid ""
+"<i>With:</i> %s \n"
+"using %s"
+msgstr ""
+"<i>Med:</i> %s \n"
+"benyttende %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:205
+#, c-format
+msgid "%s does not support ZRTP."
+msgstr "%s understøtter ikke ZRTP."
+
+#: ../sflphone-client-gnome/src/sflnotify.c:220
+#, c-format
+msgid "ZRTP negotiation failed with %s"
+msgstr "ZRTP forhandling mislykkedes med %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:235
+#, c-format
+msgid "<i>With:</i> %s"
+msgstr "<i>Med:</i> %s"
+
+#: ../sflphone-client-gnome/src/sliders.c:162
+msgid "Speakers volume"
+msgstr "Højtaler lydstyrke"
+
+#: ../sflphone-client-gnome/src/sliders.c:164
+msgid "Mic volume"
+msgstr "Mikrofon lydstyrke"
+
+#: ../sflphone-client-gnome/src/statusicon.c:96
+msgid "_Show main window"
+msgstr "_Vis hovedvindue"
+
+#: ../sflphone-client-gnome/src/statusicon.c:131
+msgid "SFLphone"
+msgstr "SFLphone"
+
+#: ../sflphone-client-gnome/src/statusicon.c:132
+#, c-format
+msgid "%i account configured"
+msgid_plural "%i accounts configured"
+msgstr[0] "%i konto oprettet"
+msgstr[1] "%i konti oprettet"
+
+#: ../sflphone-client-gnome/src/toolbar.c:38
+#: ../sflphone-client-gnome/src/uimanager.c:693
+#: ../sflphone-client-gnome/src/uimanager.c:727
+msgid "Voicemail"
+msgstr "Talebesked"
+
+#: ../sflphone-client-gnome/src/uimanager.c:117
+msgid "No address book selected"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:137
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "Address book"
+msgstr "Adressebog"
+
+#: ../sflphone-client-gnome/src/uimanager.c:279
+msgid "Voicemail (%i)"
+msgstr "Talebesked"
+
+#: ../sflphone-client-gnome/src/uimanager.c:342
+msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr "SFLphone er en VoIP-klient kompatibel med SIP og IAX2 protokoller"
+
+#: ../sflphone-client-gnome/src/uimanager.c:345
+msgid "About SFLphone"
+msgstr "Om SFLphone"
+
+#: ../sflphone-client-gnome/src/uimanager.c:719
+msgid "Call"
+msgstr "Afslut opkald"
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:1184
+msgid "_New call"
+msgstr "_Nyt opkald"
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+msgid "Place a new call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:979
+msgid "_Pick up"
+msgstr "_Svar"
+
+#: ../sflphone-client-gnome/src/uimanager.c:721
+msgid "Answer the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:991
+#: ../sflphone-client-gnome/src/uimanager.c:1032
+msgid "_Hang up"
+msgstr "_Læg på"
+
+#: ../sflphone-client-gnome/src/uimanager.c:722
+msgid "Finish the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "O_n hold"
+msgstr "I _venteposition"
+
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "Place the call on hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "O_ff hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "Place the call off hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:725
+#: ../sflphone-client-gnome/src/uimanager.c:1015
+msgid "_Record"
+msgstr "_Optag"
+
+#: ../sflphone-client-gnome/src/uimanager.c:725
+msgid "Record the current conversation"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Configuration _Assistant"
+msgstr "Konfigurationsfil"
+
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Run the configuration assistant"
+msgstr "Stun konfigureringsfejl"
+
+#: ../sflphone-client-gnome/src/uimanager.c:727
+msgid "Call your voicemail"
+msgstr "%d indtalt besked"
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "_Close"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "Minimize to system tray"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "_Quit"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "Quit the program"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:732
+msgid "_Edit"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "_Copy"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "Copy the selection"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "_Paste"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "Paste the clipboard"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear _history"
+msgstr "Opkaldshistorik"
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear the call history"
+msgstr "Opkaldshistorik"
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "_Accounts"
+msgstr "Konti"
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "Edit your accounts"
+msgstr "Nuværende konto"
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "_Preferences"
+msgstr "Indstillinger"
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "Change your preferences"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:740
+msgid "_View"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:743
+msgid "_Help"
+msgstr "_Hjem"
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Contents"
+msgstr "Fortsæt"
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Open the manual"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:745
+msgid "About this application"
+msgstr "Godkendelse"
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "_Transfer"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "Transfer the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "_Show toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "Show the toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "_Dialpad"
+msgstr "Deaktiveret"
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "Show the dialpad"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "_Volume controls"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "Show the volume controls"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "_History"
+msgstr "Opkaldshistorik"
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "Calls history"
+msgstr "Opkaldshistorik"
+
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "_Address book"
+msgstr "Adressebog"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1003
+#: ../sflphone-client-gnome/src/uimanager.c:1044
+msgid "On _Hold"
+msgstr "I _venteposition"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1107
+msgid "_Call back"
+msgstr "_Besvar opkald"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1258
+msgid "Edit phone number"
+msgstr "Ændre telefonnummer"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1269
+msgid "Edit the phone number before making a call"
+msgstr "Ændre telefonnummeret før opkald"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
+msgid "Account Parameters"
+msgstr "Kontoparametre"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
+#: ../sflphone-client-gnome/src/config/assistant.c:314
+#: ../sflphone-client-gnome/src/config/assistant.c:427
+msgid "_Alias"
+msgstr "_Alias"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
+msgid "_Protocol"
+msgstr "_Protokol"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
+msgid "Unknown"
+msgstr "Ukendt"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
+#: ../sflphone-client-gnome/src/config/assistant.c:322
+#: ../sflphone-client-gnome/src/config/assistant.c:435
+msgid "_Host name"
+msgstr "_Værtsnavn"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
+#: ../sflphone-client-gnome/src/config/assistant.c:330
+#: ../sflphone-client-gnome/src/config/assistant.c:443
+msgid "_User name"
+msgstr "_Brugernavn"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:346
+#: ../sflphone-client-gnome/src/config/assistant.c:458
+msgid "_Password"
+msgstr "_Adgangskode"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:363
+#: ../sflphone-client-gnome/src/config/assistant.c:473
+msgid "Show password"
+msgstr "Adgangskode"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:368
+#: ../sflphone-client-gnome/src/config/assistant.c:478
+msgid "_Voicemail number"
+msgstr "_Nummer for talebesked"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
+msgid "Authentication"
+msgstr "Godkendelse"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
+msgid "Secret"
+msgstr "Hemmelig"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
+msgid "Credential"
+msgstr "Legitimationsoplysning"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
+msgid "Authentication name"
+msgstr "Godkendelsesnavn"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
+msgid "Password"
+msgstr "Adgangskode"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
+msgid "Security"
+msgstr "Sikkerhed"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
+msgid "Use TLS transport (sips)"
+msgstr "Benyt TLS transport (sips)"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
+msgid "SRTP key exchange"
+msgstr "SRTP-nøgleudveksling"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
+msgid "Disabled"
+msgstr "Deaktiveret"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
+msgid "Registration"
+msgstr "Registrering"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
+msgid "Registration expire"
+msgstr "Forældelse af registrering"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
+msgid "_Comply with RFC 3263"
+msgstr "_Overhold RFC 3263"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
+msgid "Network Interface"
+msgstr "Netværk kan ikke nås"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
+msgid "Local address"
+msgstr "Lokal adresse"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
+msgid "Local port"
+msgstr "Lokal port"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
+msgid "Published address"
+msgstr "Offentliggjort adresse"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+msgid "Using STUN"
+msgstr "Ved brug af STUN "
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
+msgid "STUN server URL"
+msgstr "STUN serveradresse"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
+msgid "Same as local parameters"
+msgstr "Samme som lokale parametre"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
+msgid "Set published address and port:"
+msgstr "Konfigurer offentliggjort adresse og port:"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
+msgid "Published port"
+msgstr "Offentliggjort port"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
+msgid "Account settings"
+msgstr "Kontoindstillinger"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
+msgid "Basic"
+msgstr "Grundlæggende"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
+msgid "Advanced"
+msgstr "Advanceret"
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:164
+msgid "Server returned \"%s\" (%d)"
+msgstr "Server svarede \""
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
+msgid "Protocol"
+msgstr "Protokol"
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:396
+msgid "Status"
+msgstr "Status"
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:474
+msgid "Accounts"
+msgstr "Konti"
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:484
+msgid "Configured Accounts"
+msgstr "Oprettede konti"
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
+msgid "There is %d active account"
+msgid_plural "There are %d active accounts"
+msgstr[0] " aktiv konto"
+msgstr[1] " aktiv konto"
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
+msgid "You have no active account"
+msgstr "Der er ingen aktive konti"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
+msgid "General"
+msgstr "Generelt"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:312
+msgid "_Use Evolution address books"
+msgstr "_Benyt Evolution adressekartotek"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:319
+msgid "Download limit :"
+msgstr "Download begrænsning :"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:327
+msgid "cards"
+msgstr "kort"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:333
+msgid "_Display contact photo if available"
+msgstr "Vis _kontaktbillede hvis tilgængeligt"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:341
+msgid "Fields from Evolution's address books"
+msgstr "Felter fra Evolutions adressekartotek"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:345
+msgid "_Work"
+msgstr "_Arbejde"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:351
+msgid "_Home"
+msgstr "_Hjem"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:357
+msgid "_Mobile"
+msgstr "_Mobil"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:364
+msgid "Address Books"
+msgstr "Adressekartoteker"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:368
+msgid "Select which Evolution address books to use"
+msgstr "Vælg hvilke af Evolutions adressekartoteker skal benyttes"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:404
+#: ../sflphone-client-gnome/src/config/audioconf.c:577
+msgid "Name"
+msgstr "Navn"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:75
+#, c-format
+msgid "This assistant is now finished."
+msgstr "Denne vejledning er nu fuldført"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:77
+msgid ""
+"You can at any time check your registration state or modify your accounts "
+"parameters in the Options/Accounts window."
+msgstr ""
+"Du kan til enhver tid undersøge din registrering eller ændre dine kontis "
+"parametre i vinduet Indstillinger/Konti"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:80
+msgid "Alias"
+msgstr "Alias"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:84
+msgid "Server"
+msgstr "Server"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:88
+msgid "Username"
+msgstr "Brugernavn"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:92
+msgid "Security: "
+msgstr "Sikkerhed: "
+
+#: ../sflphone-client-gnome/src/config/assistant.c:94
+msgid "SRTP/ZRTP draft-zimmermann"
+msgstr "SRTP/ZRTP draft-zimmermann"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:96
+msgid "None"
+msgstr "Ingen"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:229
+msgid "SFLphone account creation wizard"
+msgstr "SFLphone-guiden til oprettelse af konto"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:255
+msgid "Welcome to the Account creation wizard of SFLphone!"
+msgstr "Velkommen til kontooperettelsesvejledning for SFLphone"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:256
+msgid "This installation wizard will help you configure an account."
+msgstr ""
+"Denne installeringsvejledning vil hjælpe dig med at konfigurere en konto"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:270
+msgid "VoIP Protocols"
+msgstr "VoIP protokoller"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:270
+msgid "Select an account type"
+msgstr "Vælg en kontotype"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:272
+msgid "SIP (Session Initiation Protocol)"
+msgstr "SIP (Session Initiation Protocol)"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:274
+msgid "IAX2 (InterAsterix Exchange)"
+msgstr "IAX2 (InterAsterix Exchange)"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:288
+msgid "Account"
+msgstr "Konto"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:288
+msgid "Please select one of the following options"
+msgstr "Vælg en af følgende indstillinger"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:290
+msgid "Create a free SIP/IAX2 account on sflphone.org"
+msgstr "Opret en gratis SIP/IAX2 konto hos sflphone.org"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:292
+msgid "Register an existing SIP or IAX2 account"
+msgstr "Registrer en eksisterende SIP eller IAX2 konto"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:306
+msgid "SIP account settings"
+msgstr "SIP kontoindstillinger"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:419
+msgid "Please fill the following information"
+msgstr "Udfyld venligst følgende information"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:376
+#: ../sflphone-client-gnome/src/config/assistant.c:405
+msgid "Secure communications with _ZRTP"
+msgstr "Sikker kommunikation med _ZRTP"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:389
+msgid "Optional email address"
+msgstr "Valgfri emailadresse"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:389
+msgid "This email address will be used to send your voicemail messages."
+msgstr "Denne emailadresse vil blive brugt til at sende dig indtalte beskeder"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:397
+msgid "_Email address"
+msgstr "_Emailadresse"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:419
+msgid "IAX2 account settings"
+msgstr "IAX2 kontoindstillinger"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:496
+msgid "Network Address Translation (NAT)"
+msgstr "Network Address Translation (NAT)"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:496
+msgid "You should probably enable this if you are behind a firewall."
+msgstr "Du opfordres til at aktivere dette hvis du er bag en firewall"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:505
+msgid "E_nable STUN"
+msgstr "_Benyt STUN"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:512
+msgid "_STUN server"
+msgstr "_STUN server"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:526
+msgid "Account Registration"
+msgstr "Kontoregistrering"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:526
+msgid "Congratulations!"
+msgstr "Tillykke!"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:582
+msgid "Frequency"
+msgstr "Frekvens"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:587
+msgid "Bitrate"
+msgstr "Bithastighed"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:592
+msgid "Bandwidth"
+msgstr "Båndbredde"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:670
+msgid "ALSA plugin"
+msgstr "ALSA plugin"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:692
+msgid "Output"
+msgstr "Uddata"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:714
+msgid "Input"
+msgstr "Inddata"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:749
+msgid "_Voice Activity Detection"
+msgstr "_Detektering af taleaktivitet"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:759
+msgid "_Noise Reduction (Narrow-Band Companding)"
+msgstr "_Støjreducering (Narrow-Band Companding)"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:800
+msgid "Sound Manager"
+msgstr "Lydhåndtering"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:809
+msgid "_Pulseaudio"
+msgstr "_PulseAudio"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
+msgid "_ALSA"
+msgstr "_ALSA"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:819
+msgid "ALSA settings"
+msgstr "ALSA indstillinger"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:836
+msgid "Codecs"
+msgstr "Codecs"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:865
+msgid "Recordings"
+msgstr "Optagelser"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:869
+msgid "Destination folder"
+msgstr "Destinationsmappe"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
+msgid "Select a folder"
+msgstr "Vælg en mappe"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
+msgid "Ringtones"
+msgstr "Ringetoner"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
+msgid "_Enable ringtones"
+msgstr "Aktiver _ringetoner"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:891
+msgid "Choose a ringtone"
+msgstr "Vælg en ringetone"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:897
+msgid "Audio Files"
+msgstr "Lydfiler"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:130
+msgid "URL Argument"
+msgstr "Adresseargument"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:135
+msgid "Custom commands on incoming calls with URL"
+msgstr "Brugerdefinerede kommandoer ved indgående opkald med webadresse"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:138
+#, c-format
+msgid "%s will be replaced with the passed URL."
+msgstr "%s vil blive erstattet med den givne webadresse."
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:141
+msgid "Trigger on specific _SIP header"
+msgstr "Udløse ved specifik _SIP protokolhoved"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:150
+msgid "Trigger on _IAX2 URL"
+msgstr "Udløse ved _IAX2 webadresse"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:155
+msgid "Command to _run"
+msgstr "Kommando som skal _kaldes"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:165
+msgid "Phone number rewriting"
+msgstr "Omskrivning af telefonnummer"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:169
+msgid "_Prefix dialed numbers with"
+msgstr "_Præfiks for indtastede numre"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
+msgid ""
+"This profile is used when you want to reach a remote peer simply by typing a "
+"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
+"also be used if no account can be matched to an incoming or outgoing call."
+msgstr ""
+"Denne profil benyttes når du ønsker at kontakte en ekstern peer ved blot at "
+"indtaste en sip-adresse såsom <b>sip:eksternpeer</b>. De indstillinger som "
+"du definerer her vil også benyttes hvis ingen konto kan tilknyttes et "
+"indgående eller udgående opkald."
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
+msgid "Desktop Notifications"
+msgstr "Meddelelser"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
+msgid "_Enable notifications"
+msgstr "_Aktiver meddelelser"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
+msgid "System Tray Icon"
+msgstr "Systembakke-ikon"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+msgid "_Popup main window on incoming call"
+msgstr "_Vis hovedvindue ved indgående opkald"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
+msgid "Ne_ver popup main window"
+msgstr "Aldrig _pop-op hovedvindue"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
+msgid "Hide SFLphone window on _startup"
+msgstr "Skjul SFLphone vinduet ved _start"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
+msgid "Calls History"
+msgstr "Opkaldshistorik"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
+msgid "_Keep my history for at least"
+msgstr "_Gem min historik i mindst"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
+msgid "days"
+msgstr "dage"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
+msgid "Preferences"
+msgstr "Indstillinger"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
+msgid "Audio"
+msgstr "Audio"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
+msgid "Address Book"
+msgstr "Adressebog"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
+msgid "Hooks"
+msgstr "Hooks"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
+msgid "Direct IP calls"
+msgstr "Direkte IP opkald"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:38
+msgid "Advanced options for TLS"
+msgstr "Advancerede indstillinger for TLS"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:56
+msgid "TLS transport"
+msgstr "TLS transport"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:60
+msgid ""
+"TLS transport can be used along with UDP for those calls that would\n"
+"require secure sip transactions (aka SIPS). You can configure a different\n"
+"TLS transport for each account. However, each of them will run on a "
+"dedicated\n"
+"port, different one from each other\n"
+msgstr ""
+"TLS transport kan benyttes sammen med UDP for de opkald som kræver\n"
+"sikker sip transaktion (også kaldet SIPS). Du kan konfigurere forskellige\n"
+"TLS transporter for de enkelte konti. Bemærk dog at de hver vil benytte\n"
+"en dedikeret port forskellig fra hinanden.\n"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
+msgid "Certificate of Authority list"
+msgstr "Autoritetscertifikatsliste"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
+msgid "Choose a CA list file (optional)"
+msgstr "Vælg en fil med en autoritetscertifikatsliste (valgfri)"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
+msgid "Public endpoint certificate file"
+msgstr "Offentlig endpoint certifikatsfil"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
+msgid "Choose a public endpoint certificate (optional)"
+msgstr "Vælg et offentligt endpoint-certifikat (valgfri)"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
+msgid "Choose a private key file (optional)"
+msgstr "Vælg en privat nøglefil (valgfri)"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
+msgid "Password for the private key"
+msgstr "Adgangskode for den private nøgle"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
+msgid "TLS protocol method"
+msgstr "TLS protokolmetode"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
+msgid "TLS cipher list"
+msgstr "TLS cifferliste"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
+msgid "Server name instance for outgoing TLS connection"
+msgstr "Server navneinstans for udgående TLS forbindelse"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
+msgid "Negotiation timeout (sec:msec)"
+msgstr "Forhandlingstimeout"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
+msgid "Verify incoming certificates, as a server"
+msgstr "Udfør kontrol af indgående certifikater, som en server"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
+msgid "Verify certificates from answer, as a client"
+msgstr "Udfør kontrol af certifikater fra svar, som en klient"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
+msgid "Require certificate for incoming tls connections"
+msgstr "Kræv certifikat for indgående TLS forbindelser"
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:49
+msgid "ZRTP Options"
+msgstr "ZRTP indstillinger"
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:69
+msgid "Send Hello Hash in S_DP"
+msgstr "Send \"Hello Hash\" i S_DP"
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:75
+msgid "Ask User to Confirm SAS"
+msgstr "_Spørg bruger om at godkende SAS"
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:81
+msgid "_Warn if ZRTP not supported"
+msgstr "_Advar hvis ZRTP ikke understøttes"
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:87
+msgid "Display SAS once for hold events"
+msgstr "_Vis SAS en enkelt gang for vente-hændelser"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:58
+msgid "Search all"
+msgstr "Søg alle"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:59
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:72
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:84
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:96
+msgid "Click here to change the search type"
+msgstr "Klik her for at ændre søgningstypen"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:71
+msgid "Search by missed call"
+msgstr "Søg i ubesvarede opkald"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:83
+msgid "Search by incoming call"
+msgstr "Søg i indgående opkald"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:95
+msgid "Search by outgoing call"
+msgstr "Søg i udgående opkald"
+
+#~ msgid "IP call - %s"
+#~ msgstr "IP opkald - %s"
+
+#~ msgid "Codec"
+#~ msgstr "Kodning"
+
+#~ msgid "Network"
+#~ msgstr "Netværk"
+
+#~ msgid "Manually"
+#~ msgstr "Manuelt"
+
+#~ msgid "There "
+#~ msgstr "Der "
+
+#~ msgid "is "
+#~ msgstr "er "
+
+#~ msgid "are "
+#~ msgstr "er "
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#~ msgid "_Mute other applications during a call"
+#~ msgstr "_Dæmp andre programmer ved opkald"
+
+#~ msgid "SIP Port"
+#~ msgstr "SIP Port"
+
+#~ msgid "UDP Transport"
+#~ msgstr "UDP transport"
+
+#~ msgid "Enable voicemail _notifications"
+#~ msgstr "Aktiver _talebeskedsmeddelelser"
+
+#~ msgid "Store SIP credentials as MD5 hash"
+#~ msgstr "Gem SIP-legitimationsoplysninger som _MD5-hash-værdi"
diff --git a/lang/de/de.po b/lang/de/de.po
index 7459095a3906ed0ec4b4a2bfbc536c27aefbce96..ca1afd15a46c3577ef7821d053d5730e495373e1 100644
--- a/lang/de/de.po
+++ b/lang/de/de.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: sflphone\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-14 11:18-0400\n"
-"PO-Revision-Date: 2009-10-15 00:00+0000\n"
+"POT-Creation-Date: 2009-12-03 10:22-0500\n"
+"PO-Revision-Date: 2009-10-26 20:46+0000\n"
"Last-Translator: Maxime Chambreuil <maxime.chambreuil@gmail.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"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-10-26 15:48+0000\n"
+"X-Launchpad-Export-Date: 2009-12-03 15:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: ../sflphone-client-gnome/src/accountlist.c:175
@@ -60,25 +60,15 @@ msgstr "Ungültiger Stun server"
msgid "Invalid"
msgstr "Ungültig"
-#: ../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:83
-#: ../sflphone-client-gnome/src/actions.c:919
-#: ../sflphone-client-gnome/src/actions.c:926
+#: ../sflphone-client-gnome/src/actions.c:98
msgid "Using account"
msgstr "Mit Konto"
-#: ../sflphone-client-gnome/src/actions.c:89
+#: ../sflphone-client-gnome/src/actions.c:104
msgid "No registered accounts"
msgstr "Kein registriertes Konto"
-#: ../sflphone-client-gnome/src/actions.c:268
+#: ../sflphone-client-gnome/src/actions.c:285
msgid ""
"Unable to connect to the SFLphone server.\n"
"Make sure the daemon is running."
@@ -86,22 +76,18 @@ msgstr ""
"SFLphone Server kann nicht verbunden werden. Stellen Sie sicher, dass der "
"Dämon läuft."
-#: ../sflphone-client-gnome/src/actions.c:913
-#, c-format
-msgid "IP call - %s"
-msgstr "IP Anruf - %s"
-
-#: ../sflphone-client-gnome/src/actions.c:922
-msgid "Codec"
-msgstr "Codec"
+#: ../sflphone-client-gnome/src/actions.c:589
+#: ../sflphone-client-gnome/src/actions.c:911
+msgid "Direct SIP call"
+msgstr ""
-#: ../sflphone-client-gnome/src/actions.c:1119
+#: ../sflphone-client-gnome/src/actions.c:1103
#, 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> )"
+"</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"
@@ -150,55 +136,55 @@ msgstr "Laufende Anrufe."
msgid "Do you still want to quit?"
msgstr "Bitte bestätigen, dass Sie die Anwendung beenden möchten"
-#: ../sflphone-client-gnome/src/mainwindow.c:299
+#: ../sflphone-client-gnome/src/mainwindow.c:298
msgid "SFLphone Error"
msgstr "SFLphone Fehler"
-#: ../sflphone-client-gnome/src/mainwindow.c:391
+#: ../sflphone-client-gnome/src/mainwindow.c:392
#, c-format
msgid "ZRTP is not supported by peer %s\n"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:392
-msgid "Secure Communication Unavailable"
-msgstr ""
-
#: ../sflphone-client-gnome/src/mainwindow.c:393
-#: ../sflphone-client-gnome/src/mainwindow.c:415
-msgid "Continue"
-msgstr ""
+msgid "Secure Communication Unavailable"
+msgstr "Sichere Verbindung nicht verfügbar"
#: ../sflphone-client-gnome/src/mainwindow.c:394
#: ../sflphone-client-gnome/src/mainwindow.c:416
-#: ../sflphone-client-gnome/src/mainwindow.c:430
+msgid "Continue"
+msgstr "Weiter"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:395
+#: ../sflphone-client-gnome/src/mainwindow.c:417
+#: ../sflphone-client-gnome/src/mainwindow.c:431
msgid "Stop Call"
-msgstr ""
+msgstr "Anruf beenden"
-#: ../sflphone-client-gnome/src/mainwindow.c:413
+#: ../sflphone-client-gnome/src/mainwindow.c:414
#, c-format
msgid ""
"A %s error forced the call with %s to fall under unencrypted mode.\n"
"Exact reason: %s\n"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:414
+#: ../sflphone-client-gnome/src/mainwindow.c:415
msgid "ZRTP negotiation failed"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:427
+#: ../sflphone-client-gnome/src/mainwindow.c:428
#, c-format
msgid ""
"%s wants to stop using secure communication. Confirm will resume "
"conversation without SRTP.\n"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:428
+#: ../sflphone-client-gnome/src/mainwindow.c:429
msgid "Confirm Go Clear"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:429
+#: ../sflphone-client-gnome/src/mainwindow.c:430
msgid "Confirm"
-msgstr ""
+msgstr "Bestätigen"
#: ../sflphone-client-gnome/src/sflnotify.c:71
#: ../sflphone-client-gnome/src/sflnotify.c:91
@@ -211,6 +197,13 @@ msgstr "Konto %s : %s"
msgid "<i>From</i> %s"
msgstr "<i>Von</i> %s"
+#: ../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/sflnotify.c:111
#, c-format
msgid "Calling with %s account <i>%s</i>"
@@ -258,15 +251,15 @@ msgstr "Lautsprecher Lautstärke"
msgid "Mic volume"
msgstr "Mikro Lautstärke"
-#: ../sflphone-client-gnome/src/statusicon.c:91
+#: ../sflphone-client-gnome/src/statusicon.c:96
msgid "_Show main window"
msgstr "_Hauptfenster anzeigen"
-#: ../sflphone-client-gnome/src/statusicon.c:126
+#: ../sflphone-client-gnome/src/statusicon.c:131
msgid "SFLphone"
msgstr "SFLphone"
-#: ../sflphone-client-gnome/src/statusicon.c:127
+#: ../sflphone-client-gnome/src/statusicon.c:132
#, c-format
msgid "%i account configured"
msgid_plural "%i accounts configured"
@@ -274,203 +267,398 @@ msgstr[0] "%i Konto konfiguriert"
msgstr[1] "%i Konten konfiguriert"
#: ../sflphone-client-gnome/src/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:750
+#: ../sflphone-client-gnome/src/uimanager.c:693
+#: ../sflphone-client-gnome/src/uimanager.c:727
msgid "Voicemail"
msgstr "Voicemail"
-#: ../sflphone-client-gnome/src/uimanager.c:403
+#: ../sflphone-client-gnome/src/uimanager.c:117
+msgid "No address book selected"
+msgstr "Adressbuch"
+
+#: ../sflphone-client-gnome/src/uimanager.c:137
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "Address book"
+msgstr "Adressbuch"
+
+#: ../sflphone-client-gnome/src/uimanager.c:279
+msgid "Voicemail (%i)"
+msgstr "Voicemail (%i)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:342
msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
-msgstr ""
-"SFLphone ist ein VoIP Client (kompatibel mit SIP und IAX2 Protokolle)"
+msgstr "SFLphone ist ein VoIP Client (kompatibel mit SIP und IAX2 Protokolle)"
-#: ../sflphone-client-gnome/src/uimanager.c:406
+#: ../sflphone-client-gnome/src/uimanager.c:345
msgid "About SFLphone"
msgstr "Über SFLphone"
-#: ../sflphone-client-gnome/src/uimanager.c:1028
+#: ../sflphone-client-gnome/src/uimanager.c:719
+msgid "Call"
+msgstr "_Anruf"
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:1184
+msgid "_New call"
+msgstr "_Neuer Anruf"
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+msgid "Place a new call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:979
msgid "_Pick up"
msgstr "_Abnehmen"
-#: ../sflphone-client-gnome/src/uimanager.c:1040
-#: ../sflphone-client-gnome/src/uimanager.c:1081
+#: ../sflphone-client-gnome/src/uimanager.c:721
+msgid "Answer the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:991
+#: ../sflphone-client-gnome/src/uimanager.c:1032
msgid "_Hang up"
msgstr "A_uflegen"
-#: ../sflphone-client-gnome/src/uimanager.c:1052
-#: ../sflphone-client-gnome/src/uimanager.c:1093
-msgid "On _Hold"
+#: ../sflphone-client-gnome/src/uimanager.c:722
+msgid "Finish the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "O_n hold"
msgstr "in _Warteschleife"
-#: ../sflphone-client-gnome/src/uimanager.c:1064
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "Place the call on hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "O_ff hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "Place the call off hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:725
+#: ../sflphone-client-gnome/src/uimanager.c:1015
msgid "_Record"
msgstr "_Gespräch aufzeichnen"
-#: ../sflphone-client-gnome/src/uimanager.c:1154
+#: ../sflphone-client-gnome/src/uimanager.c:725
+msgid "Record the current conversation"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Configuration _Assistant"
+msgstr "Einrichtungsdatei"
+
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Run the configuration assistant"
+msgstr "Stun: Konfigurationsfehler"
+
+#: ../sflphone-client-gnome/src/uimanager.c:727
+msgid "Call your voicemail"
+msgstr "%d Voice Nachricht"
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "_Close"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "Minimize to system tray"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "_Quit"
+msgstr "_Editieren"
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "Quit the program"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:732
+msgid "_Edit"
+msgstr "_Editieren"
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "_Copy"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "Copy the selection"
+msgstr "Entfernen Sie das ausgewählte Konto"
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "_Paste"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "Paste the clipboard"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear _history"
+msgstr "Liste der vorherigen Anrufen _leeren"
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear the call history"
+msgstr "Vorherigen Anrufen leeren"
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "_Accounts"
+msgstr "_Konten"
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "Edit your accounts"
+msgstr "Aktuelles Konto"
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "_Preferences"
+msgstr "Einstellungen"
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "Change your preferences"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:740
+msgid "_View"
+msgstr "_Anzeigen"
+
+#: ../sflphone-client-gnome/src/uimanager.c:743
+msgid "_Help"
+msgstr "_Hilfe"
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Contents"
+msgstr "Weiter"
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Open the manual"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:745
+msgid "About this application"
+msgstr "Authentifizierung"
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "_Transfer"
+msgstr "Weiterleiten"
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "Transfer the call"
+msgstr "Weiterleiten zu : "
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "_Show toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "Show the toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "_Dialpad"
+msgstr "_Wählscheibe"
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "Show the dialpad"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "_Volume controls"
+msgstr "Lautstärke-Regler anzeigen"
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "Show the volume controls"
+msgstr "Lautstärke-Regler anzeigen"
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "_History"
+msgstr "Vorherige Anrufe"
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "Calls history"
+msgstr "Liste der vorherigen Anrufen"
+
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "_Address book"
+msgstr "Adressbuch"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1003
+#: ../sflphone-client-gnome/src/uimanager.c:1044
+msgid "On _Hold"
+msgstr "in _Warteschleife"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1107
msgid "_Call back"
msgstr "_Zurückrufen"
-#: ../sflphone-client-gnome/src/uimanager.c:1226
-msgid "_New call"
-msgstr "_Neuer Anruf"
-
-#: ../sflphone-client-gnome/src/uimanager.c:1300
+#: ../sflphone-client-gnome/src/uimanager.c:1258
msgid "Edit phone number"
msgstr "Nummer editieren"
-#: ../sflphone-client-gnome/src/uimanager.c:1311
+#: ../sflphone-client-gnome/src/uimanager.c:1269
msgid "Edit the phone number before making a call"
msgstr "Nummer vor dem Anruf editieren"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:164
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
msgid "Account Parameters"
-msgstr ""
+msgstr "Konto parameter"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:173
-#: ../sflphone-client-gnome/src/config/assistant.c:294
-#: ../sflphone-client-gnome/src/config/assistant.c:402
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
+#: ../sflphone-client-gnome/src/config/assistant.c:314
+#: ../sflphone-client-gnome/src/config/assistant.c:427
msgid "_Alias"
msgstr "_Alias"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:181
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
msgid "_Protocol"
msgstr "_Protokoll"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:199
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
msgid "Unknown"
msgstr "Unbekannt"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:209
-#: ../sflphone-client-gnome/src/config/assistant.c:302
-#: ../sflphone-client-gnome/src/config/assistant.c:410
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
+#: ../sflphone-client-gnome/src/config/assistant.c:322
+#: ../sflphone-client-gnome/src/config/assistant.c:435
msgid "_Host name"
msgstr "_Hostname"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:217
-#: ../sflphone-client-gnome/src/config/assistant.c:310
-#: ../sflphone-client-gnome/src/config/assistant.c:418
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
+#: ../sflphone-client-gnome/src/config/assistant.c:330
+#: ../sflphone-client-gnome/src/config/assistant.c:443
msgid "_User name"
msgstr "_Benutzername"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:234
-#: ../sflphone-client-gnome/src/config/assistant.c:326
-#: ../sflphone-client-gnome/src/config/assistant.c:433
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:346
+#: ../sflphone-client-gnome/src/config/assistant.c:458
msgid "_Password"
msgstr "_Passwort"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:254
-#: ../sflphone-client-gnome/src/config/assistant.c:344
-#: ../sflphone-client-gnome/src/config/assistant.c:449
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:363
+#: ../sflphone-client-gnome/src/config/assistant.c:473
+msgid "Show password"
+msgstr "Passwort"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:368
+#: ../sflphone-client-gnome/src/config/assistant.c:478
msgid "_Voicemail number"
msgstr "_Voicemail Nummer"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:340
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
msgid "Authentication"
-msgstr ""
+msgstr "Authentifizierung"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:341
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
msgid "Secret"
-msgstr ""
+msgstr "Geheim"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:466
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
msgid "Credential"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:501
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
msgid "Authentication name"
-msgstr ""
+msgstr "Authentifizierung Name"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:512
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
msgid "Password"
msgstr "Passwort"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:535
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:909
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:201
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
msgid "Security"
msgstr "Sicherheit"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:547
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:213
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
msgid "Use TLS transport (sips)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:552
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:218
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
msgid "SRTP key exchange"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:558
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
msgid "Disabled"
-msgstr ""
+msgstr "Deaktiviert"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
msgid "Registration"
-msgstr ""
+msgstr "Anmeldung"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:679
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
msgid "Registration expire"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
msgid "_Comply with RFC 3263"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
-msgid "Network"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
+msgid "Network Interface"
+msgstr "Kein netzwerk"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:707
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
msgid "Local address"
-msgstr ""
+msgstr "Adresse (lokal)"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:744
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
msgid "Local port"
+msgstr "Port (lokal)"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
+msgid "Published address"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:752
-msgid "Set published address and port:"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+msgid "Using STUN"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:756
-msgid "Using STUN "
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
+msgid "STUN server URL"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:761
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
msgid "Same as local parameters"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:764
-msgid "Manually"
-msgstr "Manuell"
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:769
-msgid "Published address"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
+msgid "Set published address and port:"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:777
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
msgid "Published port"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:785
-msgid "STUN server URL"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
msgid "Account settings"
msgstr "Kontoeinstellungen"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
msgid "Basic"
-msgstr ""
+msgstr "Allgemein"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:904
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
msgid "Advanced"
-msgstr ""
+msgstr "Erweitert"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:169
-msgid "Server returned \""
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:164
+#, c-format
+msgid "Server returned \"%s\" (%d)"
msgstr ""
#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
@@ -483,40 +671,26 @@ msgstr "Status"
#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:474
msgid "Accounts"
-msgstr ""
+msgstr "Konten"
#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:484
msgid "Configured Accounts"
msgstr "Konfigurierten Konten"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:505
-msgid "There "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "is "
-msgstr ""
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
+msgid "There is %d active account"
+msgid_plural "There are %d active accounts"
+msgstr[0] " aktive Konten"
+msgstr[1] " aktive Konten"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "are "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:508
-msgid " active account"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:509
-msgid "s"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:514
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
msgid "You have no active account"
-msgstr ""
+msgstr "Sie haben kein aktives Konto"
#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:443
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
msgid "General"
-msgstr ""
+msgstr "Allgemein"
#: ../sflphone-client-gnome/src/config/addressbook-config.c:312
msgid "_Use Evolution address books"
@@ -559,16 +733,16 @@ msgid "Select which Evolution address books to use"
msgstr "Adressbücher von Evolution zum verwenden auswählen"
#: ../sflphone-client-gnome/src/config/addressbook-config.c:404
-#: ../sflphone-client-gnome/src/config/audioconf.c:578
+#: ../sflphone-client-gnome/src/config/audioconf.c:577
msgid "Name"
msgstr "Name"
-#: ../sflphone-client-gnome/src/config/assistant.c:69
+#: ../sflphone-client-gnome/src/config/assistant.c:75
#, c-format
msgid "This assistant is now finished."
msgstr "Assistent beendet."
-#: ../sflphone-client-gnome/src/config/assistant.c:71
+#: ../sflphone-client-gnome/src/config/assistant.c:77
msgid ""
"You can at any time check your registration state or modify your accounts "
"parameters in the Options/Accounts window."
@@ -576,213 +750,207 @@ msgstr ""
"Sie können jederzeit Ihres Registrierungsstatus überprüfen oder "
"IhreKontoparameter ändern (Optionen/Konten)."
-#: ../sflphone-client-gnome/src/config/assistant.c:74
+#: ../sflphone-client-gnome/src/config/assistant.c:80
msgid "Alias"
msgstr "Alias"
-#: ../sflphone-client-gnome/src/config/assistant.c:78
+#: ../sflphone-client-gnome/src/config/assistant.c:84
msgid "Server"
msgstr "Server"
-#: ../sflphone-client-gnome/src/config/assistant.c:82
+#: ../sflphone-client-gnome/src/config/assistant.c:88
msgid "Username"
msgstr "Benutzername"
-#: ../sflphone-client-gnome/src/config/assistant.c:86
+#: ../sflphone-client-gnome/src/config/assistant.c:92
msgid "Security: "
-msgstr ""
+msgstr "Sicherheit: "
-#: ../sflphone-client-gnome/src/config/assistant.c:88
+#: ../sflphone-client-gnome/src/config/assistant.c:94
msgid "SRTP/ZRTP draft-zimmermann"
msgstr "SRTP/ZRTP draft-zimmermann"
-#: ../sflphone-client-gnome/src/config/assistant.c:90
-#: ../sflphone-client-gnome/src/config/assistant.c:182
+#: ../sflphone-client-gnome/src/config/assistant.c:96
msgid "None"
msgstr "Nichts"
-#: ../sflphone-client-gnome/src/config/assistant.c:210
+#: ../sflphone-client-gnome/src/config/assistant.c:229
msgid "SFLphone account creation wizard"
msgstr "SFLphone Konto (Konfigurationsassistent)"
-#: ../sflphone-client-gnome/src/config/assistant.c:236
+#: ../sflphone-client-gnome/src/config/assistant.c:255
msgid "Welcome to the Account creation wizard of SFLphone!"
msgstr "Wilkommen zu SFLphone!"
-#: ../sflphone-client-gnome/src/config/assistant.c:237
+#: ../sflphone-client-gnome/src/config/assistant.c:256
msgid "This installation wizard will help you configure an account."
msgstr ""
"The Installationsassistent wird Ihnen helfen, ein Konto zu konfigurieren."
-#: ../sflphone-client-gnome/src/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "VoIP Protocols"
msgstr "VoIP Protokoll"
-#: ../sflphone-client-gnome/src/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "Select an account type"
msgstr "Kontotyp auswählen"
-#: ../sflphone-client-gnome/src/config/assistant.c:253
+#: ../sflphone-client-gnome/src/config/assistant.c:272
msgid "SIP (Session Initiation Protocol)"
msgstr "SIP (Session Initiation Protocol)"
-#: ../sflphone-client-gnome/src/config/assistant.c:255
+#: ../sflphone-client-gnome/src/config/assistant.c:274
msgid "IAX2 (InterAsterix Exchange)"
msgstr "IAX2 (InterAsterisk Exchange)"
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Account"
msgstr "Konto"
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Please select one of the following options"
msgstr "Bitte eine Option auswählen"
-#: ../sflphone-client-gnome/src/config/assistant.c:271
+#: ../sflphone-client-gnome/src/config/assistant.c:290
msgid "Create a free SIP/IAX2 account on sflphone.org"
msgstr "SIP/IAX2 Konto bei sflphone.org erstellen lassen"
-#: ../sflphone-client-gnome/src/config/assistant.c:273
+#: ../sflphone-client-gnome/src/config/assistant.c:292
msgid "Register an existing SIP or IAX2 account"
msgstr "Existierendes SIP/IAX2 Konto registrieren"
-#: ../sflphone-client-gnome/src/config/assistant.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:306
msgid "SIP account settings"
msgstr "Konfiguration des SIP Konto"
-#: ../sflphone-client-gnome/src/config/assistant.c:286
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "Please fill the following information"
msgstr "Folgende Informationen bitte ausfühlen"
-#: ../sflphone-client-gnome/src/config/assistant.c:352
-#: ../sflphone-client-gnome/src/config/assistant.c:381
+#: ../sflphone-client-gnome/src/config/assistant.c:376
+#: ../sflphone-client-gnome/src/config/assistant.c:405
msgid "Secure communications with _ZRTP"
-msgstr ""
+msgstr "Sichere Kommunikation mit _ZRTP"
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "Optional email address"
msgstr "Fakultative E-mail-Adresse"
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
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-gnome/src/config/assistant.c:373
+#: ../sflphone-client-gnome/src/config/assistant.c:397
msgid "_Email address"
msgstr "_Email"
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "IAX2 account settings"
msgstr "Konfiguration des IAX2 Konto"
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "Network Address Translation (NAT)"
msgstr "Network Address Translation (NAT)"
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "You should probably enable this if you are behind a firewall."
-msgstr ""
-"Sie sollten dieses einschalten, falls Sie hinter einer Firewall sind."
+msgstr "Sie sollten dieses einschalten, falls Sie hinter einer Firewall sind."
-#: ../sflphone-client-gnome/src/config/assistant.c:476
+#: ../sflphone-client-gnome/src/config/assistant.c:505
msgid "E_nable STUN"
msgstr "STUN Ei_nschalten"
-#: ../sflphone-client-gnome/src/config/assistant.c:483
+#: ../sflphone-client-gnome/src/config/assistant.c:512
msgid "_STUN server"
msgstr "_STUN Server"
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Account Registration"
msgstr "Konto Registrierung"
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Congratulations!"
msgstr "Gratulation!"
-#: ../sflphone-client-gnome/src/config/audioconf.c:583
+#: ../sflphone-client-gnome/src/config/audioconf.c:582
msgid "Frequency"
msgstr "Frequenz"
-#: ../sflphone-client-gnome/src/config/audioconf.c:588
+#: ../sflphone-client-gnome/src/config/audioconf.c:587
msgid "Bitrate"
msgstr "Bitrate"
-#: ../sflphone-client-gnome/src/config/audioconf.c:593
+#: ../sflphone-client-gnome/src/config/audioconf.c:592
msgid "Bandwidth"
msgstr "Bandbreite"
-#: ../sflphone-client-gnome/src/config/audioconf.c:673
+#: ../sflphone-client-gnome/src/config/audioconf.c:670
msgid "ALSA plugin"
msgstr "ALSA Plugin"
-#: ../sflphone-client-gnome/src/config/audioconf.c:695
+#: ../sflphone-client-gnome/src/config/audioconf.c:692
msgid "Output"
msgstr "Ausgabe"
-#: ../sflphone-client-gnome/src/config/audioconf.c:717
+#: ../sflphone-client-gnome/src/config/audioconf.c:714
msgid "Input"
msgstr "Eingabe"
-#: ../sflphone-client-gnome/src/config/audioconf.c:752
+#: ../sflphone-client-gnome/src/config/audioconf.c:749
msgid "_Voice Activity Detection"
msgstr "\"Voice Activity\" Erkennung"
-#: ../sflphone-client-gnome/src/config/audioconf.c:762
+#: ../sflphone-client-gnome/src/config/audioconf.c:759
msgid "_Noise Reduction (Narrow-Band Companding)"
msgstr "_Geräuschreduzierung (Narrow-Band Companding)"
-#: ../sflphone-client-gnome/src/config/audioconf.c:798
+#: ../sflphone-client-gnome/src/config/audioconf.c:800
msgid "Sound Manager"
msgstr "Sound Manager"
-#: ../sflphone-client-gnome/src/config/audioconf.c:807
+#: ../sflphone-client-gnome/src/config/audioconf.c:809
msgid "_Pulseaudio"
msgstr "Pulseaudio"
-#: ../sflphone-client-gnome/src/config/audioconf.c:811
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
msgid "_ALSA"
msgstr "ALSA"
-#: ../sflphone-client-gnome/src/config/audioconf.c:816
-msgid "_Mute other applications during a call"
-msgstr "_Während eines Anrufs andere Anwendungen stumm schalten"
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:823
+#: ../sflphone-client-gnome/src/config/audioconf.c:819
msgid "ALSA settings"
msgstr "ALSA Konfiguration"
-#: ../sflphone-client-gnome/src/config/audioconf.c:840
+#: ../sflphone-client-gnome/src/config/audioconf.c:836
msgid "Codecs"
msgstr "Codecs"
-#: ../sflphone-client-gnome/src/config/audioconf.c:869
+#: ../sflphone-client-gnome/src/config/audioconf.c:865
msgid "Recordings"
-msgstr ""
+msgstr "Aufnahmen"
-#: ../sflphone-client-gnome/src/config/audioconf.c:873
+#: ../sflphone-client-gnome/src/config/audioconf.c:869
msgid "Destination folder"
msgstr "Zielverzeichnis"
-#: ../sflphone-client-gnome/src/config/audioconf.c:877
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
msgid "Select a folder"
msgstr "Verzeichnis auswählen"
-#: ../sflphone-client-gnome/src/config/audioconf.c:883
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
msgid "Ringtones"
msgstr "Klingeltöne"
-#: ../sflphone-client-gnome/src/config/audioconf.c:889
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
msgid "_Enable ringtones"
msgstr "Klingeltöne _einschalten"
-#: ../sflphone-client-gnome/src/config/audioconf.c:895
+#: ../sflphone-client-gnome/src/config/audioconf.c:891
msgid "Choose a ringtone"
msgstr "Klingelton auswählen"
-#: ../sflphone-client-gnome/src/config/audioconf.c:901
+#: ../sflphone-client-gnome/src/config/audioconf.c:897
msgid "Audio Files"
msgstr "Audio Dateien"
@@ -819,86 +987,66 @@ msgstr "Telefonnummer umformen"
msgid "_Prefix dialed numbers with"
msgstr "_Präfix vor Nummern einfügen"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:195
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
msgid ""
"This profile is used when you want to reach a remote peer simply by typing a "
"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
"also be used if no account can be matched to an incoming or outgoing call."
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:274
-msgid "SIP Port"
-msgstr "SIP Port"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:281
-msgid "UDP Transport"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:319
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
msgid "Desktop Notifications"
msgstr "Desktopbenachrichtigungen"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:323
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
msgid "_Enable notifications"
msgstr "Benachrichtigungen _einschalten"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:329
-msgid "Enable voicemail _notifications"
-msgstr "_Benachrichtigung für Voice Nachrichten"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:341
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
msgid "System Tray Icon"
msgstr "Benachrichtigungsfeld (\"System Tray\") Icon"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
msgid "_Popup main window on incoming call"
msgstr "Hauptfenster anzeigen wenn eingehendes Gespräch"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:349
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
msgid "Ne_ver popup main window"
msgstr "_Hauptfenster nie anzeigen"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:353
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
msgid "Hide SFLphone window on _startup"
msgstr "_Unsichtbar beim Start"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:359
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
msgid "Calls History"
msgstr "Liste der vorherigen Anrufen"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:362
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
msgid "_Keep my history for at least"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:373
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
msgid "days"
msgstr "Tage"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:377
-msgid "Configuration File"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:379
-msgid "Store SIP credentials as MD5 hash"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:423
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
msgid "Preferences"
msgstr "Einstellungen"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:448
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
msgid "Audio"
msgstr "Audio"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
msgid "Address Book"
msgstr "Adressbuch"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:458
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
msgid "Hooks"
msgstr "Hooks"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:468
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
msgid "Direct IP calls"
msgstr ""
@@ -906,11 +1054,11 @@ msgstr ""
msgid "Advanced options for TLS"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:55
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:56
msgid "TLS transport"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:59
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:60
msgid ""
"TLS transport can be used along with UDP for those calls that would\n"
"require secure sip transactions (aka SIPS). You can configure a different\n"
@@ -919,101 +1067,134 @@ msgid ""
"port, different one from each other\n"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:100
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
msgid "Certificate of Authority list"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:104
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
msgid "Choose a CA list file (optional)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:115
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
msgid "Public endpoint certificate file"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:119
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
msgid "Choose a public endpoint certificate (optional)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:134
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
msgid "Choose a private key file (optional)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:145
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
msgid "Password for the private key"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:168
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
msgid "TLS protocol method"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:202
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
msgid "TLS cipher list"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:211
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
msgid "Server name instance for outgoing TLS connection"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:219
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
msgid "Negotiation timeout (sec:msec)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:236
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
msgid "Verify incoming certificates, as a server"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:242
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
msgid "Verify certificates from answer, as a client"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:248
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
msgid "Require certificate for incoming tls connections"
msgstr ""
#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:49
msgid "ZRTP Options"
-msgstr ""
+msgstr "ZRTP Optionen"
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:68
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:69
msgid "Send Hello Hash in S_DP"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:74
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:75
msgid "Ask User to Confirm SAS"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:80
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:81
msgid "_Warn if ZRTP not supported"
-msgstr ""
+msgstr "_Warnung wenn ZRTP nicht unterstüzt"
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:86
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:87
msgid "Display SAS once for hold events"
msgstr ""
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:58
msgid "Search all"
msgstr "Suche alle"
-#: ../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
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:59
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:72
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:84
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:96
msgid "Click here to change the search type"
msgstr "Klicken Sie hier, um Suchtyp zu wechseln"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:71
msgid "Search by missed call"
msgstr "Suche nach Anruf in Abwesenheit"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:83
msgid "Search by incoming call"
msgstr "Suche nach eingehenden Anruf"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:95
msgid "Search by outgoing call"
msgstr "Suche nach ausgehenden Anru"
+#~ msgid "IP call - %s"
+#~ msgstr "IP Anruf - %s"
+
+#~ msgid "Codec"
+#~ msgstr "Codec"
+
+#~ msgid "Network"
+#~ msgstr "Netzwerk"
+
+#~ msgid "Manually"
+#~ msgstr "Manuell"
+
+#~ msgid "There "
+#~ msgstr "Es "
+
+#~ msgid "is "
+#~ msgstr "gibt "
+
+#~ msgid "are "
+#~ msgstr "gibt "
+
+#~ msgid "_Mute other applications during a call"
+#~ msgstr "_Während eines Anrufs andere Anwendungen stumm schalten"
+
+#~ msgid "SIP Port"
+#~ msgstr "SIP Port"
+
+#~ msgid "UDP Transport"
+#~ msgstr "UDP Transport"
+
+#~ msgid "Enable voicemail _notifications"
+#~ msgstr "_Benachrichtigung für Voice Nachrichten"
+
#~ msgctxt "account state"
#~ msgid "Error"
#~ msgstr "Fehler"
@@ -1050,9 +1231,6 @@ msgstr "Suche nach ausgehenden Anru"
#~ msgid "Default account"
#~ msgstr "Default Konto"
-#~ msgid "Transfer to : "
-#~ msgstr "Weiterleiten zu : "
-
#~ msgid "SFLphone KDE Client"
#~ msgstr "SFLphone KDE Client"
@@ -1062,14 +1240,6 @@ msgstr "Suche nach ausgehenden Anru"
#~ msgid "Jérémy Quentin"
#~ msgstr "Jérémy Quentin"
-#~ msgctxt "NAME OF TRANSLATORS"
-#~ msgid "Your names"
-#~ msgstr "Ihre Namen, ,Launchpad Contributions:,Maxime Chambreuil,Sven Werlen"
-
-#~ msgctxt "EMAIL OF TRANSLATORS"
-#~ msgid "Your emails"
-#~ msgstr "Ihre E-Mail-Adressen,,,maxime.chambreuil@gmail.com,"
-
#~ msgid "Incoming call"
#~ msgstr "Eingehende Anrufe"
@@ -1085,12 +1255,6 @@ msgstr "Suche nach ausgehenden Anru"
#~ msgid "Main screen"
#~ msgstr "Hauptbildschirm"
-#~ msgid "Call history"
-#~ msgstr "Liste der vorherigen Anrufen"
-
-#~ msgid "Address book"
-#~ msgstr "Adressbuch"
-
#~ msgid "Edit before call"
#~ msgstr "Vor Aufruf bearbeiten"
@@ -1103,9 +1267,6 @@ msgstr "Suche nach ausgehenden Anru"
#~ msgid "Hold on"
#~ msgstr "In Warteschleife"
-#~ msgid "Transfer"
-#~ msgstr "Weiterleiten"
-
#~ msgid "Record"
#~ msgstr "Gespräch aufzeichnen"
@@ -1124,22 +1285,19 @@ msgstr "Suche nach ausgehenden Anru"
#~ 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."
+#~ "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."
-
-#~ msgid "Remove the selected account"
-#~ msgstr "Entfernen Sie das ausgewählte Konto"
+#~ "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."
#~ 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."
+#~ "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."
@@ -1161,8 +1319,9 @@ msgstr "Suche nach ausgehenden Anru"
#~ "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 verwendet das erste \"registrierte\" Konto in der Liste, wenn "
+#~ "Sie anrufen. Benutzen Sie die Pfeile, um die Anordnung der Kontos zu "
+#~ "ändern."
#~ msgid "Down"
#~ msgstr "Unten"
@@ -1248,9 +1407,6 @@ msgstr "Suche nach ausgehenden Anru"
#~ msgid "On start"
#~ msgstr "Beim Start"
-#~ msgid "Clear history"
-#~ msgstr "Vorherigen Anrufen leeren"
-
#~ msgid "Connection"
#~ msgstr "Anbindung"
@@ -1266,15 +1422,9 @@ msgstr "Suche nach ausgehenden Anru"
#~ msgid "Prefix dialed numbers with"
#~ msgstr "Präfix vor Nummern einfügen"
-#~ msgid "History"
-#~ msgstr "Vorherige Anrufe"
-
#~ msgid "Configure SFLphone"
#~ msgstr "Konfigurieren SFLphone"
-#~ msgid "Display volume controls"
-#~ msgstr "Lautstärke-Regler anzeigen"
-
#~ msgid "Display dialpad"
#~ msgstr "Wählscheibe anzeigen"
@@ -1285,27 +1435,6 @@ msgstr "Suche nach ausgehenden Anru"
#~ msgid "Attention:number of results exceeds max displayed."
#~ msgstr "Warnung: Anzahl Resultate überschreit definiertes Maximum"
-#~ msgid "_Help"
-#~ msgstr "_Hilfe"
-
-#~ msgid "_Call"
-#~ msgstr "_Anruf"
-
-#~ msgid "Clear _history"
-#~ msgstr "Liste der vorherigen Anrufen _leeren"
-
-#~ msgid "_Accounts"
-#~ msgstr "_Konten"
-
-#~ msgid "_Edit"
-#~ msgstr "_Editieren"
-
-#~ msgid "_Dialpad"
-#~ msgstr "_Wählscheibe"
-
-#~ msgid "_View"
-#~ msgstr "_Anzeigen"
-
#~ msgid "%s - %s"
#~ msgstr "%s - %s"
@@ -1317,3 +1446,15 @@ msgstr "Suche nach ausgehenden Anru"
#~ msgid "Port"
#~ msgstr "Port"
+
+#~ msgctxt "NAME OF TRANSLATORS"
+#~ msgid "Your names"
+#~ msgstr ""
+#~ "Ihre Namen, ,Launchpad Contributions:,Maxime Chambreuil,Sven Werlen, ,"
+#~ "Launchpad Contributions:,Maxime Chambreuil,Sven Werlen,Sven Werlen"
+
+#~ msgctxt "EMAIL OF TRANSLATORS"
+#~ msgid "Your emails"
+#~ msgstr ""
+#~ "Ihre E-Mail-Adressen,,,maxime.chambreuil@gmail.com,,,,maxime."
+#~ "chambreuil@gmail.com,,sven.werlen@gmail.com"
diff --git a/lang/es/es.po b/lang/es/es.po
index 3ec57681b12ed5d5eec3ed3c97bceb0784480856..a40c09ce90e8d1106ba4f53f66c7d832e4701a63 100644
--- a/lang/es/es.po
+++ b/lang/es/es.po
@@ -9,15 +9,15 @@ msgid ""
msgstr ""
"Project-Id-Version: SFLphone 0.9.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-14 11:18-0400\n"
-"PO-Revision-Date: 2009-10-14 23:39+0000\n"
+"POT-Creation-Date: 2009-12-03 10:22-0500\n"
+"PO-Revision-Date: 2009-10-26 20:46+0000\n"
"Last-Translator: Maxime Chambreuil <maxime.chambreuil@gmail.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"
-"X-Launchpad-Export-Date: 2009-10-26 15:48+0000\n"
+"X-Launchpad-Export-Date: 2009-12-03 15:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: ../sflphone-client-gnome/src/accountlist.c:175
@@ -62,25 +62,15 @@ msgstr "Servidor stun inválido"
msgid "Invalid"
msgstr "Inválido"
-#: ../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:83
-#: ../sflphone-client-gnome/src/actions.c:919
-#: ../sflphone-client-gnome/src/actions.c:926
+#: ../sflphone-client-gnome/src/actions.c:98
msgid "Using account"
msgstr "Usando la cuenta"
-#: ../sflphone-client-gnome/src/actions.c:89
+#: ../sflphone-client-gnome/src/actions.c:104
msgid "No registered accounts"
msgstr "Ninguna cuenta registrada"
-#: ../sflphone-client-gnome/src/actions.c:268
+#: ../sflphone-client-gnome/src/actions.c:285
msgid ""
"Unable to connect to the SFLphone server.\n"
"Make sure the daemon is running."
@@ -88,22 +78,18 @@ msgstr ""
"Incapaz de conectar con el servidor SFLphone.\n"
" Asegúrese que el demonio esté funcionando."
-#: ../sflphone-client-gnome/src/actions.c:913
-#, c-format
-msgid "IP call - %s"
-msgstr "Llamada IP - %s"
-
-#: ../sflphone-client-gnome/src/actions.c:922
-msgid "Codec"
-msgstr "Códec"
+#: ../sflphone-client-gnome/src/actions.c:589
+#: ../sflphone-client-gnome/src/actions.c:911
+msgid "Direct SIP call"
+msgstr "Llamadas IP directas"
-#: ../sflphone-client-gnome/src/actions.c:1119
+#: ../sflphone-client-gnome/src/actions.c:1103
#, 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> )"
+"</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"
@@ -152,31 +138,31 @@ msgstr "Hay llamadas en curso."
msgid "Do you still want to quit?"
msgstr "Aún quiere salir ?"
-#: ../sflphone-client-gnome/src/mainwindow.c:299
+#: ../sflphone-client-gnome/src/mainwindow.c:298
msgid "SFLphone Error"
msgstr "Error SFLphone"
-#: ../sflphone-client-gnome/src/mainwindow.c:391
+#: ../sflphone-client-gnome/src/mainwindow.c:392
#, c-format
msgid "ZRTP is not supported by peer %s\n"
msgstr "ZRTP no es compatible con %s\n"
-#: ../sflphone-client-gnome/src/mainwindow.c:392
+#: ../sflphone-client-gnome/src/mainwindow.c:393
msgid "Secure Communication Unavailable"
msgstr "Comunicación segura no disponible"
-#: ../sflphone-client-gnome/src/mainwindow.c:393
-#: ../sflphone-client-gnome/src/mainwindow.c:415
+#: ../sflphone-client-gnome/src/mainwindow.c:394
+#: ../sflphone-client-gnome/src/mainwindow.c:416
msgid "Continue"
msgstr "Seguir"
-#: ../sflphone-client-gnome/src/mainwindow.c:394
-#: ../sflphone-client-gnome/src/mainwindow.c:416
-#: ../sflphone-client-gnome/src/mainwindow.c:430
+#: ../sflphone-client-gnome/src/mainwindow.c:395
+#: ../sflphone-client-gnome/src/mainwindow.c:417
+#: ../sflphone-client-gnome/src/mainwindow.c:431
msgid "Stop Call"
msgstr "Terminar llamada"
-#: ../sflphone-client-gnome/src/mainwindow.c:413
+#: ../sflphone-client-gnome/src/mainwindow.c:414
#, c-format
msgid ""
"A %s error forced the call with %s to fall under unencrypted mode.\n"
@@ -185,11 +171,11 @@ msgstr ""
"Un error de %s obliga la llamada con %s a caer bajo un modo decifrado.\n"
"Razón exacta: %s\n"
-#: ../sflphone-client-gnome/src/mainwindow.c:414
+#: ../sflphone-client-gnome/src/mainwindow.c:415
msgid "ZRTP negotiation failed"
msgstr "Negociación ZRTP fracasada"
-#: ../sflphone-client-gnome/src/mainwindow.c:427
+#: ../sflphone-client-gnome/src/mainwindow.c:428
#, c-format
msgid ""
"%s wants to stop using secure communication. Confirm will resume "
@@ -198,11 +184,11 @@ msgstr ""
"%s quiere parar la comunicación segura. Confirmar reanudará la conversación "
"sin SRTP.\n"
-#: ../sflphone-client-gnome/src/mainwindow.c:428
+#: ../sflphone-client-gnome/src/mainwindow.c:429
msgid "Confirm Go Clear"
msgstr "Confirmar"
-#: ../sflphone-client-gnome/src/mainwindow.c:429
+#: ../sflphone-client-gnome/src/mainwindow.c:430
msgid "Confirm"
msgstr "Confirmar"
@@ -217,6 +203,13 @@ msgstr "%s cuenta : %s"
msgid "<i>From</i> %s"
msgstr "<i>De</i> %s"
+#: ../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/sflnotify.c:111
#, c-format
msgid "Calling with %s account <i>%s</i>"
@@ -266,15 +259,15 @@ msgstr "Volumen de altavoces"
msgid "Mic volume"
msgstr "Volumen del micrófono"
-#: ../sflphone-client-gnome/src/statusicon.c:91
+#: ../sflphone-client-gnome/src/statusicon.c:96
msgid "_Show main window"
msgstr "Mostrar ventana principal"
-#: ../sflphone-client-gnome/src/statusicon.c:126
+#: ../sflphone-client-gnome/src/statusicon.c:131
msgid "SFLphone"
msgstr "SFLphone"
-#: ../sflphone-client-gnome/src/statusicon.c:127
+#: ../sflphone-client-gnome/src/statusicon.c:132
#, c-format
msgid "%i account configured"
msgid_plural "%i accounts configured"
@@ -282,203 +275,397 @@ msgstr[0] "%i cuenta configurada"
msgstr[1] "%i cuentas configuradas"
#: ../sflphone-client-gnome/src/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:750
+#: ../sflphone-client-gnome/src/uimanager.c:693
+#: ../sflphone-client-gnome/src/uimanager.c:727
msgid "Voicemail"
msgstr "Mensaje de voz"
-#: ../sflphone-client-gnome/src/uimanager.c:403
+#: ../sflphone-client-gnome/src/uimanager.c:117
+msgid "No address book selected"
+msgstr "Libreta de contactos"
+
+#: ../sflphone-client-gnome/src/uimanager.c:137
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "Address book"
+msgstr "Libreta de contactos"
+
+#: ../sflphone-client-gnome/src/uimanager.c:279
+msgid "Voicemail (%i)"
+msgstr "Mensaje de voz (%i)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:342
msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
-msgstr ""
-"SFLphone es un teléfono VoIP compatible con los protocolos SIP y IAX2"
+msgstr "SFLphone es un teléfono VoIP compatible con los protocolos SIP y IAX2"
-#: ../sflphone-client-gnome/src/uimanager.c:406
+#: ../sflphone-client-gnome/src/uimanager.c:345
msgid "About SFLphone"
msgstr "Sobre SFLphone"
-#: ../sflphone-client-gnome/src/uimanager.c:1028
+#: ../sflphone-client-gnome/src/uimanager.c:719
+msgid "Call"
+msgstr "_Llamar"
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:1184
+msgid "_New call"
+msgstr "_Nueva llamada"
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+msgid "Place a new call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:979
msgid "_Pick up"
msgstr "_Descolgar"
-#: ../sflphone-client-gnome/src/uimanager.c:1040
-#: ../sflphone-client-gnome/src/uimanager.c:1081
+#: ../sflphone-client-gnome/src/uimanager.c:721
+msgid "Answer the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:991
+#: ../sflphone-client-gnome/src/uimanager.c:1032
msgid "_Hang up"
msgstr "_Colgar"
-#: ../sflphone-client-gnome/src/uimanager.c:1052
-#: ../sflphone-client-gnome/src/uimanager.c:1093
-msgid "On _Hold"
+#: ../sflphone-client-gnome/src/uimanager.c:722
+msgid "Finish the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "O_n hold"
msgstr "En _Espera"
-#: ../sflphone-client-gnome/src/uimanager.c:1064
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "Place the call on hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "O_ff hold"
+msgstr "Seguir"
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "Place the call off hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:725
+#: ../sflphone-client-gnome/src/uimanager.c:1015
msgid "_Record"
msgstr "G_rabar"
-#: ../sflphone-client-gnome/src/uimanager.c:1154
+#: ../sflphone-client-gnome/src/uimanager.c:725
+msgid "Record the current conversation"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Configuration _Assistant"
+msgstr "Archivo de configuración"
+
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Run the configuration assistant"
+msgstr "Error de configuración Stun"
+
+#: ../sflphone-client-gnome/src/uimanager.c:727
+msgid "Call your voicemail"
+msgstr "%d mensaje de voz"
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "_Close"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "Minimize to system tray"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "_Quit"
+msgstr "_Editar"
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "Quit the program"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:732
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "_Copy"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "Copy the selection"
+msgstr "Eliminar la cuenta seleccionada"
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "_Paste"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "Paste the clipboard"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear _history"
+msgstr "_Limpiar historial"
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear the call history"
+msgstr "Limpiar historial"
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "_Accounts"
+msgstr "_Cuentas"
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "Edit your accounts"
+msgstr "Cuenta actual"
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "_Preferences"
+msgstr "Preferencias"
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "Change your preferences"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:740
+msgid "_View"
+msgstr "_Ver"
+
+#: ../sflphone-client-gnome/src/uimanager.c:743
+msgid "_Help"
+msgstr "_Ayuda"
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Contents"
+msgstr "Seguir"
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Open the manual"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:745
+msgid "About this application"
+msgstr "Autentificación"
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "_Transfer"
+msgstr "Transferir"
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "Transfer the call"
+msgstr "Transferir a : "
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "_Show toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "Show the toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "_Dialpad"
+msgstr "Desactivado"
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "Show the dialpad"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "_Volume controls"
+msgstr "_Controles de volumen"
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "Show the volume controls"
+msgstr "_Controles de volumen"
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "_History"
+msgstr "Historia de Llamada"
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "Calls history"
+msgstr "Historia de Llamada"
+
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "_Address book"
+msgstr "Libreta de contactos"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1003
+#: ../sflphone-client-gnome/src/uimanager.c:1044
+msgid "On _Hold"
+msgstr "En _Espera"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1107
msgid "_Call back"
msgstr "_Llamar"
-#: ../sflphone-client-gnome/src/uimanager.c:1226
-msgid "_New call"
-msgstr "_Nueva llamada"
-
-#: ../sflphone-client-gnome/src/uimanager.c:1300
+#: ../sflphone-client-gnome/src/uimanager.c:1258
msgid "Edit phone number"
msgstr "Editar número de teléfono"
-#: ../sflphone-client-gnome/src/uimanager.c:1311
+#: ../sflphone-client-gnome/src/uimanager.c:1269
msgid "Edit the phone number before making a call"
msgstr "Editar el número de teléfono antes de llamar"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:164
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
msgid "Account Parameters"
msgstr "Parámetros de cuenta"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:173
-#: ../sflphone-client-gnome/src/config/assistant.c:294
-#: ../sflphone-client-gnome/src/config/assistant.c:402
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
+#: ../sflphone-client-gnome/src/config/assistant.c:314
+#: ../sflphone-client-gnome/src/config/assistant.c:427
msgid "_Alias"
msgstr "_Alias"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:181
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
msgid "_Protocol"
msgstr "_Protocolo"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:199
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
msgid "Unknown"
msgstr "Desconocido"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:209
-#: ../sflphone-client-gnome/src/config/assistant.c:302
-#: ../sflphone-client-gnome/src/config/assistant.c:410
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
+#: ../sflphone-client-gnome/src/config/assistant.c:322
+#: ../sflphone-client-gnome/src/config/assistant.c:435
msgid "_Host name"
msgstr "_Nombre de equipo"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:217
-#: ../sflphone-client-gnome/src/config/assistant.c:310
-#: ../sflphone-client-gnome/src/config/assistant.c:418
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
+#: ../sflphone-client-gnome/src/config/assistant.c:330
+#: ../sflphone-client-gnome/src/config/assistant.c:443
msgid "_User name"
msgstr "_Usuario"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:234
-#: ../sflphone-client-gnome/src/config/assistant.c:326
-#: ../sflphone-client-gnome/src/config/assistant.c:433
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:346
+#: ../sflphone-client-gnome/src/config/assistant.c:458
msgid "_Password"
msgstr "_Contraseña"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:254
-#: ../sflphone-client-gnome/src/config/assistant.c:344
-#: ../sflphone-client-gnome/src/config/assistant.c:449
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:363
+#: ../sflphone-client-gnome/src/config/assistant.c:473
+msgid "Show password"
+msgstr "Contraseña"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:368
+#: ../sflphone-client-gnome/src/config/assistant.c:478
msgid "_Voicemail number"
msgstr "_Número de buzón de voz"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:340
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
msgid "Authentication"
msgstr "Autentificación"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:341
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
msgid "Secret"
msgstr "Secreto"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:466
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
msgid "Credential"
msgstr "Informaciónes"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:501
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
msgid "Authentication name"
msgstr "Nombre de autentificación"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:512
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
msgid "Password"
msgstr "Contraseña"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:535
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:909
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:201
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
msgid "Security"
msgstr "Seguridad"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:547
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:213
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
msgid "Use TLS transport (sips)"
msgstr "Usa transporte TLS (sips)"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:552
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:218
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
msgid "SRTP key exchange"
msgstr "Intercambió de clave SRTP"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:558
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
msgid "Disabled"
msgstr "Desactivado"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
msgid "Registration"
msgstr "Registración"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:679
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
msgid "Registration expire"
msgstr "Registracíon expira"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
msgid "_Comply with RFC 3263"
msgstr "_Cumplir con RFC 3263"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
-msgid "Network"
-msgstr "Red"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
+msgid "Network Interface"
+msgstr "Red Inaccesible"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:707
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
msgid "Local address"
msgstr "Dirección local"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:744
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
msgid "Local port"
msgstr "Puerto local"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:752
-msgid "Set published address and port:"
-msgstr "Publicar dirección y puerto:"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
+msgid "Published address"
+msgstr "Dirección publicada"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:756
-msgid "Using STUN "
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+msgid "Using STUN"
msgstr "Usando STUN "
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:761
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
+msgid "STUN server URL"
+msgstr "URL del servidor STUN"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
msgid "Same as local parameters"
msgstr "Igual que parámetros locales"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:764
-msgid "Manually"
-msgstr "Manualmente"
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:769
-msgid "Published address"
-msgstr "Dirección publicada"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
+msgid "Set published address and port:"
+msgstr "Publicar dirección y puerto:"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:777
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
msgid "Published port"
msgstr "Puerto publicado"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:785
-msgid "STUN server URL"
-msgstr "URL del servidor STUN"
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
msgid "Account settings"
msgstr "Configuración de cuentas"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
msgid "Basic"
msgstr "Básico"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:904
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
msgid "Advanced"
msgstr "Avanzado"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:169
-msgid "Server returned \""
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:164
+msgid "Server returned \"%s\" (%d)"
msgstr "Servidor contesta \""
#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
@@ -497,32 +684,18 @@ msgstr "Cuentas"
msgid "Configured Accounts"
msgstr "Cuentas Configuradas"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:505
-msgid "There "
-msgstr "Alla "
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "is "
-msgstr "es "
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "are "
-msgstr "son "
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:508
-msgid " active account"
-msgstr " cuenta activada"
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
+msgid "There is %d active account"
+msgid_plural "There are %d active accounts"
+msgstr[0] " cuenta activada"
+msgstr[1] " cuenta activada"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:509
-msgid "s"
-msgstr "s"
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:514
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
msgid "You have no active account"
msgstr "No tienes ninguna cuenta activada"
#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:443
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
msgid "General"
msgstr "General"
@@ -544,8 +717,7 @@ msgstr "_Mostrar fotos de contactos, si están disponibles"
#: ../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:"
+msgstr "Usar los siguientes campos de la libreta de direcciones de Evolution:"
#: ../sflphone-client-gnome/src/config/addressbook-config.c:345
msgid "_Work"
@@ -568,16 +740,16 @@ msgid "Select which Evolution address books to use"
msgstr "Seleccione la libreta de contactos de Evolution a usar"
#: ../sflphone-client-gnome/src/config/addressbook-config.c:404
-#: ../sflphone-client-gnome/src/config/audioconf.c:578
+#: ../sflphone-client-gnome/src/config/audioconf.c:577
msgid "Name"
msgstr "Nombre"
-#: ../sflphone-client-gnome/src/config/assistant.c:69
+#: ../sflphone-client-gnome/src/config/assistant.c:75
#, c-format
msgid "This assistant is now finished."
msgstr "El asistente ha finalizado"
-#: ../sflphone-client-gnome/src/config/assistant.c:71
+#: ../sflphone-client-gnome/src/config/assistant.c:77
msgid ""
"You can at any time check your registration state or modify your accounts "
"parameters in the Options/Accounts window."
@@ -585,211 +757,205 @@ 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/config/assistant.c:74
+#: ../sflphone-client-gnome/src/config/assistant.c:80
msgid "Alias"
msgstr "Alias"
-#: ../sflphone-client-gnome/src/config/assistant.c:78
+#: ../sflphone-client-gnome/src/config/assistant.c:84
msgid "Server"
msgstr "Servidor"
-#: ../sflphone-client-gnome/src/config/assistant.c:82
+#: ../sflphone-client-gnome/src/config/assistant.c:88
msgid "Username"
msgstr "Usuario"
-#: ../sflphone-client-gnome/src/config/assistant.c:86
+#: ../sflphone-client-gnome/src/config/assistant.c:92
msgid "Security: "
msgstr "Seguridad: "
-#: ../sflphone-client-gnome/src/config/assistant.c:88
+#: ../sflphone-client-gnome/src/config/assistant.c:94
msgid "SRTP/ZRTP draft-zimmermann"
msgstr "SRTP/ZRTP draft-zimmermann"
-#: ../sflphone-client-gnome/src/config/assistant.c:90
-#: ../sflphone-client-gnome/src/config/assistant.c:182
+#: ../sflphone-client-gnome/src/config/assistant.c:96
msgid "None"
msgstr "Ninguno"
-#: ../sflphone-client-gnome/src/config/assistant.c:210
+#: ../sflphone-client-gnome/src/config/assistant.c:229
msgid "SFLphone account creation wizard"
msgstr "Asistente de creación de cuentas"
-#: ../sflphone-client-gnome/src/config/assistant.c:236
+#: ../sflphone-client-gnome/src/config/assistant.c:255
msgid "Welcome to the Account creation wizard of SFLphone!"
msgstr "¡Bienvenido al asistente de configuración de cuentas de SFLphone"
-#: ../sflphone-client-gnome/src/config/assistant.c:237
+#: ../sflphone-client-gnome/src/config/assistant.c:256
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/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "VoIP Protocols"
msgstr "Protocolos VoIP"
-#: ../sflphone-client-gnome/src/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "Select an account type"
msgstr "Escoja un tipo de cuenta"
-#: ../sflphone-client-gnome/src/config/assistant.c:253
+#: ../sflphone-client-gnome/src/config/assistant.c:272
msgid "SIP (Session Initiation Protocol)"
msgstr "SIP (Session Initiation Protocol)"
-#: ../sflphone-client-gnome/src/config/assistant.c:255
+#: ../sflphone-client-gnome/src/config/assistant.c:274
msgid "IAX2 (InterAsterix Exchange)"
msgstr "IAX2 (InterAsterix Exchange)"
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Account"
msgstr "Cuenta"
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Please select one of the following options"
msgstr "Por favor, elija una de las siguientes opciones"
-#: ../sflphone-client-gnome/src/config/assistant.c:271
+#: ../sflphone-client-gnome/src/config/assistant.c:290
msgid "Create a free SIP/IAX2 account on sflphone.org"
msgstr "Crear una cuenta SIP/IAX2 gratis en sflphone.org"
-#: ../sflphone-client-gnome/src/config/assistant.c:273
+#: ../sflphone-client-gnome/src/config/assistant.c:292
msgid "Register an existing SIP or IAX2 account"
msgstr "Registrar una cuenta SIP o IAX2 existente"
-#: ../sflphone-client-gnome/src/config/assistant.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:306
msgid "SIP account settings"
msgstr "Configuración de cuenta SIP"
-#: ../sflphone-client-gnome/src/config/assistant.c:286
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "Please fill the following information"
msgstr "Por favor, ingrese la siguiente información"
-#: ../sflphone-client-gnome/src/config/assistant.c:352
-#: ../sflphone-client-gnome/src/config/assistant.c:381
+#: ../sflphone-client-gnome/src/config/assistant.c:376
+#: ../sflphone-client-gnome/src/config/assistant.c:405
msgid "Secure communications with _ZRTP"
msgstr "Communicaciòn segura con _ZRTP"
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "Optional email address"
msgstr "Dirección de correo opcional"
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
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-gnome/src/config/assistant.c:373
+#: ../sflphone-client-gnome/src/config/assistant.c:397
msgid "_Email address"
msgstr "_Correo"
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "IAX2 account settings"
msgstr "Configuración de cuenta IAX2"
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "Network Address Translation (NAT)"
msgstr "Conversión de Dirección de Red (NAT)"
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
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."
+msgstr "Probablemente tiene que activar esto si está detrás de un cortafuegos."
-#: ../sflphone-client-gnome/src/config/assistant.c:476
+#: ../sflphone-client-gnome/src/config/assistant.c:505
msgid "E_nable STUN"
msgstr "A_ctivar STUN"
-#: ../sflphone-client-gnome/src/config/assistant.c:483
+#: ../sflphone-client-gnome/src/config/assistant.c:512
msgid "_STUN server"
msgstr "_Servidor STUN"
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Account Registration"
msgstr "Registro de cuenta"
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Congratulations!"
msgstr "¡Enhorabuena!"
-#: ../sflphone-client-gnome/src/config/audioconf.c:583
+#: ../sflphone-client-gnome/src/config/audioconf.c:582
msgid "Frequency"
msgstr "Frecuencia"
-#: ../sflphone-client-gnome/src/config/audioconf.c:588
+#: ../sflphone-client-gnome/src/config/audioconf.c:587
msgid "Bitrate"
msgstr "Tasa de transferencia"
-#: ../sflphone-client-gnome/src/config/audioconf.c:593
+#: ../sflphone-client-gnome/src/config/audioconf.c:592
msgid "Bandwidth"
msgstr "Ancho de banda"
-#: ../sflphone-client-gnome/src/config/audioconf.c:673
+#: ../sflphone-client-gnome/src/config/audioconf.c:670
msgid "ALSA plugin"
msgstr "Plugin ALSA"
-#: ../sflphone-client-gnome/src/config/audioconf.c:695
+#: ../sflphone-client-gnome/src/config/audioconf.c:692
msgid "Output"
msgstr "Salida"
-#: ../sflphone-client-gnome/src/config/audioconf.c:717
+#: ../sflphone-client-gnome/src/config/audioconf.c:714
msgid "Input"
msgstr "Entrada"
-#: ../sflphone-client-gnome/src/config/audioconf.c:752
+#: ../sflphone-client-gnome/src/config/audioconf.c:749
msgid "_Voice Activity Detection"
msgstr "_Detección de actividad de voz"
-#: ../sflphone-client-gnome/src/config/audioconf.c:762
+#: ../sflphone-client-gnome/src/config/audioconf.c:759
msgid "_Noise Reduction (Narrow-Band Companding)"
msgstr "_Reducción de ruido"
-#: ../sflphone-client-gnome/src/config/audioconf.c:798
+#: ../sflphone-client-gnome/src/config/audioconf.c:800
msgid "Sound Manager"
msgstr "Gestor de audio"
-#: ../sflphone-client-gnome/src/config/audioconf.c:807
+#: ../sflphone-client-gnome/src/config/audioconf.c:809
msgid "_Pulseaudio"
msgstr "_Pulseaudio"
-#: ../sflphone-client-gnome/src/config/audioconf.c:811
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
msgid "_ALSA"
msgstr "_ALSA"
-#: ../sflphone-client-gnome/src/config/audioconf.c:816
-msgid "_Mute other applications during a call"
-msgstr "Silenciar otras aplicaciones durante una llamada"
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:823
+#: ../sflphone-client-gnome/src/config/audioconf.c:819
msgid "ALSA settings"
msgstr "Configuración de ALSA"
-#: ../sflphone-client-gnome/src/config/audioconf.c:840
+#: ../sflphone-client-gnome/src/config/audioconf.c:836
msgid "Codecs"
msgstr "Códecs"
-#: ../sflphone-client-gnome/src/config/audioconf.c:869
+#: ../sflphone-client-gnome/src/config/audioconf.c:865
msgid "Recordings"
msgstr "Grabaciones"
-#: ../sflphone-client-gnome/src/config/audioconf.c:873
+#: ../sflphone-client-gnome/src/config/audioconf.c:869
msgid "Destination folder"
msgstr "Carpeta de destino"
-#: ../sflphone-client-gnome/src/config/audioconf.c:877
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
msgid "Select a folder"
msgstr "Seleccione una carpeta"
-#: ../sflphone-client-gnome/src/config/audioconf.c:883
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
msgid "Ringtones"
msgstr "Tonos de llamada"
-#: ../sflphone-client-gnome/src/config/audioconf.c:889
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
msgid "_Enable ringtones"
msgstr "_Habilitar tonos de llamada"
-#: ../sflphone-client-gnome/src/config/audioconf.c:895
+#: ../sflphone-client-gnome/src/config/audioconf.c:891
msgid "Choose a ringtone"
msgstr "Elija un tono de llmada"
-#: ../sflphone-client-gnome/src/config/audioconf.c:901
+#: ../sflphone-client-gnome/src/config/audioconf.c:897
msgid "Audio Files"
msgstr "Archivos de Audio"
@@ -826,7 +992,7 @@ msgstr "Reescritura de número de teléfono"
msgid "_Prefix dialed numbers with"
msgstr "_Prefijar los números marcados con"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:195
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
msgid ""
"This profile is used when you want to reach a remote peer simply by typing a "
"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
@@ -837,79 +1003,59 @@ msgstr ""
"usted define aqui serán también utilizados si ninguná cuenta puede ser "
"igualada a una llamada entrante o saliente."
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:274
-msgid "SIP Port"
-msgstr "Puerto SIP"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:281
-msgid "UDP Transport"
-msgstr "Transporte UDP"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:319
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
msgid "Desktop Notifications"
msgstr "Notificación de escritorio"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:323
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
msgid "_Enable notifications"
msgstr "_Activar notificaciones"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:329
-msgid "Enable voicemail _notifications"
-msgstr "Activar _notificaciones de mensajes de voz"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:341
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
msgid "System Tray Icon"
msgstr "Icono de bandeja del sistema"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
msgid "_Popup main window on incoming call"
msgstr "_Popup ventana principal al recibir llamadas"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:349
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
msgid "Ne_ver popup main window"
msgstr "_Nunca mostrar ventana principal"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:353
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
msgid "Hide SFLphone window on _startup"
msgstr "Esconder SFLphone al principio"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:359
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
msgid "Calls History"
msgstr "Historia de llamadas"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:362
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
msgid "_Keep my history for at least"
msgstr "_Guardar mi historia por lo menos"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:373
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
msgid "days"
msgstr "días"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:377
-msgid "Configuration File"
-msgstr "Archivo de configuración"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:379
-msgid "Store SIP credentials as MD5 hash"
-msgstr "Guarda informaciòn SIP como hash MD5"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:423
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
msgid "Preferences"
msgstr "Preferencias"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:448
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
msgid "Audio"
msgstr "Sonido"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
msgid "Address Book"
msgstr "Libreta de Direcciones"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:458
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
msgid "Hooks"
msgstr "Disparadores"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:468
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
msgid "Direct IP calls"
msgstr "Llamadas IP directas"
@@ -917,11 +1063,11 @@ msgstr "Llamadas IP directas"
msgid "Advanced options for TLS"
msgstr "Opciones avanzadas por TLS"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:55
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:56
msgid "TLS transport"
msgstr "Transporte TLS"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:59
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:60
msgid ""
"TLS transport can be used along with UDP for those calls that would\n"
"require secure sip transactions (aka SIPS). You can configure a different\n"
@@ -934,55 +1080,55 @@ msgstr ""
"diferente transporte TLS para cada cuenta. De cualquier forma, cada uno de "
"ellos usará un puerto dedicado, diferente el uno del otro.\n"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:100
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
msgid "Certificate of Authority list"
msgstr "Lista de Certificados de Autoridad"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:104
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
msgid "Choose a CA list file (optional)"
msgstr "Escoge un archivo de lista de CA (opcional)"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:115
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
msgid "Public endpoint certificate file"
msgstr "Archivo del certificado del par público"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:119
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
msgid "Choose a public endpoint certificate (optional)"
msgstr "Escoge un certificado de par público (opcional)"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:134
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
msgid "Choose a private key file (optional)"
msgstr "Escoge un archivo de clave privada"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:145
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
msgid "Password for the private key"
msgstr "Contraseña de clave privada"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:168
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
msgid "TLS protocol method"
msgstr "Método de protocolo TLS"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:202
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
msgid "TLS cipher list"
msgstr "Lista de cifrado TLS"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:211
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
msgid "Server name instance for outgoing TLS connection"
msgstr "Nombre del servidor para conección TLS saliente"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:219
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
msgid "Negotiation timeout (sec:msec)"
msgstr "Negociación expirada"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:236
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
msgid "Verify incoming certificates, as a server"
msgstr "Checar certificados entrantes, como un servidor"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:242
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
msgid "Verify certificates from answer, as a client"
msgstr "Checar certificados de la respuesta, como cliente"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:248
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
msgid "Require certificate for incoming tls connections"
msgstr "Requiere certificado para conecciones TLS entrantes"
@@ -990,45 +1136,84 @@ msgstr "Requiere certificado para conecciones TLS entrantes"
msgid "ZRTP Options"
msgstr "Opciones ZRTP"
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:68
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:69
msgid "Send Hello Hash in S_DP"
msgstr "Enviar Hello Hash en S_DP"
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:74
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:75
msgid "Ask User to Confirm SAS"
msgstr "Preguntar al usuario de confirmar SAS"
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:80
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:81
msgid "_Warn if ZRTP not supported"
msgstr "_Prevenir si ZRTP no es compatible"
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:86
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:87
msgid "Display SAS once for hold events"
msgstr "Presentar SAS una vez para eventos en espera"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:58
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
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:59
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:72
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:84
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:96
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
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:71
msgid "Search by missed call"
msgstr "Buscar en llamadas pérdidas"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:83
msgid "Search by incoming call"
msgstr "Buscar en llamadas entrantes"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:95
msgid "Search by outgoing call"
msgstr "Buscar en llamadas salientes"
+#~ msgid "IP call - %s"
+#~ msgstr "Llamada IP - %s"
+
+#~ msgid "Codec"
+#~ msgstr "Códec"
+
+#~ msgid "Network"
+#~ msgstr "Red"
+
+#~ msgid "Manually"
+#~ msgstr "Manualmente"
+
+#~ msgid "There "
+#~ msgstr "Alla "
+
+#~ msgid "is "
+#~ msgstr "es "
+
+#~ msgid "are "
+#~ msgstr "son "
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#~ msgid "_Mute other applications during a call"
+#~ msgstr "Silenciar otras aplicaciones durante una llamada"
+
+#~ msgid "SIP Port"
+#~ msgstr "Puerto SIP"
+
+#~ msgid "UDP Transport"
+#~ msgstr "Transporte UDP"
+
+#~ msgid "Enable voicemail _notifications"
+#~ msgstr "Activar _notificaciones de mensajes de voz"
+
+#~ msgid "Store SIP credentials as MD5 hash"
+#~ msgstr "Guarda informaciòn SIP como hash MD5"
+
#~ msgctxt "account state"
#~ msgid "Registered"
#~ msgstr "Registrado"
@@ -1047,9 +1232,6 @@ msgstr "Buscar en llamadas salientes"
#~ msgid "Stun Server"
#~ msgstr "Servidor STUN"
-#~ msgid "Transfer to : "
-#~ msgstr "Transferir a : "
-
#~ msgid "Default account"
#~ msgstr "Cuenta por defecto"
@@ -1065,9 +1247,6 @@ msgstr "Buscar en llamadas salientes"
#~ msgid "Incoming call"
#~ msgstr "Llamada entrante"
-#~ msgid "Transfer"
-#~ msgstr "Transferir"
-
#~ msgid "Hang up"
#~ msgstr "Colgar"
@@ -1090,9 +1269,6 @@ msgstr "Buscar en llamadas salientes"
#~ msgid "Recordings"
#~ msgstr "Grabaciones"
-#~ msgid "Remove the selected account"
-#~ msgstr "Eliminar la cuenta seleccionada"
-
#~ msgid "Remove"
#~ msgstr "Eliminar"
@@ -1130,21 +1306,6 @@ msgstr "Buscar en llamadas salientes"
#~ msgid "Configure SFLphone"
#~ msgstr "Configurar SFLphone"
-#~ msgid "_Help"
-#~ msgstr "_Ayuda"
-
-#~ msgid "_Call"
-#~ msgstr "_Llamar"
-
-#~ msgid "_Edit"
-#~ msgstr "_Editar"
-
-#~ msgid "_Accounts"
-#~ msgstr "_Cuentas"
-
-#~ msgid "_View"
-#~ msgstr "_Ver"
-
#~ msgid "Port"
#~ msgstr "Puerto"
@@ -1198,12 +1359,6 @@ msgstr "Buscar en llamadas salientes"
#~ msgid "Address book loading..."
#~ msgstr "Cargando el directorio..."
-#~ msgid "Call history"
-#~ msgstr "Historia de Llamada"
-
-#~ msgid "Address book"
-#~ msgstr "Libreta de contactos"
-
#~ msgid "Edit before call"
#~ msgstr "Editar antes de llamar"
@@ -1294,18 +1449,12 @@ msgstr "Buscar en llamadas salientes"
#~ msgid "Prefix dialed numbers with"
#~ msgstr "Prefijar los números marcados con"
-#~ msgid "History"
-#~ msgstr "Historia de Llamada"
-
#~ msgid "Attention:number of results exceeds max displayed."
#~ msgstr "Cuidado:número de resultatos excede el maximo a mostrar."
#~ msgid "_Account creation wizard"
#~ msgstr "Asistente de configuración de cuentas"
-#~ msgid "_Volume controls"
-#~ msgstr "_Controles de volumen"
-
#~ msgid "_Enable this account"
#~ msgstr "_Habilitar esta cuenta"
@@ -1435,9 +1584,6 @@ msgstr "Buscar en llamadas salientes"
#~ msgid "\"Voicemail\" <%s>"
#~ msgstr "\"Mensaje\" <%s>"
-#~ msgid "Off Hold"
-#~ msgstr "Seguir"
-
#~ msgid "Record a call"
#~ msgstr "Grabar una llamada"
@@ -1535,20 +1681,20 @@ msgstr "Buscar en llamadas salientes"
#~ msgstr "Retomar"
#~ 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."
+#~ "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. Asegúrese "
-#~ "de no necesitarla más. Si cree que la pueda necesitar más adelante, "
-#~ "simplemente quité la selección."
+#~ "Este botón elimina la cuenta seleccionada en la siguiente lista. "
+#~ "Asegúrese de no necesitarla más. Si cree que la pueda necesitar más "
+#~ "adelante, simplemente quité la selección."
#~ msgid ""
-#~ "This button enables you to initialize a new account. You will then be able "
-#~ "to edit it using the form on the right."
+#~ "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á corregirlo "
-#~ "con el formulario a la derecha."
+#~ "Este botón le permite inicializar una nueva cuenta. Usted podrá "
+#~ "corregirlo con el formulario a la derecha."
#~ msgid ""
#~ "By default, when you place a call, sflphone will use the first account in "
@@ -1571,18 +1717,12 @@ msgstr "Buscar en llamadas salientes"
#~ msgid "Display phone numbers of these types :"
#~ msgstr "Mostrar números de este tipo:"
-#~ msgid "Clear history"
-#~ msgstr "Limpiar historial"
-
#~ msgid "Display dialpad"
#~ msgstr "Mostrar teclado"
#~ msgid "Command to run"
#~ msgstr "Comando a ejecutar"
-#~ msgid "Clear _history"
-#~ msgstr "_Limpiar historial"
-
#~ msgid "Keep my history for at least"
#~ msgstr "Guardar el historial al menos"
@@ -1598,11 +1738,11 @@ msgstr "Buscar en llamadas salientes"
#~ msgstr "NAT Traversal"
#~ msgid ""
-#~ "Pressing \"apply\" will restart the network layer. Otherwise, SFLPhone would "
-#~ "have to be restarted."
+#~ "Pressing \"apply\" will restart the network layer. Otherwise, SFLPhone "
+#~ "would have to be restarted."
#~ msgstr ""
-#~ "Presionar “aplica” recomenzará la capa de red. Si no, SFLPhone tendría que "
-#~ "ser reiniciado."
+#~ "Presionar “aplica” recomenzará la capa de red. Si no, SFLPhone tendría "
+#~ "que ser reiniciado."
#~ msgid "_Volume Controls"
#~ msgstr "_Controles de Volumen"
@@ -1619,26 +1759,29 @@ msgstr "Buscar en llamadas salientes"
#~ 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."
+#~ "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, cuando usted realiza una llamada, sflphone usará la primera "
-#~ "cuenta en esta lista que este \"registrada\". Cambie el orden de las cuentas "
-#~ "usando las flechas \"Arriba\" y \"Abajo\". Las Activa/desactiva marcando la "
-#~ "opción de la izquierda. Adiciona o elimina con los botones de \"Más\" o "
-#~ "\"Menos\". Edita la cuenta seleccionada con el formulario a la derecha."
+#~ "cuenta en esta lista que este \"registrada\". Cambie el orden de las "
+#~ "cuentas usando las flechas \"Arriba\" y \"Abajo\". Las Activa/desactiva "
+#~ "marcando la opción de la izquierda. Adiciona o elimina con los botones de "
+#~ "\"Más\" o \"Menos\". Edita la cuenta seleccionada con el formulario a la "
+#~ "derecha."
#~ msgctxt "NAME OF TRANSLATORS"
#~ msgid "Your names"
#~ msgstr ""
#~ "Maxime Chambreuil, ,Launchpad Contributions:,Andres Mujica,Maxime "
-#~ "Chambreuil, ,Launchpad Contributions:,Andres Mujica,Maxime Chambreuil, "
-#~ ",Launchpad Contributions:,Andres Mujica,Maxime Chambreuil"
+#~ "Chambreuil, ,Launchpad Contributions:,Andres Mujica,Maxime Chambreuil, ,"
+#~ "Launchpad Contributions:,Andres Mujica,Maxime Chambreuil, ,Launchpad "
+#~ "Contributions:,Andres Mujica,Maxime Chambreuil"
#~ msgctxt "EMAIL OF TRANSLATORS"
#~ msgid "Your emails"
#~ msgstr ""
-#~ "maxime.chambreuil@savoirfairelinux.com,,,andres.mujica@seaq.com.co,maxime.cha"
-#~ "mbreuil@gmail.com,,,andres.mujica@seaq.com.co,maxime.chambreuil@gmail.com,,,a"
-#~ "ndres.mujica@seaq.com.co,maxime.chambreuil@gmail.com"
+#~ "maxime.chambreuil@savoirfairelinux.com,,,andres.mujica@seaq.com.co,maxime."
+#~ "chambreuil@gmail.com,,,andres.mujica@seaq.com.co,maxime.chambreuil@gmail."
+#~ "com,,,andres.mujica@seaq.com.co,maxime.chambreuil@gmail.com,,,andres."
+#~ "mujica@seaq.com.co,maxime.chambreuil@gmail.com"
diff --git a/lang/fr/fr.po b/lang/fr/fr.po
index 53cac6638613f2ce611ffda87dd6705d08ee6c59..c7ace4f55b20cd568eb48572c1eb71af406ac753 100644
--- a/lang/fr/fr.po
+++ b/lang/fr/fr.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: SFLphone 0.9.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-12 14:02-0500\n"
+"POT-Creation-Date: 2009-12-03 10:22-0500\n"
"PO-Revision-Date: 2009-10-26 20:46+0000\n"
"Last-Translator: Maxime Chambreuil <maxime.chambreuil@gmail.com>\n"
"Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n"
@@ -62,15 +62,15 @@ msgstr "Serveur Stun invalide"
msgid "Invalid"
msgstr "Non valide"
-#: ../sflphone-client-gnome/src/actions.c:72
+#: ../sflphone-client-gnome/src/actions.c:98
msgid "Using account"
msgstr "Utilise le compte"
-#: ../sflphone-client-gnome/src/actions.c:78
+#: ../sflphone-client-gnome/src/actions.c:104
msgid "No registered accounts"
msgstr "Pas de compte enregistré"
-#: ../sflphone-client-gnome/src/actions.c:259
+#: ../sflphone-client-gnome/src/actions.c:285
msgid ""
"Unable to connect to the SFLphone server.\n"
"Make sure the daemon is running."
@@ -78,11 +78,12 @@ msgstr ""
"Impossible de se connecter au serveur SFLphone.\n"
" Assurez-vous que le démon est lancé."
-#: ../sflphone-client-gnome/src/actions.c:879
+#: ../sflphone-client-gnome/src/actions.c:589
+#: ../sflphone-client-gnome/src/actions.c:911
msgid "Direct SIP call"
msgstr "Appel direct SIP"
-#: ../sflphone-client-gnome/src/actions.c:1071
+#: ../sflphone-client-gnome/src/actions.c:1103
#, c-format
msgid ""
"<b>Error: No audio codecs found.\n"
@@ -137,31 +138,31 @@ msgstr "Vous avez des appels en cours."
msgid "Do you still want to quit?"
msgstr "Voulez-vous quitter?"
-#: ../sflphone-client-gnome/src/mainwindow.c:297
+#: ../sflphone-client-gnome/src/mainwindow.c:298
msgid "SFLphone Error"
msgstr "Erreur SFLphone"
-#: ../sflphone-client-gnome/src/mainwindow.c:391
+#: ../sflphone-client-gnome/src/mainwindow.c:392
#, c-format
msgid "ZRTP is not supported by peer %s\n"
msgstr "ZRTP n'est pas supporté par %s\n"
-#: ../sflphone-client-gnome/src/mainwindow.c:392
+#: ../sflphone-client-gnome/src/mainwindow.c:393
msgid "Secure Communication Unavailable"
msgstr "Communications sécurisées non disponibles"
-#: ../sflphone-client-gnome/src/mainwindow.c:393
-#: ../sflphone-client-gnome/src/mainwindow.c:415
+#: ../sflphone-client-gnome/src/mainwindow.c:394
+#: ../sflphone-client-gnome/src/mainwindow.c:416
msgid "Continue"
msgstr "Continuer"
-#: ../sflphone-client-gnome/src/mainwindow.c:394
-#: ../sflphone-client-gnome/src/mainwindow.c:416
-#: ../sflphone-client-gnome/src/mainwindow.c:430
+#: ../sflphone-client-gnome/src/mainwindow.c:395
+#: ../sflphone-client-gnome/src/mainwindow.c:417
+#: ../sflphone-client-gnome/src/mainwindow.c:431
msgid "Stop Call"
msgstr "Arrêter l'appel"
-#: ../sflphone-client-gnome/src/mainwindow.c:413
+#: ../sflphone-client-gnome/src/mainwindow.c:414
#, c-format
msgid ""
"A %s error forced the call with %s to fall under unencrypted mode.\n"
@@ -170,11 +171,11 @@ msgstr ""
"L'appel avec %s est passé en mode non-crypté à cause d'une erreur %s.\n"
"Raison exacte: %s\n"
-#: ../sflphone-client-gnome/src/mainwindow.c:414
+#: ../sflphone-client-gnome/src/mainwindow.c:415
msgid "ZRTP negotiation failed"
msgstr "Erreur d'authentification"
-#: ../sflphone-client-gnome/src/mainwindow.c:427
+#: ../sflphone-client-gnome/src/mainwindow.c:428
#, c-format
msgid ""
"%s wants to stop using secure communication. Confirm will resume "
@@ -183,11 +184,11 @@ msgstr ""
"%s ne désire plus utiliser la communication sécurisée. Confirmer que vous "
"voulez continuer sans ZRTP.\n"
-#: ../sflphone-client-gnome/src/mainwindow.c:428
+#: ../sflphone-client-gnome/src/mainwindow.c:429
msgid "Confirm Go Clear"
msgstr "Confirmer Communication en clair"
-#: ../sflphone-client-gnome/src/mainwindow.c:429
+#: ../sflphone-client-gnome/src/mainwindow.c:430
msgid "Confirm"
msgstr "Confirmer"
@@ -258,15 +259,15 @@ msgstr "Volume des hauts-parleurs"
msgid "Mic volume"
msgstr "Volume du micro"
-#: ../sflphone-client-gnome/src/statusicon.c:91
+#: ../sflphone-client-gnome/src/statusicon.c:96
msgid "_Show main window"
msgstr "_Afficher la fenêtre principale"
-#: ../sflphone-client-gnome/src/statusicon.c:126
+#: ../sflphone-client-gnome/src/statusicon.c:131
msgid "SFLphone"
msgstr "SFLphone"
-#: ../sflphone-client-gnome/src/statusicon.c:127
+#: ../sflphone-client-gnome/src/statusicon.c:132
#, c-format
msgid "%i account configured"
msgid_plural "%i accounts configured"
@@ -274,388 +275,395 @@ msgstr[0] "%i compte configuré"
msgstr[1] "%i comptes configurés"
#: ../sflphone-client-gnome/src/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:628
-#: ../sflphone-client-gnome/src/uimanager.c:662
+#: ../sflphone-client-gnome/src/uimanager.c:693
+#: ../sflphone-client-gnome/src/uimanager.c:727
msgid "Voicemail"
msgstr "Boite vocale"
-#: ../sflphone-client-gnome/src/uimanager.c:115
+#: ../sflphone-client-gnome/src/uimanager.c:117
msgid "No address book selected"
msgstr "Aucun carnet d'adresses sélectionné"
-#: ../sflphone-client-gnome/src/uimanager.c:135
-#: ../sflphone-client-gnome/src/uimanager.c:691
+#: ../sflphone-client-gnome/src/uimanager.c:137
+#: ../sflphone-client-gnome/src/uimanager.c:756
msgid "Address book"
msgstr "Carnet d'adresses"
-#: ../sflphone-client-gnome/src/uimanager.c:237
+#: ../sflphone-client-gnome/src/uimanager.c:279
#, c-format
msgid "Voicemail (%i)"
msgstr "Boite vocale (%i)"
-#: ../sflphone-client-gnome/src/uimanager.c:300
+#: ../sflphone-client-gnome/src/uimanager.c:342
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/uimanager.c:303
+#: ../sflphone-client-gnome/src/uimanager.c:345
msgid "About SFLphone"
msgstr "A propos de SFLphone"
-#: ../sflphone-client-gnome/src/uimanager.c:654
+#: ../sflphone-client-gnome/src/uimanager.c:719
msgid "Call"
msgstr "Actions"
-#: ../sflphone-client-gnome/src/uimanager.c:655
-#: ../sflphone-client-gnome/src/uimanager.c:1119
+#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:1184
msgid "_New call"
msgstr "_Nouvel appel"
-#: ../sflphone-client-gnome/src/uimanager.c:655
+#: ../sflphone-client-gnome/src/uimanager.c:720
msgid "Place a new call"
msgstr "Appeler"
-#: ../sflphone-client-gnome/src/uimanager.c:656
-#: ../sflphone-client-gnome/src/uimanager.c:914
+#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:979
msgid "_Pick up"
msgstr "_Décrocher"
-#: ../sflphone-client-gnome/src/uimanager.c:656
+#: ../sflphone-client-gnome/src/uimanager.c:721
msgid "Answer the call"
msgstr "Répondre à l'appel"
-#: ../sflphone-client-gnome/src/uimanager.c:657
-#: ../sflphone-client-gnome/src/uimanager.c:926
-#: ../sflphone-client-gnome/src/uimanager.c:967
+#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:991
+#: ../sflphone-client-gnome/src/uimanager.c:1032
msgid "_Hang up"
msgstr "_Raccrocher"
-#: ../sflphone-client-gnome/src/uimanager.c:657
+#: ../sflphone-client-gnome/src/uimanager.c:722
msgid "Finish the call"
msgstr "Terminer l'appel"
-#: ../sflphone-client-gnome/src/uimanager.c:658
+#: ../sflphone-client-gnome/src/uimanager.c:723
msgid "O_n hold"
msgstr "Mettre en attente"
-#: ../sflphone-client-gnome/src/uimanager.c:658
+#: ../sflphone-client-gnome/src/uimanager.c:723
msgid "Place the call on hold"
msgstr "Mettre l'appel en attente"
-#: ../sflphone-client-gnome/src/uimanager.c:659
+#: ../sflphone-client-gnome/src/uimanager.c:724
msgid "O_ff hold"
msgstr "Reprendre"
-#: ../sflphone-client-gnome/src/uimanager.c:659
+#: ../sflphone-client-gnome/src/uimanager.c:724
msgid "Place the call off hold"
msgstr "Reprendre l'appel"
-#: ../sflphone-client-gnome/src/uimanager.c:660
-#: ../sflphone-client-gnome/src/uimanager.c:950
+#: ../sflphone-client-gnome/src/uimanager.c:725
+#: ../sflphone-client-gnome/src/uimanager.c:1015
msgid "_Record"
msgstr "Enregistrer"
-#: ../sflphone-client-gnome/src/uimanager.c:660
+#: ../sflphone-client-gnome/src/uimanager.c:725
msgid "Record the current conversation"
msgstr "Enregistrer la conversation courante"
-#: ../sflphone-client-gnome/src/uimanager.c:661
+#: ../sflphone-client-gnome/src/uimanager.c:726
msgid "Configuration _Assistant"
msgstr "_Assistant de configuration"
-#: ../sflphone-client-gnome/src/uimanager.c:661
+#: ../sflphone-client-gnome/src/uimanager.c:726
msgid "Run the configuration assistant"
msgstr "Lancer l'assistant de configuration"
-#: ../sflphone-client-gnome/src/uimanager.c:662
+#: ../sflphone-client-gnome/src/uimanager.c:727
msgid "Call your voicemail"
msgstr "Appeler la boite vocale"
-#: ../sflphone-client-gnome/src/uimanager.c:663
+#: ../sflphone-client-gnome/src/uimanager.c:728
msgid "_Close"
msgstr "_Fermer"
-#: ../sflphone-client-gnome/src/uimanager.c:663
+#: ../sflphone-client-gnome/src/uimanager.c:728
msgid "Minimize to system tray"
msgstr "Minimiser dans la barre des tâches"
-#: ../sflphone-client-gnome/src/uimanager.c:664
+#: ../sflphone-client-gnome/src/uimanager.c:729
msgid "_Quit"
msgstr "_Quitter"
-#: ../sflphone-client-gnome/src/uimanager.c:664
+#: ../sflphone-client-gnome/src/uimanager.c:729
msgid "Quit the program"
msgstr "Quitter le programme"
-#: ../sflphone-client-gnome/src/uimanager.c:667
+#: ../sflphone-client-gnome/src/uimanager.c:732
msgid "_Edit"
msgstr "_Editer"
-#: ../sflphone-client-gnome/src/uimanager.c:668
+#: ../sflphone-client-gnome/src/uimanager.c:733
msgid "_Copy"
msgstr "_Copier"
-#: ../sflphone-client-gnome/src/uimanager.c:668
+#: ../sflphone-client-gnome/src/uimanager.c:733
msgid "Copy the selection"
msgstr "Copier la sélection"
-#: ../sflphone-client-gnome/src/uimanager.c:669
+#: ../sflphone-client-gnome/src/uimanager.c:734
msgid "_Paste"
msgstr "C_oller"
-#: ../sflphone-client-gnome/src/uimanager.c:669
+#: ../sflphone-client-gnome/src/uimanager.c:734
msgid "Paste the clipboard"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:670
+#: ../sflphone-client-gnome/src/uimanager.c:735
msgid "Clear _history"
msgstr "Effacer l'_historique"
-#: ../sflphone-client-gnome/src/uimanager.c:670
+#: ../sflphone-client-gnome/src/uimanager.c:735
msgid "Clear the call history"
msgstr "Effacer l'historique"
-#: ../sflphone-client-gnome/src/uimanager.c:671
+#: ../sflphone-client-gnome/src/uimanager.c:736
msgid "_Accounts"
msgstr "Co_mptes"
-#: ../sflphone-client-gnome/src/uimanager.c:671
+#: ../sflphone-client-gnome/src/uimanager.c:736
msgid "Edit your accounts"
msgstr "Éditer les comptes"
-#: ../sflphone-client-gnome/src/uimanager.c:672
+#: ../sflphone-client-gnome/src/uimanager.c:737
msgid "_Preferences"
msgstr "Préférences"
-#: ../sflphone-client-gnome/src/uimanager.c:672
+#: ../sflphone-client-gnome/src/uimanager.c:737
msgid "Change your preferences"
msgstr "Modifier les préférences"
-#: ../sflphone-client-gnome/src/uimanager.c:675
+#: ../sflphone-client-gnome/src/uimanager.c:740
msgid "_View"
msgstr "A_ffichage"
-#: ../sflphone-client-gnome/src/uimanager.c:678
+#: ../sflphone-client-gnome/src/uimanager.c:743
msgid "_Help"
msgstr "A_ide"
-#: ../sflphone-client-gnome/src/uimanager.c:679
+#: ../sflphone-client-gnome/src/uimanager.c:744
msgid "Contents"
msgstr "Sommaire"
-#: ../sflphone-client-gnome/src/uimanager.c:679
+#: ../sflphone-client-gnome/src/uimanager.c:744
msgid "Open the manual"
msgstr "Ouvrir le manuel"
-#: ../sflphone-client-gnome/src/uimanager.c:680
+#: ../sflphone-client-gnome/src/uimanager.c:745
msgid "About this application"
msgstr "À propos de cette application"
-#: ../sflphone-client-gnome/src/uimanager.c:686
+#: ../sflphone-client-gnome/src/uimanager.c:751
msgid "_Transfer"
msgstr "Transférer"
-#: ../sflphone-client-gnome/src/uimanager.c:686
+#: ../sflphone-client-gnome/src/uimanager.c:751
msgid "Transfer the call"
msgstr "Transférer à : "
-#: ../sflphone-client-gnome/src/uimanager.c:687
+#: ../sflphone-client-gnome/src/uimanager.c:752
msgid "_Show toolbar"
msgstr "Afficher la _barre d'outil"
-#: ../sflphone-client-gnome/src/uimanager.c:687
+#: ../sflphone-client-gnome/src/uimanager.c:752
msgid "Show the toolbar"
msgstr "Afficher la barre d'outil"
-#: ../sflphone-client-gnome/src/uimanager.c:688
+#: ../sflphone-client-gnome/src/uimanager.c:753
msgid "_Dialpad"
msgstr "_Clavier"
-#: ../sflphone-client-gnome/src/uimanager.c:688
+#: ../sflphone-client-gnome/src/uimanager.c:753
msgid "Show the dialpad"
msgstr "Afficher le clavier"
-#: ../sflphone-client-gnome/src/uimanager.c:689
+#: ../sflphone-client-gnome/src/uimanager.c:754
msgid "_Volume controls"
msgstr "Contrôle du _volume"
-#: ../sflphone-client-gnome/src/uimanager.c:689
+#: ../sflphone-client-gnome/src/uimanager.c:754
msgid "Show the volume controls"
msgstr "Afficher les controles du volume"
-#: ../sflphone-client-gnome/src/uimanager.c:690
+#: ../sflphone-client-gnome/src/uimanager.c:755
msgid "_History"
msgstr "Historique"
-#: ../sflphone-client-gnome/src/uimanager.c:690
+#: ../sflphone-client-gnome/src/uimanager.c:755
msgid "Calls history"
msgstr "Historique d'appels"
-#: ../sflphone-client-gnome/src/uimanager.c:691
+#: ../sflphone-client-gnome/src/uimanager.c:756
msgid "_Address book"
msgstr "Carnet d'adresses"
-#: ../sflphone-client-gnome/src/uimanager.c:938
-#: ../sflphone-client-gnome/src/uimanager.c:979
+#: ../sflphone-client-gnome/src/uimanager.c:1003
+#: ../sflphone-client-gnome/src/uimanager.c:1044
msgid "On _Hold"
msgstr "_Mettre en attente"
-#: ../sflphone-client-gnome/src/uimanager.c:1042
+#: ../sflphone-client-gnome/src/uimanager.c:1107
msgid "_Call back"
msgstr "_Rappeler"
-#: ../sflphone-client-gnome/src/uimanager.c:1193
+#: ../sflphone-client-gnome/src/uimanager.c:1258
msgid "Edit phone number"
msgstr "Éditer le numéro"
-#: ../sflphone-client-gnome/src/uimanager.c:1204
+#: ../sflphone-client-gnome/src/uimanager.c:1269
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/config/accountconfigdialog.c:172
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
msgid "Account Parameters"
msgstr "Paramètres du Compte"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:181
-#: ../sflphone-client-gnome/src/config/assistant.c:307
-#: ../sflphone-client-gnome/src/config/assistant.c:415
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
+#: ../sflphone-client-gnome/src/config/assistant.c:314
+#: ../sflphone-client-gnome/src/config/assistant.c:427
msgid "_Alias"
msgstr "A_lias"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
msgid "_Protocol"
msgstr "P_rotocole"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:207
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
msgid "Unknown"
msgstr "Inconnu"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:217
-#: ../sflphone-client-gnome/src/config/assistant.c:315
-#: ../sflphone-client-gnome/src/config/assistant.c:423
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
+#: ../sflphone-client-gnome/src/config/assistant.c:322
+#: ../sflphone-client-gnome/src/config/assistant.c:435
msgid "_Host name"
msgstr "_Serveur"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
-#: ../sflphone-client-gnome/src/config/assistant.c:323
-#: ../sflphone-client-gnome/src/config/assistant.c:431
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
+#: ../sflphone-client-gnome/src/config/assistant.c:330
+#: ../sflphone-client-gnome/src/config/assistant.c:443
msgid "_User name"
msgstr "Usa_ger"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:242
-#: ../sflphone-client-gnome/src/config/assistant.c:339
-#: ../sflphone-client-gnome/src/config/assistant.c:446
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:346
+#: ../sflphone-client-gnome/src/config/assistant.c:458
msgid "_Password"
msgstr "_Mot de passe"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:262
-#: ../sflphone-client-gnome/src/config/assistant.c:357
-#: ../sflphone-client-gnome/src/config/assistant.c:462
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:363
+#: ../sflphone-client-gnome/src/config/assistant.c:473
+#, fuzzy
+msgid "Show password"
+msgstr "Mot de passe"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:368
+#: ../sflphone-client-gnome/src/config/assistant.c:478
msgid "_Voicemail number"
msgstr "_Boite vocale #"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:348
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
msgid "Authentication"
msgstr "Identification"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:349
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
msgid "Secret"
msgstr "Mot de passe"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:579
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
msgid "Credential"
msgstr "Informations"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:614
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
msgid "Authentication name"
msgstr "Nom d'authentification"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:625
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
msgid "Password"
msgstr "Mot de passe"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:649
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1029
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:306
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
msgid "Security"
msgstr "Sécurité"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:662
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:318
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
msgid "Use TLS transport (sips)"
msgstr "Utiliser un transport TLS (sips)"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:668
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:323
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
msgid "SRTP key exchange"
msgstr "Échange de clé SRTP"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:329
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
msgid "Disabled"
msgstr "Désactivé"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:770
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
msgid "Registration"
msgstr "Expiration d'enregistrement"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:775
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
msgid "Registration expire"
msgstr "Expiration d'enregistrement"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:784
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
msgid "_Comply with RFC 3263"
msgstr "Respecter RFC 3263"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:791
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:221
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
msgid "Network Interface"
msgstr "Interface réseau"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:805
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:236
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
msgid "Local address"
msgstr "Adresse locale"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:855
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:292
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
msgid "Local port"
msgstr "Port local"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:868
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:903
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
msgid "Published address"
msgstr "Adresse de publication"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:874
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
msgid "Using STUN"
msgstr "Utiliser STUN "
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:881
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
msgid "STUN server URL"
msgstr "URL du serveur STUN"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:889
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
msgid "Same as local parameters"
msgstr "Identique aux paramètres locaux"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:892
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
msgid "Set published address and port:"
msgstr "Configurer l'adresse et le port à publier"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:911
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
msgid "Published port"
msgstr "Port de publication"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1000
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
msgid "Account settings"
msgstr "Paramètre des comptes"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1019
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
msgid "Basic"
msgstr "Général"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1024
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
msgid "Advanced"
msgstr "Avancé"
@@ -664,35 +672,35 @@ msgstr "Avancé"
msgid "Server returned \"%s\" (%d)"
msgstr "Le serveur a répondu \"%s\" (%d)"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:387
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
msgid "Protocol"
msgstr "Protocole"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:394
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:396
msgid "Status"
msgstr "Statut"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:472
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:474
msgid "Accounts"
msgstr "Comptes"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:482
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:484
msgid "Configured Accounts"
msgstr "Comptes Configurés"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:499
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
#, c-format
msgid "There is %d active account"
msgid_plural "There are %d active accounts"
msgstr[0] " %d compte actif"
msgstr[1] " %d comptes actifs"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:505
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
msgid "You have no active account"
msgstr "Vous n'avez aucun compte actif"
#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:537
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
msgid "General"
msgstr "Général"
@@ -741,12 +749,12 @@ msgstr "Sélectionnez les carnets d'adresses d'Evolution à utiliser"
msgid "Name"
msgstr "Nom"
-#: ../sflphone-client-gnome/src/config/assistant.c:69
+#: ../sflphone-client-gnome/src/config/assistant.c:75
#, c-format
msgid "This assistant is now finished."
msgstr "Cet assistant est maintenant terminé."
-#: ../sflphone-client-gnome/src/config/assistant.c:71
+#: ../sflphone-client-gnome/src/config/assistant.c:77
msgid ""
"You can at any time check your registration state or modify your accounts "
"parameters in the Options/Accounts window."
@@ -754,127 +762,127 @@ 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/config/assistant.c:74
+#: ../sflphone-client-gnome/src/config/assistant.c:80
msgid "Alias"
msgstr "Alias"
-#: ../sflphone-client-gnome/src/config/assistant.c:78
+#: ../sflphone-client-gnome/src/config/assistant.c:84
msgid "Server"
msgstr "Serveur"
-#: ../sflphone-client-gnome/src/config/assistant.c:82
+#: ../sflphone-client-gnome/src/config/assistant.c:88
msgid "Username"
msgstr "Nom d'utilisateur"
-#: ../sflphone-client-gnome/src/config/assistant.c:86
+#: ../sflphone-client-gnome/src/config/assistant.c:92
msgid "Security: "
msgstr "Sécurité: "
-#: ../sflphone-client-gnome/src/config/assistant.c:88
+#: ../sflphone-client-gnome/src/config/assistant.c:94
msgid "SRTP/ZRTP draft-zimmermann"
msgstr "SRTP/ZRTP draft-zimmermann"
-#: ../sflphone-client-gnome/src/config/assistant.c:90
+#: ../sflphone-client-gnome/src/config/assistant.c:96
msgid "None"
msgstr "Aucun"
-#: ../sflphone-client-gnome/src/config/assistant.c:223
+#: ../sflphone-client-gnome/src/config/assistant.c:229
msgid "SFLphone account creation wizard"
msgstr "Assistant de création de compte de SFLphone"
-#: ../sflphone-client-gnome/src/config/assistant.c:249
+#: ../sflphone-client-gnome/src/config/assistant.c:255
msgid "Welcome to the Account creation wizard of SFLphone!"
msgstr "Bienvenue dans l'assistant de création de compte de SFLphone !"
-#: ../sflphone-client-gnome/src/config/assistant.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:256
msgid "This installation wizard will help you configure an account."
msgstr "Cet assistant vous guidera dans la configuration d'un compte."
-#: ../sflphone-client-gnome/src/config/assistant.c:264
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "VoIP Protocols"
msgstr "Protocoles VoIP"
-#: ../sflphone-client-gnome/src/config/assistant.c:264
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "Select an account type"
msgstr "Sélectionnez un type de compte"
-#: ../sflphone-client-gnome/src/config/assistant.c:266
+#: ../sflphone-client-gnome/src/config/assistant.c:272
msgid "SIP (Session Initiation Protocol)"
msgstr "SIP (Session Initiation Protocol)"
-#: ../sflphone-client-gnome/src/config/assistant.c:268
+#: ../sflphone-client-gnome/src/config/assistant.c:274
msgid "IAX2 (InterAsterix Exchange)"
msgstr "IAX2 (InterAsterix Exchange)"
-#: ../sflphone-client-gnome/src/config/assistant.c:282
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Account"
msgstr "Compte"
-#: ../sflphone-client-gnome/src/config/assistant.c:282
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Please select one of the following options"
msgstr "Veuillez sélectionner une des options suivantes"
-#: ../sflphone-client-gnome/src/config/assistant.c:284
+#: ../sflphone-client-gnome/src/config/assistant.c:290
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/config/assistant.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:292
msgid "Register an existing SIP or IAX2 account"
msgstr "Enregistrer un compte SIP ou IAX2 existant"
-#: ../sflphone-client-gnome/src/config/assistant.c:299
+#: ../sflphone-client-gnome/src/config/assistant.c:306
msgid "SIP account settings"
msgstr "Paramètres de compte SIP"
-#: ../sflphone-client-gnome/src/config/assistant.c:299
-#: ../sflphone-client-gnome/src/config/assistant.c:407
+#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "Please fill the following information"
msgstr "Veuillez remplir les champs suivants"
-#: ../sflphone-client-gnome/src/config/assistant.c:365
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:376
+#: ../sflphone-client-gnome/src/config/assistant.c:405
msgid "Secure communications with _ZRTP"
msgstr "Communications sécurisées avec _ZRTP"
-#: ../sflphone-client-gnome/src/config/assistant.c:378
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "Optional email address"
msgstr "Adresse courriel optionnelle"
-#: ../sflphone-client-gnome/src/config/assistant.c:378
+#: ../sflphone-client-gnome/src/config/assistant.c:389
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-gnome/src/config/assistant.c:386
+#: ../sflphone-client-gnome/src/config/assistant.c:397
msgid "_Email address"
msgstr "A_dresse courriel"
-#: ../sflphone-client-gnome/src/config/assistant.c:407
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "IAX2 account settings"
msgstr "Paramètres de compte IAX2"
-#: ../sflphone-client-gnome/src/config/assistant.c:480
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "Network Address Translation (NAT)"
msgstr "Network Address Translation (NAT)"
-#: ../sflphone-client-gnome/src/config/assistant.c:480
+#: ../sflphone-client-gnome/src/config/assistant.c:496
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/config/assistant.c:489
+#: ../sflphone-client-gnome/src/config/assistant.c:505
msgid "E_nable STUN"
msgstr "A_ctiver STUN"
-#: ../sflphone-client-gnome/src/config/assistant.c:496
+#: ../sflphone-client-gnome/src/config/assistant.c:512
msgid "_STUN server"
msgstr "S_erveur STUN"
-#: ../sflphone-client-gnome/src/config/assistant.c:510
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Account Registration"
msgstr "Enregistrement du compte"
-#: ../sflphone-client-gnome/src/config/assistant.c:510
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Congratulations!"
msgstr "Félicitations!"
@@ -910,51 +918,51 @@ msgstr "Détection de l'activité de la voix"
msgid "_Noise Reduction (Narrow-Band Companding)"
msgstr "Réduction du bruit (Compresseur extenseur LBR)"
-#: ../sflphone-client-gnome/src/config/audioconf.c:795
+#: ../sflphone-client-gnome/src/config/audioconf.c:800
msgid "Sound Manager"
msgstr "Interface Audio"
-#: ../sflphone-client-gnome/src/config/audioconf.c:804
+#: ../sflphone-client-gnome/src/config/audioconf.c:809
msgid "_Pulseaudio"
msgstr "_Pulseaudio"
-#: ../sflphone-client-gnome/src/config/audioconf.c:808
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
msgid "_ALSA"
msgstr "_ALSA"
-#: ../sflphone-client-gnome/src/config/audioconf.c:814
+#: ../sflphone-client-gnome/src/config/audioconf.c:819
msgid "ALSA settings"
msgstr "Paramètres ALSA"
-#: ../sflphone-client-gnome/src/config/audioconf.c:831
+#: ../sflphone-client-gnome/src/config/audioconf.c:836
msgid "Codecs"
msgstr "Codecs"
-#: ../sflphone-client-gnome/src/config/audioconf.c:860
+#: ../sflphone-client-gnome/src/config/audioconf.c:865
msgid "Recordings"
msgstr "Enregistrements"
-#: ../sflphone-client-gnome/src/config/audioconf.c:864
+#: ../sflphone-client-gnome/src/config/audioconf.c:869
msgid "Destination folder"
msgstr "Dossier de destination"
-#: ../sflphone-client-gnome/src/config/audioconf.c:868
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
msgid "Select a folder"
msgstr "Choisissez un dossier"
-#: ../sflphone-client-gnome/src/config/audioconf.c:874
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
msgid "Ringtones"
msgstr "Sonneries"
-#: ../sflphone-client-gnome/src/config/audioconf.c:880
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
msgid "_Enable ringtones"
msgstr "_Activer les sonneries"
-#: ../sflphone-client-gnome/src/config/audioconf.c:886
+#: ../sflphone-client-gnome/src/config/audioconf.c:891
msgid "Choose a ringtone"
msgstr "Sélectionner une sonnerie"
-#: ../sflphone-client-gnome/src/config/audioconf.c:892
+#: ../sflphone-client-gnome/src/config/audioconf.c:897
msgid "Audio Files"
msgstr "Fichier Audio"
@@ -991,7 +999,7 @@ msgstr "Réécriture des numéros appelés"
msgid "_Prefix dialed numbers with"
msgstr "_Préfixer les numéros composés par"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:212
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
msgid ""
"This profile is used when you want to reach a remote peer simply by typing a "
"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
@@ -1002,67 +1010,59 @@ msgstr ""
"sont aussi utilisé si aucun compte ne peut être attribué à un appel entrant "
"ou sortant."
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:425
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
msgid "Desktop Notifications"
msgstr "Notifications de Bureau"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:429
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
msgid "_Enable notifications"
msgstr "_Activer les notifications"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:435
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
msgid "System Tray Icon"
msgstr "Icône dans la barre des tâches"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:438
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
msgid "_Popup main window on incoming call"
msgstr "Faire apparaître la fenêtre _principale lors d'appel entrant"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:443
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
msgid "Ne_ver popup main window"
msgstr "Ne _jamais afficher la fenêtre principale"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:447
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
msgid "Hide SFLphone window on _startup"
msgstr "_Cacher la fenêtre de SFLphone au démarrage"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
msgid "Calls History"
msgstr "Historique des appels"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:456
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
msgid "_Keep my history for at least"
msgstr "Garder mon historique au moins"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:467
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
msgid "days"
msgstr "jours"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:471
-msgid "Configuration File"
-msgstr "Fichier de configuration"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:473
-msgid "Store SIP credentials as MD5 hash"
-msgstr "Stocker les informations d'authentification sour forme encryptée (MD5)"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:517
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
msgid "Preferences"
msgstr "Préférences"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:542
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
msgid "Audio"
msgstr "Audio"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:547
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
msgid "Address Book"
msgstr "Carnet d'adresse"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:552
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
msgid "Hooks"
msgstr "Ancrage"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:562
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
msgid "Direct IP calls"
msgstr "Appels IP"
@@ -1070,11 +1070,11 @@ msgstr "Appels IP"
msgid "Advanced options for TLS"
msgstr "Options avancées TLS"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:55
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:56
msgid "TLS transport"
msgstr "Transport TLS"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:59
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:60
msgid ""
"TLS transport can be used along with UDP for those calls that would\n"
"require secure sip transactions (aka SIPS). You can configure a different\n"
@@ -1087,55 +1087,55 @@ msgstr ""
"TLS différent pour chaque compte. Cependant, chacun écoutera sur un port "
"différent.\n"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:100
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
msgid "Certificate of Authority list"
msgstr "Liste des autorités de certification"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:104
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
msgid "Choose a CA list file (optional)"
msgstr "Choisir une liste d'AC (optionnel)"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:128
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
msgid "Public endpoint certificate file"
msgstr "Fichier de certificats de l'extrémité public"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:132
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
msgid "Choose a public endpoint certificate (optional)"
msgstr "Sélectionner le certificat de l'extrémité public"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:156
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
msgid "Choose a private key file (optional)"
msgstr "Choisir une clé privée (optionnel)"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:178
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
msgid "Password for the private key"
msgstr "Mot de passe pour la clé privée"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:201
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
msgid "TLS protocol method"
msgstr "Méthode pour TLS"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:235
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
msgid "TLS cipher list"
msgstr "Liste de cryptogramme TLS"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:244
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
msgid "Server name instance for outgoing TLS connection"
msgstr "Instance du serveur pour les connections TLS sortantes"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:252
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
msgid "Negotiation timeout (sec:msec)"
msgstr "Expiration de la négociation"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:269
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
msgid "Verify incoming certificates, as a server"
msgstr "En tant que serveur, vérifier les certificats entrants"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:275
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
msgid "Verify certificates from answer, as a client"
msgstr "En tant que client, vérifier les certificats dans les réponses"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:281
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
msgid "Require certificate for incoming tls connections"
msgstr "Exiger un certificat pour les connexions TLS entrantes"
@@ -1159,29 +1159,36 @@ msgstr "_Avertir si ZRTP n'est pas supporté"
msgid "Display SAS once for hold events"
msgstr "Afficher le SAS seulement une fois sur les mises en attente"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:58
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
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:59
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:72
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:84
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:96
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
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:71
msgid "Search by missed call"
msgstr "Rechercher dans les appels manqués"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:83
msgid "Search by incoming call"
msgstr "Rechercher dans les appels entrants"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:95
msgid "Search by outgoing call"
msgstr "Rechercher dans les appels sortants"
+#~ msgid "Configuration File"
+#~ msgstr "Fichier de configuration"
+
+#~ msgid "Store SIP credentials as MD5 hash"
+#~ msgstr ""
+#~ "Stocker les informations d'authentification sour forme encryptée (MD5)"
+
#~ msgid "IP call - %s"
#~ msgstr "Appel IP - %s"
diff --git a/lang/it/it.po b/lang/it/it.po
index 88fc58458f6e365dd5d030203af3e1d5057ccf11..cf8644aea926a034434257d7637e4c5c02e5a84c 100644
--- a/lang/it/it.po
+++ b/lang/it/it.po
@@ -1,21 +1,21 @@
-# SFLphone italian translation.
+# 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.
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.7\n"
+"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-14 11:18-0400\n"
+"POT-Creation-Date: 2009-12-03 10:22-0500\n"
"PO-Revision-Date: 2009-10-14 17:47+0000\n"
-"Last-Translator: Stefano Scamuzzo <stefano.scamuzzo@eng.it>\n"
+"Last-Translator: Maxime Chambreuil <maxime.chambreuil@gmail.com>\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=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-10-26 15:48+0000\n"
+"X-Launchpad-Export-Date: 2009-12-03 15:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: ../sflphone-client-gnome/src/accountlist.c:175
@@ -60,25 +60,15 @@ msgstr "Server STUN non valido"
msgid "Invalid"
msgstr "Non valido"
-#: ../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 messaggio vocale"
-msgstr[1] "%d messaggi vocali"
-
-#: ../sflphone-client-gnome/src/actions.c:83
-#: ../sflphone-client-gnome/src/actions.c:919
-#: ../sflphone-client-gnome/src/actions.c:926
+#: ../sflphone-client-gnome/src/actions.c:98
msgid "Using account"
msgstr "Account in uso:"
-#: ../sflphone-client-gnome/src/actions.c:89
+#: ../sflphone-client-gnome/src/actions.c:104
msgid "No registered accounts"
msgstr "Nessun account registrato"
-#: ../sflphone-client-gnome/src/actions.c:268
+#: ../sflphone-client-gnome/src/actions.c:285
msgid ""
"Unable to connect to the SFLphone server.\n"
"Make sure the daemon is running."
@@ -86,27 +76,23 @@ msgstr ""
"Impossibile connettersi al server SFLphone.\n"
"Accertarsi che il demone sia in esecuzione."
-#: ../sflphone-client-gnome/src/actions.c:913
-#, c-format
-msgid "IP call - %s"
-msgstr "Chiamata IP diretta - %s"
-
-#: ../sflphone-client-gnome/src/actions.c:922
-msgid "Codec"
-msgstr "Codec"
+#: ../sflphone-client-gnome/src/actions.c:589
+#: ../sflphone-client-gnome/src/actions.c:911
+msgid "Direct SIP call"
+msgstr ""
-#: ../sflphone-client-gnome/src/actions.c:1119
+#: ../sflphone-client-gnome/src/actions.c:1103
#, 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> )"
+"</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>Errore: Non è stato trovato alcun codec audio.</b>\n"
+"<b>Errore: Non è stato trovato alcun codec audio.</b>\n"
"\n"
-"I codec audio SFL devono trovarsi in <i>%s</i> o nella sottocartella "
-"<b>.sflphone</b> della cartella home dell'utente (</i>%s</i>)"
+"I codec audio SFL devono trovarsi in <i>%s</i> o nella sottocartella <b>."
+"sflphone</b> della cartella home dell'utente (</i>%s</i>)"
#: ../sflphone-client-gnome/src/errors.c:29
msgid ""
@@ -133,11 +119,11 @@ msgid ""
"Pulseaudio is not running"
msgstr ""
"Notifica PulseAudio\n"
-"PulseAudio non è in esecuzione"
+"PulseAudio non è in esecuzione"
#: ../sflphone-client-gnome/src/mainwindow.c:73
msgid "There is one call in progress."
-msgstr "C'è una chiamata in corso."
+msgstr "C'è una chiamata in corso."
#: ../sflphone-client-gnome/src/mainwindow.c:77
msgid "There are calls in progress."
@@ -147,57 +133,55 @@ msgstr "Ci sono chiamate in corso."
msgid "Do you still want to quit?"
msgstr "Vuoi veramente uscire?"
-#: ../sflphone-client-gnome/src/mainwindow.c:299
+#: ../sflphone-client-gnome/src/mainwindow.c:298
msgid "SFLphone Error"
msgstr "Errore SFLphone"
-#: ../sflphone-client-gnome/src/mainwindow.c:391
+#: ../sflphone-client-gnome/src/mainwindow.c:392
#, c-format
msgid "ZRTP is not supported by peer %s\n"
-msgstr "ZRPT non supportato dal nodo %s\n"
-
-#: ../sflphone-client-gnome/src/mainwindow.c:392
-msgid "Secure Communication Unavailable"
-msgstr "Comunicazione sicura non disponibile"
+msgstr ""
#: ../sflphone-client-gnome/src/mainwindow.c:393
-#: ../sflphone-client-gnome/src/mainwindow.c:415
-msgid "Continue"
-msgstr "Continua"
+msgid "Secure Communication Unavailable"
+msgstr ""
#: ../sflphone-client-gnome/src/mainwindow.c:394
#: ../sflphone-client-gnome/src/mainwindow.c:416
-#: ../sflphone-client-gnome/src/mainwindow.c:430
+msgid "Continue"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/mainwindow.c:395
+#: ../sflphone-client-gnome/src/mainwindow.c:417
+#: ../sflphone-client-gnome/src/mainwindow.c:431
msgid "Stop Call"
-msgstr "Chiudi la chiamata"
+msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:413
+#: ../sflphone-client-gnome/src/mainwindow.c:414
#, c-format
msgid ""
"A %s error forced the call with %s to fall under unencrypted mode.\n"
"Exact reason: %s\n"
-msgstr "Un errore %s ha provocato il passaggio della chiamata %s in modalità non sicura.\n"
-"Motivo esatto: %s\n"
+msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:414
+#: ../sflphone-client-gnome/src/mainwindow.c:415
msgid "ZRTP negotiation failed"
-msgstr "Negoziazione ZRTP fallita"
+msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:427
+#: ../sflphone-client-gnome/src/mainwindow.c:428
#, c-format
msgid ""
"%s wants to stop using secure communication. Confirm will resume "
"conversation without SRTP.\n"
-msgstr "%s vuole terminare l'uso della comunicazione sicura. Conferma ripristinerà "
-"la converazione senza SRTP.\n"
+msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:428
+#: ../sflphone-client-gnome/src/mainwindow.c:429
msgid "Confirm Go Clear"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:429
+#: ../sflphone-client-gnome/src/mainwindow.c:430
msgid "Confirm"
-msgstr "Conferma"
+msgstr ""
#: ../sflphone-client-gnome/src/sflnotify.c:71
#: ../sflphone-client-gnome/src/sflnotify.c:91
@@ -210,6 +194,13 @@ msgstr "Account %s: %s"
msgid "<i>From</i> %s"
msgstr "<i>Da</i> %s"
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+#, c-format
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] "%d messaggio vocale"
+msgstr[1] "%d messaggi vocali"
+
#: ../sflphone-client-gnome/src/sflnotify.c:111
#, c-format
msgid "Calling with %s account <i>%s</i>"
@@ -233,23 +224,21 @@ msgid ""
"<i>With:</i> %s \n"
"using %s"
msgstr ""
-"<i>con:</i> %s \n"
-"utilizzando $s"
#: ../sflphone-client-gnome/src/sflnotify.c:205
#, c-format
msgid "%s does not support ZRTP."
-msgstr "%s non supporta ZRTP."
+msgstr ""
#: ../sflphone-client-gnome/src/sflnotify.c:220
#, c-format
msgid "ZRTP negotiation failed with %s"
-msgstr "Negoziazione ZRTP con %s fallita"
+msgstr ""
#: ../sflphone-client-gnome/src/sflnotify.c:235
#, c-format
msgid "<i>With:</i> %s"
-msgstr "<i>Con:</i> %s"
+msgstr ""
#: ../sflphone-client-gnome/src/sliders.c:162
msgid "Speakers volume"
@@ -259,15 +248,15 @@ msgstr "Volume altoparlante"
msgid "Mic volume"
msgstr "Volume microfono"
-#: ../sflphone-client-gnome/src/statusicon.c:91
+#: ../sflphone-client-gnome/src/statusicon.c:96
msgid "_Show main window"
msgstr "Mostra la finestra principale"
-#: ../sflphone-client-gnome/src/statusicon.c:126
+#: ../sflphone-client-gnome/src/statusicon.c:131
msgid "SFLphone"
msgstr "SFLphone"
-#: ../sflphone-client-gnome/src/statusicon.c:127
+#: ../sflphone-client-gnome/src/statusicon.c:132
#, c-format
msgid "%i account configured"
msgid_plural "%i accounts configured"
@@ -275,203 +264,399 @@ msgstr[0] "%i account configurato"
msgstr[1] "%i account configurati"
#: ../sflphone-client-gnome/src/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:750
+#: ../sflphone-client-gnome/src/uimanager.c:693
+#: ../sflphone-client-gnome/src/uimanager.c:727
msgid "Voicemail"
msgstr "Segreteria telefonica"
-#: ../sflphone-client-gnome/src/uimanager.c:403
+#: ../sflphone-client-gnome/src/uimanager.c:117
+msgid "No address book selected"
+msgstr "Rubrica"
+
+#: ../sflphone-client-gnome/src/uimanager.c:137
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "Address book"
+msgstr "Rubrica"
+
+#: ../sflphone-client-gnome/src/uimanager.c:279
+msgid "Voicemail (%i)"
+msgstr "Segreteria telefonica (%i)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:342
msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
-msgstr "SFLphone è un client VoIP compatibile con i protocolli SIP e IAX2."
+msgstr "SFLphone è un client VoIP compatibile con i protocolli SIP e IAX2."
-#: ../sflphone-client-gnome/src/uimanager.c:406
+#: ../sflphone-client-gnome/src/uimanager.c:345
msgid "About SFLphone"
msgstr "Informazioni su SFLphone"
-#: ../sflphone-client-gnome/src/uimanager.c:1028
+#: ../sflphone-client-gnome/src/uimanager.c:719
+msgid "Call"
+msgstr "_Chiama"
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:1184
+msgid "_New call"
+msgstr "Chiama"
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+msgid "Place a new call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:979
msgid "_Pick up"
msgstr "Rispondi"
-#: ../sflphone-client-gnome/src/uimanager.c:1040
-#: ../sflphone-client-gnome/src/uimanager.c:1081
+#: ../sflphone-client-gnome/src/uimanager.c:721
+msgid "Answer the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:991
+#: ../sflphone-client-gnome/src/uimanager.c:1032
msgid "_Hang up"
msgstr "_Chiudi"
-#: ../sflphone-client-gnome/src/uimanager.c:1052
-#: ../sflphone-client-gnome/src/uimanager.c:1093
-msgid "On _Hold"
+#: ../sflphone-client-gnome/src/uimanager.c:722
+msgid "Finish the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "O_n hold"
msgstr "Attesa"
-#: ../sflphone-client-gnome/src/uimanager.c:1064
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "Place the call on hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "O_ff hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "Place the call off hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:725
+#: ../sflphone-client-gnome/src/uimanager.c:1015
msgid "_Record"
msgstr "_Registra"
-#: ../sflphone-client-gnome/src/uimanager.c:1154
-msgid "_Call back"
-msgstr "Richiama"
+#: ../sflphone-client-gnome/src/uimanager.c:725
+msgid "Record the current conversation"
+msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1226
-msgid "_New call"
-msgstr "Chiama"
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Configuration _Assistant"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Run the configuration assistant"
+msgstr "Errore di configurazione STUN"
+
+#: ../sflphone-client-gnome/src/uimanager.c:727
+msgid "Call your voicemail"
+msgstr "%d messaggio vocale"
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "_Close"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "Minimize to system tray"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "_Quit"
+msgstr "_Modifica"
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "Quit the program"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:732
+msgid "_Edit"
+msgstr "_Modifica"
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "_Copy"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "Copy the selection"
+msgstr "Elimina l'account selezionato"
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "_Paste"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "Paste the clipboard"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear _history"
+msgstr "Cancella la cronologia"
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear the call history"
+msgstr "Cancella la cronologia"
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "_Accounts"
+msgstr "_Account"
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "Edit your accounts"
+msgstr "Account attivo"
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "_Preferences"
+msgstr "Preferenze"
-#: ../sflphone-client-gnome/src/uimanager.c:1300
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "Change your preferences"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:740
+msgid "_View"
+msgstr "_Visualizza"
+
+#: ../sflphone-client-gnome/src/uimanager.c:743
+msgid "_Help"
+msgstr "_Aiuto"
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Contents"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Open the manual"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:745
+msgid "About this application"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "_Transfer"
+msgstr "Inoltra"
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "Transfer the call"
+msgstr "Inoltra a: "
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "_Show toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "Show the toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "_Dialpad"
+msgstr "Mostra tastiera"
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "Show the dialpad"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "_Volume controls"
+msgstr "Mostra i controlli del volume"
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "Show the volume controls"
+msgstr "Mostra i controlli del volume"
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "_History"
+msgstr "Cronologia"
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "Calls history"
+msgstr "Cronologia chiamate"
+
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "_Address book"
+msgstr "Rubrica"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1003
+#: ../sflphone-client-gnome/src/uimanager.c:1044
+msgid "On _Hold"
+msgstr "Attesa"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1107
+msgid "_Call back"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:1258
msgid "Edit phone number"
-msgstr "Modifica numero di telefono"
+msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1311
+#: ../sflphone-client-gnome/src/uimanager.c:1269
msgid "Edit the phone number before making a call"
-msgstr "Modifica il numero di telefono prima di chiamare"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:164
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
msgid "Account Parameters"
msgstr "Parametri account"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:173
-#: ../sflphone-client-gnome/src/config/assistant.c:294
-#: ../sflphone-client-gnome/src/config/assistant.c:402
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
+#: ../sflphone-client-gnome/src/config/assistant.c:314
+#: ../sflphone-client-gnome/src/config/assistant.c:427
msgid "_Alias"
msgstr "_Pseudonimo"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:181
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
msgid "_Protocol"
msgstr "_Protocollo"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:199
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
msgid "Unknown"
msgstr "Sconosciuto"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:209
-#: ../sflphone-client-gnome/src/config/assistant.c:302
-#: ../sflphone-client-gnome/src/config/assistant.c:410
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
+#: ../sflphone-client-gnome/src/config/assistant.c:322
+#: ../sflphone-client-gnome/src/config/assistant.c:435
msgid "_Host name"
msgstr "Nome _host"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:217
-#: ../sflphone-client-gnome/src/config/assistant.c:310
-#: ../sflphone-client-gnome/src/config/assistant.c:418
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
+#: ../sflphone-client-gnome/src/config/assistant.c:330
+#: ../sflphone-client-gnome/src/config/assistant.c:443
msgid "_User name"
msgstr "Nome _utente"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:234
-#: ../sflphone-client-gnome/src/config/assistant.c:326
-#: ../sflphone-client-gnome/src/config/assistant.c:433
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:346
+#: ../sflphone-client-gnome/src/config/assistant.c:458
msgid "_Password"
msgstr "_Password"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:254
-#: ../sflphone-client-gnome/src/config/assistant.c:344
-#: ../sflphone-client-gnome/src/config/assistant.c:449
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:363
+#: ../sflphone-client-gnome/src/config/assistant.c:473
+msgid "Show password"
+msgstr "Password"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:368
+#: ../sflphone-client-gnome/src/config/assistant.c:478
msgid "_Voicemail number"
msgstr "Numero segreteria telefonica"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:340
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
msgid "Authentication"
-msgstr "Autenticazione"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:341
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
msgid "Secret"
-msgstr "Segreto"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:466
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
msgid "Credential"
-msgstr "Credenziali"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:501
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
msgid "Authentication name"
-msgstr "Nome autenticazione"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:512
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
msgid "Password"
msgstr "Password"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:535
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:909
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:201
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
msgid "Security"
-msgstr "Sicurezza"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:547
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:213
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
msgid "Use TLS transport (sips)"
-msgstr "Utilizza il trasporto TLS (sips)"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:552
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:218
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
msgid "SRTP key exchange"
-msgstr "Scambio di chiavi SRTP"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:558
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
msgid "Disabled"
-msgstr "Disabilitato"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
msgid "Registration"
-msgstr "Registrazione"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:679
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
msgid "Registration expire"
msgstr "Scadenza registrazione"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
msgid "_Comply with RFC 3263"
-msgstr "Compatibile con RFC 3263"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
-msgid "Network"
-msgstr "Rete"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
+msgid "Network Interface"
+msgstr "Rete irraggiungibile"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:707
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
msgid "Local address"
-msgstr "Indirizzo locale"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:744
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
msgid "Local port"
-msgstr "Porta locale"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:752
-msgid "Set published address and port:"
-msgstr "Configura indirizzo pubblicato e porta:"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
+msgid "Published address"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:756
-msgid "Using STUN "
-msgstr "Utilizza STUN "
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+msgid "Using STUN"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:761
-msgid "Same as local parameters"
-msgstr "Come paramteri locali"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
+msgid "STUN server URL"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:764
-msgid "Manually"
-msgstr "Manuale"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
+msgid "Same as local parameters"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:769
-msgid "Published address"
-msgstr "Indirizzo pubblicato"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
+msgid "Set published address and port:"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:777
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
msgid "Published port"
-msgstr "Porta pubblicata"
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:785
-msgid "STUN server URL"
-msgstr "URL del server STUN"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
msgid "Account settings"
msgstr "Impostazioni dell'account"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
msgid "Basic"
msgstr "Generale"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:904
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
msgid "Advanced"
msgstr "Avanzate"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:169
-msgid "Server returned \""
-msgstr "Il server ha restituito \""
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:164
+#, c-format
+msgid "Server returned \"%s\" (%d)"
+msgstr ""
#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
msgid "Protocol"
@@ -483,40 +668,27 @@ msgstr "Stato"
#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:474
msgid "Accounts"
-msgstr "Accounts"
+msgstr "Account"
#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:484
msgid "Configured Accounts"
msgstr "Account configurati"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:505
-msgid "There "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "is "
-msgstr "è"
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "are "
-msgstr "sono"
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:508
-msgid " active account"
-msgstr " account attivo"
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:509
-msgid "s"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
+#, c-format
+msgid "There is %d active account"
+msgid_plural "There are %d active accounts"
+msgstr[0] ""
+msgstr[1] ""
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:514
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
msgid "You have no active account"
-msgstr "Non ci sono account attivi"
+msgstr ""
#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:443
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
msgid "General"
-msgstr "Generale"
+msgstr ""
#: ../sflphone-client-gnome/src/config/addressbook-config.c:312
msgid "_Use Evolution address books"
@@ -524,11 +696,11 @@ msgstr "_Usa la rubrica di Evolution"
#: ../sflphone-client-gnome/src/config/addressbook-config.c:319
msgid "Download limit :"
-msgstr "Limite per il download: "
+msgstr ""
#: ../sflphone-client-gnome/src/config/addressbook-config.c:327
msgid "cards"
-msgstr "schede"
+msgstr "tessere"
#: ../sflphone-client-gnome/src/config/addressbook-config.c:333
msgid "_Display contact photo if available"
@@ -559,244 +731,238 @@ msgid "Select which Evolution address books to use"
msgstr "Selezionare la rubrica di Evolution da usare"
#: ../sflphone-client-gnome/src/config/addressbook-config.c:404
-#: ../sflphone-client-gnome/src/config/audioconf.c:578
+#: ../sflphone-client-gnome/src/config/audioconf.c:577
msgid "Name"
msgstr "Nome"
-#: ../sflphone-client-gnome/src/config/assistant.c:69
+#: ../sflphone-client-gnome/src/config/assistant.c:75
#, c-format
msgid "This assistant is now finished."
msgstr "La procedura guidata è terminata."
-#: ../sflphone-client-gnome/src/config/assistant.c:71
+#: ../sflphone-client-gnome/src/config/assistant.c:77
msgid ""
"You can at any time check your registration state or modify your accounts "
"parameters in the Options/Accounts window."
-msgstr "In qualsiasi momento puoi controllare lo stato della tua registrazione o modificare i tuoi parametri"
-"di acccount nella finestra Opzioni/Accounts."
+msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:74
+#: ../sflphone-client-gnome/src/config/assistant.c:80
msgid "Alias"
-msgstr "Alias"
+msgstr "Pseudonimo"
-#: ../sflphone-client-gnome/src/config/assistant.c:78
+#: ../sflphone-client-gnome/src/config/assistant.c:84
msgid "Server"
msgstr "Server"
-#: ../sflphone-client-gnome/src/config/assistant.c:82
+#: ../sflphone-client-gnome/src/config/assistant.c:88
msgid "Username"
msgstr "Nome utente"
-#: ../sflphone-client-gnome/src/config/assistant.c:86
+#: ../sflphone-client-gnome/src/config/assistant.c:92
msgid "Security: "
-msgstr "Sicurezza: "
+msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:88
+#: ../sflphone-client-gnome/src/config/assistant.c:94
msgid "SRTP/ZRTP draft-zimmermann"
-msgstr "SRTP/ZRTP draft-zimmermann"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:90
-#: ../sflphone-client-gnome/src/config/assistant.c:182
+#: ../sflphone-client-gnome/src/config/assistant.c:96
msgid "None"
-msgstr "Nessuno"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:210
+#: ../sflphone-client-gnome/src/config/assistant.c:229
msgid "SFLphone account creation wizard"
-msgstr "Procedura guidata per la creazione dell'account SFLphone"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:236
+#: ../sflphone-client-gnome/src/config/assistant.c:255
msgid "Welcome to the Account creation wizard of SFLphone!"
msgstr ""
"Benvenuti alla procedura guidata per la creazione di un account SFLphone"
-#: ../sflphone-client-gnome/src/config/assistant.c:237
+#: ../sflphone-client-gnome/src/config/assistant.c:256
msgid "This installation wizard will help you configure an account."
-msgstr "Questa procedura di installazione permetterà di configurare un account."
+msgstr "Questa procedura permetterà di configurare un account."
-#: ../sflphone-client-gnome/src/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "VoIP Protocols"
msgstr "Protocolli VoIP"
-#: ../sflphone-client-gnome/src/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "Select an account type"
msgstr "Selezionare un tipo di account"
-#: ../sflphone-client-gnome/src/config/assistant.c:253
+#: ../sflphone-client-gnome/src/config/assistant.c:272
msgid "SIP (Session Initiation Protocol)"
msgstr "SIP (Session Initiation Protocol)"
-#: ../sflphone-client-gnome/src/config/assistant.c:255
+#: ../sflphone-client-gnome/src/config/assistant.c:274
msgid "IAX2 (InterAsterix Exchange)"
msgstr "IAX2 (InterAsterix Exchange)"
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Account"
msgstr "Account"
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Please select one of the following options"
msgstr "Scegliere una delle seguenti opzioni"
-#: ../sflphone-client-gnome/src/config/assistant.c:271
+#: ../sflphone-client-gnome/src/config/assistant.c:290
msgid "Create a free SIP/IAX2 account on sflphone.org"
msgstr "Creare un account SIP/IAX2 gratuito su sflphone.org"
-#: ../sflphone-client-gnome/src/config/assistant.c:273
+#: ../sflphone-client-gnome/src/config/assistant.c:292
msgid "Register an existing SIP or IAX2 account"
msgstr "Registrare un account SIP o IAX2 esistente"
-#: ../sflphone-client-gnome/src/config/assistant.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:306
msgid "SIP account settings"
msgstr "Impostazioni account SIP"
-#: ../sflphone-client-gnome/src/config/assistant.c:286
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "Please fill the following information"
-msgstr "Per favore compila le seguenti informazioni"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:352
-#: ../sflphone-client-gnome/src/config/assistant.c:381
+#: ../sflphone-client-gnome/src/config/assistant.c:376
+#: ../sflphone-client-gnome/src/config/assistant.c:405
msgid "Secure communications with _ZRTP"
-msgstr "Comunicazioni sicure con _ZRTP"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "Optional email address"
msgstr "Indirizzo email opzionale"
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "This email address will be used to send your voicemail messages."
msgstr ""
-"L'indirizzo email sarà usato per l'invio dei messaggi della segreteria "
+"L'indirizzo email sarà usato per l'invio dei messaggi della segreteria "
"telefonica."
-#: ../sflphone-client-gnome/src/config/assistant.c:373
+#: ../sflphone-client-gnome/src/config/assistant.c:397
msgid "_Email address"
msgstr "Indirizzo _email"
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "IAX2 account settings"
msgstr "Impostazioni account IAX2"
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "Network Address Translation (NAT)"
msgstr "Network Address Translation (NAT)"
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "You should probably enable this if you are behind a firewall."
msgstr "Dovrebbe essere abilitato se ci si trova dietro ad un firewall."
-#: ../sflphone-client-gnome/src/config/assistant.c:476
+#: ../sflphone-client-gnome/src/config/assistant.c:505
msgid "E_nable STUN"
msgstr "Abilita STUN"
-#: ../sflphone-client-gnome/src/config/assistant.c:483
+#: ../sflphone-client-gnome/src/config/assistant.c:512
msgid "_STUN server"
msgstr "Server STUN"
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Account Registration"
msgstr "Registrazione account"
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Congratulations!"
msgstr "Congratulazioni!"
-#: ../sflphone-client-gnome/src/config/audioconf.c:583
+#: ../sflphone-client-gnome/src/config/audioconf.c:582
msgid "Frequency"
msgstr "Frequenza"
-#: ../sflphone-client-gnome/src/config/audioconf.c:588
+#: ../sflphone-client-gnome/src/config/audioconf.c:587
msgid "Bitrate"
msgstr "Bitrate"
-#: ../sflphone-client-gnome/src/config/audioconf.c:593
+#: ../sflphone-client-gnome/src/config/audioconf.c:592
msgid "Bandwidth"
msgstr "Banda"
-#: ../sflphone-client-gnome/src/config/audioconf.c:673
+#: ../sflphone-client-gnome/src/config/audioconf.c:670
msgid "ALSA plugin"
msgstr "Plugin ALSA"
-#: ../sflphone-client-gnome/src/config/audioconf.c:695
+#: ../sflphone-client-gnome/src/config/audioconf.c:692
msgid "Output"
msgstr "Uscita"
-#: ../sflphone-client-gnome/src/config/audioconf.c:717
+#: ../sflphone-client-gnome/src/config/audioconf.c:714
msgid "Input"
msgstr "Ingresso"
-#: ../sflphone-client-gnome/src/config/audioconf.c:752
+#: ../sflphone-client-gnome/src/config/audioconf.c:749
msgid "_Voice Activity Detection"
-msgstr "Rilevazione dell'attività _Voce"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:762
+#: ../sflphone-client-gnome/src/config/audioconf.c:759
msgid "_Noise Reduction (Narrow-Band Companding)"
-msgstr "Riduzione del rumore (Narrow-Band Companding)"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:798
+#: ../sflphone-client-gnome/src/config/audioconf.c:800
msgid "Sound Manager"
-msgstr "Gestore del suono"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:807
+#: ../sflphone-client-gnome/src/config/audioconf.c:809
msgid "_Pulseaudio"
msgstr "_Pulseaudio"
-#: ../sflphone-client-gnome/src/config/audioconf.c:811
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
msgid "_ALSA"
msgstr "_ALSA"
-#: ../sflphone-client-gnome/src/config/audioconf.c:816
-msgid "_Mute other applications during a call"
-msgstr "Spegni l'audio delle altre applicazioni durante una chiamata"
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:823
+#: ../sflphone-client-gnome/src/config/audioconf.c:819
msgid "ALSA settings"
msgstr "Impostazioni ALSA"
-#: ../sflphone-client-gnome/src/config/audioconf.c:840
+#: ../sflphone-client-gnome/src/config/audioconf.c:836
msgid "Codecs"
msgstr "Codec"
-#: ../sflphone-client-gnome/src/config/audioconf.c:869
+#: ../sflphone-client-gnome/src/config/audioconf.c:865
msgid "Recordings"
msgstr "Registrazioni"
-#: ../sflphone-client-gnome/src/config/audioconf.c:873
+#: ../sflphone-client-gnome/src/config/audioconf.c:869
msgid "Destination folder"
msgstr "Cartella di destinazione"
-#: ../sflphone-client-gnome/src/config/audioconf.c:877
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
msgid "Select a folder"
msgstr "Seleziona una cartella"
-#: ../sflphone-client-gnome/src/config/audioconf.c:883
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
msgid "Ringtones"
msgstr "Suonerie"
-#: ../sflphone-client-gnome/src/config/audioconf.c:889
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
msgid "_Enable ringtones"
msgstr "Abilita suonerie"
-#: ../sflphone-client-gnome/src/config/audioconf.c:895
+#: ../sflphone-client-gnome/src/config/audioconf.c:891
msgid "Choose a ringtone"
msgstr "Selezionare una suoneria"
-#: ../sflphone-client-gnome/src/config/audioconf.c:901
+#: ../sflphone-client-gnome/src/config/audioconf.c:897
msgid "Audio Files"
msgstr "File audio"
#: ../sflphone-client-gnome/src/config/hooks-config.c:130
msgid "URL Argument"
-msgstr "Stringa URL"
+msgstr ""
#: ../sflphone-client-gnome/src/config/hooks-config.c:135
msgid "Custom commands on incoming calls with URL"
-msgstr "Comandi custom sulle chiamate in ingresso con URL"
+msgstr ""
#: ../sflphone-client-gnome/src/config/hooks-config.c:138
#, c-format
msgid "%s will be replaced with the passed URL."
-msgstr "%s saranno rimpiazzati dall'URL fornito."
+msgstr ""
#: ../sflphone-client-gnome/src/config/hooks-config.c:141
msgid "Trigger on specific _SIP header"
@@ -818,101 +984,78 @@ msgstr "Riscrittura numero telefonico"
msgid "_Prefix dialed numbers with"
msgstr "Prefisso da aggiungere ai numeri da chiamare"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:195
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
msgid ""
"This profile is used when you want to reach a remote peer simply by typing a "
"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
"also be used if no account can be matched to an incoming or outgoing call."
msgstr ""
-"Questo profilo è utilizzato quando vuoi raggiungere un nodo remoto semplicemente digitando un "
-"URI sip tipo <b>sip:remotepeer</b>. Le configurazione che definisci qui saranno "
-"usate anche se nessun account corrisponde ad una chiamata in ingresso o in uscita."
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:274
-msgid "SIP Port"
-msgstr "SIP Port"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:281
-msgid "UDP Transport"
-msgstr "Trasporto UDP"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:319
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
msgid "Desktop Notifications"
msgstr "Notifiche"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:323
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
msgid "_Enable notifications"
msgstr "Abilita notifiche"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:329
-msgid "Enable voicemail _notifications"
-msgstr "Abilita notifiche messaggi vocali"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:341
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
msgid "System Tray Icon"
msgstr "Icona per area di notifica"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
msgid "_Popup main window on incoming call"
msgstr "Mostra la finestra principale all'arrivo delle chiamate"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:349
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
msgid "Ne_ver popup main window"
msgstr "Non mostrare mai la finestra principale"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:353
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
msgid "Hide SFLphone window on _startup"
msgstr "Nascondi la finestra di SFLphone all'avvio"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:359
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
msgid "Calls History"
msgstr "Cronologia chiamate"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:362
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
msgid "_Keep my history for at least"
msgstr "Mantieni la cronologia per almeno"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:373
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
msgid "days"
msgstr "giorni"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:377
-msgid "Configuration File"
-msgstr "File di configurazione"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:379
-msgid "Store SIP credentials as MD5 hash"
-msgstr "Memorizza le credenziali SIP in MD5"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:423
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
msgid "Preferences"
msgstr "Preferenze"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:448
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
msgid "Audio"
msgstr "Audio"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
msgid "Address Book"
msgstr "Rubrica"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:458
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
msgid "Hooks"
-msgstr "Agganci"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:468
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
msgid "Direct IP calls"
-msgstr "Chiamate IP dirette"
+msgstr ""
#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:38
msgid "Advanced options for TLS"
-msgstr "Opzioni avanzate per TLS"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:55
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:56
msgid "TLS transport"
-msgstr "Trasporto TLS"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:59
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:60
msgid ""
"TLS transport can be used along with UDP for those calls that would\n"
"require secure sip transactions (aka SIPS). You can configure a different\n"
@@ -920,117 +1063,125 @@ msgid ""
"dedicated\n"
"port, different one from each other\n"
msgstr ""
-"Il trasporto TLS può essere utilizzato con UDP per le chiamate che\n"
-"richiedono transazioni sip sicure (aka SIPS). Puoi configurare un trasporto\n"
-"TLS diverso per ognia account. Tuttavia, ognuino di essi girerà su una "
-"porta dedicata, differente dalle altre\n"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:100
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
msgid "Certificate of Authority list"
-msgstr "Lista delle Autorità di certificazione"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:104
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
msgid "Choose a CA list file (optional)"
-msgstr "Scelgi una lista di CA (opzionale)"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:115
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
msgid "Public endpoint certificate file"
-msgstr "File di certificato dell'endpoint pubblico"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:119
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
msgid "Choose a public endpoint certificate (optional)"
-msgstr "Scegli un certificato dell'endpoint pubblico (opzionale)"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:134
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
msgid "Choose a private key file (optional)"
-msgstr "Scegli un file con la chiave privata (opzionale)"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:145
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
msgid "Password for the private key"
-msgstr "Password per la chiave privata"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:168
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
msgid "TLS protocol method"
-msgstr "Metodo del protocollo TLS"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:202
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
msgid "TLS cipher list"
-msgstr "Cifratura TLS"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:211
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
msgid "Server name instance for outgoing TLS connection"
-msgstr "Nome dell'istanza serfer pre connessioni TLS in uscita"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:219
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
msgid "Negotiation timeout (sec:msec)"
-msgstr "Timeout di negoziazione (sec:msec)"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:236
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
msgid "Verify incoming certificates, as a server"
-msgstr "Verifica certificati in ingresso, come server"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:242
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
msgid "Verify certificates from answer, as a client"
-msgstr "Verifica certificati nella risposta, come client"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:248
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
msgid "Require certificate for incoming tls connections"
-msgstr "Richiede un certificato per le connessioni tls in ingresso"
+msgstr ""
#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:49
msgid "ZRTP Options"
-msgstr "Opziobi ZRTP"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:68
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:69
msgid "Send Hello Hash in S_DP"
-msgstr "Invia Hello Hash in S_DP"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:74
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:75
msgid "Ask User to Confirm SAS"
-msgstr "Chiedi all'utente di confermare SAS"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:80
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:81
msgid "_Warn if ZRTP not supported"
-msgstr "Notifica se ZRTP non è supportato"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:86
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:87
msgid "Display SAS once for hold events"
msgstr ""
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:58
msgid "Search all"
msgstr "Cerca tra tutte le chiamate"
-#: ../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
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:59
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:72
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:84
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:96
msgid "Click here to change the search type"
msgstr "Fare clic qui per cambiare il tipo di ricerca"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:71
msgid "Search by missed call"
msgstr "Cerca tra le chiamate perse"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:83
msgid "Search by incoming call"
msgstr "Cerca tra le chiamate ricevute"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:95
msgid "Search by outgoing call"
msgstr "Cerca tra le chiamate effettuate"
-#~ msgid "(C) 2009 Savoir-faire Linux"
-#~ msgstr "(C) 2009 Savoir-faire Linux"
+#~ msgid "IP call - %s"
+#~ msgstr "Chiamata IP diretta - %s"
+
+#~ msgid "Codec"
+#~ msgstr "Codec"
-#~ msgid "Jérémy Quentin"
-#~ msgstr "Jérémy Quentin"
+#~ msgid "Network"
+#~ msgstr "Rete"
-#~ msgid "Address book"
-#~ msgstr "Rubrica"
+#~ msgid "_Mute other applications during a call"
+#~ msgstr "Spegni l'audio delle altre applicazioni durante una chiamata"
-#~ msgid "Call history"
-#~ msgstr "Cronologia chiamate"
+#~ msgid "SIP Port"
+#~ msgstr "SIP Port"
+
+#~ msgid "Enable voicemail _notifications"
+#~ msgstr "Abilita notifiche messaggi vocali"
+
+#~ msgid "(C) 2009 Savoir-faire Linux"
+#~ msgstr "(C) 2009 Savoir-faire Linux"
+
+#~ msgid "Jérémy Quentin"
+#~ msgstr "Jérémy Quentin"
#~ msgid "Hang up"
#~ msgstr "Chiudi"
@@ -1077,26 +1228,8 @@ msgstr "Cerca tra le chiamate effettuate"
#~ msgid "Enable notifications"
#~ msgstr "Attiva le notifiche"
-#~ msgid "History"
-#~ msgstr "Cronologia"
-
-#~ msgid "_Call"
-#~ msgstr "_Chiama"
-
-#~ msgid "_Help"
-#~ msgstr "_Aiuto"
-
-#~ msgid "_View"
-#~ msgstr "_Visualizza"
-
-#~ msgid "_Edit"
-#~ msgstr "_Modifica"
-
-#~ msgid "_Accounts"
-#~ msgstr "_Account"
-
#~ msgid "Port"
-#~ msgstr "Porta"
+#~ msgstr "Port"
#~ msgid "PulseAudio sound server"
#~ msgstr "Server audio PulseAudio"
@@ -1107,9 +1240,6 @@ msgstr "Cerca tra le chiamate effettuate"
#~ msgid "You have an incoming call from"
#~ msgstr "Chiamata in arrivo da"
-#~ msgid "Transfer"
-#~ msgstr "Inoltra"
-
#~ msgid "Hold on"
#~ msgstr "Attesa"
@@ -1122,15 +1252,6 @@ msgstr "Cerca tra le chiamate effettuate"
#~ msgid "Command to run"
#~ msgstr "Comando da eseguire"
-#~ msgid "Display volume controls"
-#~ msgstr "Mostra i controlli del volume"
-
-#~ msgid "Display dialpad"
-#~ msgstr "Mostra tastiera"
-
-#~ msgid "Clear _history"
-#~ msgstr "Cancella la cronologia"
-
#~ msgid "_Enable this account"
#~ msgstr "Abilita questo account"
@@ -1143,9 +1264,6 @@ msgstr "Cerca tra le chiamate effettuate"
#~ msgid "Stun Server"
#~ msgstr "Server STUN"
-#~ msgid "Transfer to : "
-#~ msgstr "Inoltra a: "
-
#~ msgid "Address book loading..."
#~ msgstr "Caricamento rubrica..."
@@ -1156,14 +1274,11 @@ msgstr "Cerca tra le chiamate effettuate"
#~ msgstr "Abilita STUN"
#~ msgid "Format : name.server:port"
-#~ msgstr "Formato: nome.server:porta"
+#~ msgstr "Formato: nome.del.server:porta"
#~ msgid "Incoming call"
#~ msgstr "Chiamata in arrivo"
-#~ msgid "Remove the selected account"
-#~ msgstr "Elimina l'account selezionato"
-
#~ msgid "Display photo if available"
#~ msgstr "Mostrare foto se disponibile"
@@ -1179,9 +1294,6 @@ msgstr "Cerca tra le chiamate effettuate"
#~ msgid "Show main window"
#~ msgstr "Mostra finestra principale"
-#~ msgid "Clear history"
-#~ msgstr "Cancella la cronologia"
-
#~ msgid "Prefix dialed numbers with"
#~ msgstr "Prefisso da aggiungere al numero da chiamare"
@@ -1192,27 +1304,27 @@ msgstr "Cerca tra le chiamate effettuate"
#~ msgstr "Scadenza registrazione"
#~ msgid ""
-#~ "Pressing \"apply\" will restart the network layer. Otherwise, SFLPhone would "
-#~ "have to be restarted."
+#~ "Pressing \"apply\" will restart the network layer. Otherwise, SFLPhone "
+#~ "would have to be restarted."
#~ msgstr ""
-#~ "Premendo il tasto \"Applica\" il modulo di rete verrà riavviato. In "
+#~ "Premendo il tasto \"Applica\" il modulo di rete verrà riavviato. In "
#~ "alternativa occorrerebbe riavviare SFLphone."
#~ msgid "Creation of account has failed for the reason"
-#~ msgstr "La creazione dell'account è fallita per il seguente motivo"
+#~ msgstr "La creazione dell'accound è fallita per il seguente motivo"
#~ msgid "Account creation wizard"
#~ msgstr "Procedura guidata creazione account"
#~ msgctxt "NAME OF TRANSLATORS"
#~ msgid "Your names"
-#~ msgstr "I tuoi nomi"
+#~ msgstr ""
#~ ",Launchpad Contributions:,Maurizio Porrato,Maxime Chambreuil, ,Launchpad "
#~ "Contributions:,Maurizio Porrato,Maxime Chambreuil, ,Launchpad "
#~ "Contributions:,Maurizio Porrato,Maxime Chambreuil"
#~ msgctxt "EMAIL OF TRANSLATORS"
#~ msgid "Your emails"
-#~ msgstr "I tuoi indirizzi email"
-#~ ",,,maxime.chambreuil@gmail.com,,,,maxime.chambreuil@gmail.com,,,,maxime.chamb"
-#~ "reuil@gmail.com"
+#~ msgstr ""
+#~ ",,,maxime.chambreuil@gmail.com,,,,maxime.chambreuil@gmail.com,,,,maxime."
+#~ "chambreuil@gmail.com"
diff --git a/lang/ja.po b/lang/ja.po
deleted file mode 100644
index 2cf0f2f7b7ac56d42423f4ed8cdc1954fc188a1f..0000000000000000000000000000000000000000
--- a/lang/ja.po
+++ /dev/null
@@ -1,995 +0,0 @@
-# Japanese translation for sflphone
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the sflphone package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: sflphone\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-10-14 11:18-0400\n"
-"PO-Revision-Date: 2009-10-25 12:58+0000\n"
-"Last-Translator: DanyBoy <daniel@mon-ocean.com>\n"
-"Language-Team: Japanese <ja@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-10-26 15:48+0000\n"
-"X-Generator: Launchpad (build Unknown)\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 "Authentication Failed"
-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:54
-#: ../sflphone-client-gnome/src/sflnotify.c:94
-#, c-format
-msgid "%d voice mail"
-msgid_plural "%d voice mails"
-msgstr[0] "%d ボイスメール"
-
-#: ../sflphone-client-gnome/src/actions.c:83
-#: ../sflphone-client-gnome/src/actions.c:919
-#: ../sflphone-client-gnome/src/actions.c:926
-msgid "Using account"
-msgstr "アカウント使っています"
-
-#: ../sflphone-client-gnome/src/actions.c:89
-msgid "No registered accounts"
-msgstr "アカウント登録されていません"
-
-#: ../sflphone-client-gnome/src/actions.c:268
-msgid ""
-"Unable to connect to the SFLphone server.\n"
-"Make sure the daemon is running."
-msgstr ""
-"SFLphoneサーバに接続できません\n"
-"デーモンを確認してください。"
-
-#: ../sflphone-client-gnome/src/actions.c:913
-#, c-format
-msgid "IP call - %s"
-msgstr "IP 電話 -%s"
-
-#: ../sflphone-client-gnome/src/actions.c:922
-msgid "Codec"
-msgstr "コーデック"
-
-#: ../sflphone-client-gnome/src/actions.c:1119
-#, 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/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:73
-msgid "There is one call in progress."
-msgstr ""
-
-#: ../sflphone-client-gnome/src/mainwindow.c:77
-msgid "There are calls in progress."
-msgstr ""
-
-#: ../sflphone-client-gnome/src/mainwindow.c:86
-msgid "Do you still want to quit?"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/mainwindow.c:299
-msgid "SFLphone Error"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/mainwindow.c:391
-#, c-format
-msgid "ZRTP is not supported by peer %s\n"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/mainwindow.c:392
-msgid "Secure Communication Unavailable"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/mainwindow.c:393
-#: ../sflphone-client-gnome/src/mainwindow.c:415
-msgid "Continue"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/mainwindow.c:394
-#: ../sflphone-client-gnome/src/mainwindow.c:416
-#: ../sflphone-client-gnome/src/mainwindow.c:430
-msgid "Stop Call"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/mainwindow.c:413
-#, c-format
-msgid ""
-"A %s error forced the call with %s to fall under unencrypted mode.\n"
-"Exact reason: %s\n"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/mainwindow.c:414
-msgid "ZRTP negotiation failed"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/mainwindow.c:427
-#, c-format
-msgid ""
-"%s wants to stop using secure communication. Confirm will resume "
-"conversation without SRTP.\n"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/mainwindow.c:428
-msgid "Confirm Go Clear"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/mainwindow.c:429
-msgid "Confirm"
-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:147
-msgid "You have no registered accounts"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/sflnotify.c:190
-#, c-format
-msgid ""
-"<i>With:</i> %s \n"
-"using %s"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/sflnotify.c:205
-#, c-format
-msgid "%s does not support ZRTP."
-msgstr ""
-
-#: ../sflphone-client-gnome/src/sflnotify.c:220
-#, c-format
-msgid "ZRTP negotiation failed with %s"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/sflnotify.c:235
-#, c-format
-msgid "<i>With:</i> %s"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/sliders.c:162
-msgid "Speakers volume"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/sliders.c:164
-msgid "Mic volume"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/statusicon.c:91
-msgid "_Show main window"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/statusicon.c:126
-msgid "SFLphone"
-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/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:750
-msgid "Voicemail"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:403
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:406
-msgid "About SFLphone"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:1028
-msgid "_Pick up"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:1040
-#: ../sflphone-client-gnome/src/uimanager.c:1081
-msgid "_Hang up"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:1052
-#: ../sflphone-client-gnome/src/uimanager.c:1093
-msgid "On _Hold"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:1064
-msgid "_Record"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:1154
-msgid "_Call back"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:1226
-msgid "_New call"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:1300
-msgid "Edit phone number"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:1311
-msgid "Edit the phone number before making a call"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:164
-msgid "Account Parameters"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:173
-#: ../sflphone-client-gnome/src/config/assistant.c:294
-#: ../sflphone-client-gnome/src/config/assistant.c:402
-msgid "_Alias"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:181
-msgid "_Protocol"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:199
-msgid "Unknown"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:209
-#: ../sflphone-client-gnome/src/config/assistant.c:302
-#: ../sflphone-client-gnome/src/config/assistant.c:410
-msgid "_Host name"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:217
-#: ../sflphone-client-gnome/src/config/assistant.c:310
-#: ../sflphone-client-gnome/src/config/assistant.c:418
-msgid "_User name"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:234
-#: ../sflphone-client-gnome/src/config/assistant.c:326
-#: ../sflphone-client-gnome/src/config/assistant.c:433
-msgid "_Password"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:254
-#: ../sflphone-client-gnome/src/config/assistant.c:344
-#: ../sflphone-client-gnome/src/config/assistant.c:449
-msgid "_Voicemail number"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:340
-msgid "Authentication"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:341
-msgid "Secret"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:466
-msgid "Credential"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:501
-msgid "Authentication name"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:512
-msgid "Password"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:535
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:909
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:201
-msgid "Security"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:547
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:213
-msgid "Use TLS transport (sips)"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:552
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:218
-msgid "SRTP key exchange"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:558
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
-msgid "Disabled"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
-msgid "Registration"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:679
-msgid "Registration expire"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
-msgid "_Comply with RFC 3263"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
-msgid "Network"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:707
-msgid "Local address"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:744
-msgid "Local port"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:752
-msgid "Set published address and port:"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:756
-msgid "Using STUN "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:761
-msgid "Same as local parameters"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:764
-msgid "Manually"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:769
-msgid "Published address"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:777
-msgid "Published port"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:785
-msgid "STUN server URL"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
-msgid "Account settings"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
-msgid "Basic"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:904
-msgid "Advanced"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:169
-msgid "Server returned \""
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
-msgid "Protocol"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:396
-msgid "Status"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:474
-msgid "Accounts"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:484
-msgid "Configured Accounts"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:505
-msgid "There "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "is "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "are "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:508
-msgid " active account"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:509
-msgid "s"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:514
-msgid "You have no active account"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:443
-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 "_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:578
-msgid "Name"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:69
-#, c-format
-msgid "This assistant is now finished."
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:71
-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/config/assistant.c:74
-msgid "Alias"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:78
-msgid "Server"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:82
-msgid "Username"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:86
-msgid "Security: "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:88
-msgid "SRTP/ZRTP draft-zimmermann"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:90
-#: ../sflphone-client-gnome/src/config/assistant.c:182
-msgid "None"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:210
-msgid "SFLphone account creation wizard"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:236
-msgid "Welcome to the Account creation wizard of SFLphone!"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:237
-msgid "This installation wizard will help you configure an account."
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:251
-msgid "VoIP Protocols"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:251
-msgid "Select an account type"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:253
-msgid "SIP (Session Initiation Protocol)"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:255
-msgid "IAX2 (InterAsterix Exchange)"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:269
-msgid "Account"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:269
-msgid "Please select one of the following options"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:271
-msgid "Create a free SIP/IAX2 account on sflphone.org"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:273
-msgid "Register an existing SIP or IAX2 account"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:286
-msgid "SIP account settings"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:286
-#: ../sflphone-client-gnome/src/config/assistant.c:394
-msgid "Please fill the following information"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:352
-#: ../sflphone-client-gnome/src/config/assistant.c:381
-msgid "Secure communications with _ZRTP"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:365
-msgid "Optional email address"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:365
-msgid "This email address will be used to send your voicemail messages."
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:373
-msgid "_Email address"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:394
-msgid "IAX2 account settings"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:467
-msgid "Network Address Translation (NAT)"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:467
-msgid "You should probably enable this if you are behind a firewall."
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:476
-msgid "E_nable STUN"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:483
-msgid "_STUN server"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:497
-msgid "Account Registration"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:497
-msgid "Congratulations!"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:583
-msgid "Frequency"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:588
-msgid "Bitrate"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:593
-msgid "Bandwidth"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:673
-msgid "ALSA plugin"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:695
-msgid "Output"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:717
-msgid "Input"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:752
-msgid "_Voice Activity Detection"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:762
-msgid "_Noise Reduction (Narrow-Band Companding)"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:798
-msgid "Sound Manager"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:807
-msgid "_Pulseaudio"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:811
-msgid "_ALSA"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:816
-msgid "_Mute other applications during a call"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:823
-msgid "ALSA settings"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:840
-msgid "Codecs"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:869
-msgid "Recordings"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:873
-msgid "Destination folder"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:877
-msgid "Select a folder"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:883
-msgid "Ringtones"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:889
-msgid "_Enable ringtones"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:895
-msgid "Choose a ringtone"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:901
-msgid "Audio Files"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/hooks-config.c:130
-msgid "URL Argument"
-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/config/preferencesdialog.c:195
-msgid ""
-"This profile is used when you want to reach a remote peer simply by typing a "
-"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
-"also be used if no account can be matched to an incoming or outgoing call."
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:274
-msgid "SIP Port"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:281
-msgid "UDP Transport"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:319
-msgid "Desktop Notifications"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:323
-msgid "_Enable notifications"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:329
-msgid "Enable voicemail _notifications"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:341
-msgid "System Tray Icon"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
-msgid "_Popup main window on incoming call"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:349
-msgid "Ne_ver popup main window"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:353
-msgid "Hide SFLphone window on _startup"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:359
-msgid "Calls History"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:362
-msgid "_Keep my history for at least"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:373
-msgid "days"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:377
-msgid "Configuration File"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:379
-msgid "Store SIP credentials as MD5 hash"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:423
-msgid "Preferences"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:448
-msgid "Audio"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
-msgid "Address Book"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:458
-msgid "Hooks"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:468
-msgid "Direct IP calls"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:38
-msgid "Advanced options for TLS"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:55
-msgid "TLS transport"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:59
-msgid ""
-"TLS transport can be used along with UDP for those calls that would\n"
-"require secure sip transactions (aka SIPS). You can configure a different\n"
-"TLS transport for each account. However, each of them will run on a "
-"dedicated\n"
-"port, different one from each other\n"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:100
-msgid "Certificate of Authority list"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:104
-msgid "Choose a CA list file (optional)"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:115
-msgid "Public endpoint certificate file"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:119
-msgid "Choose a public endpoint certificate (optional)"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:134
-msgid "Choose a private key file (optional)"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:145
-msgid "Password for the private key"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:168
-msgid "TLS protocol method"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:202
-msgid "TLS cipher list"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:211
-msgid "Server name instance for outgoing TLS connection"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:219
-msgid "Negotiation timeout (sec:msec)"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:236
-msgid "Verify incoming certificates, as a server"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:242
-msgid "Verify certificates from answer, as a client"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:248
-msgid "Require certificate for incoming tls connections"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:49
-msgid "ZRTP Options"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:68
-msgid "Send Hello Hash in S_DP"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:74
-msgid "Ask User to Confirm SAS"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:80
-msgid "_Warn if ZRTP not supported"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:86
-msgid "Display SAS once for hold events"
-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/ko.po b/lang/ko.po
deleted file mode 100644
index a614e49297ac1530ef7ab703eaa21c2419b5298a..0000000000000000000000000000000000000000
--- a/lang/ko.po
+++ /dev/null
@@ -1,1006 +0,0 @@
-# Korean translation for sflphone
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the sflphone package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: sflphone\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-14 11:18-0400\n"
-"PO-Revision-Date: 2009-10-14 17:31+0000\n"
-"Last-Translator: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>\n"
-"Language-Team: Korean <ko@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-10-26 15:48+0000\n"
-"X-Generator: Launchpad (build Unknown)\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 "Authentication Failed"
-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: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:83
-#: ../sflphone-client-gnome/src/actions.c:919
-#: ../sflphone-client-gnome/src/actions.c:926
-msgid "Using account"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/actions.c:89
-msgid "No registered accounts"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/actions.c:268
-msgid ""
-"Unable to connect to the SFLphone server.\n"
-"Make sure the daemon is running."
-msgstr ""
-
-#: ../sflphone-client-gnome/src/actions.c:913
-#, c-format
-msgid "IP call - %s"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/actions.c:922
-msgid "Codec"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/actions.c:1119
-#, 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/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:73
-msgid "There is one call in progress."
-msgstr ""
-
-#: ../sflphone-client-gnome/src/mainwindow.c:77
-msgid "There are calls in progress."
-msgstr ""
-
-#: ../sflphone-client-gnome/src/mainwindow.c:86
-msgid "Do you still want to quit?"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/mainwindow.c:299
-msgid "SFLphone Error"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/mainwindow.c:391
-#, c-format
-msgid "ZRTP is not supported by peer %s\n"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/mainwindow.c:392
-msgid "Secure Communication Unavailable"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/mainwindow.c:393
-#: ../sflphone-client-gnome/src/mainwindow.c:415
-msgid "Continue"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/mainwindow.c:394
-#: ../sflphone-client-gnome/src/mainwindow.c:416
-#: ../sflphone-client-gnome/src/mainwindow.c:430
-msgid "Stop Call"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/mainwindow.c:413
-#, c-format
-msgid ""
-"A %s error forced the call with %s to fall under unencrypted mode.\n"
-"Exact reason: %s\n"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/mainwindow.c:414
-msgid "ZRTP negotiation failed"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/mainwindow.c:427
-#, c-format
-msgid ""
-"%s wants to stop using secure communication. Confirm will resume "
-"conversation without SRTP.\n"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/mainwindow.c:428
-msgid "Confirm Go Clear"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/mainwindow.c:429
-msgid "Confirm"
-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:147
-msgid "You have no registered accounts"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/sflnotify.c:190
-#, c-format
-msgid ""
-"<i>With:</i> %s \n"
-"using %s"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/sflnotify.c:205
-#, c-format
-msgid "%s does not support ZRTP."
-msgstr ""
-
-#: ../sflphone-client-gnome/src/sflnotify.c:220
-#, c-format
-msgid "ZRTP negotiation failed with %s"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/sflnotify.c:235
-#, c-format
-msgid "<i>With:</i> %s"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/sliders.c:162
-msgid "Speakers volume"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/sliders.c:164
-msgid "Mic volume"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/statusicon.c:91
-msgid "_Show main window"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/statusicon.c:126
-msgid "SFLphone"
-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/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:750
-msgid "Voicemail"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:403
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:406
-msgid "About SFLphone"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:1028
-msgid "_Pick up"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:1040
-#: ../sflphone-client-gnome/src/uimanager.c:1081
-msgid "_Hang up"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:1052
-#: ../sflphone-client-gnome/src/uimanager.c:1093
-msgid "On _Hold"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:1064
-msgid "_Record"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:1154
-msgid "_Call back"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:1226
-msgid "_New call"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:1300
-msgid "Edit phone number"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:1311
-msgid "Edit the phone number before making a call"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:164
-msgid "Account Parameters"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:173
-#: ../sflphone-client-gnome/src/config/assistant.c:294
-#: ../sflphone-client-gnome/src/config/assistant.c:402
-msgid "_Alias"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:181
-msgid "_Protocol"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:199
-msgid "Unknown"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:209
-#: ../sflphone-client-gnome/src/config/assistant.c:302
-#: ../sflphone-client-gnome/src/config/assistant.c:410
-msgid "_Host name"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:217
-#: ../sflphone-client-gnome/src/config/assistant.c:310
-#: ../sflphone-client-gnome/src/config/assistant.c:418
-msgid "_User name"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:234
-#: ../sflphone-client-gnome/src/config/assistant.c:326
-#: ../sflphone-client-gnome/src/config/assistant.c:433
-msgid "_Password"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:254
-#: ../sflphone-client-gnome/src/config/assistant.c:344
-#: ../sflphone-client-gnome/src/config/assistant.c:449
-msgid "_Voicemail number"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:340
-msgid "Authentication"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:341
-msgid "Secret"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:466
-msgid "Credential"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:501
-msgid "Authentication name"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:512
-msgid "Password"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:535
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:909
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:201
-msgid "Security"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:547
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:213
-msgid "Use TLS transport (sips)"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:552
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:218
-msgid "SRTP key exchange"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:558
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
-msgid "Disabled"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
-msgid "Registration"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:679
-msgid "Registration expire"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
-msgid "_Comply with RFC 3263"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
-msgid "Network"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:707
-msgid "Local address"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:744
-msgid "Local port"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:752
-msgid "Set published address and port:"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:756
-msgid "Using STUN "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:761
-msgid "Same as local parameters"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:764
-msgid "Manually"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:769
-msgid "Published address"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:777
-msgid "Published port"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:785
-msgid "STUN server URL"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
-msgid "Account settings"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
-msgid "Basic"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:904
-msgid "Advanced"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:169
-msgid "Server returned \""
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
-msgid "Protocol"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:396
-msgid "Status"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:474
-msgid "Accounts"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:484
-msgid "Configured Accounts"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:505
-msgid "There "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "is "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "are "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:508
-msgid " active account"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:509
-msgid "s"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:514
-msgid "You have no active account"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:443
-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 "_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:578
-msgid "Name"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:69
-#, c-format
-msgid "This assistant is now finished."
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:71
-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/config/assistant.c:74
-msgid "Alias"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:78
-msgid "Server"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:82
-msgid "Username"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:86
-msgid "Security: "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:88
-msgid "SRTP/ZRTP draft-zimmermann"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:90
-#: ../sflphone-client-gnome/src/config/assistant.c:182
-msgid "None"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:210
-msgid "SFLphone account creation wizard"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:236
-msgid "Welcome to the Account creation wizard of SFLphone!"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:237
-msgid "This installation wizard will help you configure an account."
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:251
-msgid "VoIP Protocols"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:251
-msgid "Select an account type"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:253
-msgid "SIP (Session Initiation Protocol)"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:255
-msgid "IAX2 (InterAsterix Exchange)"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:269
-msgid "Account"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:269
-msgid "Please select one of the following options"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:271
-msgid "Create a free SIP/IAX2 account on sflphone.org"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:273
-msgid "Register an existing SIP or IAX2 account"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:286
-msgid "SIP account settings"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:286
-#: ../sflphone-client-gnome/src/config/assistant.c:394
-msgid "Please fill the following information"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:352
-#: ../sflphone-client-gnome/src/config/assistant.c:381
-msgid "Secure communications with _ZRTP"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:365
-msgid "Optional email address"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:365
-msgid "This email address will be used to send your voicemail messages."
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:373
-msgid "_Email address"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:394
-msgid "IAX2 account settings"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:467
-msgid "Network Address Translation (NAT)"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:467
-msgid "You should probably enable this if you are behind a firewall."
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:476
-msgid "E_nable STUN"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:483
-msgid "_STUN server"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:497
-msgid "Account Registration"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/assistant.c:497
-msgid "Congratulations!"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:583
-msgid "Frequency"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:588
-msgid "Bitrate"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:593
-msgid "Bandwidth"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:673
-msgid "ALSA plugin"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:695
-msgid "Output"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:717
-msgid "Input"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:752
-msgid "_Voice Activity Detection"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:762
-msgid "_Noise Reduction (Narrow-Band Companding)"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:798
-msgid "Sound Manager"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:807
-msgid "_Pulseaudio"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:811
-msgid "_ALSA"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:816
-msgid "_Mute other applications during a call"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:823
-msgid "ALSA settings"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:840
-msgid "Codecs"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:869
-msgid "Recordings"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:873
-msgid "Destination folder"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:877
-msgid "Select a folder"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:883
-msgid "Ringtones"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:889
-msgid "_Enable ringtones"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:895
-msgid "Choose a ringtone"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:901
-msgid "Audio Files"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/hooks-config.c:130
-msgid "URL Argument"
-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/config/preferencesdialog.c:195
-msgid ""
-"This profile is used when you want to reach a remote peer simply by typing a "
-"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
-"also be used if no account can be matched to an incoming or outgoing call."
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:274
-msgid "SIP Port"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:281
-msgid "UDP Transport"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:319
-msgid "Desktop Notifications"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:323
-msgid "_Enable notifications"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:329
-msgid "Enable voicemail _notifications"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:341
-msgid "System Tray Icon"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
-msgid "_Popup main window on incoming call"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:349
-msgid "Ne_ver popup main window"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:353
-msgid "Hide SFLphone window on _startup"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:359
-msgid "Calls History"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:362
-msgid "_Keep my history for at least"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:373
-msgid "days"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:377
-msgid "Configuration File"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:379
-msgid "Store SIP credentials as MD5 hash"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:423
-msgid "Preferences"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:448
-msgid "Audio"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
-msgid "Address Book"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:458
-msgid "Hooks"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:468
-msgid "Direct IP calls"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:38
-msgid "Advanced options for TLS"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:55
-msgid "TLS transport"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:59
-msgid ""
-"TLS transport can be used along with UDP for those calls that would\n"
-"require secure sip transactions (aka SIPS). You can configure a different\n"
-"TLS transport for each account. However, each of them will run on a "
-"dedicated\n"
-"port, different one from each other\n"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:100
-msgid "Certificate of Authority list"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:104
-msgid "Choose a CA list file (optional)"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:115
-msgid "Public endpoint certificate file"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:119
-msgid "Choose a public endpoint certificate (optional)"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:134
-msgid "Choose a private key file (optional)"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:145
-msgid "Password for the private key"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:168
-msgid "TLS protocol method"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:202
-msgid "TLS cipher list"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:211
-msgid "Server name instance for outgoing TLS connection"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:219
-msgid "Negotiation timeout (sec:msec)"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:236
-msgid "Verify incoming certificates, as a server"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:242
-msgid "Verify certificates from answer, as a client"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:248
-msgid "Require certificate for incoming tls connections"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:49
-msgid "ZRTP Options"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:68
-msgid "Send Hello Hash in S_DP"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:74
-msgid "Ask User to Confirm SAS"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:80
-msgid "_Warn if ZRTP not supported"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:86
-msgid "Display SAS once for hold events"
-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 ""
-
-#~ msgctxt "NAME OF TRANSLATORS"
-#~ msgid "Your names"
-#~ msgstr ""
-#~ ",Launchpad Contributions:, ,Launchpad Contributions:,Emmanuel Milou,Scion, "
-#~ ",Launchpad Contributions:,Emmanuel Milou,Scion"
-
-#~ msgctxt "EMAIL OF TRANSLATORS"
-#~ msgid "Your emails"
-#~ msgstr ""
-#~ ",,,,emmanuel.milou@savoirfairelinux.com,,,,emmanuel.milou@savoirfairelinux.co"
-#~ "m,"
diff --git a/lang/ko/ko.po b/lang/ko/ko.po
index bce28b265518df70726eed2ce988e0b6569cff9d..c7ebb3c80fea05d48123044557c037e1a7ef3bb9 100644
--- a/lang/ko/ko.po
+++ b/lang/ko/ko.po
@@ -3,20 +3,19 @@
# This file is distributed under the same license as the sflphone package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
#
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:509
msgid ""
msgstr ""
"Project-Id-Version: sflphone\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-14 11:18-0400\n"
-"PO-Revision-Date: 2009-10-14 14:47+0000\n"
-"Last-Translator: Scion <Unknown>\n"
+"POT-Creation-Date: 2009-12-03 10:22-0500\n"
+"PO-Revision-Date: 2009-10-26 20:46+0000\n"
+"Last-Translator: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>\n"
"Language-Team: Korean <ko@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-10-14 15:20+0000\n"
+"X-Launchpad-Export-Date: 2009-12-03 15:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: ../sflphone-client-gnome/src/accountlist.c:175
@@ -61,40 +60,26 @@ msgstr ""
msgid "Invalid"
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:83
-#: ../sflphone-client-gnome/src/actions.c:919
-#: ../sflphone-client-gnome/src/actions.c:926
+#: ../sflphone-client-gnome/src/actions.c:98
msgid "Using account"
msgstr ""
-#: ../sflphone-client-gnome/src/actions.c:89
+#: ../sflphone-client-gnome/src/actions.c:104
msgid "No registered accounts"
msgstr ""
-#: ../sflphone-client-gnome/src/actions.c:268
+#: ../sflphone-client-gnome/src/actions.c:285
msgid ""
"Unable to connect to the SFLphone server.\n"
"Make sure the daemon is running."
msgstr ""
-#: ../sflphone-client-gnome/src/actions.c:913
-#, c-format
-msgid "IP call - %s"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/actions.c:922
-msgid "Codec"
+#: ../sflphone-client-gnome/src/actions.c:589
+#: ../sflphone-client-gnome/src/actions.c:911
+msgid "Direct SIP call"
msgstr ""
-#: ../sflphone-client-gnome/src/actions.c:1119
+#: ../sflphone-client-gnome/src/actions.c:1103
#, c-format
msgid ""
"<b>Error: No audio codecs found.\n"
@@ -136,53 +121,53 @@ msgstr ""
msgid "Do you still want to quit?"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:299
+#: ../sflphone-client-gnome/src/mainwindow.c:298
msgid "SFLphone Error"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:391
+#: ../sflphone-client-gnome/src/mainwindow.c:392
#, c-format
msgid "ZRTP is not supported by peer %s\n"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:392
+#: ../sflphone-client-gnome/src/mainwindow.c:393
msgid "Secure Communication Unavailable"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:393
-#: ../sflphone-client-gnome/src/mainwindow.c:415
+#: ../sflphone-client-gnome/src/mainwindow.c:394
+#: ../sflphone-client-gnome/src/mainwindow.c:416
msgid "Continue"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:394
-#: ../sflphone-client-gnome/src/mainwindow.c:416
-#: ../sflphone-client-gnome/src/mainwindow.c:430
+#: ../sflphone-client-gnome/src/mainwindow.c:395
+#: ../sflphone-client-gnome/src/mainwindow.c:417
+#: ../sflphone-client-gnome/src/mainwindow.c:431
msgid "Stop Call"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:413
+#: ../sflphone-client-gnome/src/mainwindow.c:414
#, c-format
msgid ""
"A %s error forced the call with %s to fall under unencrypted mode.\n"
"Exact reason: %s\n"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:414
+#: ../sflphone-client-gnome/src/mainwindow.c:415
msgid "ZRTP negotiation failed"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:427
+#: ../sflphone-client-gnome/src/mainwindow.c:428
#, c-format
msgid ""
"%s wants to stop using secure communication. Confirm will resume "
"conversation without SRTP.\n"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:428
+#: ../sflphone-client-gnome/src/mainwindow.c:429
msgid "Confirm Go Clear"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:429
+#: ../sflphone-client-gnome/src/mainwindow.c:430
msgid "Confirm"
msgstr ""
@@ -197,6 +182,13 @@ msgstr ""
msgid "<i>From</i> %s"
msgstr ""
+#: ../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/sflnotify.c:111
#, c-format
msgid "Calling with %s account <i>%s</i>"
@@ -244,15 +236,15 @@ msgstr ""
msgid "Mic volume"
msgstr ""
-#: ../sflphone-client-gnome/src/statusicon.c:91
+#: ../sflphone-client-gnome/src/statusicon.c:96
msgid "_Show main window"
msgstr ""
-#: ../sflphone-client-gnome/src/statusicon.c:126
+#: ../sflphone-client-gnome/src/statusicon.c:131
msgid "SFLphone"
msgstr ""
-#: ../sflphone-client-gnome/src/statusicon.c:127
+#: ../sflphone-client-gnome/src/statusicon.c:132
#, c-format
msgid "%i account configured"
msgid_plural "%i accounts configured"
@@ -260,203 +252,399 @@ msgstr[0] ""
msgstr[1] ""
#: ../sflphone-client-gnome/src/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:750
+#: ../sflphone-client-gnome/src/uimanager.c:693
+#: ../sflphone-client-gnome/src/uimanager.c:727
msgid "Voicemail"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:403
+#: ../sflphone-client-gnome/src/uimanager.c:117
+msgid "No address book selected"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:137
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "Address book"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:279
+#, c-format
+msgid "Voicemail (%i)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:342
msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:406
+#: ../sflphone-client-gnome/src/uimanager.c:345
msgid "About SFLphone"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1028
+#: ../sflphone-client-gnome/src/uimanager.c:719
+msgid "Call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:1184
+msgid "_New call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+msgid "Place a new call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:979
msgid "_Pick up"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1040
-#: ../sflphone-client-gnome/src/uimanager.c:1081
+#: ../sflphone-client-gnome/src/uimanager.c:721
+msgid "Answer the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:991
+#: ../sflphone-client-gnome/src/uimanager.c:1032
msgid "_Hang up"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1052
-#: ../sflphone-client-gnome/src/uimanager.c:1093
-msgid "On _Hold"
+#: ../sflphone-client-gnome/src/uimanager.c:722
+msgid "Finish the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "O_n hold"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1064
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "Place the call on hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "O_ff hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "Place the call off hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:725
+#: ../sflphone-client-gnome/src/uimanager.c:1015
msgid "_Record"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1154
-msgid "_Call back"
+#: ../sflphone-client-gnome/src/uimanager.c:725
+msgid "Record the current conversation"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1226
-msgid "_New call"
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Configuration _Assistant"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1300
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Run the configuration assistant"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:727
+msgid "Call your voicemail"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "_Close"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "Minimize to system tray"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "_Quit"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "Quit the program"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:732
+msgid "_Edit"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "_Copy"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "Copy the selection"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "_Paste"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "Paste the clipboard"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear _history"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear the call history"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "_Accounts"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "Edit your accounts"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "_Preferences"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "Change your preferences"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:740
+msgid "_View"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:743
+msgid "_Help"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Contents"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Open the manual"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:745
+msgid "About this application"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "_Transfer"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "Transfer the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "_Show toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "Show the toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "_Dialpad"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "Show the dialpad"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "_Volume controls"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "Show the volume controls"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "_History"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "Calls history"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "_Address book"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:1003
+#: ../sflphone-client-gnome/src/uimanager.c:1044
+msgid "On _Hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:1107
+msgid "_Call back"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:1258
msgid "Edit phone number"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1311
+#: ../sflphone-client-gnome/src/uimanager.c:1269
msgid "Edit the phone number before making a call"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:164
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
msgid "Account Parameters"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:173
-#: ../sflphone-client-gnome/src/config/assistant.c:294
-#: ../sflphone-client-gnome/src/config/assistant.c:402
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
+#: ../sflphone-client-gnome/src/config/assistant.c:314
+#: ../sflphone-client-gnome/src/config/assistant.c:427
msgid "_Alias"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:181
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
msgid "_Protocol"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:199
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
msgid "Unknown"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:209
-#: ../sflphone-client-gnome/src/config/assistant.c:302
-#: ../sflphone-client-gnome/src/config/assistant.c:410
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
+#: ../sflphone-client-gnome/src/config/assistant.c:322
+#: ../sflphone-client-gnome/src/config/assistant.c:435
msgid "_Host name"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:217
-#: ../sflphone-client-gnome/src/config/assistant.c:310
-#: ../sflphone-client-gnome/src/config/assistant.c:418
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
+#: ../sflphone-client-gnome/src/config/assistant.c:330
+#: ../sflphone-client-gnome/src/config/assistant.c:443
msgid "_User name"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:234
-#: ../sflphone-client-gnome/src/config/assistant.c:326
-#: ../sflphone-client-gnome/src/config/assistant.c:433
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:346
+#: ../sflphone-client-gnome/src/config/assistant.c:458
msgid "_Password"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:254
-#: ../sflphone-client-gnome/src/config/assistant.c:344
-#: ../sflphone-client-gnome/src/config/assistant.c:449
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:363
+#: ../sflphone-client-gnome/src/config/assistant.c:473
+msgid "Show password"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:368
+#: ../sflphone-client-gnome/src/config/assistant.c:478
msgid "_Voicemail number"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:340
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
msgid "Authentication"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:341
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
msgid "Secret"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:466
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
msgid "Credential"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:501
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
msgid "Authentication name"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:512
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
msgid "Password"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:535
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:909
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:201
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
msgid "Security"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:547
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:213
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
msgid "Use TLS transport (sips)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:552
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:218
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
msgid "SRTP key exchange"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:558
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
msgid "Disabled"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
-#, fuzzy
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
msgid "Registration"
-msgstr "등록했습니다"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:679
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
msgid "Registration expire"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
msgid "_Comply with RFC 3263"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
-msgid "Network"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
+msgid "Network Interface"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:707
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
msgid "Local address"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:744
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
msgid "Local port"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:752
-msgid "Set published address and port:"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
+msgid "Published address"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:756
-msgid "Using STUN "
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+msgid "Using STUN"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:761
-msgid "Same as local parameters"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
+msgid "STUN server URL"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:764
-msgid "Manually"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
+msgid "Same as local parameters"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:769
-msgid "Published address"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
+msgid "Set published address and port:"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:777
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
msgid "Published port"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:785
-msgid "STUN server URL"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
msgid "Account settings"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
msgid "Basic"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:904
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
msgid "Advanced"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:169
-msgid "Server returned \""
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:164
+#, c-format
+msgid "Server returned \"%s\" (%d)"
msgstr ""
#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
@@ -475,32 +663,18 @@ msgstr ""
msgid "Configured Accounts"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:505
-msgid "There "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "is "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "are "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:508
-msgid " active account"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:509
-msgid "s"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
+#, c-format
+msgid "There is %d active account"
+msgid_plural "There are %d active accounts"
+msgstr[0] ""
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:514
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
msgid "You have no active account"
msgstr ""
#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:443
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
msgid "General"
msgstr ""
@@ -545,225 +719,220 @@ 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:578
+#: ../sflphone-client-gnome/src/config/audioconf.c:577
msgid "Name"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:69
+#: ../sflphone-client-gnome/src/config/assistant.c:75
#, c-format
msgid "This assistant is now finished."
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:71
+#: ../sflphone-client-gnome/src/config/assistant.c:77
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/config/assistant.c:74
+#: ../sflphone-client-gnome/src/config/assistant.c:80
msgid "Alias"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:78
+#: ../sflphone-client-gnome/src/config/assistant.c:84
msgid "Server"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:82
+#: ../sflphone-client-gnome/src/config/assistant.c:88
msgid "Username"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:86
+#: ../sflphone-client-gnome/src/config/assistant.c:92
msgid "Security: "
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:88
+#: ../sflphone-client-gnome/src/config/assistant.c:94
msgid "SRTP/ZRTP draft-zimmermann"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:90
-#: ../sflphone-client-gnome/src/config/assistant.c:182
+#: ../sflphone-client-gnome/src/config/assistant.c:96
msgid "None"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:210
+#: ../sflphone-client-gnome/src/config/assistant.c:229
msgid "SFLphone account creation wizard"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:236
+#: ../sflphone-client-gnome/src/config/assistant.c:255
msgid "Welcome to the Account creation wizard of SFLphone!"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:237
+#: ../sflphone-client-gnome/src/config/assistant.c:256
msgid "This installation wizard will help you configure an account."
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "VoIP Protocols"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "Select an account type"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:253
+#: ../sflphone-client-gnome/src/config/assistant.c:272
msgid "SIP (Session Initiation Protocol)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:255
+#: ../sflphone-client-gnome/src/config/assistant.c:274
msgid "IAX2 (InterAsterix Exchange)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Account"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Please select one of the following options"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:271
+#: ../sflphone-client-gnome/src/config/assistant.c:290
msgid "Create a free SIP/IAX2 account on sflphone.org"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:273
+#: ../sflphone-client-gnome/src/config/assistant.c:292
msgid "Register an existing SIP or IAX2 account"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:306
msgid "SIP account settings"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:286
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "Please fill the following information"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:352
-#: ../sflphone-client-gnome/src/config/assistant.c:381
+#: ../sflphone-client-gnome/src/config/assistant.c:376
+#: ../sflphone-client-gnome/src/config/assistant.c:405
msgid "Secure communications with _ZRTP"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "Optional email address"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "This email address will be used to send your voicemail messages."
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:373
+#: ../sflphone-client-gnome/src/config/assistant.c:397
msgid "_Email address"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "IAX2 account settings"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "Network Address Translation (NAT)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "You should probably enable this if you are behind a firewall."
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:476
+#: ../sflphone-client-gnome/src/config/assistant.c:505
msgid "E_nable STUN"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:483
+#: ../sflphone-client-gnome/src/config/assistant.c:512
msgid "_STUN server"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Account Registration"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Congratulations!"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:583
+#: ../sflphone-client-gnome/src/config/audioconf.c:582
msgid "Frequency"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:588
+#: ../sflphone-client-gnome/src/config/audioconf.c:587
msgid "Bitrate"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:593
+#: ../sflphone-client-gnome/src/config/audioconf.c:592
msgid "Bandwidth"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:673
+#: ../sflphone-client-gnome/src/config/audioconf.c:670
msgid "ALSA plugin"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:695
+#: ../sflphone-client-gnome/src/config/audioconf.c:692
msgid "Output"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:717
+#: ../sflphone-client-gnome/src/config/audioconf.c:714
msgid "Input"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:752
+#: ../sflphone-client-gnome/src/config/audioconf.c:749
msgid "_Voice Activity Detection"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:762
+#: ../sflphone-client-gnome/src/config/audioconf.c:759
msgid "_Noise Reduction (Narrow-Band Companding)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:798
+#: ../sflphone-client-gnome/src/config/audioconf.c:800
msgid "Sound Manager"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:807
+#: ../sflphone-client-gnome/src/config/audioconf.c:809
msgid "_Pulseaudio"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:811
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
msgid "_ALSA"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:816
-msgid "_Mute other applications during a call"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:823
+#: ../sflphone-client-gnome/src/config/audioconf.c:819
msgid "ALSA settings"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:840
+#: ../sflphone-client-gnome/src/config/audioconf.c:836
msgid "Codecs"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:869
+#: ../sflphone-client-gnome/src/config/audioconf.c:865
msgid "Recordings"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:873
+#: ../sflphone-client-gnome/src/config/audioconf.c:869
msgid "Destination folder"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:877
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
msgid "Select a folder"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:883
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
msgid "Ringtones"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:889
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
msgid "_Enable ringtones"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:895
+#: ../sflphone-client-gnome/src/config/audioconf.c:891
msgid "Choose a ringtone"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:901
+#: ../sflphone-client-gnome/src/config/audioconf.c:897
msgid "Audio Files"
msgstr ""
@@ -800,86 +969,66 @@ msgstr ""
msgid "_Prefix dialed numbers with"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:195
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
msgid ""
"This profile is used when you want to reach a remote peer simply by typing a "
"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
"also be used if no account can be matched to an incoming or outgoing call."
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:274
-msgid "SIP Port"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:281
-msgid "UDP Transport"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:319
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
msgid "Desktop Notifications"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:323
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
msgid "_Enable notifications"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:329
-msgid "Enable voicemail _notifications"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:341
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
msgid "System Tray Icon"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
msgid "_Popup main window on incoming call"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:349
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
msgid "Ne_ver popup main window"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:353
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
msgid "Hide SFLphone window on _startup"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:359
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
msgid "Calls History"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:362
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
msgid "_Keep my history for at least"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:373
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
msgid "days"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:377
-msgid "Configuration File"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:379
-msgid "Store SIP credentials as MD5 hash"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:423
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
msgid "Preferences"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:448
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
msgid "Audio"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
msgid "Address Book"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:458
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
msgid "Hooks"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:468
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
msgid "Direct IP calls"
msgstr ""
@@ -887,11 +1036,11 @@ msgstr ""
msgid "Advanced options for TLS"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:55
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:56
msgid "TLS transport"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:59
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:60
msgid ""
"TLS transport can be used along with UDP for those calls that would\n"
"require secure sip transactions (aka SIPS). You can configure a different\n"
@@ -900,55 +1049,55 @@ msgid ""
"port, different one from each other\n"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:100
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
msgid "Certificate of Authority list"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:104
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
msgid "Choose a CA list file (optional)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:115
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
msgid "Public endpoint certificate file"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:119
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
msgid "Choose a public endpoint certificate (optional)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:134
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
msgid "Choose a private key file (optional)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:145
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
msgid "Password for the private key"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:168
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
msgid "TLS protocol method"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:202
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
msgid "TLS cipher list"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:211
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
msgid "Server name instance for outgoing TLS connection"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:219
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
msgid "Negotiation timeout (sec:msec)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:236
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
msgid "Verify incoming certificates, as a server"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:242
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
msgid "Verify certificates from answer, as a client"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:248
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
msgid "Require certificate for incoming tls connections"
msgstr ""
@@ -956,50 +1105,54 @@ msgstr ""
msgid "ZRTP Options"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:68
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:69
msgid "Send Hello Hash in S_DP"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:74
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:75
msgid "Ask User to Confirm SAS"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:80
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:81
msgid "_Warn if ZRTP not supported"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:86
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:87
msgid "Display SAS once for hold events"
msgstr ""
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:58
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
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:59
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:72
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:84
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:96
msgid "Click here to change the search type"
msgstr ""
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:71
msgid "Search by missed call"
msgstr ""
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:83
msgid "Search by incoming call"
msgstr ""
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:95
msgid "Search by outgoing call"
msgstr ""
#~ msgctxt "NAME OF TRANSLATORS"
#~ msgid "Your names"
#~ msgstr ""
-#~ ",Launchpad Contributions:, ,Launchpad Contributions:,Emmanuel Milou,Scion"
+#~ ",Launchpad Contributions:, ,Launchpad Contributions:,Emmanuel Milou,"
+#~ "Scion, ,Launchpad Contributions:,Emmanuel Milou,Scion, ,Launchpad "
+#~ "Contributions:,Emmanuel Milou,Scion"
#~ msgctxt "EMAIL OF TRANSLATORS"
#~ msgid "Your emails"
-#~ msgstr ",,,,emmanuel.milou@savoirfairelinux.com,"
+#~ msgstr ""
+#~ ",,,,emmanuel.milou@savoirfairelinux.com,,,,emmanuel."
+#~ "milou@savoirfairelinux.com,,,,emmanuel.milou@savoirfairelinux.com,"
diff --git a/lang/merge-po-with-template.sh b/lang/merge-po-with-template.sh
new file mode 100755
index 0000000000000000000000000000000000000000..122b2b262ac4fddf6c9f1b5d369bba276dd15b9d
--- /dev/null
+++ b/lang/merge-po-with-template.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# Merge sflphone template into the existing po files
+
+for fichier in `find . -name *.po`
+do
+msgmerge --update $fichier sflphone.pot
+done
diff --git a/lang/pl/pl.po b/lang/pl/pl.po
index ef0270f757e8b142f87287787b208da15e557474..6d2a4515bef5e5fb3cb82c6f409335a53e3f7a4e 100644
--- a/lang/pl/pl.po
+++ b/lang/pl/pl.po
@@ -7,47 +7,47 @@ msgid ""
msgstr ""
"Project-Id-Version: sflphone\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-14 11:18-0400\n"
-"PO-Revision-Date: 2009-10-14 17:24+0000\n"
-"Last-Translator: Maxime Chambreuil <maxime.chambreuil@gmail.com>\n"
+"POT-Creation-Date: 2009-12-03 10:22-0500\n"
+"PO-Revision-Date: 2009-11-04 12:08+0000\n"
+"Last-Translator: Mariusz Bednarz <mbednarz@bedmar.pl>\n"
"Language-Team: Polish <pl@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2009-10-26 15:48+0000\n"
+"X-Launchpad-Export-Date: 2009-12-03 15:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: ../sflphone-client-gnome/src/accountlist.c:175
msgid "Registered"
-msgstr ""
+msgstr "Zarejestrowany"
#: ../sflphone-client-gnome/src/accountlist.c:178
msgid "Not Registered"
-msgstr ""
+msgstr "Nie zarejestrowany"
#: ../sflphone-client-gnome/src/accountlist.c:181
msgid "Trying..."
-msgstr ""
+msgstr "Próbuję ..."
#: ../sflphone-client-gnome/src/accountlist.c:184
#: ../sflphone-client-gnome/src/sflnotify.c:131
#: ../sflphone-client-gnome/src/sflnotify.c:148
msgid "Error"
-msgstr ""
+msgstr "Błąd"
#: ../sflphone-client-gnome/src/accountlist.c:187
msgid "Authentication Failed"
-msgstr ""
+msgstr "Autoryzacja nie powiodła się"
#: ../sflphone-client-gnome/src/accountlist.c:190
msgid "Network unreachable"
-msgstr ""
+msgstr "Sieć niedostępna"
#: ../sflphone-client-gnome/src/accountlist.c:193
msgid "Host unreachable"
-msgstr ""
+msgstr "Wybrany host jest niedostępny"
#: ../sflphone-client-gnome/src/accountlist.c:196
msgid "Stun configuration error"
@@ -59,48 +59,36 @@ msgstr ""
#: ../sflphone-client-gnome/src/accountlist.c:202
msgid "Invalid"
-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] ""
+msgstr "Niepoprawny"
-#: ../sflphone-client-gnome/src/actions.c:83
-#: ../sflphone-client-gnome/src/actions.c:919
-#: ../sflphone-client-gnome/src/actions.c:926
+#: ../sflphone-client-gnome/src/actions.c:98
msgid "Using account"
-msgstr ""
+msgstr "Używane konto"
-#: ../sflphone-client-gnome/src/actions.c:89
+#: ../sflphone-client-gnome/src/actions.c:104
msgid "No registered accounts"
-msgstr ""
+msgstr "Brak zarejestrowanych kont"
-#: ../sflphone-client-gnome/src/actions.c:268
+#: ../sflphone-client-gnome/src/actions.c:285
msgid ""
"Unable to connect to the SFLphone server.\n"
"Make sure the daemon is running."
msgstr ""
+"Nie można połączyć się z serwerem SFLphone.\n"
+"Upewnij się, że został uruchomiony daemon SFLphone"
-#: ../sflphone-client-gnome/src/actions.c:913
-#, c-format
-msgid "IP call - %s"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/actions.c:922
-msgid "Codec"
+#: ../sflphone-client-gnome/src/actions.c:589
+#: ../sflphone-client-gnome/src/actions.c:911
+msgid "Direct SIP call"
msgstr ""
-#: ../sflphone-client-gnome/src/actions.c:1119
+#: ../sflphone-client-gnome/src/actions.c:1103
#, 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> )"
+"</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/errors.c:29
@@ -109,6 +97,8 @@ msgid ""
"\n"
"Error while opening playback device"
msgstr ""
+"Informacja ALSA\n"
+"Błąd otwarcia urządzenia do odtwarzania dźwięku"
#: ../sflphone-client-gnome/src/errors.c:32
msgid ""
@@ -116,6 +106,8 @@ msgid ""
"\n"
"Error while opening capture device"
msgstr ""
+"Informacja ALSA\n"
+"Błąd otwarcia urządzenia do przechwytywania"
#: ../sflphone-client-gnome/src/errors.c:35
msgid ""
@@ -123,6 +115,8 @@ msgid ""
"\n"
"Pulseaudio is not running"
msgstr ""
+"Informacja Pulseaudio\n"
+"Pulseaudio nie zostało uruchomione"
#: ../sflphone-client-gnome/src/mainwindow.c:73
msgid "There is one call in progress."
@@ -136,53 +130,53 @@ msgstr ""
msgid "Do you still want to quit?"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:299
+#: ../sflphone-client-gnome/src/mainwindow.c:298
msgid "SFLphone Error"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:391
+#: ../sflphone-client-gnome/src/mainwindow.c:392
#, c-format
msgid "ZRTP is not supported by peer %s\n"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:392
+#: ../sflphone-client-gnome/src/mainwindow.c:393
msgid "Secure Communication Unavailable"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:393
-#: ../sflphone-client-gnome/src/mainwindow.c:415
+#: ../sflphone-client-gnome/src/mainwindow.c:394
+#: ../sflphone-client-gnome/src/mainwindow.c:416
msgid "Continue"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:394
-#: ../sflphone-client-gnome/src/mainwindow.c:416
-#: ../sflphone-client-gnome/src/mainwindow.c:430
+#: ../sflphone-client-gnome/src/mainwindow.c:395
+#: ../sflphone-client-gnome/src/mainwindow.c:417
+#: ../sflphone-client-gnome/src/mainwindow.c:431
msgid "Stop Call"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:413
+#: ../sflphone-client-gnome/src/mainwindow.c:414
#, c-format
msgid ""
"A %s error forced the call with %s to fall under unencrypted mode.\n"
"Exact reason: %s\n"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:414
+#: ../sflphone-client-gnome/src/mainwindow.c:415
msgid "ZRTP negotiation failed"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:427
+#: ../sflphone-client-gnome/src/mainwindow.c:428
#, c-format
msgid ""
"%s wants to stop using secure communication. Confirm will resume "
"conversation without SRTP.\n"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:428
+#: ../sflphone-client-gnome/src/mainwindow.c:429
msgid "Confirm Go Clear"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:429
+#: ../sflphone-client-gnome/src/mainwindow.c:430
msgid "Confirm"
msgstr ""
@@ -197,6 +191,13 @@ msgstr ""
msgid "<i>From</i> %s"
msgstr ""
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+#, c-format
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] "%d głosowa wiadomość"
+msgstr[1] "%d głosowych wiadomości"
+
#: ../sflphone-client-gnome/src/sflnotify.c:111
#, c-format
msgid "Calling with %s account <i>%s</i>"
@@ -244,15 +245,15 @@ msgstr ""
msgid "Mic volume"
msgstr ""
-#: ../sflphone-client-gnome/src/statusicon.c:91
+#: ../sflphone-client-gnome/src/statusicon.c:96
msgid "_Show main window"
msgstr ""
-#: ../sflphone-client-gnome/src/statusicon.c:126
+#: ../sflphone-client-gnome/src/statusicon.c:131
msgid "SFLphone"
msgstr ""
-#: ../sflphone-client-gnome/src/statusicon.c:127
+#: ../sflphone-client-gnome/src/statusicon.c:132
#, c-format
msgid "%i account configured"
msgid_plural "%i accounts configured"
@@ -260,202 +261,399 @@ msgstr[0] ""
msgstr[1] ""
#: ../sflphone-client-gnome/src/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:750
+#: ../sflphone-client-gnome/src/uimanager.c:693
+#: ../sflphone-client-gnome/src/uimanager.c:727
msgid "Voicemail"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:403
+#: ../sflphone-client-gnome/src/uimanager.c:117
+msgid "No address book selected"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:137
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "Address book"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:279
+#, c-format
+msgid "Voicemail (%i)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:342
msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:406
+#: ../sflphone-client-gnome/src/uimanager.c:345
msgid "About SFLphone"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1028
+#: ../sflphone-client-gnome/src/uimanager.c:719
+msgid "Call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:1184
+msgid "_New call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+msgid "Place a new call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:979
msgid "_Pick up"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1040
-#: ../sflphone-client-gnome/src/uimanager.c:1081
+#: ../sflphone-client-gnome/src/uimanager.c:721
+msgid "Answer the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:991
+#: ../sflphone-client-gnome/src/uimanager.c:1032
msgid "_Hang up"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1052
-#: ../sflphone-client-gnome/src/uimanager.c:1093
-msgid "On _Hold"
+#: ../sflphone-client-gnome/src/uimanager.c:722
+msgid "Finish the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "O_n hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "Place the call on hold"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1064
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "O_ff hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "Place the call off hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:725
+#: ../sflphone-client-gnome/src/uimanager.c:1015
msgid "_Record"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1154
-msgid "_Call back"
+#: ../sflphone-client-gnome/src/uimanager.c:725
+msgid "Record the current conversation"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1226
-msgid "_New call"
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Configuration _Assistant"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Run the configuration assistant"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:727
+msgid "Call your voicemail"
+msgstr "%d głosowa wiadomość"
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "_Close"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "Minimize to system tray"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "_Quit"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "Quit the program"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:732
+msgid "_Edit"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "_Copy"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "Copy the selection"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "_Paste"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "Paste the clipboard"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear _history"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear the call history"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "_Accounts"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "Edit your accounts"
+msgstr "Brak zarejestrowanych kont"
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "_Preferences"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "Change your preferences"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1300
+#: ../sflphone-client-gnome/src/uimanager.c:740
+msgid "_View"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:743
+msgid "_Help"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Contents"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Open the manual"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:745
+msgid "About this application"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "_Transfer"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "Transfer the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "_Show toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "Show the toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "_Dialpad"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "Show the dialpad"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "_Volume controls"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "Show the volume controls"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "_History"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "Calls history"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "_Address book"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:1003
+#: ../sflphone-client-gnome/src/uimanager.c:1044
+msgid "On _Hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:1107
+msgid "_Call back"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:1258
msgid "Edit phone number"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1311
+#: ../sflphone-client-gnome/src/uimanager.c:1269
msgid "Edit the phone number before making a call"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:164
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
msgid "Account Parameters"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:173
-#: ../sflphone-client-gnome/src/config/assistant.c:294
-#: ../sflphone-client-gnome/src/config/assistant.c:402
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
+#: ../sflphone-client-gnome/src/config/assistant.c:314
+#: ../sflphone-client-gnome/src/config/assistant.c:427
msgid "_Alias"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:181
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
msgid "_Protocol"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:199
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
msgid "Unknown"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:209
-#: ../sflphone-client-gnome/src/config/assistant.c:302
-#: ../sflphone-client-gnome/src/config/assistant.c:410
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
+#: ../sflphone-client-gnome/src/config/assistant.c:322
+#: ../sflphone-client-gnome/src/config/assistant.c:435
msgid "_Host name"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:217
-#: ../sflphone-client-gnome/src/config/assistant.c:310
-#: ../sflphone-client-gnome/src/config/assistant.c:418
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
+#: ../sflphone-client-gnome/src/config/assistant.c:330
+#: ../sflphone-client-gnome/src/config/assistant.c:443
msgid "_User name"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:234
-#: ../sflphone-client-gnome/src/config/assistant.c:326
-#: ../sflphone-client-gnome/src/config/assistant.c:433
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:346
+#: ../sflphone-client-gnome/src/config/assistant.c:458
msgid "_Password"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:254
-#: ../sflphone-client-gnome/src/config/assistant.c:344
-#: ../sflphone-client-gnome/src/config/assistant.c:449
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:363
+#: ../sflphone-client-gnome/src/config/assistant.c:473
+msgid "Show password"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:368
+#: ../sflphone-client-gnome/src/config/assistant.c:478
msgid "_Voicemail number"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:340
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
msgid "Authentication"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:341
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
msgid "Secret"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:466
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
msgid "Credential"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:501
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
msgid "Authentication name"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:512
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
msgid "Password"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:535
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:909
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:201
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
msgid "Security"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:547
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:213
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
msgid "Use TLS transport (sips)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:552
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:218
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
msgid "SRTP key exchange"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:558
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
msgid "Disabled"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
msgid "Registration"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:679
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
msgid "Registration expire"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
msgid "_Comply with RFC 3263"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
-msgid "Network"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
+msgid "Network Interface"
+msgstr "Sieć niedostępna"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:707
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
msgid "Local address"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:744
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
msgid "Local port"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:752
-msgid "Set published address and port:"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
+msgid "Published address"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:756
-msgid "Using STUN "
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+msgid "Using STUN"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:761
-msgid "Same as local parameters"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
+msgid "STUN server URL"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:764
-msgid "Manually"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
+msgid "Same as local parameters"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:769
-msgid "Published address"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
+msgid "Set published address and port:"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:777
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
msgid "Published port"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:785
-msgid "STUN server URL"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
msgid "Account settings"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
msgid "Basic"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:904
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
msgid "Advanced"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:169
-msgid "Server returned \""
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:164
+#, c-format
+msgid "Server returned \"%s\" (%d)"
msgstr ""
#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
@@ -474,32 +672,20 @@ msgstr ""
msgid "Configured Accounts"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:505
-msgid "There "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "is "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "are "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:508
-msgid " active account"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:509
-msgid "s"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
+#, c-format
+msgid "There is %d active account"
+msgid_plural "There are %d active accounts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:514
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
msgid "You have no active account"
msgstr ""
#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:443
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
msgid "General"
msgstr ""
@@ -544,225 +730,220 @@ 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:578
+#: ../sflphone-client-gnome/src/config/audioconf.c:577
msgid "Name"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:69
+#: ../sflphone-client-gnome/src/config/assistant.c:75
#, c-format
msgid "This assistant is now finished."
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:71
+#: ../sflphone-client-gnome/src/config/assistant.c:77
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/config/assistant.c:74
+#: ../sflphone-client-gnome/src/config/assistant.c:80
msgid "Alias"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:78
+#: ../sflphone-client-gnome/src/config/assistant.c:84
msgid "Server"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:82
+#: ../sflphone-client-gnome/src/config/assistant.c:88
msgid "Username"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:86
+#: ../sflphone-client-gnome/src/config/assistant.c:92
msgid "Security: "
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:88
+#: ../sflphone-client-gnome/src/config/assistant.c:94
msgid "SRTP/ZRTP draft-zimmermann"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:90
-#: ../sflphone-client-gnome/src/config/assistant.c:182
+#: ../sflphone-client-gnome/src/config/assistant.c:96
msgid "None"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:210
+#: ../sflphone-client-gnome/src/config/assistant.c:229
msgid "SFLphone account creation wizard"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:236
+#: ../sflphone-client-gnome/src/config/assistant.c:255
msgid "Welcome to the Account creation wizard of SFLphone!"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:237
+#: ../sflphone-client-gnome/src/config/assistant.c:256
msgid "This installation wizard will help you configure an account."
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "VoIP Protocols"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "Select an account type"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:253
+#: ../sflphone-client-gnome/src/config/assistant.c:272
msgid "SIP (Session Initiation Protocol)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:255
+#: ../sflphone-client-gnome/src/config/assistant.c:274
msgid "IAX2 (InterAsterix Exchange)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Account"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Please select one of the following options"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:271
+#: ../sflphone-client-gnome/src/config/assistant.c:290
msgid "Create a free SIP/IAX2 account on sflphone.org"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:273
+#: ../sflphone-client-gnome/src/config/assistant.c:292
msgid "Register an existing SIP or IAX2 account"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:306
msgid "SIP account settings"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:286
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "Please fill the following information"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:352
-#: ../sflphone-client-gnome/src/config/assistant.c:381
+#: ../sflphone-client-gnome/src/config/assistant.c:376
+#: ../sflphone-client-gnome/src/config/assistant.c:405
msgid "Secure communications with _ZRTP"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "Optional email address"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "This email address will be used to send your voicemail messages."
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:373
+#: ../sflphone-client-gnome/src/config/assistant.c:397
msgid "_Email address"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "IAX2 account settings"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "Network Address Translation (NAT)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "You should probably enable this if you are behind a firewall."
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:476
+#: ../sflphone-client-gnome/src/config/assistant.c:505
msgid "E_nable STUN"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:483
+#: ../sflphone-client-gnome/src/config/assistant.c:512
msgid "_STUN server"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Account Registration"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Congratulations!"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:583
+#: ../sflphone-client-gnome/src/config/audioconf.c:582
msgid "Frequency"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:588
+#: ../sflphone-client-gnome/src/config/audioconf.c:587
msgid "Bitrate"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:593
+#: ../sflphone-client-gnome/src/config/audioconf.c:592
msgid "Bandwidth"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:673
+#: ../sflphone-client-gnome/src/config/audioconf.c:670
msgid "ALSA plugin"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:695
+#: ../sflphone-client-gnome/src/config/audioconf.c:692
msgid "Output"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:717
+#: ../sflphone-client-gnome/src/config/audioconf.c:714
msgid "Input"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:752
+#: ../sflphone-client-gnome/src/config/audioconf.c:749
msgid "_Voice Activity Detection"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:762
+#: ../sflphone-client-gnome/src/config/audioconf.c:759
msgid "_Noise Reduction (Narrow-Band Companding)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:798
+#: ../sflphone-client-gnome/src/config/audioconf.c:800
msgid "Sound Manager"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:807
+#: ../sflphone-client-gnome/src/config/audioconf.c:809
msgid "_Pulseaudio"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:811
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
msgid "_ALSA"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:816
-msgid "_Mute other applications during a call"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:823
+#: ../sflphone-client-gnome/src/config/audioconf.c:819
msgid "ALSA settings"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:840
+#: ../sflphone-client-gnome/src/config/audioconf.c:836
msgid "Codecs"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:869
+#: ../sflphone-client-gnome/src/config/audioconf.c:865
msgid "Recordings"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:873
+#: ../sflphone-client-gnome/src/config/audioconf.c:869
msgid "Destination folder"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:877
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
msgid "Select a folder"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:883
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
msgid "Ringtones"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:889
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
msgid "_Enable ringtones"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:895
+#: ../sflphone-client-gnome/src/config/audioconf.c:891
msgid "Choose a ringtone"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:901
+#: ../sflphone-client-gnome/src/config/audioconf.c:897
msgid "Audio Files"
msgstr ""
@@ -799,86 +980,66 @@ msgstr ""
msgid "_Prefix dialed numbers with"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:195
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
msgid ""
"This profile is used when you want to reach a remote peer simply by typing a "
"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
"also be used if no account can be matched to an incoming or outgoing call."
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:274
-msgid "SIP Port"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:281
-msgid "UDP Transport"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:319
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
msgid "Desktop Notifications"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:323
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
msgid "_Enable notifications"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:329
-msgid "Enable voicemail _notifications"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:341
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
msgid "System Tray Icon"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
msgid "_Popup main window on incoming call"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:349
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
msgid "Ne_ver popup main window"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:353
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
msgid "Hide SFLphone window on _startup"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:359
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
msgid "Calls History"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:362
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
msgid "_Keep my history for at least"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:373
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
msgid "days"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:377
-msgid "Configuration File"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:379
-msgid "Store SIP credentials as MD5 hash"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:423
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
msgid "Preferences"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:448
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
msgid "Audio"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
msgid "Address Book"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:458
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
msgid "Hooks"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:468
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
msgid "Direct IP calls"
msgstr ""
@@ -886,11 +1047,11 @@ msgstr ""
msgid "Advanced options for TLS"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:55
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:56
msgid "TLS transport"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:59
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:60
msgid ""
"TLS transport can be used along with UDP for those calls that would\n"
"require secure sip transactions (aka SIPS). You can configure a different\n"
@@ -899,55 +1060,55 @@ msgid ""
"port, different one from each other\n"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:100
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
msgid "Certificate of Authority list"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:104
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
msgid "Choose a CA list file (optional)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:115
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
msgid "Public endpoint certificate file"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:119
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
msgid "Choose a public endpoint certificate (optional)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:134
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
msgid "Choose a private key file (optional)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:145
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
msgid "Password for the private key"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:168
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
msgid "TLS protocol method"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:202
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
msgid "TLS cipher list"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:211
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
msgid "Server name instance for outgoing TLS connection"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:219
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
msgid "Negotiation timeout (sec:msec)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:236
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
msgid "Verify incoming certificates, as a server"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:242
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
msgid "Verify certificates from answer, as a client"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:248
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
msgid "Require certificate for incoming tls connections"
msgstr ""
@@ -955,53 +1116,60 @@ msgstr ""
msgid "ZRTP Options"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:68
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:69
msgid "Send Hello Hash in S_DP"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:74
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:75
msgid "Ask User to Confirm SAS"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:80
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:81
msgid "_Warn if ZRTP not supported"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:86
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:87
msgid "Display SAS once for hold events"
msgstr ""
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:58
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
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:59
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:72
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:84
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:96
msgid "Click here to change the search type"
msgstr ""
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:71
msgid "Search by missed call"
msgstr ""
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:83
msgid "Search by incoming call"
msgstr ""
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:95
msgid "Search by outgoing call"
msgstr ""
+#~ msgid "IP call - %s"
+#~ msgstr "Telefonów IP - %s"
+
+#~ msgid "Codec"
+#~ msgstr "Kodek"
+
#~ msgctxt "NAME OF TRANSLATORS"
#~ msgid "Your names"
#~ msgstr ""
-#~ ",Launchpad Contributions:,Maxime Chambreuil, ,Launchpad "
-#~ "Contributions:,Maxime Chambreuil, ,Launchpad Contributions:,Maxime Chambreuil"
+#~ ",Launchpad Contributions:,Maxime Chambreuil, ,Launchpad Contributions:,"
+#~ "Maxime Chambreuil, ,Launchpad Contributions:,Maxime Chambreuil, ,"
+#~ "Launchpad Contributions:,Mariusz Bednarz,Maxime Chambreuil"
#~ msgctxt "EMAIL OF TRANSLATORS"
#~ msgid "Your emails"
#~ msgstr ""
-#~ ",,maxime.chambreuil@gmail.com,,,maxime.chambreuil@gmail.com,,,maxime.chambreu"
-#~ "il@gmail.com"
+#~ ",,maxime.chambreuil@gmail.com,,,maxime.chambreuil@gmail.com,,,maxime."
+#~ "chambreuil@gmail.com,,,mbednarz@bedmar.pl,maxime.chambreuil@gmail.com"
diff --git a/lang/pt/pt.po b/lang/pt/pt.po
index 10ff891b2bb0cbd3ed1f79ce40369fba83a595e9..ef406f9445d8e15fc11370bfebd328e752863004 100644
--- a/lang/pt/pt.po
+++ b/lang/pt/pt.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-14 11:18-0400\n"
-"PO-Revision-Date: 2009-10-14 17:26+0000\n"
+"POT-Creation-Date: 2009-12-03 10:22-0500\n"
+"PO-Revision-Date: 2009-10-26 20:46+0000\n"
"Last-Translator: Maxime Chambreuil <maxime.chambreuil@gmail.com>\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=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-10-26 15:48+0000\n"
+"X-Launchpad-Export-Date: 2009-12-03 15:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: ../sflphone-client-gnome/src/accountlist.c:175
@@ -60,46 +60,32 @@ msgstr ""
msgid "Invalid"
msgstr "Inválido"
-#: ../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:83
-#: ../sflphone-client-gnome/src/actions.c:919
-#: ../sflphone-client-gnome/src/actions.c:926
+#: ../sflphone-client-gnome/src/actions.c:98
msgid "Using account"
msgstr ""
-#: ../sflphone-client-gnome/src/actions.c:89
+#: ../sflphone-client-gnome/src/actions.c:104
msgid "No registered accounts"
msgstr ""
-#: ../sflphone-client-gnome/src/actions.c:268
+#: ../sflphone-client-gnome/src/actions.c:285
msgid ""
"Unable to connect to the SFLphone server.\n"
"Make sure the daemon is running."
msgstr ""
-#: ../sflphone-client-gnome/src/actions.c:913
-#, c-format
-msgid "IP call - %s"
+#: ../sflphone-client-gnome/src/actions.c:589
+#: ../sflphone-client-gnome/src/actions.c:911
+msgid "Direct SIP call"
msgstr ""
-#: ../sflphone-client-gnome/src/actions.c:922
-msgid "Codec"
-msgstr "Codec"
-
-#: ../sflphone-client-gnome/src/actions.c:1119
+#: ../sflphone-client-gnome/src/actions.c:1103
#, 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> )"
+"</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/errors.c:29
@@ -135,53 +121,53 @@ msgstr ""
msgid "Do you still want to quit?"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:299
+#: ../sflphone-client-gnome/src/mainwindow.c:298
msgid "SFLphone Error"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:391
+#: ../sflphone-client-gnome/src/mainwindow.c:392
#, c-format
msgid "ZRTP is not supported by peer %s\n"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:392
+#: ../sflphone-client-gnome/src/mainwindow.c:393
msgid "Secure Communication Unavailable"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:393
-#: ../sflphone-client-gnome/src/mainwindow.c:415
+#: ../sflphone-client-gnome/src/mainwindow.c:394
+#: ../sflphone-client-gnome/src/mainwindow.c:416
msgid "Continue"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:394
-#: ../sflphone-client-gnome/src/mainwindow.c:416
-#: ../sflphone-client-gnome/src/mainwindow.c:430
+#: ../sflphone-client-gnome/src/mainwindow.c:395
+#: ../sflphone-client-gnome/src/mainwindow.c:417
+#: ../sflphone-client-gnome/src/mainwindow.c:431
msgid "Stop Call"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:413
+#: ../sflphone-client-gnome/src/mainwindow.c:414
#, c-format
msgid ""
"A %s error forced the call with %s to fall under unencrypted mode.\n"
"Exact reason: %s\n"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:414
+#: ../sflphone-client-gnome/src/mainwindow.c:415
msgid "ZRTP negotiation failed"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:427
+#: ../sflphone-client-gnome/src/mainwindow.c:428
#, c-format
msgid ""
"%s wants to stop using secure communication. Confirm will resume "
"conversation without SRTP.\n"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:428
+#: ../sflphone-client-gnome/src/mainwindow.c:429
msgid "Confirm Go Clear"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:429
+#: ../sflphone-client-gnome/src/mainwindow.c:430
msgid "Confirm"
msgstr ""
@@ -196,6 +182,13 @@ msgstr "conta %s : %s"
msgid "<i>From</i> %s"
msgstr ""
+#: ../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/sflnotify.c:111
#, c-format
msgid "Calling with %s account <i>%s</i>"
@@ -243,15 +236,15 @@ msgstr ""
msgid "Mic volume"
msgstr ""
-#: ../sflphone-client-gnome/src/statusicon.c:91
+#: ../sflphone-client-gnome/src/statusicon.c:96
msgid "_Show main window"
msgstr ""
-#: ../sflphone-client-gnome/src/statusicon.c:126
+#: ../sflphone-client-gnome/src/statusicon.c:131
msgid "SFLphone"
msgstr "SFLphone"
-#: ../sflphone-client-gnome/src/statusicon.c:127
+#: ../sflphone-client-gnome/src/statusicon.c:132
#, c-format
msgid "%i account configured"
msgid_plural "%i accounts configured"
@@ -259,202 +252,398 @@ msgstr[0] ""
msgstr[1] ""
#: ../sflphone-client-gnome/src/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:750
+#: ../sflphone-client-gnome/src/uimanager.c:693
+#: ../sflphone-client-gnome/src/uimanager.c:727
msgid "Voicemail"
msgstr "Correio de voz"
-#: ../sflphone-client-gnome/src/uimanager.c:403
+#: ../sflphone-client-gnome/src/uimanager.c:117
+msgid "No address book selected"
+msgstr "Livro de endereços"
+
+#: ../sflphone-client-gnome/src/uimanager.c:137
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "Address book"
+msgstr "Livro de endereços"
+
+#: ../sflphone-client-gnome/src/uimanager.c:279
+msgid "Voicemail (%i)"
+msgstr "Correio de voz (%i)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:342
msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:406
+#: ../sflphone-client-gnome/src/uimanager.c:345
msgid "About SFLphone"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1028
+#: ../sflphone-client-gnome/src/uimanager.c:719
+msgid "Call"
+msgstr "_Chamar"
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:1184
+msgid "_New call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+msgid "Place a new call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:979
msgid "_Pick up"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1040
-#: ../sflphone-client-gnome/src/uimanager.c:1081
+#: ../sflphone-client-gnome/src/uimanager.c:721
+msgid "Answer the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:991
+#: ../sflphone-client-gnome/src/uimanager.c:1032
msgid "_Hang up"
msgstr "_Desligar"
-#: ../sflphone-client-gnome/src/uimanager.c:1052
-#: ../sflphone-client-gnome/src/uimanager.c:1093
-msgid "On _Hold"
+#: ../sflphone-client-gnome/src/uimanager.c:722
+msgid "Finish the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "O_n hold"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1064
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "Place the call on hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "O_ff hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "Place the call off hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:725
+#: ../sflphone-client-gnome/src/uimanager.c:1015
msgid "_Record"
msgstr "_Gravar"
-#: ../sflphone-client-gnome/src/uimanager.c:1154
-msgid "_Call back"
+#: ../sflphone-client-gnome/src/uimanager.c:725
+msgid "Record the current conversation"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1226
-msgid "_New call"
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Configuration _Assistant"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Run the configuration assistant"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:727
+msgid "Call your voicemail"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1300
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "_Close"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "Minimize to system tray"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "_Quit"
+msgstr "_Editar"
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "Quit the program"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:732
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "_Copy"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "Copy the selection"
+msgstr "Remover a conta seleccionada"
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "_Paste"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "Paste the clipboard"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear _history"
+msgstr "Histórico de chamadas"
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear the call history"
+msgstr "Histórico de chamadas"
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "_Accounts"
+msgstr "_Contas"
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "Edit your accounts"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "_Preferences"
+msgstr "Preferências"
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "Change your preferences"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:740
+msgid "_View"
+msgstr "_Ver"
+
+#: ../sflphone-client-gnome/src/uimanager.c:743
+msgid "_Help"
+msgstr "_Ajuda"
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Contents"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Open the manual"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:745
+msgid "About this application"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "_Transfer"
+msgstr "Transferir"
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "Transfer the call"
+msgstr "Transferir"
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "_Show toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "Show the toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "_Dialpad"
+msgstr "Marca_dor"
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "Show the dialpad"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "_Volume controls"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "Show the volume controls"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "_History"
+msgstr "Histórico"
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "Calls history"
+msgstr "Histórico de chamadas"
+
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "_Address book"
+msgstr "Livro de endereços"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1003
+#: ../sflphone-client-gnome/src/uimanager.c:1044
+msgid "On _Hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:1107
+msgid "_Call back"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:1258
msgid "Edit phone number"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1311
+#: ../sflphone-client-gnome/src/uimanager.c:1269
msgid "Edit the phone number before making a call"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:164
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
msgid "Account Parameters"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:173
-#: ../sflphone-client-gnome/src/config/assistant.c:294
-#: ../sflphone-client-gnome/src/config/assistant.c:402
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
+#: ../sflphone-client-gnome/src/config/assistant.c:314
+#: ../sflphone-client-gnome/src/config/assistant.c:427
msgid "_Alias"
msgstr "_Nomear"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:181
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
msgid "_Protocol"
msgstr "_Protocolo"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:199
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
msgid "Unknown"
msgstr "Desconhecido"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:209
-#: ../sflphone-client-gnome/src/config/assistant.c:302
-#: ../sflphone-client-gnome/src/config/assistant.c:410
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
+#: ../sflphone-client-gnome/src/config/assistant.c:322
+#: ../sflphone-client-gnome/src/config/assistant.c:435
msgid "_Host name"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:217
-#: ../sflphone-client-gnome/src/config/assistant.c:310
-#: ../sflphone-client-gnome/src/config/assistant.c:418
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
+#: ../sflphone-client-gnome/src/config/assistant.c:330
+#: ../sflphone-client-gnome/src/config/assistant.c:443
msgid "_User name"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:234
-#: ../sflphone-client-gnome/src/config/assistant.c:326
-#: ../sflphone-client-gnome/src/config/assistant.c:433
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:346
+#: ../sflphone-client-gnome/src/config/assistant.c:458
msgid "_Password"
msgstr "_Senha"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:254
-#: ../sflphone-client-gnome/src/config/assistant.c:344
-#: ../sflphone-client-gnome/src/config/assistant.c:449
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:363
+#: ../sflphone-client-gnome/src/config/assistant.c:473
+msgid "Show password"
+msgstr "Senha"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:368
+#: ../sflphone-client-gnome/src/config/assistant.c:478
msgid "_Voicemail number"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:340
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
msgid "Authentication"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:341
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
msgid "Secret"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:466
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
msgid "Credential"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:501
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
msgid "Authentication name"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:512
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
msgid "Password"
msgstr "Senha"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:535
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:909
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:201
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
msgid "Security"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:547
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:213
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
msgid "Use TLS transport (sips)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:552
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:218
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
msgid "SRTP key exchange"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:558
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
msgid "Disabled"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
msgid "Registration"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:679
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
msgid "Registration expire"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
msgid "_Comply with RFC 3263"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
-msgid "Network"
-msgstr "Rede"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
+msgid "Network Interface"
+msgstr "A rede está inacessível"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:707
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
msgid "Local address"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:744
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
msgid "Local port"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:752
-msgid "Set published address and port:"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
+msgid "Published address"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:756
-msgid "Using STUN "
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+msgid "Using STUN"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:761
-msgid "Same as local parameters"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
+msgid "STUN server URL"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:764
-msgid "Manually"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
+msgid "Same as local parameters"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:769
-msgid "Published address"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
+msgid "Set published address and port:"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:777
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
msgid "Published port"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:785
-msgid "STUN server URL"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
msgid "Account settings"
msgstr "Configurações da conta"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
msgid "Basic"
msgstr "Básico"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:904
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
msgid "Advanced"
msgstr "Avançado"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:169
-msgid "Server returned \""
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:164
+#, c-format
+msgid "Server returned \"%s\" (%d)"
msgstr ""
#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
@@ -473,32 +662,19 @@ msgstr "Contas"
msgid "Configured Accounts"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:505
-msgid "There "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "is "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "are "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:508
-msgid " active account"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:509
-msgid "s"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
+#, c-format
+msgid "There is %d active account"
+msgid_plural "There are %d active accounts"
+msgstr[0] ""
+msgstr[1] ""
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:514
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
msgid "You have no active account"
msgstr ""
#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:443
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
msgid "General"
msgstr "Geral"
@@ -543,225 +719,220 @@ 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:578
+#: ../sflphone-client-gnome/src/config/audioconf.c:577
msgid "Name"
msgstr "Nome"
-#: ../sflphone-client-gnome/src/config/assistant.c:69
+#: ../sflphone-client-gnome/src/config/assistant.c:75
#, c-format
msgid "This assistant is now finished."
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:71
+#: ../sflphone-client-gnome/src/config/assistant.c:77
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/config/assistant.c:74
+#: ../sflphone-client-gnome/src/config/assistant.c:80
msgid "Alias"
msgstr "Nome Alternativo"
-#: ../sflphone-client-gnome/src/config/assistant.c:78
+#: ../sflphone-client-gnome/src/config/assistant.c:84
msgid "Server"
msgstr "Servidor"
-#: ../sflphone-client-gnome/src/config/assistant.c:82
+#: ../sflphone-client-gnome/src/config/assistant.c:88
msgid "Username"
msgstr "Utilizador"
-#: ../sflphone-client-gnome/src/config/assistant.c:86
+#: ../sflphone-client-gnome/src/config/assistant.c:92
msgid "Security: "
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:88
+#: ../sflphone-client-gnome/src/config/assistant.c:94
msgid "SRTP/ZRTP draft-zimmermann"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:90
-#: ../sflphone-client-gnome/src/config/assistant.c:182
+#: ../sflphone-client-gnome/src/config/assistant.c:96
msgid "None"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:210
+#: ../sflphone-client-gnome/src/config/assistant.c:229
msgid "SFLphone account creation wizard"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:236
+#: ../sflphone-client-gnome/src/config/assistant.c:255
msgid "Welcome to the Account creation wizard of SFLphone!"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:237
+#: ../sflphone-client-gnome/src/config/assistant.c:256
msgid "This installation wizard will help you configure an account."
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "VoIP Protocols"
msgstr "Protocolos VoIP"
-#: ../sflphone-client-gnome/src/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "Select an account type"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:253
+#: ../sflphone-client-gnome/src/config/assistant.c:272
msgid "SIP (Session Initiation Protocol)"
msgstr "SIP (Session Initiation Protocol)"
-#: ../sflphone-client-gnome/src/config/assistant.c:255
+#: ../sflphone-client-gnome/src/config/assistant.c:274
msgid "IAX2 (InterAsterix Exchange)"
msgstr "IAX2 (InterAsterix Exchange)"
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Account"
msgstr "Conta"
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Please select one of the following options"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:271
+#: ../sflphone-client-gnome/src/config/assistant.c:290
msgid "Create a free SIP/IAX2 account on sflphone.org"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:273
+#: ../sflphone-client-gnome/src/config/assistant.c:292
msgid "Register an existing SIP or IAX2 account"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:306
msgid "SIP account settings"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:286
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "Please fill the following information"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:352
-#: ../sflphone-client-gnome/src/config/assistant.c:381
+#: ../sflphone-client-gnome/src/config/assistant.c:376
+#: ../sflphone-client-gnome/src/config/assistant.c:405
msgid "Secure communications with _ZRTP"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "Optional email address"
msgstr "Endereço de email opcional"
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "This email address will be used to send your voicemail messages."
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:373
+#: ../sflphone-client-gnome/src/config/assistant.c:397
msgid "_Email address"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "IAX2 account settings"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "Network Address Translation (NAT)"
msgstr "Network Address Translation (NAT)"
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "You should probably enable this if you are behind a firewall."
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:476
+#: ../sflphone-client-gnome/src/config/assistant.c:505
msgid "E_nable STUN"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:483
+#: ../sflphone-client-gnome/src/config/assistant.c:512
msgid "_STUN server"
msgstr "_Servidor STUN"
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Account Registration"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Congratulations!"
msgstr "Parabéns!"
-#: ../sflphone-client-gnome/src/config/audioconf.c:583
+#: ../sflphone-client-gnome/src/config/audioconf.c:582
msgid "Frequency"
msgstr "Frequência"
-#: ../sflphone-client-gnome/src/config/audioconf.c:588
+#: ../sflphone-client-gnome/src/config/audioconf.c:587
msgid "Bitrate"
msgstr "Taxa de Dados"
-#: ../sflphone-client-gnome/src/config/audioconf.c:593
+#: ../sflphone-client-gnome/src/config/audioconf.c:592
msgid "Bandwidth"
msgstr "Largura de Banda"
-#: ../sflphone-client-gnome/src/config/audioconf.c:673
+#: ../sflphone-client-gnome/src/config/audioconf.c:670
msgid "ALSA plugin"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:695
+#: ../sflphone-client-gnome/src/config/audioconf.c:692
msgid "Output"
msgstr "Saída"
-#: ../sflphone-client-gnome/src/config/audioconf.c:717
+#: ../sflphone-client-gnome/src/config/audioconf.c:714
msgid "Input"
msgstr "Entrada"
-#: ../sflphone-client-gnome/src/config/audioconf.c:752
+#: ../sflphone-client-gnome/src/config/audioconf.c:749
msgid "_Voice Activity Detection"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:762
+#: ../sflphone-client-gnome/src/config/audioconf.c:759
msgid "_Noise Reduction (Narrow-Band Companding)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:798
+#: ../sflphone-client-gnome/src/config/audioconf.c:800
msgid "Sound Manager"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:807
+#: ../sflphone-client-gnome/src/config/audioconf.c:809
msgid "_Pulseaudio"
msgstr "_Pulseaudio"
-#: ../sflphone-client-gnome/src/config/audioconf.c:811
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
msgid "_ALSA"
msgstr "_ALSA"
-#: ../sflphone-client-gnome/src/config/audioconf.c:816
-msgid "_Mute other applications during a call"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:823
+#: ../sflphone-client-gnome/src/config/audioconf.c:819
msgid "ALSA settings"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:840
+#: ../sflphone-client-gnome/src/config/audioconf.c:836
msgid "Codecs"
msgstr "Codecs"
-#: ../sflphone-client-gnome/src/config/audioconf.c:869
+#: ../sflphone-client-gnome/src/config/audioconf.c:865
msgid "Recordings"
msgstr "Gravações"
-#: ../sflphone-client-gnome/src/config/audioconf.c:873
+#: ../sflphone-client-gnome/src/config/audioconf.c:869
msgid "Destination folder"
msgstr "Pasta de destino"
-#: ../sflphone-client-gnome/src/config/audioconf.c:877
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
msgid "Select a folder"
msgstr "Seleccione uma pasta"
-#: ../sflphone-client-gnome/src/config/audioconf.c:883
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
msgid "Ringtones"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:889
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
msgid "_Enable ringtones"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:895
+#: ../sflphone-client-gnome/src/config/audioconf.c:891
msgid "Choose a ringtone"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:901
+#: ../sflphone-client-gnome/src/config/audioconf.c:897
msgid "Audio Files"
msgstr "Ficheiros Áudio"
@@ -798,86 +969,66 @@ msgstr ""
msgid "_Prefix dialed numbers with"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:195
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
msgid ""
"This profile is used when you want to reach a remote peer simply by typing a "
"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
"also be used if no account can be matched to an incoming or outgoing call."
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:274
-msgid "SIP Port"
-msgstr "Porta SIP"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:281
-msgid "UDP Transport"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:319
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
msgid "Desktop Notifications"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:323
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
msgid "_Enable notifications"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:329
-msgid "Enable voicemail _notifications"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:341
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
msgid "System Tray Icon"
msgstr "Ícone de Notificação"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
msgid "_Popup main window on incoming call"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:349
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
msgid "Ne_ver popup main window"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:353
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
msgid "Hide SFLphone window on _startup"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:359
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
msgid "Calls History"
msgstr "Histórico de Chamadas"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:362
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
msgid "_Keep my history for at least"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:373
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
msgid "days"
msgstr "dias"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:377
-msgid "Configuration File"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:379
-msgid "Store SIP credentials as MD5 hash"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:423
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
msgid "Preferences"
msgstr "Preferências"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:448
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
msgid "Audio"
msgstr "Áudio"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
msgid "Address Book"
msgstr "Livro de Endereços"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:458
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
msgid "Hooks"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:468
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
msgid "Direct IP calls"
msgstr ""
@@ -885,11 +1036,11 @@ msgstr ""
msgid "Advanced options for TLS"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:55
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:56
msgid "TLS transport"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:59
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:60
msgid ""
"TLS transport can be used along with UDP for those calls that would\n"
"require secure sip transactions (aka SIPS). You can configure a different\n"
@@ -898,55 +1049,55 @@ msgid ""
"port, different one from each other\n"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:100
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
msgid "Certificate of Authority list"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:104
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
msgid "Choose a CA list file (optional)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:115
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
msgid "Public endpoint certificate file"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:119
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
msgid "Choose a public endpoint certificate (optional)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:134
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
msgid "Choose a private key file (optional)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:145
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
msgid "Password for the private key"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:168
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
msgid "TLS protocol method"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:202
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
msgid "TLS cipher list"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:211
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
msgid "Server name instance for outgoing TLS connection"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:219
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
msgid "Negotiation timeout (sec:msec)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:236
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
msgid "Verify incoming certificates, as a server"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:242
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
msgid "Verify certificates from answer, as a client"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:248
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
msgid "Require certificate for incoming tls connections"
msgstr ""
@@ -954,45 +1105,54 @@ msgstr ""
msgid "ZRTP Options"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:68
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:69
msgid "Send Hello Hash in S_DP"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:74
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:75
msgid "Ask User to Confirm SAS"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:80
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:81
msgid "_Warn if ZRTP not supported"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:86
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:87
msgid "Display SAS once for hold events"
msgstr ""
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:58
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
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:59
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:72
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:84
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:96
msgid "Click here to change the search type"
msgstr "Clique aqui para alterar o tipo de procura"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:71
msgid "Search by missed call"
msgstr ""
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:83
msgid "Search by incoming call"
msgstr ""
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:95
msgid "Search by outgoing call"
msgstr ""
+#~ msgid "Codec"
+#~ msgstr "Codec"
+
+#~ msgid "Network"
+#~ msgstr "Rede"
+
+#~ msgid "SIP Port"
+#~ msgstr "Porta SIP"
+
#~ msgid "Email address"
#~ msgstr "Endereço de correiro electrónico"
@@ -1005,27 +1165,15 @@ msgstr ""
#~ msgid "Incoming call"
#~ msgstr "Chamada recebida"
-#~ msgid "Call history"
-#~ msgstr "Histórico de chamadas"
-
-#~ msgid "Address book"
-#~ msgstr "Livro de endereços"
-
#~ msgid "Pick up"
#~ msgstr "Atender"
#~ msgid "Record"
#~ msgstr "Gravar"
-#~ msgid "Transfer"
-#~ msgstr "Transferir"
-
#~ msgid "Hang up"
#~ msgstr "Desligar"
-#~ msgid "Remove the selected account"
-#~ msgstr "Remover a conta seleccionada"
-
#~ msgid "Remove"
#~ msgstr "Remover"
@@ -1065,27 +1213,6 @@ msgstr ""
#~ msgid "Connection"
#~ msgstr "Connecção"
-#~ msgid "History"
-#~ msgstr "Histórico"
-
-#~ msgid "_Help"
-#~ msgstr "_Ajuda"
-
-#~ msgid "_Call"
-#~ msgstr "_Chamar"
-
-#~ msgid "_Dialpad"
-#~ msgstr "Marca_dor"
-
-#~ msgid "_Edit"
-#~ msgstr "_Editar"
-
-#~ msgid "_Accounts"
-#~ msgstr "_Contas"
-
-#~ msgid "_View"
-#~ msgstr "_Ver"
-
#~ msgid "PulseAudio sound server"
#~ msgstr "Servidor de som PulseAudio"
@@ -1110,12 +1237,13 @@ msgstr ""
#~ msgctxt "NAME OF TRANSLATORS"
#~ msgid "Your names"
#~ msgstr ""
-#~ ",Launchpad Contributions:,Maxime Chambreuil, ,Launchpad "
-#~ "Contributions:,Maxime Chambreuil,Tiago Silva, ,Launchpad "
-#~ "Contributions:,Maxime Chambreuil,Tiago Silva"
+#~ ",Launchpad Contributions:,Maxime Chambreuil, ,Launchpad Contributions:,"
+#~ "Maxime Chambreuil,Tiago Silva, ,Launchpad Contributions:,Maxime "
+#~ "Chambreuil,Tiago Silva, ,Launchpad Contributions:,Maxime Chambreuil,Tiago "
+#~ "Silva"
#~ msgctxt "EMAIL OF TRANSLATORS"
#~ msgid "Your emails"
#~ msgstr ""
-#~ ",,maxime.chambreuil@gmail.com,,,maxime.chambreuil@gmail.com,,,,maxime.chambre"
-#~ "uil@gmail.com,"
+#~ ",,maxime.chambreuil@gmail.com,,,maxime.chambreuil@gmail.com,,,,maxime."
+#~ "chambreuil@gmail.com,,,,maxime.chambreuil@gmail.com,"
diff --git a/lang/pt_BR/pt_BR.po b/lang/pt_BR/pt_BR.po
index 34f94f3dfd32e74edecc15ae1b5f3a56c15124f1..0a5429e6c0323561c75343ee5b5b977440bb1ae2 100644
--- a/lang/pt_BR/pt_BR.po
+++ b/lang/pt_BR/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: sflphone\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-14 11:18-0400\n"
-"PO-Revision-Date: 2009-10-15 18:00+0000\n"
+"POT-Creation-Date: 2009-12-03 10:22-0500\n"
+"PO-Revision-Date: 2009-10-26 20:46+0000\n"
"Last-Translator: kalib <kalibslack@gmail.com>\n"
"Language-Team: Brazilian Portuguese <pt_BR@li.org>\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"
-"X-Launchpad-Export-Date: 2009-10-26 15:48+0000\n"
+"X-Launchpad-Export-Date: 2009-12-03 15:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: ../sflphone-client-gnome/src/accountlist.c:175
@@ -60,25 +60,15 @@ msgstr "Servidor stun inválido"
msgid "Invalid"
msgstr "Inválido"
-#: ../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 mensagem de voz"
-msgstr[1] "%d mensagens de voz"
-
-#: ../sflphone-client-gnome/src/actions.c:83
-#: ../sflphone-client-gnome/src/actions.c:919
-#: ../sflphone-client-gnome/src/actions.c:926
+#: ../sflphone-client-gnome/src/actions.c:98
msgid "Using account"
msgstr "Utilizando conta"
-#: ../sflphone-client-gnome/src/actions.c:89
+#: ../sflphone-client-gnome/src/actions.c:104
msgid "No registered accounts"
msgstr "Sem contas registradas"
-#: ../sflphone-client-gnome/src/actions.c:268
+#: ../sflphone-client-gnome/src/actions.c:285
msgid ""
"Unable to connect to the SFLphone server.\n"
"Make sure the daemon is running."
@@ -86,22 +76,18 @@ msgstr ""
"Incapaz de conectar ao servidor SFLphone.\n"
"Tenha certeza de que o daemon está rodando."
-#: ../sflphone-client-gnome/src/actions.c:913
-#, c-format
-msgid "IP call - %s"
-msgstr "Ligação IP - %s"
-
-#: ../sflphone-client-gnome/src/actions.c:922
-msgid "Codec"
-msgstr "Codec"
+#: ../sflphone-client-gnome/src/actions.c:589
+#: ../sflphone-client-gnome/src/actions.c:911
+msgid "Direct SIP call"
+msgstr "Ligações IP diretas"
-#: ../sflphone-client-gnome/src/actions.c:1119
+#: ../sflphone-client-gnome/src/actions.c:1103
#, 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> )"
+"</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>Erro: Não foram encontrados codecs de áudio.\n"
"\n"
@@ -150,31 +136,31 @@ msgstr "Existem ligações em progresso"
msgid "Do you still want to quit?"
msgstr "Você ainda deseja sair?"
-#: ../sflphone-client-gnome/src/mainwindow.c:299
+#: ../sflphone-client-gnome/src/mainwindow.c:298
msgid "SFLphone Error"
msgstr "Erro no SFLphone"
-#: ../sflphone-client-gnome/src/mainwindow.c:391
+#: ../sflphone-client-gnome/src/mainwindow.c:392
#, c-format
msgid "ZRTP is not supported by peer %s\n"
msgstr "ZRTP não é suportado pelo peer %s\n"
-#: ../sflphone-client-gnome/src/mainwindow.c:392
+#: ../sflphone-client-gnome/src/mainwindow.c:393
msgid "Secure Communication Unavailable"
msgstr "Comunicação Segura Indisponível"
-#: ../sflphone-client-gnome/src/mainwindow.c:393
-#: ../sflphone-client-gnome/src/mainwindow.c:415
+#: ../sflphone-client-gnome/src/mainwindow.c:394
+#: ../sflphone-client-gnome/src/mainwindow.c:416
msgid "Continue"
msgstr "Continuar"
-#: ../sflphone-client-gnome/src/mainwindow.c:394
-#: ../sflphone-client-gnome/src/mainwindow.c:416
-#: ../sflphone-client-gnome/src/mainwindow.c:430
+#: ../sflphone-client-gnome/src/mainwindow.c:395
+#: ../sflphone-client-gnome/src/mainwindow.c:417
+#: ../sflphone-client-gnome/src/mainwindow.c:431
msgid "Stop Call"
msgstr "Finalizar Chamada"
-#: ../sflphone-client-gnome/src/mainwindow.c:413
+#: ../sflphone-client-gnome/src/mainwindow.c:414
#, c-format
msgid ""
"A %s error forced the call with %s to fall under unencrypted mode.\n"
@@ -183,11 +169,11 @@ msgstr ""
"Um erro %s forçou a ligação com %s a mudar para um modo não encriptado.\n"
"Motivo exato: %s\n"
-#: ../sflphone-client-gnome/src/mainwindow.c:414
+#: ../sflphone-client-gnome/src/mainwindow.c:415
msgid "ZRTP negotiation failed"
msgstr "Negociação ZRTP falhou"
-#: ../sflphone-client-gnome/src/mainwindow.c:427
+#: ../sflphone-client-gnome/src/mainwindow.c:428
#, c-format
msgid ""
"%s wants to stop using secure communication. Confirm will resume "
@@ -196,11 +182,11 @@ msgstr ""
"%s deseja finalizar a utilização de comunicação segura. A confirmação irá "
"retomar sem SRTP.\n"
-#: ../sflphone-client-gnome/src/mainwindow.c:428
+#: ../sflphone-client-gnome/src/mainwindow.c:429
msgid "Confirm Go Clear"
msgstr "Confirmar Vá Limpar"
-#: ../sflphone-client-gnome/src/mainwindow.c:429
+#: ../sflphone-client-gnome/src/mainwindow.c:430
msgid "Confirm"
msgstr "Confirmar"
@@ -215,6 +201,13 @@ msgstr "%s conta : %s"
msgid "<i>From</i> %s"
msgstr "<i>De</i> %s"
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+#, c-format
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] "%d mensagem de voz"
+msgstr[1] "%d mensagens de voz"
+
#: ../sflphone-client-gnome/src/sflnotify.c:111
#, c-format
msgid "Calling with %s account <i>%s</i>"
@@ -264,15 +257,15 @@ msgstr "Volume dos auto-falantes"
msgid "Mic volume"
msgstr "Volume do microfone"
-#: ../sflphone-client-gnome/src/statusicon.c:91
+#: ../sflphone-client-gnome/src/statusicon.c:96
msgid "_Show main window"
msgstr "_Apresentar janela principal"
-#: ../sflphone-client-gnome/src/statusicon.c:126
+#: ../sflphone-client-gnome/src/statusicon.c:131
msgid "SFLphone"
msgstr "SFLphone"
-#: ../sflphone-client-gnome/src/statusicon.c:127
+#: ../sflphone-client-gnome/src/statusicon.c:132
#, c-format
msgid "%i account configured"
msgid_plural "%i accounts configured"
@@ -280,202 +273,397 @@ msgstr[0] "%i conta configurada"
msgstr[1] "%i contas configuradas"
#: ../sflphone-client-gnome/src/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:750
+#: ../sflphone-client-gnome/src/uimanager.c:693
+#: ../sflphone-client-gnome/src/uimanager.c:727
msgid "Voicemail"
msgstr "Correio de voz"
-#: ../sflphone-client-gnome/src/uimanager.c:403
+#: ../sflphone-client-gnome/src/uimanager.c:117
+msgid "No address book selected"
+msgstr "Catálogo de endereços"
+
+#: ../sflphone-client-gnome/src/uimanager.c:137
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "Address book"
+msgstr "Catálogo de endereços"
+
+#: ../sflphone-client-gnome/src/uimanager.c:279
+msgid "Voicemail (%i)"
+msgstr "Correio de voz (%i)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:342
msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
msgstr "SFLphone é um cliente VoIP compatível com os protocolos SIP e IAX2."
-#: ../sflphone-client-gnome/src/uimanager.c:406
+#: ../sflphone-client-gnome/src/uimanager.c:345
msgid "About SFLphone"
msgstr "Sobre o SFLphone"
-#: ../sflphone-client-gnome/src/uimanager.c:1028
+#: ../sflphone-client-gnome/src/uimanager.c:719
+msgid "Call"
+msgstr "_Chamar"
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:1184
+msgid "_New call"
+msgstr "_Nova ligação"
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+msgid "Place a new call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:979
msgid "_Pick up"
msgstr "_Atender"
-#: ../sflphone-client-gnome/src/uimanager.c:1040
-#: ../sflphone-client-gnome/src/uimanager.c:1081
+#: ../sflphone-client-gnome/src/uimanager.c:721
+msgid "Answer the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:991
+#: ../sflphone-client-gnome/src/uimanager.c:1032
msgid "_Hang up"
msgstr "_Desligar"
-#: ../sflphone-client-gnome/src/uimanager.c:1052
-#: ../sflphone-client-gnome/src/uimanager.c:1093
-msgid "On _Hold"
+#: ../sflphone-client-gnome/src/uimanager.c:722
+msgid "Finish the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "O_n hold"
msgstr "Em _Espera"
-#: ../sflphone-client-gnome/src/uimanager.c:1064
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "Place the call on hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "O_ff hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "Place the call off hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:725
+#: ../sflphone-client-gnome/src/uimanager.c:1015
msgid "_Record"
msgstr "_Gravar"
-#: ../sflphone-client-gnome/src/uimanager.c:1154
+#: ../sflphone-client-gnome/src/uimanager.c:725
+msgid "Record the current conversation"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Configuration _Assistant"
+msgstr "Arquivo de Configuração"
+
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Run the configuration assistant"
+msgstr "Erro de configuração no stun"
+
+#: ../sflphone-client-gnome/src/uimanager.c:727
+msgid "Call your voicemail"
+msgstr "%d mensagem de voz"
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "_Close"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "Minimize to system tray"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "_Quit"
+msgstr "_Editar"
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "Quit the program"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:732
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "_Copy"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "Copy the selection"
+msgstr "Remover a conta selecionada"
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "_Paste"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "Paste the clipboard"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear _history"
+msgstr "Limpar _histórico"
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear the call history"
+msgstr "Limpar histórico"
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "_Accounts"
+msgstr "_Contas"
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "Edit your accounts"
+msgstr "Conta atual"
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "_Preferences"
+msgstr "Preferências"
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "Change your preferences"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:740
+msgid "_View"
+msgstr "_Exibir"
+
+#: ../sflphone-client-gnome/src/uimanager.c:743
+msgid "_Help"
+msgstr "_Ajuda"
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Contents"
+msgstr "Continuar"
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Open the manual"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:745
+msgid "About this application"
+msgstr "Autenticação"
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "_Transfer"
+msgstr "Transferir"
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "Transfer the call"
+msgstr "Transfirir para: "
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "_Show toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "Show the toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "_Dialpad"
+msgstr "Desabilitado"
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "Show the dialpad"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "_Volume controls"
+msgstr "_Controle de Volumes"
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "Show the volume controls"
+msgstr "Exibir controles de volume"
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "_History"
+msgstr "Histórico"
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "Calls history"
+msgstr "Histórico de chamadas"
+
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "_Address book"
+msgstr "Catálogo de endereços"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1003
+#: ../sflphone-client-gnome/src/uimanager.c:1044
+msgid "On _Hold"
+msgstr "Em _Espera"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1107
msgid "_Call back"
msgstr "_Ligar de volta"
-#: ../sflphone-client-gnome/src/uimanager.c:1226
-msgid "_New call"
-msgstr "_Nova ligação"
-
-#: ../sflphone-client-gnome/src/uimanager.c:1300
+#: ../sflphone-client-gnome/src/uimanager.c:1258
msgid "Edit phone number"
msgstr "Editar número de telefone"
-#: ../sflphone-client-gnome/src/uimanager.c:1311
+#: ../sflphone-client-gnome/src/uimanager.c:1269
msgid "Edit the phone number before making a call"
msgstr "Edite o número de telefone antes de fazer uma ligação"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:164
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
msgid "Account Parameters"
msgstr "Parâmetros de conta"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:173
-#: ../sflphone-client-gnome/src/config/assistant.c:294
-#: ../sflphone-client-gnome/src/config/assistant.c:402
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
+#: ../sflphone-client-gnome/src/config/assistant.c:314
+#: ../sflphone-client-gnome/src/config/assistant.c:427
msgid "_Alias"
msgstr "_Apelido"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:181
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
msgid "_Protocol"
msgstr "_Protocolo"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:199
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
msgid "Unknown"
msgstr "Desconhecido"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:209
-#: ../sflphone-client-gnome/src/config/assistant.c:302
-#: ../sflphone-client-gnome/src/config/assistant.c:410
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
+#: ../sflphone-client-gnome/src/config/assistant.c:322
+#: ../sflphone-client-gnome/src/config/assistant.c:435
msgid "_Host name"
msgstr "_Nome do host"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:217
-#: ../sflphone-client-gnome/src/config/assistant.c:310
-#: ../sflphone-client-gnome/src/config/assistant.c:418
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
+#: ../sflphone-client-gnome/src/config/assistant.c:330
+#: ../sflphone-client-gnome/src/config/assistant.c:443
msgid "_User name"
msgstr "_Nome do usuário"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:234
-#: ../sflphone-client-gnome/src/config/assistant.c:326
-#: ../sflphone-client-gnome/src/config/assistant.c:433
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:346
+#: ../sflphone-client-gnome/src/config/assistant.c:458
msgid "_Password"
msgstr "_Senha"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:254
-#: ../sflphone-client-gnome/src/config/assistant.c:344
-#: ../sflphone-client-gnome/src/config/assistant.c:449
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:363
+#: ../sflphone-client-gnome/src/config/assistant.c:473
+msgid "Show password"
+msgstr "Senha"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:368
+#: ../sflphone-client-gnome/src/config/assistant.c:478
msgid "_Voicemail number"
msgstr "_Senha da caixa postal de voz"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:340
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
msgid "Authentication"
msgstr "Autenticação"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:341
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
msgid "Secret"
msgstr "Segredo"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:466
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
msgid "Credential"
msgstr "Credencial"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:501
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
msgid "Authentication name"
msgstr "Nome de autenticação"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:512
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
msgid "Password"
msgstr "Senha"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:535
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:909
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:201
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
msgid "Security"
msgstr "Segurança"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:547
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:213
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
msgid "Use TLS transport (sips)"
msgstr "Use transporte TLS (sips)"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:552
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:218
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
msgid "SRTP key exchange"
msgstr "Troca de chave SRTP"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:558
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
msgid "Disabled"
msgstr "Desabilitado"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
msgid "Registration"
msgstr "Registro"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:679
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
msgid "Registration expire"
msgstr "Registro expira"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
msgid "_Comply with RFC 3263"
msgstr "_De acordo com RFC 3263"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
-msgid "Network"
-msgstr "Rede"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
+msgid "Network Interface"
+msgstr "A rede está inacessível"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:707
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
msgid "Local address"
msgstr "Endereço local"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:744
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
msgid "Local port"
msgstr "Porta local"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:752
-msgid "Set published address and port:"
-msgstr "Indique endereço e portas publicadas"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
+msgid "Published address"
+msgstr "Endereço publicado"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:756
-msgid "Using STUN "
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+msgid "Using STUN"
msgstr "Utilizando STUN "
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:761
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
+msgid "STUN server URL"
+msgstr "URL do servidor STUN"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
msgid "Same as local parameters"
msgstr "Igual aos parâmetros locais"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:764
-msgid "Manually"
-msgstr "Manualmente"
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:769
-msgid "Published address"
-msgstr "Endereço publicado"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
+msgid "Set published address and port:"
+msgstr "Indique endereço e portas publicadas"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:777
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
msgid "Published port"
msgstr "Porta publicada"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:785
-msgid "STUN server URL"
-msgstr "URL do servidor STUN"
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
msgid "Account settings"
msgstr "Configurações da conta"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
msgid "Basic"
msgstr "Básico"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:904
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
msgid "Advanced"
msgstr "Avançado"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:169
-msgid "Server returned \""
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:164
+msgid "Server returned \"%s\" (%d)"
msgstr "Servidor retornou \""
#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
@@ -494,32 +682,18 @@ msgstr "Contas"
msgid "Configured Accounts"
msgstr "Contas Configuradas"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:505
-msgid "There "
-msgstr "Ali "
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "is "
-msgstr "está "
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "are "
-msgstr "estão "
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
+msgid "There is %d active account"
+msgid_plural "There are %d active accounts"
+msgstr[0] " conta ativa"
+msgstr[1] " conta ativa"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:508
-msgid " active account"
-msgstr " conta ativa"
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:509
-msgid "s"
-msgstr "s"
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:514
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
msgid "You have no active account"
msgstr "Você não possui uma conta ativa"
#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:443
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
msgid "General"
msgstr "Geral"
@@ -564,16 +738,16 @@ msgid "Select which Evolution address books to use"
msgstr "Selecione qual catálogo de endereços do Evolution deseja utilizar"
#: ../sflphone-client-gnome/src/config/addressbook-config.c:404
-#: ../sflphone-client-gnome/src/config/audioconf.c:578
+#: ../sflphone-client-gnome/src/config/audioconf.c:577
msgid "Name"
msgstr "Nome"
-#: ../sflphone-client-gnome/src/config/assistant.c:69
+#: ../sflphone-client-gnome/src/config/assistant.c:75
#, c-format
msgid "This assistant is now finished."
msgstr "Este assistente está finalizado."
-#: ../sflphone-client-gnome/src/config/assistant.c:71
+#: ../sflphone-client-gnome/src/config/assistant.c:77
msgid ""
"You can at any time check your registration state or modify your accounts "
"parameters in the Options/Accounts window."
@@ -581,213 +755,208 @@ msgstr ""
"Você pode a qualquer momento checar seu estado de registro ou modificar seus "
"parâmetros de conta na janela Opções/Contas."
-#: ../sflphone-client-gnome/src/config/assistant.c:74
+#: ../sflphone-client-gnome/src/config/assistant.c:80
msgid "Alias"
msgstr "Apelido"
-#: ../sflphone-client-gnome/src/config/assistant.c:78
+#: ../sflphone-client-gnome/src/config/assistant.c:84
msgid "Server"
msgstr "Servidor"
-#: ../sflphone-client-gnome/src/config/assistant.c:82
+#: ../sflphone-client-gnome/src/config/assistant.c:88
msgid "Username"
msgstr "Nome de usuário"
-#: ../sflphone-client-gnome/src/config/assistant.c:86
+#: ../sflphone-client-gnome/src/config/assistant.c:92
msgid "Security: "
msgstr "Segurança: "
-#: ../sflphone-client-gnome/src/config/assistant.c:88
+#: ../sflphone-client-gnome/src/config/assistant.c:94
msgid "SRTP/ZRTP draft-zimmermann"
msgstr "SRTP/ZRTP rascunho-zimmermann"
-#: ../sflphone-client-gnome/src/config/assistant.c:90
-#: ../sflphone-client-gnome/src/config/assistant.c:182
+#: ../sflphone-client-gnome/src/config/assistant.c:96
msgid "None"
msgstr "Nenhum"
-#: ../sflphone-client-gnome/src/config/assistant.c:210
+#: ../sflphone-client-gnome/src/config/assistant.c:229
msgid "SFLphone account creation wizard"
msgstr "Assistente de criação de contas do SFLphone"
-#: ../sflphone-client-gnome/src/config/assistant.c:236
+#: ../sflphone-client-gnome/src/config/assistant.c:255
msgid "Welcome to the Account creation wizard of SFLphone!"
msgstr "Bem vindo ao assistente de criação de contas do SFLphone!"
-#: ../sflphone-client-gnome/src/config/assistant.c:237
+#: ../sflphone-client-gnome/src/config/assistant.c:256
msgid "This installation wizard will help you configure an account."
msgstr "Este assistente de instalação irá lhe ajudar a configurar uma conta."
-#: ../sflphone-client-gnome/src/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "VoIP Protocols"
msgstr "Protocolos VoIP"
-#: ../sflphone-client-gnome/src/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "Select an account type"
msgstr "Selecione um tipo de conta"
-#: ../sflphone-client-gnome/src/config/assistant.c:253
+#: ../sflphone-client-gnome/src/config/assistant.c:272
msgid "SIP (Session Initiation Protocol)"
msgstr "SIP (Session Initiation Protocol)"
-#: ../sflphone-client-gnome/src/config/assistant.c:255
+#: ../sflphone-client-gnome/src/config/assistant.c:274
msgid "IAX2 (InterAsterix Exchange)"
msgstr "IAX2 (InterAsterix Exchange)"
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Account"
msgstr "Conta"
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Please select one of the following options"
msgstr "Por favor, selecione uma das seguintes opções"
-#: ../sflphone-client-gnome/src/config/assistant.c:271
+#: ../sflphone-client-gnome/src/config/assistant.c:290
msgid "Create a free SIP/IAX2 account on sflphone.org"
msgstr "Criar uma conta gratuita SIP/IAX2 em sflphone.org"
-#: ../sflphone-client-gnome/src/config/assistant.c:273
+#: ../sflphone-client-gnome/src/config/assistant.c:292
msgid "Register an existing SIP or IAX2 account"
msgstr "Registrar uma conta SIP ou IAX2 existente"
-#: ../sflphone-client-gnome/src/config/assistant.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:306
msgid "SIP account settings"
msgstr "Configurações de conta SIP"
-#: ../sflphone-client-gnome/src/config/assistant.c:286
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "Please fill the following information"
msgstr "Por favor, preencha as informações a seguir"
-#: ../sflphone-client-gnome/src/config/assistant.c:352
-#: ../sflphone-client-gnome/src/config/assistant.c:381
+#: ../sflphone-client-gnome/src/config/assistant.c:376
+#: ../sflphone-client-gnome/src/config/assistant.c:405
msgid "Secure communications with _ZRTP"
msgstr "Comunicações seguras com _ZRTP"
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "Optional email address"
msgstr "Endereço de e-mail opcional"
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "This email address will be used to send your voicemail messages."
msgstr ""
"Este endereço de email será utilizado para enviar as mensagens de voz em sua "
"caixa postal."
-#: ../sflphone-client-gnome/src/config/assistant.c:373
+#: ../sflphone-client-gnome/src/config/assistant.c:397
msgid "_Email address"
msgstr "_endereço de email"
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "IAX2 account settings"
msgstr "Configurações de conta IAX2"
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "Network Address Translation (NAT)"
msgstr "Network Address Translation (NAT)"
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "You should probably enable this if you are behind a firewall."
msgstr ""
"Você provavelmente precise habilitar isto se estiver por trás de um firewall."
-#: ../sflphone-client-gnome/src/config/assistant.c:476
+#: ../sflphone-client-gnome/src/config/assistant.c:505
msgid "E_nable STUN"
msgstr "Ha_bilitar STUN"
-#: ../sflphone-client-gnome/src/config/assistant.c:483
+#: ../sflphone-client-gnome/src/config/assistant.c:512
msgid "_STUN server"
msgstr "_Servidor STUN"
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Account Registration"
msgstr "Registro de conta"
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Congratulations!"
msgstr "Parabéns!"
-#: ../sflphone-client-gnome/src/config/audioconf.c:583
+#: ../sflphone-client-gnome/src/config/audioconf.c:582
msgid "Frequency"
msgstr "Frequência"
-#: ../sflphone-client-gnome/src/config/audioconf.c:588
+#: ../sflphone-client-gnome/src/config/audioconf.c:587
msgid "Bitrate"
msgstr "Taxa de bits"
-#: ../sflphone-client-gnome/src/config/audioconf.c:593
+#: ../sflphone-client-gnome/src/config/audioconf.c:592
msgid "Bandwidth"
msgstr "Largura de banda"
-#: ../sflphone-client-gnome/src/config/audioconf.c:673
+#: ../sflphone-client-gnome/src/config/audioconf.c:670
msgid "ALSA plugin"
msgstr "Plugin ALSA"
-#: ../sflphone-client-gnome/src/config/audioconf.c:695
+#: ../sflphone-client-gnome/src/config/audioconf.c:692
msgid "Output"
msgstr "Saída"
-#: ../sflphone-client-gnome/src/config/audioconf.c:717
+#: ../sflphone-client-gnome/src/config/audioconf.c:714
msgid "Input"
msgstr "Entrada"
-#: ../sflphone-client-gnome/src/config/audioconf.c:752
+#: ../sflphone-client-gnome/src/config/audioconf.c:749
msgid "_Voice Activity Detection"
msgstr "_Detecção de atividade de voz"
-#: ../sflphone-client-gnome/src/config/audioconf.c:762
+#: ../sflphone-client-gnome/src/config/audioconf.c:759
msgid "_Noise Reduction (Narrow-Band Companding)"
msgstr "_Redução de ruído (Utilização de banda-estreita)"
-#: ../sflphone-client-gnome/src/config/audioconf.c:798
+#: ../sflphone-client-gnome/src/config/audioconf.c:800
msgid "Sound Manager"
msgstr "Gerenciador de Som"
-#: ../sflphone-client-gnome/src/config/audioconf.c:807
+#: ../sflphone-client-gnome/src/config/audioconf.c:809
msgid "_Pulseaudio"
msgstr "_Pulseaudio"
-#: ../sflphone-client-gnome/src/config/audioconf.c:811
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
msgid "_ALSA"
msgstr "_ALSA"
-#: ../sflphone-client-gnome/src/config/audioconf.c:816
-msgid "_Mute other applications during a call"
-msgstr "_Silenciar outras aplicações durante uma ligação"
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:823
+#: ../sflphone-client-gnome/src/config/audioconf.c:819
msgid "ALSA settings"
msgstr "Configurações do ALSA"
-#: ../sflphone-client-gnome/src/config/audioconf.c:840
+#: ../sflphone-client-gnome/src/config/audioconf.c:836
msgid "Codecs"
msgstr "Codecs"
-#: ../sflphone-client-gnome/src/config/audioconf.c:869
+#: ../sflphone-client-gnome/src/config/audioconf.c:865
msgid "Recordings"
msgstr "Gravações"
-#: ../sflphone-client-gnome/src/config/audioconf.c:873
+#: ../sflphone-client-gnome/src/config/audioconf.c:869
msgid "Destination folder"
msgstr "Pasta de destino"
-#: ../sflphone-client-gnome/src/config/audioconf.c:877
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
msgid "Select a folder"
msgstr "Selecione uma pasta"
-#: ../sflphone-client-gnome/src/config/audioconf.c:883
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
msgid "Ringtones"
msgstr "Ringtones"
-#: ../sflphone-client-gnome/src/config/audioconf.c:889
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
msgid "_Enable ringtones"
msgstr "_Habilitar ringtones"
-#: ../sflphone-client-gnome/src/config/audioconf.c:895
+#: ../sflphone-client-gnome/src/config/audioconf.c:891
msgid "Choose a ringtone"
msgstr "Escolha um ringtone"
-#: ../sflphone-client-gnome/src/config/audioconf.c:901
+#: ../sflphone-client-gnome/src/config/audioconf.c:897
msgid "Audio Files"
msgstr "Arquivos de Áudio"
@@ -824,7 +993,7 @@ msgstr "Reescrevendo número do telefone"
msgid "_Prefix dialed numbers with"
msgstr "_Prefixo de números discados com"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:195
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
msgid ""
"This profile is used when you want to reach a remote peer simply by typing a "
"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
@@ -835,79 +1004,59 @@ msgstr ""
"configurações que você definir aqui também serão utilizadas se nenhuma conta "
"puder ser combinada a uma chamada de entrada ou de saída."
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:274
-msgid "SIP Port"
-msgstr "Porta SIP"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:281
-msgid "UDP Transport"
-msgstr "Transporte UDP"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:319
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
msgid "Desktop Notifications"
msgstr "Notificações de Desktop"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:323
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
msgid "_Enable notifications"
msgstr "_Habilitar notificações"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:329
-msgid "Enable voicemail _notifications"
-msgstr "Habilitar _notificações de correio de voz"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:341
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
msgid "System Tray Icon"
msgstr "Ícone da bandeja do sistema"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
msgid "_Popup main window on incoming call"
msgstr "_Popup na janela principal ao receber ligação"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:349
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
msgid "Ne_ver popup main window"
msgstr "Nu_nca apresentar popup na janela principal"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:353
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
msgid "Hide SFLphone window on _startup"
msgstr "Esconder o SFLphone na _inicialização"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:359
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
msgid "Calls History"
msgstr "Histórico de Chamadas"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:362
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
msgid "_Keep my history for at least"
msgstr "_Manter meu histórico por pelo ao menos"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:373
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
msgid "days"
msgstr "dias"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:377
-msgid "Configuration File"
-msgstr "Arquivo de Configuração"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:379
-msgid "Store SIP credentials as MD5 hash"
-msgstr "Armazenar as credenciais SIP como hash MD5"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:423
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
msgid "Preferences"
msgstr "Preferências"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:448
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
msgid "Audio"
msgstr "Áudio"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
msgid "Address Book"
msgstr "Catálogo de endereços"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:458
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
msgid "Hooks"
msgstr "Ganchos"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:468
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
msgid "Direct IP calls"
msgstr "Ligações IP diretas"
@@ -915,11 +1064,11 @@ msgstr "Ligações IP diretas"
msgid "Advanced options for TLS"
msgstr "Opções avançadas para o TLS"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:55
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:56
msgid "TLS transport"
msgstr "Transporte TLS"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:59
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:60
msgid ""
"TLS transport can be used along with UDP for those calls that would\n"
"require secure sip transactions (aka SIPS). You can configure a different\n"
@@ -934,55 +1083,55 @@ msgstr ""
"funcionar em uma\n"
"porta dedicada, uma diferente da outra\n"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:100
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
msgid "Certificate of Authority list"
msgstr "Certificado da lista de Autoridades"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:104
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
msgid "Choose a CA list file (optional)"
msgstr "Escolha um arquivo de lista CA (opcional)"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:115
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
msgid "Public endpoint certificate file"
msgstr "Arquivo certificado endpoint público"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:119
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
msgid "Choose a public endpoint certificate (optional)"
msgstr "Escolha um certificado endpoint público (opcional)"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:134
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
msgid "Choose a private key file (optional)"
msgstr "Escolha um arquivo de chave privada (opcional)"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:145
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
msgid "Password for the private key"
msgstr "Senha para a chave privada"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:168
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
msgid "TLS protocol method"
msgstr "Método do protocolo TLS"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:202
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
msgid "TLS cipher list"
msgstr "Lista de cifras TLS"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:211
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
msgid "Server name instance for outgoing TLS connection"
msgstr "Instância de nome do servidor para saída da conexão TLS"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:219
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
msgid "Negotiation timeout (sec:msec)"
msgstr "Tempo de negociação expirado (seg:mseg)"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:236
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
msgid "Verify incoming certificates, as a server"
msgstr "Verificar os certificados de entrada, como um servidor"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:242
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
msgid "Verify certificates from answer, as a client"
msgstr "Verificar certificados de resposta, como um cliente"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:248
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
msgid "Require certificate for incoming tls connections"
msgstr "Requer certificado para conexões tls entrantes"
@@ -990,51 +1139,87 @@ msgstr "Requer certificado para conexões tls entrantes"
msgid "ZRTP Options"
msgstr "Opções ZRTP"
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:68
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:69
msgid "Send Hello Hash in S_DP"
msgstr "Enviar um Hash Olá no S_DP"
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:74
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:75
msgid "Ask User to Confirm SAS"
msgstr "Pergunta ao Usuário para Confirmar SAS"
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:80
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:81
msgid "_Warn if ZRTP not supported"
msgstr "_Alerta se o ZRTP não é suportado"
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:86
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:87
msgid "Display SAS once for hold events"
msgstr "Apresenta o SAS uma vez para realizar eventos"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:58
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
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:59
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:72
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:84
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:96
msgid "Click here to change the search type"
msgstr "Clique aqui para alterar o tipo de pesquisa"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:71
msgid "Search by missed call"
msgstr "Buscar por ligações perdidas"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:83
msgid "Search by incoming call"
msgstr "Buscar por ligações recebidas"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:95
msgid "Search by outgoing call"
msgstr "Buscar por ligações feitas"
+#~ msgid "IP call - %s"
+#~ msgstr "Ligação IP - %s"
+
+#~ msgid "Codec"
+#~ msgstr "Codec"
+
+#~ msgid "Network"
+#~ msgstr "Rede"
+
+#~ msgid "Manually"
+#~ msgstr "Manualmente"
+
+#~ msgid "There "
+#~ msgstr "Ali "
+
+#~ msgid "is "
+#~ msgstr "está "
+
+#~ msgid "are "
+#~ msgstr "estão "
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#~ msgid "_Mute other applications during a call"
+#~ msgstr "_Silenciar outras aplicações durante uma ligação"
+
+#~ msgid "SIP Port"
+#~ msgstr "Porta SIP"
+
+#~ msgid "UDP Transport"
+#~ msgstr "Transporte UDP"
+
+#~ msgid "Enable voicemail _notifications"
+#~ msgstr "Habilitar _notificações de correio de voz"
+
+#~ msgid "Store SIP credentials as MD5 hash"
+#~ msgstr "Armazenar as credenciais SIP como hash MD5"
+
#~ msgid "Stun Server"
#~ msgstr "Servidor STUN"
-#~ msgid "Call history"
-#~ msgstr "Histórico de chamadas"
-
#~ msgid "(C) 2009 Savoir-faire Linux"
#~ msgstr "(C) 2009 Savoir-faire Linux"
@@ -1050,15 +1235,9 @@ msgstr "Buscar por ligações feitas"
#~ msgid "Record"
#~ msgstr "Gravar"
-#~ msgid "Transfer"
-#~ msgstr "Transferir"
-
#~ msgid "Hang up"
#~ msgstr "Desligar"
-#~ msgid "Remove the selected account"
-#~ msgstr "Remover a conta selecionada"
-
#~ msgid "Display"
#~ msgstr "Exibir"
@@ -1095,18 +1274,6 @@ msgstr "Buscar por ligações feitas"
#~ msgid "Enable notifications"
#~ msgstr "Habilitar notificações"
-#~ msgid "History"
-#~ msgstr "Histórico"
-
-#~ msgid "_Help"
-#~ msgstr "_Ajuda"
-
-#~ msgid "_Call"
-#~ msgstr "_Chamar"
-
-#~ msgid "_Edit"
-#~ msgstr "_Editar"
-
#~ msgid "NAT Traversal"
#~ msgstr "NAT Traversal"
@@ -1126,15 +1293,12 @@ msgstr "Buscar por ligações feitas"
#~ "After checking the settings you chose, click \"Finish\" to create the "
#~ "account."
#~ msgstr ""
-#~ "Após checar as configurações que deseja, clique em \"Finalizar\" para criar "
-#~ "a conta."
+#~ "Após checar as configurações que deseja, clique em \"Finalizar\" para "
+#~ "criar a conta."
#~ msgid "Enable STUN"
#~ msgstr "Habilitar STUN"
-#~ msgid "Transfer to : "
-#~ msgstr "Transfirir para: "
-
#~ msgid "Default account"
#~ msgstr "Conta padrão"
@@ -1144,12 +1308,6 @@ msgstr "Buscar por ligações feitas"
#~ msgid "Main screen"
#~ msgstr "Tela principal"
-#~ msgid "Address book"
-#~ msgstr "Catálogo de endereços"
-
-#~ msgid "Display volume controls"
-#~ msgstr "Exibir controles de volume"
-
#~ msgid "Configure SFLphone"
#~ msgstr "Configurar SFLphone"
@@ -1186,32 +1344,32 @@ msgstr "Buscar por ligações feitas"
#~ 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."
+#~ "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 padrão, quando você realiza uma ligação, sflphone utilizará a prieira "
-#~ "conta desta lista que estiver \"registrada\". Modifique a ordem das contas "
-#~ "utilizando as setas de \"Cima\" e \"Baixo\". Habilite/desabilite as "
-#~ "marcando/desmarcando à esquerda de cada item. Adicione ou remova algumas com "
-#~ "os botões \"Adicionar\" e \"Remover\". Edite a conta selecionada com o "
-#~ "formulário à direita."
+#~ "conta desta lista que estiver \"registrada\". Modifique a ordem das "
+#~ "contas utilizando as setas de \"Cima\" e \"Baixo\". Habilite/desabilite "
+#~ "as marcando/desmarcando à esquerda de cada item. Adicione ou remova "
+#~ "algumas com os botões \"Adicionar\" e \"Remover\". Edite a conta "
+#~ "selecionada com o formulário à direita."
#~ 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."
+#~ "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ão irá remover a conta selecionada na lista apresentada. Tenha "
#~ "certeza de que você não precisa mais dela. Se você acha que você irá "
#~ "utilizar ela novamente, apenas desmarque a opção."
#~ msgid ""
-#~ "This button enables you to initialize a new account. You will then be able "
-#~ "to edit it using the form on the right."
+#~ "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ão lhe permite iniciar uma nova conta. Em seguida você poderá edita-"
-#~ "la utilizando o formulário à direita."
+#~ "Este botão lhe permite iniciar uma nova conta. Em seguida você poderá "
+#~ "edita-la utilizando o formulário à direita."
#~ msgid "Get this account down"
#~ msgstr "Desabilitar esta conta"
@@ -1222,8 +1380,8 @@ msgstr "Buscar por ligações feitas"
#~ "the \"Up\" and \"Down\" arrows."
#~ msgstr ""
#~ "Por padrão, quando você inicia uma ligação, o sflphone irá utilizar a "
-#~ "primeira conta desta lista que estiver \"registrada\". Modifique a ordem das "
-#~ "contas utilizando as setas para \"Cima\" e para \"Baixo\"."
+#~ "primeira conta desta lista que estiver \"registrada\". Modifique a ordem "
+#~ "das contas utilizando as setas para \"Cima\" e para \"Baixo\"."
#~ msgid "Get this account up"
#~ msgstr "Habilite esta conta"
@@ -1294,9 +1452,6 @@ msgstr "Buscar por ligações feitas"
#~ msgid "Trigger on specific SIP header"
#~ msgstr "Gancho no cabeçalho SIP específico"
-#~ msgid "Clear history"
-#~ msgstr "Limpar histórico"
-
#~ msgid "Attention:number of results exceeds max displayed."
#~ msgstr "Atencão:número de resultados excede o máximo de exibição"
@@ -1306,18 +1461,6 @@ msgstr "Buscar por ligações feitas"
#~ msgid "_Account creation wizard"
#~ msgstr "_Assistante de criação de conta"
-#~ msgid "_View"
-#~ msgstr "_Exibir"
-
-#~ msgid "_Accounts"
-#~ msgstr "_Contas"
-
-#~ msgid "Clear _history"
-#~ msgstr "Limpar _histórico"
-
-#~ msgid "_Volume Controls"
-#~ msgstr "_Controle de Volumes"
-
#~ msgid "_Enable this account"
#~ msgstr "_Habilitar esta conta"
@@ -1333,11 +1476,11 @@ msgstr "Buscar por ligações feitas"
#~ "sessões."
#~ msgid ""
-#~ "Pressing \"apply\" will restart the network layer. Otherwise, SFLPhone would "
-#~ "have to be restarted."
+#~ "Pressing \"apply\" will restart the network layer. Otherwise, SFLPhone "
+#~ "would have to be restarted."
#~ msgstr ""
-#~ "Pressionando \"aplicar\" a camada de rede será reiniciada. De outra forma o "
-#~ "SFKPhone teria que ser reiniciado."
+#~ "Pressionando \"aplicar\" a camada de rede será reiniciada. De outra forma "
+#~ "o SFKPhone teria que ser reiniciado."
#~ msgid "PulseAudio sound server"
#~ msgstr "Servidor de som PulseAudio"
@@ -1347,10 +1490,11 @@ msgstr "Buscar por ligações feitas"
#~ msgstr ""
#~ ",Launchpad Contributions:,Maxime Chambreuil,kalib, ,Launchpad "
#~ "Contributions:,Maxime Chambreuil,kalib, ,Launchpad Contributions:,Maxime "
-#~ "Chambreuil,kalib"
+#~ "Chambreuil,kalib, ,Launchpad Contributions:,Maxime Chambreuil,kalib"
#~ msgctxt "EMAIL OF TRANSLATORS"
#~ msgid "Your emails"
#~ msgstr ""
-#~ ",,maxime.chambreuil@gmail.com,kalibslack@gmail.com,,,maxime.chambreuil@gmail."
-#~ "com,kalibslack@gmail.com,,,maxime.chambreuil@gmail.com,kalibslack@gmail.com"
+#~ ",,maxime.chambreuil@gmail.com,kalibslack@gmail.com,,,maxime."
+#~ "chambreuil@gmail.com,kalibslack@gmail.com,,,maxime.chambreuil@gmail.com,"
+#~ "kalibslack@gmail.com,,,maxime.chambreuil@gmail.com,kalibslack@gmail.com"
diff --git a/lang/ru/ru.po b/lang/ru/ru.po
index 319dfce2c09bbbb437bf46ebf80afad98b164e99..14b3aa5dd8b52a0d5e0d4baafc1ee6278b5fe18f 100644
--- a/lang/ru/ru.po
+++ b/lang/ru/ru.po
@@ -7,17 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: SFLphone 0.9.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-14 11:18-0400\n"
-"PO-Revision-Date: 2009-10-21 22:26+0000\n"
-"Last-Translator: Hussein Abdallah <Unknown>\n"
+"POT-Creation-Date: 2009-12-03 10:22-0500\n"
+"PO-Revision-Date: 2009-12-08 20:46+0000\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"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2009-10-26 15:48+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: \n"
#: ../sflphone-client-gnome/src/accountlist.c:175
msgid "Registered"
@@ -29,7 +28,7 @@ msgstr "Не зарегистрирован"
#: ../sflphone-client-gnome/src/accountlist.c:181
msgid "Trying..."
-msgstr "Пытаюсь..."
+msgstr "Подключение..."
#: ../sflphone-client-gnome/src/accountlist.c:184
#: ../sflphone-client-gnome/src/sflnotify.c:131
@@ -59,28 +58,17 @@ msgstr "Неверный сервер Stun"
#: ../sflphone-client-gnome/src/accountlist.c:202
msgid "Invalid"
-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 голосовые письма"
-msgstr[2] "%d голосовые письма"
+msgstr "Ошибка"
-#: ../sflphone-client-gnome/src/actions.c:83
-#: ../sflphone-client-gnome/src/actions.c:919
-#: ../sflphone-client-gnome/src/actions.c:926
+#: ../sflphone-client-gnome/src/actions.c:98
msgid "Using account"
-msgstr "Используя учетную запись"
+msgstr "Используется учетная запись"
-#: ../sflphone-client-gnome/src/actions.c:89
+#: ../sflphone-client-gnome/src/actions.c:104
msgid "No registered accounts"
-msgstr "У вас нет зарегистрированных аккаунтов"
+msgstr "Нет зарегистрированных учëтных записей"
-#: ../sflphone-client-gnome/src/actions.c:268
+#: ../sflphone-client-gnome/src/actions.c:285
msgid ""
"Unable to connect to the SFLphone server.\n"
"Make sure the daemon is running."
@@ -88,27 +76,23 @@ msgstr ""
"Невозможно подключиться к SFLphone-серверу.\n"
"Проверьте если демон работает."
-#: ../sflphone-client-gnome/src/actions.c:913
-#, c-format
-msgid "IP call - %s"
-msgstr "IP звонок - %s"
-
-#: ../sflphone-client-gnome/src/actions.c:922
-msgid "Codec"
-msgstr "Codec"
+#: ../sflphone-client-gnome/src/actions.c:589
+#: ../sflphone-client-gnome/src/actions.c:911
+msgid "Direct SIP call"
+msgstr "Прямые IP-звонки"
-#: ../sflphone-client-gnome/src/actions.c:1119
+#: ../sflphone-client-gnome/src/actions.c:1103
#, 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> )"
+"</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> )"
+"</b> Звуковые кодеки SFL должны находиться в <i>%s</i> или в <b>.sflphone</"
+"b> каталоге в вашем домашнем каталоге( <i>%s</i> )"
#: ../sflphone-client-gnome/src/errors.c:29
msgid ""
@@ -142,41 +126,41 @@ msgstr ""
#: ../sflphone-client-gnome/src/mainwindow.c:73
msgid "There is one call in progress."
-msgstr "Звонок ещё не окончен."
+msgstr "Один текущий разговор."
#: ../sflphone-client-gnome/src/mainwindow.c:77
msgid "There are calls in progress."
-msgstr "Несколько звонков ещё не окончены."
+msgstr "Несколько текущих разговоров."
#: ../sflphone-client-gnome/src/mainwindow.c:86
msgid "Do you still want to quit?"
msgstr "Вы уверенны что хотите выйти?"
-#: ../sflphone-client-gnome/src/mainwindow.c:299
+#: ../sflphone-client-gnome/src/mainwindow.c:298
msgid "SFLphone Error"
msgstr "Ошибка SFLphone."
-#: ../sflphone-client-gnome/src/mainwindow.c:391
+#: ../sflphone-client-gnome/src/mainwindow.c:392
#, c-format
msgid "ZRTP is not supported by peer %s\n"
-msgstr "не поддерживается устройством %s\n"
+msgstr "ZRTP не поддерживается устройством %s\n"
-#: ../sflphone-client-gnome/src/mainwindow.c:392
+#: ../sflphone-client-gnome/src/mainwindow.c:393
msgid "Secure Communication Unavailable"
-msgstr "Зашифрованная связь недоступна."
+msgstr "Зашифрованная связь недоступна"
-#: ../sflphone-client-gnome/src/mainwindow.c:393
-#: ../sflphone-client-gnome/src/mainwindow.c:415
+#: ../sflphone-client-gnome/src/mainwindow.c:394
+#: ../sflphone-client-gnome/src/mainwindow.c:416
msgid "Continue"
msgstr "Продолжить"
-#: ../sflphone-client-gnome/src/mainwindow.c:394
-#: ../sflphone-client-gnome/src/mainwindow.c:416
-#: ../sflphone-client-gnome/src/mainwindow.c:430
+#: ../sflphone-client-gnome/src/mainwindow.c:395
+#: ../sflphone-client-gnome/src/mainwindow.c:417
+#: ../sflphone-client-gnome/src/mainwindow.c:431
msgid "Stop Call"
msgstr "Закончить звонок"
-#: ../sflphone-client-gnome/src/mainwindow.c:413
+#: ../sflphone-client-gnome/src/mainwindow.c:414
#, c-format
msgid ""
"A %s error forced the call with %s to fall under unencrypted mode.\n"
@@ -185,11 +169,11 @@ msgstr ""
"Из-за ошибки %s переговор с %s перейдëт в не зашифрованный режим.\n"
"Точная причина: %s\n"
-#: ../sflphone-client-gnome/src/mainwindow.c:414
+#: ../sflphone-client-gnome/src/mainwindow.c:415
msgid "ZRTP negotiation failed"
msgstr "Неудачный обмен информации ZRTP"
-#: ../sflphone-client-gnome/src/mainwindow.c:427
+#: ../sflphone-client-gnome/src/mainwindow.c:428
#, c-format
msgid ""
"%s wants to stop using secure communication. Confirm will resume "
@@ -198,11 +182,11 @@ msgstr ""
"%s хочет остановить зашифрованную связь. В случае подтверждения переговор "
"продолжится без SRTP.\n"
-#: ../sflphone-client-gnome/src/mainwindow.c:428
+#: ../sflphone-client-gnome/src/mainwindow.c:429
msgid "Confirm Go Clear"
msgstr "Подтвердить переход на незашифрованную связь"
-#: ../sflphone-client-gnome/src/mainwindow.c:429
+#: ../sflphone-client-gnome/src/mainwindow.c:430
msgid "Confirm"
msgstr "Подтвердить"
@@ -217,22 +201,30 @@ msgstr "%s аккаунт: %s"
msgid "<i>From</i> %s"
msgstr "<i>От:</i> %s"
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+#, c-format
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] "%d голосовое письмо"
+msgstr[1] "%d голосовые письма"
+msgstr[2] "%d голосовые письма"
+
#: ../sflphone-client-gnome/src/sflnotify.c:111
#, c-format
msgid "Calling with %s account <i>%s</i>"
-msgstr "Звонок с аккаунтом %s <i>%s</i>"
+msgstr "Звонок с учëтной записью %s <i>%s</i>"
#: ../sflphone-client-gnome/src/sflnotify.c:115
msgid "Current account"
-msgstr "Нынешний аккаунт"
+msgstr "Нынешняя учëтная запись"
#: ../sflphone-client-gnome/src/sflnotify.c:130
msgid "You have no accounts set up"
-msgstr "Вы не настроили ни одного аккаунта"
+msgstr "Вы не настроили ни одной учëтной записи"
#: ../sflphone-client-gnome/src/sflnotify.c:147
msgid "You have no registered accounts"
-msgstr "У вас нет зарегистрированных аккаунтов"
+msgstr "У вас нет зарегистрированных учëтных записей"
#: ../sflphone-client-gnome/src/sflnotify.c:190
#, c-format
@@ -266,219 +258,414 @@ msgstr "Громкость"
msgid "Mic volume"
msgstr "Громкость микрофона"
-#: ../sflphone-client-gnome/src/statusicon.c:91
+#: ../sflphone-client-gnome/src/statusicon.c:96
msgid "_Show main window"
msgstr "_Показать главное окно"
-#: ../sflphone-client-gnome/src/statusicon.c:126
+#: ../sflphone-client-gnome/src/statusicon.c:131
msgid "SFLphone"
msgstr "SFLphone"
-#: ../sflphone-client-gnome/src/statusicon.c:127
+#: ../sflphone-client-gnome/src/statusicon.c:132
#, c-format
msgid "%i account configured"
msgid_plural "%i accounts configured"
-msgstr[0] "%i аккаунт настроен."
-msgstr[1] "%i аккаунтов настроены"
-msgstr[2] "%i аккаунтов настроены"
+msgstr[0] "Настроена одна учëтная запись"
+msgstr[1] "Настроены %i учëтные записи"
+msgstr[2] "Настроены %i учëтные записи"
#: ../sflphone-client-gnome/src/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:750
+#: ../sflphone-client-gnome/src/uimanager.c:693
+#: ../sflphone-client-gnome/src/uimanager.c:727
msgid "Voicemail"
msgstr "Автоответчик"
-#: ../sflphone-client-gnome/src/uimanager.c:403
+#: ../sflphone-client-gnome/src/uimanager.c:117
+msgid "No address book selected"
+msgstr "Нет выбранных адресных книг"
+
+#: ../sflphone-client-gnome/src/uimanager.c:137
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "Address book"
+msgstr "Адресная книга"
+
+#: ../sflphone-client-gnome/src/uimanager.c:279
+msgid "Voicemail (%i)"
+msgstr "Автоответчик (%i)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:342
msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
msgstr "SFLphone - SIP и IAX2-совместимый VoIP-клиент"
-#: ../sflphone-client-gnome/src/uimanager.c:406
+#: ../sflphone-client-gnome/src/uimanager.c:345
msgid "About SFLphone"
msgstr "О SFLphone"
-#: ../sflphone-client-gnome/src/uimanager.c:1028
+#: ../sflphone-client-gnome/src/uimanager.c:719
+msgid "Call"
+msgstr "_Звонок"
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:1184
+msgid "_New call"
+msgstr "_Новый звонок"
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+msgid "Place a new call"
+msgstr "Позвонить"
+
+#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:979
msgid "_Pick up"
msgstr "_Взять трубку"
-#: ../sflphone-client-gnome/src/uimanager.c:1040
-#: ../sflphone-client-gnome/src/uimanager.c:1081
+#: ../sflphone-client-gnome/src/uimanager.c:721
+msgid "Answer the call"
+msgstr "Ответить"
+
+#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:991
+#: ../sflphone-client-gnome/src/uimanager.c:1032
msgid "_Hang up"
msgstr "_Положить трубку"
-#: ../sflphone-client-gnome/src/uimanager.c:1052
-#: ../sflphone-client-gnome/src/uimanager.c:1093
-msgid "On _Hold"
+#: ../sflphone-client-gnome/src/uimanager.c:722
+msgid "Finish the call"
+msgstr "Закончить звонок"
+
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "O_n hold"
msgstr "_Удержать звонок"
-#: ../sflphone-client-gnome/src/uimanager.c:1064
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "Place the call on hold"
+msgstr "Удержать звонок"
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "O_ff hold"
+msgstr "_Возобновить разговор"
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "Place the call off hold"
+msgstr "Возобновить разговор"
+
+#: ../sflphone-client-gnome/src/uimanager.c:725
+#: ../sflphone-client-gnome/src/uimanager.c:1015
msgid "_Record"
msgstr "Записать"
-#: ../sflphone-client-gnome/src/uimanager.c:1154
+#: ../sflphone-client-gnome/src/uimanager.c:725
+msgid "Record the current conversation"
+msgstr "Записать переговор"
+
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Configuration _Assistant"
+msgstr "Мастер настройки"
+
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Run the configuration assistant"
+msgstr "Запустить мастер настройки"
+
+#: ../sflphone-client-gnome/src/uimanager.c:727
+msgid "Call your voicemail"
+msgstr "%d голосовое письмо"
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "_Close"
+msgstr "_Закрыть"
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "Minimize to system tray"
+msgstr "Уменьшить в значок"
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "_Quit"
+msgstr "_Правка"
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "Quit the program"
+msgstr "Выйти из программы"
+
+#: ../sflphone-client-gnome/src/uimanager.c:732
+msgid "_Edit"
+msgstr "_Правка"
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "_Copy"
+msgstr "_Копировать"
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "Copy the selection"
+msgstr "Копировать видимое"
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "_Paste"
+msgstr "_Вставить"
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "Paste the clipboard"
+msgstr "Вставить из буфера обмена"
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear _history"
+msgstr "_Стереть журнал"
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear the call history"
+msgstr "Очистить историю"
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "_Accounts"
+msgstr "_Учëтные записи"
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "Edit your accounts"
+msgstr "Изменить ваши учëтные записи"
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "_Preferences"
+msgstr "_Предпочтения"
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "Change your preferences"
+msgstr "Изменить ваши предпочтении"
+
+#: ../sflphone-client-gnome/src/uimanager.c:740
+msgid "_View"
+msgstr "_Вид"
+
+#: ../sflphone-client-gnome/src/uimanager.c:743
+msgid "_Help"
+msgstr "_Помощь"
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Contents"
+msgstr "Продолжить"
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Open the manual"
+msgstr "Открыть справочник "
+
+#: ../sflphone-client-gnome/src/uimanager.c:745
+msgid "About this application"
+msgstr "Идентификация"
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "_Transfer"
+msgstr "Переслать звонок на другой номер"
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "Transfer the call"
+msgstr "Переслать звонок на другой номер"
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "_Show toolbar"
+msgstr "Показать панель инструментов"
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "Show the toolbar"
+msgstr "Показать панель инструментов"
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "_Dialpad"
+msgstr "Панель набора номера"
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "Show the dialpad"
+msgstr "Показать панель набора номера"
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "_Volume controls"
+msgstr "_Настройки громкости"
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "Show the volume controls"
+msgstr "_Настройки громкости"
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "_History"
+msgstr "Журнал"
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "Calls history"
+msgstr "Журнал звонков"
+
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "_Address book"
+msgstr "Адресная книга"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1003
+#: ../sflphone-client-gnome/src/uimanager.c:1044
+msgid "On _Hold"
+msgstr "_Удержать звонок"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1107
msgid "_Call back"
msgstr "_Перезвонить"
-#: ../sflphone-client-gnome/src/uimanager.c:1226
-msgid "_New call"
-msgstr "_Новый звонок"
-
-#: ../sflphone-client-gnome/src/uimanager.c:1300
+#: ../sflphone-client-gnome/src/uimanager.c:1258
msgid "Edit phone number"
msgstr "Мобильный телефон"
-#: ../sflphone-client-gnome/src/uimanager.c:1311
+#: ../sflphone-client-gnome/src/uimanager.c:1269
msgid "Edit the phone number before making a call"
msgstr "Изменить номер телефона перед звонком"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:164
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
msgid "Account Parameters"
msgstr "Параметры учетной записи"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:173
-#: ../sflphone-client-gnome/src/config/assistant.c:294
-#: ../sflphone-client-gnome/src/config/assistant.c:402
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
+#: ../sflphone-client-gnome/src/config/assistant.c:314
+#: ../sflphone-client-gnome/src/config/assistant.c:427
msgid "_Alias"
msgstr "_Псевдоним"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:181
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
msgid "_Protocol"
msgstr "Пр_отокол"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:199
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
msgid "Unknown"
msgstr "Неизвестный"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:209
-#: ../sflphone-client-gnome/src/config/assistant.c:302
-#: ../sflphone-client-gnome/src/config/assistant.c:410
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
+#: ../sflphone-client-gnome/src/config/assistant.c:322
+#: ../sflphone-client-gnome/src/config/assistant.c:435
msgid "_Host name"
msgstr "Имя или IP-адрес _сервера"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:217
-#: ../sflphone-client-gnome/src/config/assistant.c:310
-#: ../sflphone-client-gnome/src/config/assistant.c:418
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
+#: ../sflphone-client-gnome/src/config/assistant.c:330
+#: ../sflphone-client-gnome/src/config/assistant.c:443
msgid "_User name"
msgstr "Имя или _номер пользователя"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:234
-#: ../sflphone-client-gnome/src/config/assistant.c:326
-#: ../sflphone-client-gnome/src/config/assistant.c:433
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:346
+#: ../sflphone-client-gnome/src/config/assistant.c:458
msgid "_Password"
msgstr "Па_роль"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:254
-#: ../sflphone-client-gnome/src/config/assistant.c:344
-#: ../sflphone-client-gnome/src/config/assistant.c:449
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:363
+#: ../sflphone-client-gnome/src/config/assistant.c:473
+msgid "Show password"
+msgstr "Показать пароль"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:368
+#: ../sflphone-client-gnome/src/config/assistant.c:478
msgid "_Voicemail number"
msgstr "Номер _автоответчика #"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:340
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
msgid "Authentication"
msgstr "Идентификация"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:341
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
msgid "Secret"
msgstr "Секретный"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:466
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
msgid "Credential"
msgstr "Параметры доступа"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:501
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
msgid "Authentication name"
msgstr "Имя для аутентификации"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:512
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
msgid "Password"
msgstr "Пароль"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:535
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:909
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:201
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
msgid "Security"
msgstr "Безопасность"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:547
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:213
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
msgid "Use TLS transport (sips)"
-msgstr "Имя для аутентификации"
+msgstr "Использовать TLS-транспорт (sips)"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:552
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:218
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
msgid "SRTP key exchange"
msgstr "Обмена ключей SRTP"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:558
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
msgid "Disabled"
msgstr "Отключен"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
msgid "Registration"
msgstr "Регистрация"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:679
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
msgid "Registration expire"
-msgstr "Истек срок регистрации"
+msgstr "Срок истечения регистрации"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
msgid "_Comply with RFC 3263"
msgstr "_Соотвествует RFC 3263"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
-msgid "Network"
-msgstr "Сеть"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
+msgid "Network Interface"
+msgstr "Сетевые настройки"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:707
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
msgid "Local address"
msgstr "Локальный адрес"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:744
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
msgid "Local port"
msgstr "Локальный порт"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:752
-msgid "Set published address and port:"
-msgstr "Настроить видимый адрес и порт :"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
+msgid "Published address"
+msgstr "Сетевые настройки для Интернета"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:756
-msgid "Using STUN "
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+msgid "Using STUN"
msgstr "Использует STUN "
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:761
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
+msgid "STUN server URL"
+msgstr "URL STUN-сервера"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
msgid "Same as local parameters"
msgstr "Использовать локальный адрес и порт"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:764
-msgid "Manually"
-msgstr "Вручную"
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:769
-msgid "Published address"
-msgstr "издаваемый адрес"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
+msgid "Set published address and port:"
+msgstr "Настроить видимый адрес и порт :"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:777
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
msgid "Published port"
-msgstr "издаваемый порт"
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:785
-msgid "STUN server URL"
-msgstr "URL STUN-сервера"
+msgstr "Публичный порт"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
msgid "Account settings"
-msgstr "Настройки аккаунта"
+msgstr "Настройки учëтной записи"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
msgid "Basic"
msgstr "Основные"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:904
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
msgid "Advanced"
msgstr "Дополнительные"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:169
-msgid "Server returned \""
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:164
+msgid "Server returned \"%s\" (%d)"
msgstr "Сервер ответил \""
#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
@@ -495,34 +682,21 @@ msgstr "Учётные записи"
#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:484
msgid "Configured Accounts"
-msgstr "Нынешний аккаунт"
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:505
-msgid "There "
-msgstr "Здесь "
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "is "
-msgstr "Зарегестрирован "
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "are "
-msgstr "Зарегестрированны "
+msgstr "Настроенные учëтные записи"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:508
-msgid " active account"
-msgstr " действующий аккаунт"
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
+msgid "There is %d active account"
+msgid_plural "There are %d active accounts"
+msgstr[0] "Одна действующая учëтная запись"
+msgstr[1] "%d действующих учëтных записей"
+msgstr[2] "%d действующих учëтных записей"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:509
-msgid "s"
-msgstr "a"
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:514
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
msgid "You have no active account"
-msgstr "У вас нет активного аккаунта"
+msgstr "У вас нет активной учëтной записи"
#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:443
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
msgid "General"
msgstr "Общие настройки"
@@ -532,7 +706,7 @@ msgstr "_Использовать адресную книгу Evolution"
#: ../sflphone-client-gnome/src/config/addressbook-config.c:319
msgid "Download limit :"
-msgstr "Ограничение скорости скачивания:"
+msgstr "Показывать не более "
#: ../sflphone-client-gnome/src/config/addressbook-config.c:327
msgid "cards"
@@ -544,7 +718,7 @@ msgstr "_Показать фотографию контакта (если име
#: ../sflphone-client-gnome/src/config/addressbook-config.c:341
msgid "Fields from Evolution's address books"
-msgstr "Исполоьзовать следующие поля из адресной книги Evolution:"
+msgstr "Исполоьзовать следующие номера из адресной книги Evolution"
#: ../sflphone-client-gnome/src/config/addressbook-config.c:345
msgid "_Work"
@@ -567,228 +741,222 @@ 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:578
+#: ../sflphone-client-gnome/src/config/audioconf.c:577
msgid "Name"
msgstr "Имя"
-#: ../sflphone-client-gnome/src/config/assistant.c:69
+#: ../sflphone-client-gnome/src/config/assistant.c:75
#, c-format
msgid "This assistant is now finished."
msgstr "Мастер закончил настройку."
-#: ../sflphone-client-gnome/src/config/assistant.c:71
+#: ../sflphone-client-gnome/src/config/assistant.c:77
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/config/assistant.c:74
+#: ../sflphone-client-gnome/src/config/assistant.c:80
msgid "Alias"
msgstr "Псевдоним"
-#: ../sflphone-client-gnome/src/config/assistant.c:78
+#: ../sflphone-client-gnome/src/config/assistant.c:84
msgid "Server"
msgstr "Сервер"
-#: ../sflphone-client-gnome/src/config/assistant.c:82
+#: ../sflphone-client-gnome/src/config/assistant.c:88
msgid "Username"
msgstr "Пользователь"
-#: ../sflphone-client-gnome/src/config/assistant.c:86
+#: ../sflphone-client-gnome/src/config/assistant.c:92
msgid "Security: "
-msgstr "Безопасность "
+msgstr "Безопасность:"
-#: ../sflphone-client-gnome/src/config/assistant.c:88
+#: ../sflphone-client-gnome/src/config/assistant.c:94
msgid "SRTP/ZRTP draft-zimmermann"
msgstr "SRTP/ZRTP draft-zimmermann"
-#: ../sflphone-client-gnome/src/config/assistant.c:90
-#: ../sflphone-client-gnome/src/config/assistant.c:182
+#: ../sflphone-client-gnome/src/config/assistant.c:96
msgid "None"
msgstr "Нет"
-#: ../sflphone-client-gnome/src/config/assistant.c:210
+#: ../sflphone-client-gnome/src/config/assistant.c:229
msgid "SFLphone account creation wizard"
msgstr "Мастер настройки SFLphone"
-#: ../sflphone-client-gnome/src/config/assistant.c:236
+#: ../sflphone-client-gnome/src/config/assistant.c:255
msgid "Welcome to the Account creation wizard of SFLphone!"
msgstr "Добро пожаловать в SFLphone!"
-#: ../sflphone-client-gnome/src/config/assistant.c:237
+#: ../sflphone-client-gnome/src/config/assistant.c:256
msgid "This installation wizard will help you configure an account."
-msgstr "Этот мастер установки поможет вам настроить ваш аккаунт."
+msgstr "Этот мастер установки поможет вам настроить вашу учëтную запись"
-#: ../sflphone-client-gnome/src/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "VoIP Protocols"
msgstr "VoIP-протоколы"
-#: ../sflphone-client-gnome/src/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "Select an account type"
-msgstr "Выберите тип аккаунта"
+msgstr "Выберите тип учëтной записи"
-#: ../sflphone-client-gnome/src/config/assistant.c:253
+#: ../sflphone-client-gnome/src/config/assistant.c:272
msgid "SIP (Session Initiation Protocol)"
msgstr "SIP (Session Initiation Protocol)"
-#: ../sflphone-client-gnome/src/config/assistant.c:255
+#: ../sflphone-client-gnome/src/config/assistant.c:274
msgid "IAX2 (InterAsterix Exchange)"
msgstr "IAX2 (InterAsterix Exchange)"
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Account"
-msgstr "Аккаунты"
+msgstr "Учëтная запись"
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Please select one of the following options"
msgstr "Введите пожалуйста следующие данные"
-#: ../sflphone-client-gnome/src/config/assistant.c:271
+#: ../sflphone-client-gnome/src/config/assistant.c:290
msgid "Create a free SIP/IAX2 account on sflphone.org"
-msgstr "Создать бесплатный SIP/IAX2-аккаунт на sflphone.org"
+msgstr "Создать бесплатную SIP/IAX2-учëтную запись на sflphone.org"
-#: ../sflphone-client-gnome/src/config/assistant.c:273
+#: ../sflphone-client-gnome/src/config/assistant.c:292
msgid "Register an existing SIP or IAX2 account"
-msgstr "Зарегистрировать существующий SIP или IAX2 аккаунт"
+msgstr "Зарегистрировать существующею SIP или IAX2 учëтную запись"
-#: ../sflphone-client-gnome/src/config/assistant.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:306
msgid "SIP account settings"
-msgstr "Настройка SIP-аккаунта"
+msgstr "Настройка учëтной записи SIP"
-#: ../sflphone-client-gnome/src/config/assistant.c:286
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "Please fill the following information"
msgstr "Введите пожалуйста следующие данные"
-#: ../sflphone-client-gnome/src/config/assistant.c:352
-#: ../sflphone-client-gnome/src/config/assistant.c:381
+#: ../sflphone-client-gnome/src/config/assistant.c:376
+#: ../sflphone-client-gnome/src/config/assistant.c:405
msgid "Secure communications with _ZRTP"
msgstr "Защищëнная связь с _ZRTP"
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "Optional email address"
msgstr "Электронный адрес (необязательный)"
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "This email address will be used to send your voicemail messages."
msgstr "Этот электронный адрес будет использоваться для речевых сообщений"
-#: ../sflphone-client-gnome/src/config/assistant.c:373
+#: ../sflphone-client-gnome/src/config/assistant.c:397
msgid "_Email address"
msgstr "_Адрес эл. почты"
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "IAX2 account settings"
-msgstr "Настройка IAX2-аккаунта"
+msgstr "Настройка учëтной записи IAX2"
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "Network Address Translation (NAT)"
msgstr "Network Address Translation (NAT)"
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "You should probably enable this if you are behind a firewall."
-msgstr ""
-"Вы наверное должны это включить если вы находитесь за сетевым экраном."
+msgstr "Вы наверное должны это включить если вы находитесь за сетевым экраном."
-#: ../sflphone-client-gnome/src/config/assistant.c:476
+#: ../sflphone-client-gnome/src/config/assistant.c:505
msgid "E_nable STUN"
msgstr "Включить STUN"
-#: ../sflphone-client-gnome/src/config/assistant.c:483
+#: ../sflphone-client-gnome/src/config/assistant.c:512
msgid "_STUN server"
msgstr "_STUN-сервер"
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Account Registration"
-msgstr "Регистрация аккаунта"
+msgstr "Регистрация учëтной записи"
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Congratulations!"
msgstr "Поздравляем!"
-#: ../sflphone-client-gnome/src/config/audioconf.c:583
+#: ../sflphone-client-gnome/src/config/audioconf.c:582
msgid "Frequency"
msgstr "Частота"
-#: ../sflphone-client-gnome/src/config/audioconf.c:588
+#: ../sflphone-client-gnome/src/config/audioconf.c:587
msgid "Bitrate"
msgstr "Битрейт"
-#: ../sflphone-client-gnome/src/config/audioconf.c:593
+#: ../sflphone-client-gnome/src/config/audioconf.c:592
msgid "Bandwidth"
msgstr "Пропускная способность"
-#: ../sflphone-client-gnome/src/config/audioconf.c:673
+#: ../sflphone-client-gnome/src/config/audioconf.c:670
msgid "ALSA plugin"
msgstr "ALSA-плагин"
-#: ../sflphone-client-gnome/src/config/audioconf.c:695
+#: ../sflphone-client-gnome/src/config/audioconf.c:692
msgid "Output"
msgstr "Выход"
-#: ../sflphone-client-gnome/src/config/audioconf.c:717
+#: ../sflphone-client-gnome/src/config/audioconf.c:714
msgid "Input"
msgstr "Вход"
-#: ../sflphone-client-gnome/src/config/audioconf.c:752
+#: ../sflphone-client-gnome/src/config/audioconf.c:749
msgid "_Voice Activity Detection"
msgstr "Включить детектор тишины"
-#: ../sflphone-client-gnome/src/config/audioconf.c:762
+#: ../sflphone-client-gnome/src/config/audioconf.c:759
msgid "_Noise Reduction (Narrow-Band Companding)"
msgstr "Шумоподавление"
-#: ../sflphone-client-gnome/src/config/audioconf.c:798
+#: ../sflphone-client-gnome/src/config/audioconf.c:800
msgid "Sound Manager"
msgstr "Менеджер звука"
-#: ../sflphone-client-gnome/src/config/audioconf.c:807
+#: ../sflphone-client-gnome/src/config/audioconf.c:809
msgid "_Pulseaudio"
msgstr "_Pulseaudio"
-#: ../sflphone-client-gnome/src/config/audioconf.c:811
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
msgid "_ALSA"
msgstr "_ALSA"
-#: ../sflphone-client-gnome/src/config/audioconf.c:816
-msgid "_Mute other applications during a call"
-msgstr "Приглушать звук других програм во время звонка"
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:823
+#: ../sflphone-client-gnome/src/config/audioconf.c:819
msgid "ALSA settings"
msgstr "Настройка ALSA"
-#: ../sflphone-client-gnome/src/config/audioconf.c:840
+#: ../sflphone-client-gnome/src/config/audioconf.c:836
msgid "Codecs"
msgstr "Кодеки"
-#: ../sflphone-client-gnome/src/config/audioconf.c:869
+#: ../sflphone-client-gnome/src/config/audioconf.c:865
msgid "Recordings"
msgstr "Записи"
-#: ../sflphone-client-gnome/src/config/audioconf.c:873
+#: ../sflphone-client-gnome/src/config/audioconf.c:869
msgid "Destination folder"
msgstr "Папка назначения"
-#: ../sflphone-client-gnome/src/config/audioconf.c:877
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
msgid "Select a folder"
msgstr "Выберите папку"
-#: ../sflphone-client-gnome/src/config/audioconf.c:883
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
msgid "Ringtones"
msgstr "Звонки"
-#: ../sflphone-client-gnome/src/config/audioconf.c:889
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
msgid "_Enable ringtones"
msgstr "Включить звонок"
-#: ../sflphone-client-gnome/src/config/audioconf.c:895
+#: ../sflphone-client-gnome/src/config/audioconf.c:891
msgid "Choose a ringtone"
msgstr "Выберите звонок"
-#: ../sflphone-client-gnome/src/config/audioconf.c:901
+#: ../sflphone-client-gnome/src/config/audioconf.c:897
msgid "Audio Files"
msgstr "Звуковые файлы"
@@ -825,90 +993,70 @@ msgstr "Переписка номера телефона"
msgid "_Prefix dialed numbers with"
msgstr "Добавить перед на набранными номерами"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:195
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
msgid ""
"This profile is used when you want to reach a remote peer simply by typing a "
"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
"also be used if no account can be matched to an incoming or outgoing call."
msgstr ""
-"Этот профиль используется когда бы хотите достичь удалëнное устройство "
+"Этот профиль используется когда вы хотите достичь удалëнное устройство "
"просто набрав SIP URI (адрес) типа <b>sip:удалëнное устройство</b>. Эти "
"настройки так-же будут использованы если не будет подходящего аккаунта для "
"входящего или выходящего звонка."
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:274
-msgid "SIP Port"
-msgstr "SIP-порт"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:281
-msgid "UDP Transport"
-msgstr "Транспорт UDP"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:319
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
msgid "Desktop Notifications"
msgstr "Извещения на рабочем столе"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:323
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
msgid "_Enable notifications"
msgstr "Включить звонок"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:329
-msgid "Enable voicemail _notifications"
-msgstr "Включить предупреждения о речевых сообщениях"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:341
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
msgid "System Tray Icon"
-msgstr "System Tray Icon"
+msgstr "Поведение окна SFLPhone"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
msgid "_Popup main window on incoming call"
msgstr "_Показать главное окно при входящем звонке"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:349
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
msgid "Ne_ver popup main window"
msgstr "Никогда не показывать главное окно"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:353
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
msgid "Hide SFLphone window on _startup"
msgstr "Спрятать окно SFLphone при пуске"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:359
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
msgid "Calls History"
msgstr "Журнал звонков"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:362
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
msgid "_Keep my history for at least"
msgstr "Со_хранить мой журнал звонков как минимум в течении"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:373
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
msgid "days"
msgstr "дней"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:377
-msgid "Configuration File"
-msgstr "Файл конфигурации"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:379
-msgid "Store SIP credentials as MD5 hash"
-msgstr "Записать параметры доступа SIP с шифровкой MD5."
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:423
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
msgid "Preferences"
msgstr "Предпочтения"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:448
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
msgid "Audio"
msgstr "Звук"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
msgid "Address Book"
msgstr "Адресная книга"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:458
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
msgid "Hooks"
msgstr "Зацепки"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:468
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
msgid "Direct IP calls"
msgstr "Прямые IP-звонки"
@@ -916,11 +1064,11 @@ msgstr "Прямые IP-звонки"
msgid "Advanced options for TLS"
msgstr "Дополнительные опции для TLS"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:55
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:56
msgid "TLS transport"
msgstr "Транспорт TLS"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:59
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:60
msgid ""
"TLS transport can be used along with UDP for those calls that would\n"
"require secure sip transactions (aka SIPS). You can configure a different\n"
@@ -933,55 +1081,55 @@ msgstr ""
"каждого аккаунта (но каждый из них будет использовать свой выделенный "
"порт).\n"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:100
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
msgid "Certificate of Authority list"
msgstr "Список центра сертификации"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:104
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
msgid "Choose a CA list file (optional)"
msgstr "Выберите файл Центра сертификации (необязательный)"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:115
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
msgid "Public endpoint certificate file"
msgstr "Файл с публичным сертификатом"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:119
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
msgid "Choose a public endpoint certificate (optional)"
msgstr "Выберите публичный сертификат (необязательный)"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:134
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
msgid "Choose a private key file (optional)"
msgstr "Выберите файл с секретным ключом (необязательно)"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:145
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
msgid "Password for the private key"
msgstr "Пароль для секретного ключа"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:168
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
msgid "TLS protocol method"
msgstr "Метод протокола TLS"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:202
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
msgid "TLS cipher list"
msgstr "Список шифров TLS"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:211
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
msgid "Server name instance for outgoing TLS connection"
msgstr "Имя сервера для выходящих TLS-подключений."
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:219
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
msgid "Negotiation timeout (sec:msec)"
msgstr "Время ожидания соединения (сек:мсек)"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:236
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
msgid "Verify incoming certificates, as a server"
msgstr "Проверять входящие сертификаты (в качестве сервера)"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:242
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
msgid "Verify certificates from answer, as a client"
msgstr "Проверять входящие сертификаты (в качестве клиента)"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:248
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
msgid "Require certificate for incoming tls connections"
msgstr "Требовать сертификат для входящих TLS-подключений"
@@ -989,54 +1137,90 @@ msgstr "Требовать сертификат для входящих TLS-по
msgid "ZRTP Options"
msgstr "Опции ZRTP"
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:68
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:69
msgid "Send Hello Hash in S_DP"
msgstr "Послать hello-хэш в S_DP"
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:74
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:75
msgid "Ask User to Confirm SAS"
msgstr "Попросить пользователя подтвердить пароль SAS"
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:80
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:81
msgid "_Warn if ZRTP not supported"
msgstr "_Предупредить если ZRTP не пддерживается"
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:86
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:87
msgid "Display SAS once for hold events"
msgstr "Показать SAS один раз"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:58
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
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:59
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:72
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:84
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:96
msgid "Click here to change the search type"
msgstr "Нажмите, чтобы изменить тип поиска"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:71
msgid "Search by missed call"
msgstr "Поиск по пропущенным вызовам"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:83
msgid "Search by incoming call"
msgstr "Поиск по входящим вызовам"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:95
msgid "Search by outgoing call"
msgstr "Поиск по исходящим вызовам"
+#~ msgid "IP call - %s"
+#~ msgstr "IP звонок - %s"
+
+#~ msgid "Codec"
+#~ msgstr "Codec"
+
+#~ msgid "Network"
+#~ msgstr "Сеть"
+
+#~ msgid "Manually"
+#~ msgstr "Вручную"
+
+#~ msgid "There "
+#~ msgstr "Здесь "
+
+#~ msgid "is "
+#~ msgstr "Зарегестрирован "
+
+#~ msgid "are "
+#~ msgstr "Зарегестрированны "
+
+#~ msgid "s"
+#~ msgstr "a"
+
+#~ msgid "_Mute other applications during a call"
+#~ msgstr "Приглушать звук других програм во время звонка"
+
+#~ msgid "SIP Port"
+#~ msgstr "SIP-порт"
+
+#~ msgid "UDP Transport"
+#~ msgstr "Транспорт UDP"
+
+#~ msgid "Enable voicemail _notifications"
+#~ msgstr "Включить предупреждения о речевых сообщениях"
+
+#~ msgid "Store SIP credentials as MD5 hash"
+#~ msgstr "Записать параметры доступа SIP с шифровкой MD5."
+
#~ msgid "Account creation wizard"
#~ msgstr "Мастер настройки SFLphone"
#~ msgid "Voicemail number"
#~ msgstr "Номер автоответчика #"
-#~ msgid "Address book"
-#~ msgstr "Адресная книга"
-
#~ msgid "Display volume controls"
#~ msgstr "_Настройки громкости"
@@ -1049,9 +1233,6 @@ msgstr "Поиск по исходящим вызовам"
#~ msgid "Hold on"
#~ msgstr "Удержать звонок"
-#~ msgid "Transfer"
-#~ msgstr "Переслать звонок на другой номер"
-
#~ msgid "Record"
#~ msgstr "Записать переговор"
@@ -1091,33 +1272,9 @@ msgstr "Поиск по исходящим вызовам"
#~ msgid "Prefix dialed numbers with"
#~ msgstr "Добавить перед на набранными номерами"
-#~ msgid "_Help"
-#~ msgstr "_Помощь"
-
#~ msgid "_Account creation wizard"
#~ msgstr "Мастер настройки SFLphone"
-#~ msgid "_Call"
-#~ msgstr "_Звонок"
-
-#~ msgid "Clear _history"
-#~ msgstr "_Стереть журнал"
-
-#~ msgid "_Accounts"
-#~ msgstr "_Аккаунты"
-
-#~ msgid "_Edit"
-#~ msgstr "_Правка"
-
-#~ msgid "_Volume controls"
-#~ msgstr "_Настройки громкости"
-
-#~ msgid "_View"
-#~ msgstr "_Вид"
-
-#~ msgid "History"
-#~ msgstr "Журнал"
-
#~ msgid "_Enable this account"
#~ msgstr "_Включить"
@@ -1185,9 +1342,6 @@ msgstr "Поиск по исходящим вызовам"
#~ msgid "Enable STUN"
#~ msgstr "Задействовать STUN"
-#~ msgid "Transfer to : "
-#~ msgstr "Передать : "
-
#~ msgid "Default account"
#~ msgstr "Учетная запись по умолчанию"
@@ -1218,12 +1372,9 @@ msgstr "Поиск по исходящим вызовам"
#~ msgid "Give up transfer"
#~ msgstr "Прекратить передачу"
-#~ msgid "Remove the selected account"
-#~ msgstr "Удалить выбранную учетную запись"
-
#~ msgid ""
-#~ "This button enables you to initialize a new account. You will then be able "
-#~ "to edit it using the form on the right."
+#~ "This button enables you to initialize a new account. You will then be "
+#~ "able to edit it using the form on the right."
#~ msgstr ""
#~ "Эта кнопка позволяет инициализировать новую учетную запись. Редактировать "
#~ "данные будет возможно в форме справа."
@@ -1275,18 +1426,9 @@ msgstr "Поиск по исходящим вызовам"
#~ msgid "Keep my history for at least"
#~ msgstr "По крайней мере хранить историю"
-#~ msgid "Clear history"
-#~ msgstr "Очистить историю"
-
-#~ msgid "Call history"
-#~ msgstr "История звонков"
-
#~ msgid "Incoming call"
#~ msgstr "Входящий звонок"
-#~ msgid "Call back"
-#~ msgstr "Обратный вызов"
-
#~ msgid "(C) 2009 Savoir-faire Linux"
#~ msgstr "(C) 2009 Savoir-faire Linux"
@@ -1317,13 +1459,16 @@ msgstr "Поиск по исходящим вызовам"
#~ msgctxt "NAME OF TRANSLATORS"
#~ msgid "Your names"
#~ msgstr ""
-#~ ",Launchpad Contributions:,Hussein Abdallah, ,Launchpad "
-#~ "Contributions:,Emmanuel Milou,Hussein Abdallah,Maxime Chambreuil,Pavlo "
-#~ "Kucheriavyi,Sergei Sedov, ,Launchpad Contributions:,Emmanuel Milou,Hussein "
-#~ "Abdallah,Hussein Abdallah,Maxime Chambreuil,Pavlo Kucheriavyi,Sergei Sedov"
+#~ ",Launchpad Contributions:,Hussein Abdallah, ,Launchpad Contributions:,"
+#~ "Emmanuel Milou,Hussein Abdallah,Maxime Chambreuil,Pavlo Kucheriavyi,"
+#~ "Sergei Sedov, ,Launchpad Contributions:,Emmanuel Milou,Hussein Abdallah,"
+#~ "Hussein Abdallah,Maxime Chambreuil,Pavlo Kucheriavyi,Sergei Sedov, ,"
+#~ "Launchpad Contributions:,Emmanuel Milou,Hussein Abdallah,Hussein Abdallah,"
+#~ "Maxime Chambreuil,Pavlo Kucheriavyi,Sergey Sedov"
#~ msgctxt "EMAIL OF TRANSLATORS"
#~ msgid "Your emails"
#~ msgstr ""
-#~ ",,,,,emmanuel.milou@savoirfairelinux.com,,maxime.chambreuil@gmail.com,,,,,emm"
-#~ "anuel.milou@savoirfairelinux.com,,,maxime.chambreuil@gmail.com,,"
+#~ ",,,,,emmanuel.milou@savoirfairelinux.com,,maxime.chambreuil@gmail.com,,,,,"
+#~ "emmanuel.milou@savoirfairelinux.com,,,maxime.chambreuil@gmail.com,,,,,"
+#~ "emmanuel.milou@savoirfairelinux.com,,,maxime.chambreuil@gmail.com,,"
diff --git a/lang/sflphone.pot b/lang/sflphone.pot
index 103b76190c9fd54962614fb369ccf2bb81567bb1..8fd477d58564f569288946c0cc0852a4611ef0b6 100644
--- a/lang/sflphone.pot
+++ b/lang/sflphone.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-12 14:02-0500\n"
+"POT-Creation-Date: 2009-12-03 10:22-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -59,25 +59,26 @@ msgstr ""
msgid "Invalid"
msgstr ""
-#: ../sflphone-client-gnome/src/actions.c:72
+#: ../sflphone-client-gnome/src/actions.c:98
msgid "Using account"
msgstr ""
-#: ../sflphone-client-gnome/src/actions.c:78
+#: ../sflphone-client-gnome/src/actions.c:104
msgid "No registered accounts"
msgstr ""
-#: ../sflphone-client-gnome/src/actions.c:259
+#: ../sflphone-client-gnome/src/actions.c:285
msgid ""
"Unable to connect to the SFLphone server.\n"
"Make sure the daemon is running."
msgstr ""
-#: ../sflphone-client-gnome/src/actions.c:879
+#: ../sflphone-client-gnome/src/actions.c:589
+#: ../sflphone-client-gnome/src/actions.c:911
msgid "Direct SIP call"
msgstr ""
-#: ../sflphone-client-gnome/src/actions.c:1071
+#: ../sflphone-client-gnome/src/actions.c:1103
#, c-format
msgid ""
"<b>Error: No audio codecs found.\n"
@@ -119,53 +120,53 @@ msgstr ""
msgid "Do you still want to quit?"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:297
+#: ../sflphone-client-gnome/src/mainwindow.c:298
msgid "SFLphone Error"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:391
+#: ../sflphone-client-gnome/src/mainwindow.c:392
#, c-format
msgid "ZRTP is not supported by peer %s\n"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:392
+#: ../sflphone-client-gnome/src/mainwindow.c:393
msgid "Secure Communication Unavailable"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:393
-#: ../sflphone-client-gnome/src/mainwindow.c:415
+#: ../sflphone-client-gnome/src/mainwindow.c:394
+#: ../sflphone-client-gnome/src/mainwindow.c:416
msgid "Continue"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:394
-#: ../sflphone-client-gnome/src/mainwindow.c:416
-#: ../sflphone-client-gnome/src/mainwindow.c:430
+#: ../sflphone-client-gnome/src/mainwindow.c:395
+#: ../sflphone-client-gnome/src/mainwindow.c:417
+#: ../sflphone-client-gnome/src/mainwindow.c:431
msgid "Stop Call"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:413
+#: ../sflphone-client-gnome/src/mainwindow.c:414
#, c-format
msgid ""
"A %s error forced the call with %s to fall under unencrypted mode.\n"
"Exact reason: %s\n"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:414
+#: ../sflphone-client-gnome/src/mainwindow.c:415
msgid "ZRTP negotiation failed"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:427
+#: ../sflphone-client-gnome/src/mainwindow.c:428
#, c-format
msgid ""
"%s wants to stop using secure communication. Confirm will resume "
"conversation without SRTP.\n"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:428
+#: ../sflphone-client-gnome/src/mainwindow.c:429
msgid "Confirm Go Clear"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:429
+#: ../sflphone-client-gnome/src/mainwindow.c:430
msgid "Confirm"
msgstr ""
@@ -234,15 +235,15 @@ msgstr ""
msgid "Mic volume"
msgstr ""
-#: ../sflphone-client-gnome/src/statusicon.c:91
+#: ../sflphone-client-gnome/src/statusicon.c:96
msgid "_Show main window"
msgstr ""
-#: ../sflphone-client-gnome/src/statusicon.c:126
+#: ../sflphone-client-gnome/src/statusicon.c:131
msgid "SFLphone"
msgstr ""
-#: ../sflphone-client-gnome/src/statusicon.c:127
+#: ../sflphone-client-gnome/src/statusicon.c:132
#, c-format
msgid "%i account configured"
msgid_plural "%i accounts configured"
@@ -250,387 +251,393 @@ msgstr[0] ""
msgstr[1] ""
#: ../sflphone-client-gnome/src/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:628
-#: ../sflphone-client-gnome/src/uimanager.c:662
+#: ../sflphone-client-gnome/src/uimanager.c:693
+#: ../sflphone-client-gnome/src/uimanager.c:727
msgid "Voicemail"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:115
+#: ../sflphone-client-gnome/src/uimanager.c:117
msgid "No address book selected"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:135
-#: ../sflphone-client-gnome/src/uimanager.c:691
+#: ../sflphone-client-gnome/src/uimanager.c:137
+#: ../sflphone-client-gnome/src/uimanager.c:756
msgid "Address book"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:237
+#: ../sflphone-client-gnome/src/uimanager.c:279
#, c-format
msgid "Voicemail (%i)"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:300
+#: ../sflphone-client-gnome/src/uimanager.c:342
msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:303
+#: ../sflphone-client-gnome/src/uimanager.c:345
msgid "About SFLphone"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:654
+#: ../sflphone-client-gnome/src/uimanager.c:719
msgid "Call"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:655
-#: ../sflphone-client-gnome/src/uimanager.c:1119
+#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:1184
msgid "_New call"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:655
+#: ../sflphone-client-gnome/src/uimanager.c:720
msgid "Place a new call"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:656
-#: ../sflphone-client-gnome/src/uimanager.c:914
+#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:979
msgid "_Pick up"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:656
+#: ../sflphone-client-gnome/src/uimanager.c:721
msgid "Answer the call"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:657
-#: ../sflphone-client-gnome/src/uimanager.c:926
-#: ../sflphone-client-gnome/src/uimanager.c:967
+#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:991
+#: ../sflphone-client-gnome/src/uimanager.c:1032
msgid "_Hang up"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:657
+#: ../sflphone-client-gnome/src/uimanager.c:722
msgid "Finish the call"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:658
+#: ../sflphone-client-gnome/src/uimanager.c:723
msgid "O_n hold"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:658
+#: ../sflphone-client-gnome/src/uimanager.c:723
msgid "Place the call on hold"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:659
+#: ../sflphone-client-gnome/src/uimanager.c:724
msgid "O_ff hold"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:659
+#: ../sflphone-client-gnome/src/uimanager.c:724
msgid "Place the call off hold"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:660
-#: ../sflphone-client-gnome/src/uimanager.c:950
+#: ../sflphone-client-gnome/src/uimanager.c:725
+#: ../sflphone-client-gnome/src/uimanager.c:1015
msgid "_Record"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:660
+#: ../sflphone-client-gnome/src/uimanager.c:725
msgid "Record the current conversation"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:661
+#: ../sflphone-client-gnome/src/uimanager.c:726
msgid "Configuration _Assistant"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:661
+#: ../sflphone-client-gnome/src/uimanager.c:726
msgid "Run the configuration assistant"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:662
+#: ../sflphone-client-gnome/src/uimanager.c:727
msgid "Call your voicemail"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:663
+#: ../sflphone-client-gnome/src/uimanager.c:728
msgid "_Close"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:663
+#: ../sflphone-client-gnome/src/uimanager.c:728
msgid "Minimize to system tray"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:664
+#: ../sflphone-client-gnome/src/uimanager.c:729
msgid "_Quit"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:664
+#: ../sflphone-client-gnome/src/uimanager.c:729
msgid "Quit the program"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:667
+#: ../sflphone-client-gnome/src/uimanager.c:732
msgid "_Edit"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:668
+#: ../sflphone-client-gnome/src/uimanager.c:733
msgid "_Copy"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:668
+#: ../sflphone-client-gnome/src/uimanager.c:733
msgid "Copy the selection"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:669
+#: ../sflphone-client-gnome/src/uimanager.c:734
msgid "_Paste"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:669
+#: ../sflphone-client-gnome/src/uimanager.c:734
msgid "Paste the clipboard"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:670
+#: ../sflphone-client-gnome/src/uimanager.c:735
msgid "Clear _history"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:670
+#: ../sflphone-client-gnome/src/uimanager.c:735
msgid "Clear the call history"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:671
+#: ../sflphone-client-gnome/src/uimanager.c:736
msgid "_Accounts"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:671
+#: ../sflphone-client-gnome/src/uimanager.c:736
msgid "Edit your accounts"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:672
+#: ../sflphone-client-gnome/src/uimanager.c:737
msgid "_Preferences"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:672
+#: ../sflphone-client-gnome/src/uimanager.c:737
msgid "Change your preferences"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:675
+#: ../sflphone-client-gnome/src/uimanager.c:740
msgid "_View"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:678
+#: ../sflphone-client-gnome/src/uimanager.c:743
msgid "_Help"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:679
+#: ../sflphone-client-gnome/src/uimanager.c:744
msgid "Contents"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:679
+#: ../sflphone-client-gnome/src/uimanager.c:744
msgid "Open the manual"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:680
+#: ../sflphone-client-gnome/src/uimanager.c:745
msgid "About this application"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:686
+#: ../sflphone-client-gnome/src/uimanager.c:751
msgid "_Transfer"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:686
+#: ../sflphone-client-gnome/src/uimanager.c:751
msgid "Transfer the call"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:687
+#: ../sflphone-client-gnome/src/uimanager.c:752
msgid "_Show toolbar"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:687
+#: ../sflphone-client-gnome/src/uimanager.c:752
msgid "Show the toolbar"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:688
+#: ../sflphone-client-gnome/src/uimanager.c:753
msgid "_Dialpad"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:688
+#: ../sflphone-client-gnome/src/uimanager.c:753
msgid "Show the dialpad"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:689
+#: ../sflphone-client-gnome/src/uimanager.c:754
msgid "_Volume controls"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:689
+#: ../sflphone-client-gnome/src/uimanager.c:754
msgid "Show the volume controls"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:690
+#: ../sflphone-client-gnome/src/uimanager.c:755
msgid "_History"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:690
+#: ../sflphone-client-gnome/src/uimanager.c:755
msgid "Calls history"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:691
+#: ../sflphone-client-gnome/src/uimanager.c:756
msgid "_Address book"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:938
-#: ../sflphone-client-gnome/src/uimanager.c:979
+#: ../sflphone-client-gnome/src/uimanager.c:1003
+#: ../sflphone-client-gnome/src/uimanager.c:1044
msgid "On _Hold"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1042
+#: ../sflphone-client-gnome/src/uimanager.c:1107
msgid "_Call back"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1193
+#: ../sflphone-client-gnome/src/uimanager.c:1258
msgid "Edit phone number"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1204
+#: ../sflphone-client-gnome/src/uimanager.c:1269
msgid "Edit the phone number before making a call"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:172
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
msgid "Account Parameters"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:181
-#: ../sflphone-client-gnome/src/config/assistant.c:307
-#: ../sflphone-client-gnome/src/config/assistant.c:415
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
+#: ../sflphone-client-gnome/src/config/assistant.c:314
+#: ../sflphone-client-gnome/src/config/assistant.c:427
msgid "_Alias"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
msgid "_Protocol"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:207
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
msgid "Unknown"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:217
-#: ../sflphone-client-gnome/src/config/assistant.c:315
-#: ../sflphone-client-gnome/src/config/assistant.c:423
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
+#: ../sflphone-client-gnome/src/config/assistant.c:322
+#: ../sflphone-client-gnome/src/config/assistant.c:435
msgid "_Host name"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
-#: ../sflphone-client-gnome/src/config/assistant.c:323
-#: ../sflphone-client-gnome/src/config/assistant.c:431
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
+#: ../sflphone-client-gnome/src/config/assistant.c:330
+#: ../sflphone-client-gnome/src/config/assistant.c:443
msgid "_User name"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:242
-#: ../sflphone-client-gnome/src/config/assistant.c:339
-#: ../sflphone-client-gnome/src/config/assistant.c:446
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:346
+#: ../sflphone-client-gnome/src/config/assistant.c:458
msgid "_Password"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:262
-#: ../sflphone-client-gnome/src/config/assistant.c:357
-#: ../sflphone-client-gnome/src/config/assistant.c:462
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:363
+#: ../sflphone-client-gnome/src/config/assistant.c:473
+msgid "Show password"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:368
+#: ../sflphone-client-gnome/src/config/assistant.c:478
msgid "_Voicemail number"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:348
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
msgid "Authentication"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:349
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
msgid "Secret"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:579
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
msgid "Credential"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:614
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
msgid "Authentication name"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:625
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
msgid "Password"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:649
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1029
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:306
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
msgid "Security"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:662
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:318
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
msgid "Use TLS transport (sips)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:668
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:323
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
msgid "SRTP key exchange"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:329
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
msgid "Disabled"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:770
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
msgid "Registration"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:775
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
msgid "Registration expire"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:784
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
msgid "_Comply with RFC 3263"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:791
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:221
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
msgid "Network Interface"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:805
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:236
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
msgid "Local address"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:855
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:292
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
msgid "Local port"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:868
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:903
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
msgid "Published address"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:874
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
msgid "Using STUN"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:881
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
msgid "STUN server URL"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:889
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
msgid "Same as local parameters"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:892
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
msgid "Set published address and port:"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:911
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
msgid "Published port"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1000
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
msgid "Account settings"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1019
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
msgid "Basic"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1024
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
msgid "Advanced"
msgstr ""
@@ -639,35 +646,35 @@ msgstr ""
msgid "Server returned \"%s\" (%d)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:387
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
msgid "Protocol"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:394
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:396
msgid "Status"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:472
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:474
msgid "Accounts"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:482
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:484
msgid "Configured Accounts"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:499
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
#, c-format
msgid "There is %d active account"
msgid_plural "There are %d active accounts"
msgstr[0] ""
msgstr[1] ""
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:505
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
msgid "You have no active account"
msgstr ""
#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:537
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
msgid "General"
msgstr ""
@@ -716,136 +723,136 @@ msgstr ""
msgid "Name"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:69
+#: ../sflphone-client-gnome/src/config/assistant.c:75
#, c-format
msgid "This assistant is now finished."
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:71
+#: ../sflphone-client-gnome/src/config/assistant.c:77
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/config/assistant.c:74
+#: ../sflphone-client-gnome/src/config/assistant.c:80
msgid "Alias"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:78
+#: ../sflphone-client-gnome/src/config/assistant.c:84
msgid "Server"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:82
+#: ../sflphone-client-gnome/src/config/assistant.c:88
msgid "Username"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:86
+#: ../sflphone-client-gnome/src/config/assistant.c:92
msgid "Security: "
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:88
+#: ../sflphone-client-gnome/src/config/assistant.c:94
msgid "SRTP/ZRTP draft-zimmermann"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:90
+#: ../sflphone-client-gnome/src/config/assistant.c:96
msgid "None"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:223
+#: ../sflphone-client-gnome/src/config/assistant.c:229
msgid "SFLphone account creation wizard"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:249
+#: ../sflphone-client-gnome/src/config/assistant.c:255
msgid "Welcome to the Account creation wizard of SFLphone!"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:256
msgid "This installation wizard will help you configure an account."
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:264
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "VoIP Protocols"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:264
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "Select an account type"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:266
+#: ../sflphone-client-gnome/src/config/assistant.c:272
msgid "SIP (Session Initiation Protocol)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:268
+#: ../sflphone-client-gnome/src/config/assistant.c:274
msgid "IAX2 (InterAsterix Exchange)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:282
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Account"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:282
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Please select one of the following options"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:284
+#: ../sflphone-client-gnome/src/config/assistant.c:290
msgid "Create a free SIP/IAX2 account on sflphone.org"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:292
msgid "Register an existing SIP or IAX2 account"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:299
+#: ../sflphone-client-gnome/src/config/assistant.c:306
msgid "SIP account settings"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:299
-#: ../sflphone-client-gnome/src/config/assistant.c:407
+#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "Please fill the following information"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:365
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:376
+#: ../sflphone-client-gnome/src/config/assistant.c:405
msgid "Secure communications with _ZRTP"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:378
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "Optional email address"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:378
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "This email address will be used to send your voicemail messages."
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:386
+#: ../sflphone-client-gnome/src/config/assistant.c:397
msgid "_Email address"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:407
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "IAX2 account settings"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:480
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "Network Address Translation (NAT)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:480
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "You should probably enable this if you are behind a firewall."
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:489
+#: ../sflphone-client-gnome/src/config/assistant.c:505
msgid "E_nable STUN"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:496
+#: ../sflphone-client-gnome/src/config/assistant.c:512
msgid "_STUN server"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:510
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Account Registration"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:510
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Congratulations!"
msgstr ""
@@ -881,51 +888,51 @@ msgstr ""
msgid "_Noise Reduction (Narrow-Band Companding)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:795
+#: ../sflphone-client-gnome/src/config/audioconf.c:800
msgid "Sound Manager"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:804
+#: ../sflphone-client-gnome/src/config/audioconf.c:809
msgid "_Pulseaudio"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:808
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
msgid "_ALSA"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:814
+#: ../sflphone-client-gnome/src/config/audioconf.c:819
msgid "ALSA settings"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:831
+#: ../sflphone-client-gnome/src/config/audioconf.c:836
msgid "Codecs"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:860
+#: ../sflphone-client-gnome/src/config/audioconf.c:865
msgid "Recordings"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:864
+#: ../sflphone-client-gnome/src/config/audioconf.c:869
msgid "Destination folder"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:868
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
msgid "Select a folder"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:874
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
msgid "Ringtones"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:880
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
msgid "_Enable ringtones"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:886
+#: ../sflphone-client-gnome/src/config/audioconf.c:891
msgid "Choose a ringtone"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:892
+#: ../sflphone-client-gnome/src/config/audioconf.c:897
msgid "Audio Files"
msgstr ""
@@ -962,74 +969,66 @@ msgstr ""
msgid "_Prefix dialed numbers with"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:212
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
msgid ""
"This profile is used when you want to reach a remote peer simply by typing a "
"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
"also be used if no account can be matched to an incoming or outgoing call."
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:425
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
msgid "Desktop Notifications"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:429
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
msgid "_Enable notifications"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:435
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
msgid "System Tray Icon"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:438
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
msgid "_Popup main window on incoming call"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:443
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
msgid "Ne_ver popup main window"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:447
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
msgid "Hide SFLphone window on _startup"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
msgid "Calls History"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:456
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
msgid "_Keep my history for at least"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:467
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
msgid "days"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:471
-msgid "Configuration File"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:473
-msgid "Store SIP credentials as MD5 hash"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:517
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
msgid "Preferences"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:542
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
msgid "Audio"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:547
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
msgid "Address Book"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:552
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
msgid "Hooks"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:562
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
msgid "Direct IP calls"
msgstr ""
@@ -1037,11 +1036,11 @@ msgstr ""
msgid "Advanced options for TLS"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:55
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:56
msgid "TLS transport"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:59
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:60
msgid ""
"TLS transport can be used along with UDP for those calls that would\n"
"require secure sip transactions (aka SIPS). You can configure a different\n"
@@ -1050,55 +1049,55 @@ msgid ""
"port, different one from each other\n"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:100
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
msgid "Certificate of Authority list"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:104
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
msgid "Choose a CA list file (optional)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:128
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
msgid "Public endpoint certificate file"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:132
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
msgid "Choose a public endpoint certificate (optional)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:156
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
msgid "Choose a private key file (optional)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:178
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
msgid "Password for the private key"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:201
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
msgid "TLS protocol method"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:235
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
msgid "TLS cipher list"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:244
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
msgid "Server name instance for outgoing TLS connection"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:252
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
msgid "Negotiation timeout (sec:msec)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:269
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
msgid "Verify incoming certificates, as a server"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:275
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
msgid "Verify certificates from answer, as a client"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:281
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
msgid "Require certificate for incoming tls connections"
msgstr ""
@@ -1122,25 +1121,25 @@ msgstr ""
msgid "Display SAS once for hold events"
msgstr ""
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:58
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
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:59
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:72
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:84
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:96
msgid "Click here to change the search type"
msgstr ""
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:71
msgid "Search by missed call"
msgstr ""
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:83
msgid "Search by incoming call"
msgstr ""
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:95
msgid "Search by outgoing call"
msgstr ""
diff --git a/lang/update-template.sh b/lang/update-template.sh
new file mode 100755
index 0000000000000000000000000000000000000000..6d91e60fe9987bd85cd07cf96054bdcae4285dc5
--- /dev/null
+++ b/lang/update-template.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# Parse the GNOME client only to build the langage template
+
+xgettext --from-code=utf-8 --language=C -k_ -kN_ -kc_:1c,2 -kn_:1,2 -ktr2i18n -ktr2i18n:2c,1 -kki18nc:1c,2 -kki18n -ki18n -ki18nc:1c,2 -o sflphone.pot ../sflphone-client-gnome/src/*.c ../sflphone-client-gnome/src/dbus/*.c ../sflphone-client-gnome/src/config/*.c ../sflphone-client-gnome/src/contacts/*.c ../sflphone-client-gnome/src/icons/*.c ../sflphone-client-gnome/src/widget/*.c
+
diff --git a/lang/update.sh b/lang/update.sh
deleted file mode 100755
index 2903b9fba1763acb871aa95da9b96763f111dd4d..0000000000000000000000000000000000000000
--- a/lang/update.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-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/zh_CN.po b/lang/zh_CN/zh_CN.po
index 992e7b045726c45b4bdbcb8db8b7ea439abbe947..bfc3429d51dec35ea9728985f2d0967e8ad86bd1 100644
--- a/lang/zh_CN/zh_CN.po
+++ b/lang/zh_CN/zh_CN.po
@@ -4,20 +4,19 @@
#
# Yun Liu <yun.liu@savoirfairelinux.com>, 2008.
#
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:509
msgid ""
msgstr ""
"Project-Id-Version: SFLphone 0.9.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-14 11:18-0400\n"
-"PO-Revision-Date: 2009-10-07 16:46+0000\n"
-"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
+"POT-Creation-Date: 2009-12-03 10:22-0500\n"
+"PO-Revision-Date: 2009-10-26 20:46+0000\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=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-10-14 15:20+0000\n"
+"X-Launchpad-Export-Date: 2009-12-03 15:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: ../sflphone-client-gnome/src/accountlist.c:175
@@ -40,7 +39,7 @@ msgstr "注册失败"
#: ../sflphone-client-gnome/src/accountlist.c:187
msgid "Authentication Failed"
-msgstr ""
+msgstr "认证失败"
#: ../sflphone-client-gnome/src/accountlist.c:190
msgid "Network unreachable"
@@ -62,24 +61,15 @@ msgstr "Stun服务器无效"
msgid "Invalid"
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 个语音信息"
-
-#: ../sflphone-client-gnome/src/actions.c:83
-#: ../sflphone-client-gnome/src/actions.c:919
-#: ../sflphone-client-gnome/src/actions.c:926
+#: ../sflphone-client-gnome/src/actions.c:98
msgid "Using account"
msgstr "使用账户"
-#: ../sflphone-client-gnome/src/actions.c:89
+#: ../sflphone-client-gnome/src/actions.c:104
msgid "No registered accounts"
msgstr "没有已注册帐户"
-#: ../sflphone-client-gnome/src/actions.c:268
+#: ../sflphone-client-gnome/src/actions.c:285
msgid ""
"Unable to connect to the SFLphone server.\n"
"Make sure the daemon is running."
@@ -87,16 +77,12 @@ msgstr ""
"连接SFLphone服务器失败.\n"
"请检查daemon是否还在运行."
-#: ../sflphone-client-gnome/src/actions.c:913
-#, c-format
-msgid "IP call - %s"
-msgstr "IP 电话 - %s"
-
-#: ../sflphone-client-gnome/src/actions.c:922
-msgid "Codec"
-msgstr "编码"
+#: ../sflphone-client-gnome/src/actions.c:589
+#: ../sflphone-client-gnome/src/actions.c:911
+msgid "Direct SIP call"
+msgstr ""
-#: ../sflphone-client-gnome/src/actions.c:1119
+#: ../sflphone-client-gnome/src/actions.c:1103
#, c-format
msgid ""
"<b>Error: No audio codecs found.\n"
@@ -151,56 +137,55 @@ msgstr "有电话正在处理中"
msgid "Do you still want to quit?"
msgstr "确认要退出?"
-#: ../sflphone-client-gnome/src/mainwindow.c:299
+#: ../sflphone-client-gnome/src/mainwindow.c:298
msgid "SFLphone Error"
msgstr "SFLphone出错"
-#: ../sflphone-client-gnome/src/mainwindow.c:391
+#: ../sflphone-client-gnome/src/mainwindow.c:392
#, c-format
msgid "ZRTP is not supported by peer %s\n"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:392
-msgid "Secure Communication Unavailable"
-msgstr ""
-
#: ../sflphone-client-gnome/src/mainwindow.c:393
-#: ../sflphone-client-gnome/src/mainwindow.c:415
-#, fuzzy
-msgid "Continue"
-msgstr "连接"
+msgid "Secure Communication Unavailable"
+msgstr "安全通信不可用"
#: ../sflphone-client-gnome/src/mainwindow.c:394
#: ../sflphone-client-gnome/src/mainwindow.c:416
-#: ../sflphone-client-gnome/src/mainwindow.c:430
+msgid "Continue"
+msgstr "继续"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:395
+#: ../sflphone-client-gnome/src/mainwindow.c:417
+#: ../sflphone-client-gnome/src/mainwindow.c:431
msgid "Stop Call"
-msgstr ""
+msgstr "停止呼叫"
-#: ../sflphone-client-gnome/src/mainwindow.c:413
+#: ../sflphone-client-gnome/src/mainwindow.c:414
#, c-format
msgid ""
"A %s error forced the call with %s to fall under unencrypted mode.\n"
"Exact reason: %s\n"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:414
+#: ../sflphone-client-gnome/src/mainwindow.c:415
msgid "ZRTP negotiation failed"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:427
+#: ../sflphone-client-gnome/src/mainwindow.c:428
#, c-format
msgid ""
"%s wants to stop using secure communication. Confirm will resume "
"conversation without SRTP.\n"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:428
+#: ../sflphone-client-gnome/src/mainwindow.c:429
msgid "Confirm Go Clear"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:429
+#: ../sflphone-client-gnome/src/mainwindow.c:430
msgid "Confirm"
-msgstr ""
+msgstr "确认"
#: ../sflphone-client-gnome/src/sflnotify.c:71
#: ../sflphone-client-gnome/src/sflnotify.c:91
@@ -213,6 +198,12 @@ msgstr "%s 帐户: %s"
msgid "<i>From</i> %s"
msgstr "<i>拨入方</i> %s"
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+#, c-format
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] "%d 个语音信息"
+
#: ../sflphone-client-gnome/src/sflnotify.c:111
#, c-format
msgid "Calling with %s account <i>%s</i>"
@@ -240,7 +231,7 @@ msgstr ""
#: ../sflphone-client-gnome/src/sflnotify.c:205
#, c-format
msgid "%s does not support ZRTP."
-msgstr ""
+msgstr "%s 不支持 ZRTP。"
#: ../sflphone-client-gnome/src/sflnotify.c:220
#, c-format
@@ -248,9 +239,9 @@ msgid "ZRTP negotiation failed with %s"
msgstr ""
#: ../sflphone-client-gnome/src/sflnotify.c:235
-#, fuzzy, c-format
+#, c-format
msgid "<i>With:</i> %s"
-msgstr "<i>拨入方</i> %s"
+msgstr ""
#: ../sflphone-client-gnome/src/sliders.c:162
msgid "Speakers volume"
@@ -260,223 +251,413 @@ msgstr "扬声器音量"
msgid "Mic volume"
msgstr "话筒音量"
-#: ../sflphone-client-gnome/src/statusicon.c:91
+#: ../sflphone-client-gnome/src/statusicon.c:96
msgid "_Show main window"
msgstr "显示主窗口(S)"
-#: ../sflphone-client-gnome/src/statusicon.c:126
+#: ../sflphone-client-gnome/src/statusicon.c:131
msgid "SFLphone"
msgstr "SFLphone"
-#: ../sflphone-client-gnome/src/statusicon.c:127
+#: ../sflphone-client-gnome/src/statusicon.c:132
#, c-format
msgid "%i account configured"
msgid_plural "%i accounts configured"
msgstr[0] "已配置了%i个账户"
#: ../sflphone-client-gnome/src/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:750
+#: ../sflphone-client-gnome/src/uimanager.c:693
+#: ../sflphone-client-gnome/src/uimanager.c:727
msgid "Voicemail"
msgstr "语音信箱"
-#: ../sflphone-client-gnome/src/uimanager.c:403
+#: ../sflphone-client-gnome/src/uimanager.c:117
+msgid "No address book selected"
+msgstr "地址簿"
+
+#: ../sflphone-client-gnome/src/uimanager.c:137
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "Address book"
+msgstr "地址簿"
+
+#: ../sflphone-client-gnome/src/uimanager.c:279
+msgid "Voicemail (%i)"
+msgstr "语音信箱 (%i)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:342
msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
msgstr "SFLphone是一个VoIP客户端，它兼容SIP和IAX2协议."
-#: ../sflphone-client-gnome/src/uimanager.c:406
+#: ../sflphone-client-gnome/src/uimanager.c:345
msgid "About SFLphone"
msgstr "关于SFLphone"
-#: ../sflphone-client-gnome/src/uimanager.c:1028
+#: ../sflphone-client-gnome/src/uimanager.c:719
+msgid "Call"
+msgstr "电话(_C)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:1184
+msgid "_New call"
+msgstr "新电话(_N)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+msgid "Place a new call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:979
msgid "_Pick up"
msgstr "接听(_P)"
-#: ../sflphone-client-gnome/src/uimanager.c:1040
-#: ../sflphone-client-gnome/src/uimanager.c:1081
+#: ../sflphone-client-gnome/src/uimanager.c:721
+msgid "Answer the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:991
+#: ../sflphone-client-gnome/src/uimanager.c:1032
msgid "_Hang up"
msgstr "挂断(_H)"
-#: ../sflphone-client-gnome/src/uimanager.c:1052
-#: ../sflphone-client-gnome/src/uimanager.c:1093
-msgid "On _Hold"
+#: ../sflphone-client-gnome/src/uimanager.c:722
+msgid "Finish the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "O_n hold"
msgstr "保持(_H)"
-#: ../sflphone-client-gnome/src/uimanager.c:1064
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "Place the call on hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "O_ff hold"
+msgstr "恢复通话"
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "Place the call off hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:725
+#: ../sflphone-client-gnome/src/uimanager.c:1015
msgid "_Record"
msgstr "录音(_R)"
-#: ../sflphone-client-gnome/src/uimanager.c:1154
+#: ../sflphone-client-gnome/src/uimanager.c:725
+msgid "Record the current conversation"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Configuration _Assistant"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Run the configuration assistant"
+msgstr "Stun配置有误"
+
+#: ../sflphone-client-gnome/src/uimanager.c:727
+msgid "Call your voicemail"
+msgstr "%d 个语音信息"
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "_Close"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "Minimize to system tray"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "_Quit"
+msgstr "编辑(_E)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "Quit the program"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:732
+msgid "_Edit"
+msgstr "编辑(_E)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "_Copy"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "Copy the selection"
+msgstr "删除所选账户"
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "_Paste"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "Paste the clipboard"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear _history"
+msgstr "清空历史记录(_H)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear the call history"
+msgstr "清空历史记录"
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "_Accounts"
+msgstr "账户(_A)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "Edit your accounts"
+msgstr "当前帐户"
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "_Preferences"
+msgstr "首选项"
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "Change your preferences"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:740
+msgid "_View"
+msgstr "查看(_V)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:743
+msgid "_Help"
+msgstr "帮助(_H)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Contents"
+msgstr "继续"
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Open the manual"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:745
+msgid "About this application"
+msgstr "身份验证"
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "_Transfer"
+msgstr "转接"
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "Transfer the call"
+msgstr "转给: "
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "_Show toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "Show the toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "_Dialpad"
+msgstr "禁用"
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "Show the dialpad"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "_Volume controls"
+msgstr "音量控制(V)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "Show the volume controls"
+msgstr "音量控制(V)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "_History"
+msgstr "历史"
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "Calls history"
+msgstr "呼叫记录"
+
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "_Address book"
+msgstr "地址簿"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1003
+#: ../sflphone-client-gnome/src/uimanager.c:1044
+msgid "On _Hold"
+msgstr "保持(_H)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1107
msgid "_Call back"
msgstr "回叫(_C)"
-#: ../sflphone-client-gnome/src/uimanager.c:1226
-msgid "_New call"
-msgstr "新电话(_N)"
-
-#: ../sflphone-client-gnome/src/uimanager.c:1300
+#: ../sflphone-client-gnome/src/uimanager.c:1258
msgid "Edit phone number"
msgstr "编辑电话号码"
-#: ../sflphone-client-gnome/src/uimanager.c:1311
+#: ../sflphone-client-gnome/src/uimanager.c:1269
msgid "Edit the phone number before making a call"
msgstr "拨出电话前编辑电话号码"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:164
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
msgid "Account Parameters"
msgstr "帐户相关参数"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:173
-#: ../sflphone-client-gnome/src/config/assistant.c:294
-#: ../sflphone-client-gnome/src/config/assistant.c:402
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
+#: ../sflphone-client-gnome/src/config/assistant.c:314
+#: ../sflphone-client-gnome/src/config/assistant.c:427
msgid "_Alias"
msgstr "别名(A)"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:181
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
msgid "_Protocol"
msgstr "协议(P)"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:199
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
msgid "Unknown"
msgstr "未知"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:209
-#: ../sflphone-client-gnome/src/config/assistant.c:302
-#: ../sflphone-client-gnome/src/config/assistant.c:410
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
+#: ../sflphone-client-gnome/src/config/assistant.c:322
+#: ../sflphone-client-gnome/src/config/assistant.c:435
msgid "_Host name"
msgstr "主机名(H)"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:217
-#: ../sflphone-client-gnome/src/config/assistant.c:310
-#: ../sflphone-client-gnome/src/config/assistant.c:418
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
+#: ../sflphone-client-gnome/src/config/assistant.c:330
+#: ../sflphone-client-gnome/src/config/assistant.c:443
msgid "_User name"
msgstr "用户名(U)"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:234
-#: ../sflphone-client-gnome/src/config/assistant.c:326
-#: ../sflphone-client-gnome/src/config/assistant.c:433
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:346
+#: ../sflphone-client-gnome/src/config/assistant.c:458
msgid "_Password"
msgstr "密码(P)"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:254
-#: ../sflphone-client-gnome/src/config/assistant.c:344
-#: ../sflphone-client-gnome/src/config/assistant.c:449
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:363
+#: ../sflphone-client-gnome/src/config/assistant.c:473
+msgid "Show password"
+msgstr "密码"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:368
+#: ../sflphone-client-gnome/src/config/assistant.c:478
msgid "_Voicemail number"
msgstr "语音信箱号码(V)"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:340
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
msgid "Authentication"
-msgstr ""
+msgstr "身份验证"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:341
-#, fuzzy
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
msgid "Secret"
-msgstr "服务器"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:466
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
msgid "Credential"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:501
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
msgid "Authentication name"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:512
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
msgid "Password"
msgstr "密码"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:535
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:909
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:201
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
msgid "Security"
-msgstr ""
+msgstr "安全"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:547
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:213
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
msgid "Use TLS transport (sips)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:552
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:218
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
msgid "SRTP key exchange"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:558
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
-#, fuzzy
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
msgid "Disabled"
-msgstr "拨号盘(_D)"
+msgstr "禁用"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
-#, fuzzy
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
msgid "Registration"
-msgstr "帐户注册"
+msgstr "注册"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:679
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
msgid "Registration expire"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
msgid "_Comply with RFC 3263"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
-msgid "Network"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
+msgid "Network Interface"
+msgstr "网络连接失败"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:707
-#, fuzzy
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
msgid "Local address"
-msgstr "邮件地址"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:744
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
msgid "Local port"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:752
-msgid "Set published address and port:"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
+msgid "Published address"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:756
-msgid "Using STUN "
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+msgid "Using STUN"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:761
-msgid "Same as local parameters"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
+msgid "STUN server URL"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:764
-msgid "Manually"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
+msgid "Same as local parameters"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:769
-#, fuzzy
-msgid "Published address"
-msgstr "启用地址簿"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
+msgid "Set published address and port:"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:777
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
msgid "Published port"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:785
-#, fuzzy
-msgid "STUN server URL"
-msgstr "STUN服务器(S)"
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
msgid "Account settings"
msgstr "帐户设置"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
msgid "Basic"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:904
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
msgid "Advanced"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:169
-msgid "Server returned \""
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:164
+#, c-format
+msgid "Server returned \"%s\" (%d)"
msgstr ""
#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
@@ -495,34 +676,18 @@ msgstr "帐户"
msgid "Configured Accounts"
msgstr "已配置帐户"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:505
-msgid "There "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "is "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "are "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:508
-#, fuzzy
-msgid " active account"
-msgstr "增加新帐户"
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:509
-msgid "s"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
+#, c-format
+msgid "There is %d active account"
+msgid_plural "There are %d active accounts"
+msgstr[0] ""
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:514
-#, fuzzy
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
msgid "You have no active account"
-msgstr "未发现已注册帐户"
+msgstr ""
#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:443
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
msgid "General"
msgstr "常用配置"
@@ -567,225 +732,220 @@ 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:578
+#: ../sflphone-client-gnome/src/config/audioconf.c:577
msgid "Name"
msgstr "名称"
-#: ../sflphone-client-gnome/src/config/assistant.c:69
+#: ../sflphone-client-gnome/src/config/assistant.c:75
#, c-format
msgid "This assistant is now finished."
msgstr "配置完成."
-#: ../sflphone-client-gnome/src/config/assistant.c:71
+#: ../sflphone-client-gnome/src/config/assistant.c:77
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/config/assistant.c:74
+#: ../sflphone-client-gnome/src/config/assistant.c:80
msgid "Alias"
msgstr "别名"
-#: ../sflphone-client-gnome/src/config/assistant.c:78
+#: ../sflphone-client-gnome/src/config/assistant.c:84
msgid "Server"
msgstr "服务器"
-#: ../sflphone-client-gnome/src/config/assistant.c:82
+#: ../sflphone-client-gnome/src/config/assistant.c:88
msgid "Username"
msgstr "用户名"
-#: ../sflphone-client-gnome/src/config/assistant.c:86
+#: ../sflphone-client-gnome/src/config/assistant.c:92
msgid "Security: "
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:88
+#: ../sflphone-client-gnome/src/config/assistant.c:94
msgid "SRTP/ZRTP draft-zimmermann"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:90
-#: ../sflphone-client-gnome/src/config/assistant.c:182
+#: ../sflphone-client-gnome/src/config/assistant.c:96
msgid "None"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:210
+#: ../sflphone-client-gnome/src/config/assistant.c:229
msgid "SFLphone account creation wizard"
msgstr "SFLphone账户创建向导"
-#: ../sflphone-client-gnome/src/config/assistant.c:236
+#: ../sflphone-client-gnome/src/config/assistant.c:255
msgid "Welcome to the Account creation wizard of SFLphone!"
msgstr "欢迎使用SFLphone帐户创建向导!"
-#: ../sflphone-client-gnome/src/config/assistant.c:237
+#: ../sflphone-client-gnome/src/config/assistant.c:256
msgid "This installation wizard will help you configure an account."
msgstr "安装向导将帮助您配置帐户"
-#: ../sflphone-client-gnome/src/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "VoIP Protocols"
msgstr "VoIP协议"
-#: ../sflphone-client-gnome/src/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "Select an account type"
msgstr "选择帐户类型"
-#: ../sflphone-client-gnome/src/config/assistant.c:253
+#: ../sflphone-client-gnome/src/config/assistant.c:272
msgid "SIP (Session Initiation Protocol)"
msgstr "SIP(会话初始化协议)"
-#: ../sflphone-client-gnome/src/config/assistant.c:255
+#: ../sflphone-client-gnome/src/config/assistant.c:274
msgid "IAX2 (InterAsterix Exchange)"
msgstr "IAX2(Asterisk内部交换协议)"
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Account"
msgstr "帐户"
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Please select one of the following options"
msgstr "请选择以下选项中的一个"
-#: ../sflphone-client-gnome/src/config/assistant.c:271
+#: ../sflphone-client-gnome/src/config/assistant.c:290
msgid "Create a free SIP/IAX2 account on sflphone.org"
msgstr "在sflphone.org上创建免费的SIP/IAX2帐户"
-#: ../sflphone-client-gnome/src/config/assistant.c:273
+#: ../sflphone-client-gnome/src/config/assistant.c:292
msgid "Register an existing SIP or IAX2 account"
msgstr "注册已存在的SIP或IAX2帐户"
-#: ../sflphone-client-gnome/src/config/assistant.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:306
msgid "SIP account settings"
msgstr "SIP帐户设置"
-#: ../sflphone-client-gnome/src/config/assistant.c:286
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "Please fill the following information"
msgstr "请填写以下信息"
-#: ../sflphone-client-gnome/src/config/assistant.c:352
-#: ../sflphone-client-gnome/src/config/assistant.c:381
+#: ../sflphone-client-gnome/src/config/assistant.c:376
+#: ../sflphone-client-gnome/src/config/assistant.c:405
msgid "Secure communications with _ZRTP"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "Optional email address"
msgstr "可选邮件地址"
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "This email address will be used to send your voicemail messages."
msgstr "这个邮件地址将被用来发送您的语音邮箱消息"
-#: ../sflphone-client-gnome/src/config/assistant.c:373
+#: ../sflphone-client-gnome/src/config/assistant.c:397
msgid "_Email address"
msgstr "邮件地址(E)"
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "IAX2 account settings"
msgstr "IAX2帐户设置"
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "Network Address Translation (NAT)"
msgstr "网络地址解析(NAT)"
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "You should probably enable this if you are behind a firewall."
msgstr "如果你使用网络使用防火墙，你很有可能需要设定此项."
-#: ../sflphone-client-gnome/src/config/assistant.c:476
+#: ../sflphone-client-gnome/src/config/assistant.c:505
msgid "E_nable STUN"
msgstr "使用STUN(n)"
-#: ../sflphone-client-gnome/src/config/assistant.c:483
+#: ../sflphone-client-gnome/src/config/assistant.c:512
msgid "_STUN server"
msgstr "STUN服务器(S)"
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Account Registration"
msgstr "帐户注册"
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Congratulations!"
msgstr "恭喜！"
-#: ../sflphone-client-gnome/src/config/audioconf.c:583
+#: ../sflphone-client-gnome/src/config/audioconf.c:582
msgid "Frequency"
msgstr "频率"
-#: ../sflphone-client-gnome/src/config/audioconf.c:588
+#: ../sflphone-client-gnome/src/config/audioconf.c:587
msgid "Bitrate"
msgstr "比率"
-#: ../sflphone-client-gnome/src/config/audioconf.c:593
+#: ../sflphone-client-gnome/src/config/audioconf.c:592
msgid "Bandwidth"
msgstr "带宽"
-#: ../sflphone-client-gnome/src/config/audioconf.c:673
+#: ../sflphone-client-gnome/src/config/audioconf.c:670
msgid "ALSA plugin"
msgstr "ALSA插件"
-#: ../sflphone-client-gnome/src/config/audioconf.c:695
+#: ../sflphone-client-gnome/src/config/audioconf.c:692
msgid "Output"
msgstr "输出"
-#: ../sflphone-client-gnome/src/config/audioconf.c:717
+#: ../sflphone-client-gnome/src/config/audioconf.c:714
msgid "Input"
msgstr "输入"
-#: ../sflphone-client-gnome/src/config/audioconf.c:752
+#: ../sflphone-client-gnome/src/config/audioconf.c:749
msgid "_Voice Activity Detection"
msgstr "声音状态检测(V)"
-#: ../sflphone-client-gnome/src/config/audioconf.c:762
+#: ../sflphone-client-gnome/src/config/audioconf.c:759
msgid "_Noise Reduction (Narrow-Band Companding)"
msgstr "降噪处理-窄频压缩(N)"
-#: ../sflphone-client-gnome/src/config/audioconf.c:798
+#: ../sflphone-client-gnome/src/config/audioconf.c:800
msgid "Sound Manager"
msgstr "音频管理器"
-#: ../sflphone-client-gnome/src/config/audioconf.c:807
+#: ../sflphone-client-gnome/src/config/audioconf.c:809
msgid "_Pulseaudio"
msgstr "Pulseaudio"
-#: ../sflphone-client-gnome/src/config/audioconf.c:811
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
msgid "_ALSA"
msgstr "ALSA"
-#: ../sflphone-client-gnome/src/config/audioconf.c:816
-msgid "_Mute other applications during a call"
-msgstr "当有来电时静音其它应用程序(c)"
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:823
+#: ../sflphone-client-gnome/src/config/audioconf.c:819
msgid "ALSA settings"
msgstr "ALSA设置"
-#: ../sflphone-client-gnome/src/config/audioconf.c:840
+#: ../sflphone-client-gnome/src/config/audioconf.c:836
msgid "Codecs"
msgstr "Codecs编码"
-#: ../sflphone-client-gnome/src/config/audioconf.c:869
+#: ../sflphone-client-gnome/src/config/audioconf.c:865
msgid "Recordings"
msgstr "记录"
-#: ../sflphone-client-gnome/src/config/audioconf.c:873
+#: ../sflphone-client-gnome/src/config/audioconf.c:869
msgid "Destination folder"
msgstr "目标文件夹"
-#: ../sflphone-client-gnome/src/config/audioconf.c:877
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
msgid "Select a folder"
msgstr "选择文件夹"
-#: ../sflphone-client-gnome/src/config/audioconf.c:883
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
msgid "Ringtones"
msgstr "铃声"
-#: ../sflphone-client-gnome/src/config/audioconf.c:889
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
msgid "_Enable ringtones"
msgstr "启用铃声(E)"
-#: ../sflphone-client-gnome/src/config/audioconf.c:895
+#: ../sflphone-client-gnome/src/config/audioconf.c:891
msgid "Choose a ringtone"
msgstr "选择铃声"
-#: ../sflphone-client-gnome/src/config/audioconf.c:901
+#: ../sflphone-client-gnome/src/config/audioconf.c:897
msgid "Audio Files"
msgstr "音频文件"
@@ -822,87 +982,66 @@ msgstr "重设电话号码"
msgid "_Prefix dialed numbers with"
msgstr "号码前缀(P)"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:195
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
msgid ""
"This profile is used when you want to reach a remote peer simply by typing a "
"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
"also be used if no account can be matched to an incoming or outgoing call."
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:274
-msgid "SIP Port"
-msgstr "SIP端口号"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:281
-msgid "UDP Transport"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:319
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
msgid "Desktop Notifications"
msgstr "桌面提示"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:323
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
msgid "_Enable notifications"
msgstr "启用提示(E)"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:329
-msgid "Enable voicemail _notifications"
-msgstr "启用语音邮箱提示(n)"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:341
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
msgid "System Tray Icon"
msgstr "系统托盘图标"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
msgid "_Popup main window on incoming call"
msgstr "来电时弹出主窗口(P)"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:349
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
msgid "Ne_ver popup main window"
msgstr "从不弹出主窗口(v)"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:353
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
msgid "Hide SFLphone window on _startup"
msgstr "在启动时隐藏SFLphone主窗口"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:359
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
msgid "Calls History"
msgstr "拨号历史"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:362
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
msgid "_Keep my history for at least"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:373
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
msgid "days"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:377
-#, fuzzy
-msgid "Configuration File"
-msgstr "Stun配置有误"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:379
-msgid "Store SIP credentials as MD5 hash"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:423
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
msgid "Preferences"
msgstr "首选项"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:448
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
msgid "Audio"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
msgid "Address Book"
msgstr "地址簿"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:458
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
msgid "Hooks"
msgstr "钩键"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:468
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
msgid "Direct IP calls"
msgstr ""
@@ -910,11 +1049,11 @@ msgstr ""
msgid "Advanced options for TLS"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:55
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:56
msgid "TLS transport"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:59
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:60
msgid ""
"TLS transport can be used along with UDP for those calls that would\n"
"require secure sip transactions (aka SIPS). You can configure a different\n"
@@ -923,55 +1062,55 @@ msgid ""
"port, different one from each other\n"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:100
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
msgid "Certificate of Authority list"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:104
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
msgid "Choose a CA list file (optional)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:115
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
msgid "Public endpoint certificate file"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:119
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
msgid "Choose a public endpoint certificate (optional)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:134
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
msgid "Choose a private key file (optional)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:145
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
msgid "Password for the private key"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:168
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
msgid "TLS protocol method"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:202
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
msgid "TLS cipher list"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:211
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
msgid "Server name instance for outgoing TLS connection"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:219
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
msgid "Negotiation timeout (sec:msec)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:236
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
msgid "Verify incoming certificates, as a server"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:242
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
msgid "Verify certificates from answer, as a client"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:248
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
msgid "Require certificate for incoming tls connections"
msgstr ""
@@ -979,45 +1118,63 @@ msgstr ""
msgid "ZRTP Options"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:68
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:69
msgid "Send Hello Hash in S_DP"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:74
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:75
msgid "Ask User to Confirm SAS"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:80
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:81
msgid "_Warn if ZRTP not supported"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:86
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:87
msgid "Display SAS once for hold events"
msgstr ""
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:58
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
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:59
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:72
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:84
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:96
msgid "Click here to change the search type"
msgstr "请点击此处改变查询方式"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:71
msgid "Search by missed call"
msgstr "从未接电话中查询"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:83
msgid "Search by incoming call"
msgstr "从来电中查询"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:95
msgid "Search by outgoing call"
msgstr "从拨出电话中查询"
+#~ msgid "IP call - %s"
+#~ msgstr "IP 电话 - %s"
+
+#~ msgid "Codec"
+#~ msgstr "编码"
+
+#~ msgid "Network"
+#~ msgstr "网络"
+
+#~ msgid "_Mute other applications during a call"
+#~ msgstr "当有来电时静音其它应用程序(c)"
+
+#~ msgid "SIP Port"
+#~ msgstr "SIP端口号"
+
+#~ msgid "Enable voicemail _notifications"
+#~ msgstr "启用语音邮箱提示(n)"
+
#~ msgid "Account creation wizard"
#~ msgstr "帐户创建向导"
@@ -1038,9 +1195,6 @@ msgstr "从拨出电话中查询"
#~ msgid "Default account"
#~ msgstr "默认帐户"
-#~ msgid "Transfer to : "
-#~ msgstr "转给: "
-
#~ msgid "SFLphone KDE Client"
#~ msgstr "SFLphone KDE客户端"
@@ -1050,27 +1204,9 @@ msgstr "从拨出电话中查询"
#~ msgid "Jérémy Quentin"
#~ msgstr "Jérémy Quentin"
-#~ msgctxt "NAME OF TRANSLATORS"
-#~ msgid "Your names"
-#~ msgstr ""
-#~ "Yun Liu, ,Launchpad Contributions:,Aron Xu,Yun Liu, ,Launchpad "
-#~ "Contributions:,Aron Xu,Yinghua Wang,Yun Liu,rainofchaos"
-
-#~ msgctxt "EMAIL OF TRANSLATORS"
-#~ msgid "Your emails"
-#~ msgstr ""
-#~ "yunliu2000@gmail.com,,,happyaron.xu@gmail.com,,,,happyaron.xu@gmail.com,,,"
-#~ "rainofchaos@gmail.com"
-
#~ msgid "Main screen"
#~ msgstr "主屏幕"
-#~ msgid "Call history"
-#~ msgstr "呼叫记录"
-
-#~ msgid "Address book"
-#~ msgstr "地址簿"
-
#~ msgid "Configure SFLphone"
#~ msgstr "配置SFLphone"
@@ -1104,9 +1240,6 @@ msgstr "从拨出电话中查询"
#~ msgid "Hold on"
#~ msgstr "呼叫保持"
-#~ msgid "Transfer"
-#~ msgstr "转接"
-
#~ msgid "Record"
#~ msgstr "记录"
@@ -1134,9 +1267,6 @@ msgstr "从拨出电话中查询"
#~ "取消选择则会禁用该账户。通过\"加\"\"减\"按钮可以添加或删除账户。点击\"编辑"
#~ "\"按钮可以改变账户的设置。"
-#~ msgid "Remove the selected account"
-#~ msgstr "删除所选账户"
-
#~ 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 "
@@ -1251,9 +1381,6 @@ msgstr "从拨出电话中查询"
#~ msgid "On start"
#~ msgstr "正在启动"
-#~ msgid "Clear history"
-#~ msgstr "清空历史记录"
-
#~ msgid "Trigger on specific SIP header"
#~ msgstr "激活指定的SIP头"
@@ -1266,33 +1393,9 @@ msgstr "从拨出电话中查询"
#~ msgid "Prefix dialed numbers with"
#~ msgstr "号码前缀"
-#~ msgid "History"
-#~ msgstr "历史"
-
#~ msgid "Attention:number of results exceeds max displayed."
#~ msgstr "注意:结果超过可显示的最大值"
-#~ msgid "_Help"
-#~ msgstr "帮助(_H)"
-
-#~ msgid "_Account creation wizard"
-#~ msgstr "帐户创建向导(_A)"
-
-#~ msgid "_Call"
-#~ msgstr "电话(_C)"
-
-#~ msgid "Clear _history"
-#~ msgstr "清空历史记录(_H)"
-
-#~ msgid "_Accounts"
-#~ msgstr "账户(_A)"
-
-#~ msgid "_Edit"
-#~ msgstr "编辑(_E)"
-
-#~ msgid "_View"
-#~ msgstr "查看(_V)"
-
#~ msgid "_Enable this account"
#~ msgstr "启用该账户(E)"
@@ -1302,9 +1405,6 @@ msgstr "从拨出电话中查询"
#~ msgid "Port"
#~ msgstr "端口"
-#~ msgid "_Volume controls"
-#~ msgstr "音量控制(V)"
-
#~ msgctxt "Config section"
#~ msgid "Accounts"
#~ msgstr "帐户"
@@ -1444,9 +1544,6 @@ msgstr "从拨出电话中查询"
#~ msgid "\"Voicemail\" <%s>"
#~ msgstr "\"语音邮件\" <%s>"
-#~ msgid "Off Hold"
-#~ msgstr "恢复通话"
-
#~ msgid "Record a call"
#~ msgstr "记录通话"
@@ -1595,3 +1692,22 @@ msgstr "从拨出电话中查询"
#~ msgid "_STUN Server"
#~ msgstr "STUN服务器(S)"
+
+#~ msgid "_Account creation wizard"
+#~ msgstr "帐户创建向导(_A)"
+
+#~ msgctxt "NAME OF TRANSLATORS"
+#~ msgid "Your names"
+#~ msgstr ""
+#~ "Yun Liu, ,Launchpad Contributions:,Aron Xu,Yun Liu, ,Launchpad "
+#~ "Contributions:,Aron Xu,Yinghua Wang,Yun Liu,rainofchaos, ,Launchpad "
+#~ "Contributions:,Aron Xu,Yinghua Wang,Yun Liu,冯超, ,Launchpad "
+#~ "Contributions:,Aron Xu,Emmanuel Milou,Yun Liu,冯超,王英华"
+
+#~ msgctxt "EMAIL OF TRANSLATORS"
+#~ msgid "Your emails"
+#~ msgstr ""
+#~ "yunliu2000@gmail.com,,,happyaron.xu@gmail.com,,,,happyaron.xu@gmail.com,,,"
+#~ "rainofchaos@gmail.com,,,happyaron.xu@gmail.com,,,rainofchaos@gmail.com,,,,"
+#~ "emmanuel.milou@savoirfairelinux.com,,rainofchaos@gmail.com,"
+#~ "wantinghard@gmail.com"
diff --git a/lang/zh_HK/zh_HK.po b/lang/zh_HK/zh_HK.po
index 6cc983115e30508c0a05a29ace1cce430197e383..0e4afca0c52ab6cb04c97d2e67f3c4fd39c9c273 100644
--- a/lang/zh_HK/zh_HK.po
+++ b/lang/zh_HK/zh_HK.po
@@ -4,20 +4,19 @@
#
# Yun Liu <yun.liu@savoirfairelinux.com>, 2008.
#
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:509
msgid ""
msgstr ""
"Project-Id-Version: SFLphone 0.9.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-14 11:18-0400\n"
-"PO-Revision-Date: 2009-10-07 16:34+0000\n"
+"POT-Creation-Date: 2009-12-03 10:22-0500\n"
+"PO-Revision-Date: 2009-10-26 20:46+0000\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=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-10-14 15:20+0000\n"
+"X-Launchpad-Export-Date: 2009-12-03 15:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: ../sflphone-client-gnome/src/accountlist.c:175
@@ -62,24 +61,15 @@ msgstr "Stun伺服器無效"
msgid "Invalid"
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 個語音郵件"
-
-#: ../sflphone-client-gnome/src/actions.c:83
-#: ../sflphone-client-gnome/src/actions.c:919
-#: ../sflphone-client-gnome/src/actions.c:926
+#: ../sflphone-client-gnome/src/actions.c:98
msgid "Using account"
msgstr "使用賬戶"
-#: ../sflphone-client-gnome/src/actions.c:89
+#: ../sflphone-client-gnome/src/actions.c:104
msgid "No registered accounts"
msgstr "沒有已註冊帳戶"
-#: ../sflphone-client-gnome/src/actions.c:268
+#: ../sflphone-client-gnome/src/actions.c:285
msgid ""
"Unable to connect to the SFLphone server.\n"
"Make sure the daemon is running."
@@ -87,16 +77,12 @@ msgstr ""
"連接SFLphone伺服器失敗.\n"
"請核查daemon是否正在運行."
-#: ../sflphone-client-gnome/src/actions.c:913
-#, c-format
-msgid "IP call - %s"
-msgstr "IP電話- %s"
-
-#: ../sflphone-client-gnome/src/actions.c:922
-msgid "Codec"
-msgstr "編碼"
+#: ../sflphone-client-gnome/src/actions.c:589
+#: ../sflphone-client-gnome/src/actions.c:911
+msgid "Direct SIP call"
+msgstr ""
-#: ../sflphone-client-gnome/src/actions.c:1119
+#: ../sflphone-client-gnome/src/actions.c:1103
#, c-format
msgid ""
"<b>Error: No audio codecs found.\n"
@@ -151,54 +137,53 @@ msgstr "有電話正在處理中."
msgid "Do you still want to quit?"
msgstr "確認要退出?"
-#: ../sflphone-client-gnome/src/mainwindow.c:299
+#: ../sflphone-client-gnome/src/mainwindow.c:298
msgid "SFLphone Error"
msgstr "SFLphone 出錯"
-#: ../sflphone-client-gnome/src/mainwindow.c:391
+#: ../sflphone-client-gnome/src/mainwindow.c:392
#, c-format
msgid "ZRTP is not supported by peer %s\n"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:392
+#: ../sflphone-client-gnome/src/mainwindow.c:393
msgid "Secure Communication Unavailable"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:393
-#: ../sflphone-client-gnome/src/mainwindow.c:415
-#, fuzzy
-msgid "Continue"
-msgstr "連接"
-
#: ../sflphone-client-gnome/src/mainwindow.c:394
#: ../sflphone-client-gnome/src/mainwindow.c:416
-#: ../sflphone-client-gnome/src/mainwindow.c:430
+msgid "Continue"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/mainwindow.c:395
+#: ../sflphone-client-gnome/src/mainwindow.c:417
+#: ../sflphone-client-gnome/src/mainwindow.c:431
msgid "Stop Call"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:413
+#: ../sflphone-client-gnome/src/mainwindow.c:414
#, c-format
msgid ""
"A %s error forced the call with %s to fall under unencrypted mode.\n"
"Exact reason: %s\n"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:414
+#: ../sflphone-client-gnome/src/mainwindow.c:415
msgid "ZRTP negotiation failed"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:427
+#: ../sflphone-client-gnome/src/mainwindow.c:428
#, c-format
msgid ""
"%s wants to stop using secure communication. Confirm will resume "
"conversation without SRTP.\n"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:428
+#: ../sflphone-client-gnome/src/mainwindow.c:429
msgid "Confirm Go Clear"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:429
+#: ../sflphone-client-gnome/src/mainwindow.c:430
msgid "Confirm"
msgstr ""
@@ -213,6 +198,12 @@ msgstr "%s 帳戶 : %s"
msgid "<i>From</i> %s"
msgstr "<i>撥入方</i> %s"
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+#, c-format
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] "%d 個語音郵件"
+
#: ../sflphone-client-gnome/src/sflnotify.c:111
#, c-format
msgid "Calling with %s account <i>%s</i>"
@@ -248,9 +239,9 @@ msgid "ZRTP negotiation failed with %s"
msgstr ""
#: ../sflphone-client-gnome/src/sflnotify.c:235
-#, fuzzy, c-format
+#, c-format
msgid "<i>With:</i> %s"
-msgstr "<i>撥入方</i> %s"
+msgstr ""
#: ../sflphone-client-gnome/src/sliders.c:162
msgid "Speakers volume"
@@ -260,223 +251,413 @@ msgstr "揚聲器音量"
msgid "Mic volume"
msgstr "話筒音量"
-#: ../sflphone-client-gnome/src/statusicon.c:91
+#: ../sflphone-client-gnome/src/statusicon.c:96
msgid "_Show main window"
msgstr "顯示主窗口(S)"
-#: ../sflphone-client-gnome/src/statusicon.c:126
+#: ../sflphone-client-gnome/src/statusicon.c:131
msgid "SFLphone"
msgstr "SFLphone"
-#: ../sflphone-client-gnome/src/statusicon.c:127
+#: ../sflphone-client-gnome/src/statusicon.c:132
#, c-format
msgid "%i account configured"
msgid_plural "%i accounts configured"
msgstr[0] "已配置了%i個賬戶"
#: ../sflphone-client-gnome/src/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:750
+#: ../sflphone-client-gnome/src/uimanager.c:693
+#: ../sflphone-client-gnome/src/uimanager.c:727
msgid "Voicemail"
msgstr "語音郵件"
-#: ../sflphone-client-gnome/src/uimanager.c:403
+#: ../sflphone-client-gnome/src/uimanager.c:117
+msgid "No address book selected"
+msgstr "地址簿"
+
+#: ../sflphone-client-gnome/src/uimanager.c:137
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "Address book"
+msgstr "地址簿"
+
+#: ../sflphone-client-gnome/src/uimanager.c:279
+msgid "Voicemail (%i)"
+msgstr "語音郵件 (%i)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:342
msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
msgstr "SFLphone是一個VoIP客戶端，它兼容SIP和IAX2协议."
-#: ../sflphone-client-gnome/src/uimanager.c:406
+#: ../sflphone-client-gnome/src/uimanager.c:345
msgid "About SFLphone"
msgstr "有關SFLphone"
-#: ../sflphone-client-gnome/src/uimanager.c:1028
+#: ../sflphone-client-gnome/src/uimanager.c:719
+msgid "Call"
+msgstr "電話"
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:1184
+msgid "_New call"
+msgstr "新電話(N)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+msgid "Place a new call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:979
msgid "_Pick up"
msgstr "撥出(P)"
-#: ../sflphone-client-gnome/src/uimanager.c:1040
-#: ../sflphone-client-gnome/src/uimanager.c:1081
+#: ../sflphone-client-gnome/src/uimanager.c:721
+msgid "Answer the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:991
+#: ../sflphone-client-gnome/src/uimanager.c:1032
msgid "_Hang up"
msgstr "放下(H)"
-#: ../sflphone-client-gnome/src/uimanager.c:1052
-#: ../sflphone-client-gnome/src/uimanager.c:1093
-msgid "On _Hold"
+#: ../sflphone-client-gnome/src/uimanager.c:722
+msgid "Finish the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "O_n hold"
msgstr "待机"
-#: ../sflphone-client-gnome/src/uimanager.c:1064
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "Place the call on hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "O_ff hold"
+msgstr "恢复通話"
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "Place the call off hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:725
+#: ../sflphone-client-gnome/src/uimanager.c:1015
msgid "_Record"
msgstr "記錄(R)"
-#: ../sflphone-client-gnome/src/uimanager.c:1154
+#: ../sflphone-client-gnome/src/uimanager.c:725
+msgid "Record the current conversation"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Configuration _Assistant"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Run the configuration assistant"
+msgstr "Stun配置有誤"
+
+#: ../sflphone-client-gnome/src/uimanager.c:727
+msgid "Call your voicemail"
+msgstr "%d 個語音郵件"
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "_Close"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "Minimize to system tray"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "_Quit"
+msgstr "編輯(E)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "Quit the program"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:732
+msgid "_Edit"
+msgstr "編輯(E)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "_Copy"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "Copy the selection"
+msgstr "刪除所選賬戶"
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "_Paste"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "Paste the clipboard"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear _history"
+msgstr "清空曆史記錄(C)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear the call history"
+msgstr "清空曆史記錄"
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "_Accounts"
+msgstr "帳戶(A)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "Edit your accounts"
+msgstr "當前帳戶"
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "_Preferences"
+msgstr "屬性"
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "Change your preferences"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:740
+msgid "_View"
+msgstr "查看(V)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:743
+msgid "_Help"
+msgstr "幫助(H)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Contents"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Open the manual"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:745
+msgid "About this application"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "_Transfer"
+msgstr "轉接"
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "Transfer the call"
+msgstr "轉給: "
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "_Show toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "Show the toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "_Dialpad"
+msgstr "顯示撥號鍵盤"
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "Show the dialpad"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "_Volume controls"
+msgstr "音量控制(V)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "Show the volume controls"
+msgstr "音量控制(V)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "_History"
+msgstr "歷史"
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "Calls history"
+msgstr "呼叫記錄"
+
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "_Address book"
+msgstr "地址簿"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1003
+#: ../sflphone-client-gnome/src/uimanager.c:1044
+msgid "On _Hold"
+msgstr "待机"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1107
msgid "_Call back"
msgstr "回叫(C)"
-#: ../sflphone-client-gnome/src/uimanager.c:1226
-msgid "_New call"
-msgstr "新電話(N)"
-
-#: ../sflphone-client-gnome/src/uimanager.c:1300
+#: ../sflphone-client-gnome/src/uimanager.c:1258
msgid "Edit phone number"
msgstr "編輯電話號碼"
-#: ../sflphone-client-gnome/src/uimanager.c:1311
+#: ../sflphone-client-gnome/src/uimanager.c:1269
msgid "Edit the phone number before making a call"
msgstr "撥出電話前編輯電話號碼"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:164
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
msgid "Account Parameters"
msgstr "帳戶相關參數"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:173
-#: ../sflphone-client-gnome/src/config/assistant.c:294
-#: ../sflphone-client-gnome/src/config/assistant.c:402
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
+#: ../sflphone-client-gnome/src/config/assistant.c:314
+#: ../sflphone-client-gnome/src/config/assistant.c:427
msgid "_Alias"
msgstr "別稱(A)"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:181
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
msgid "_Protocol"
msgstr "協議(P)"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:199
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
msgid "Unknown"
msgstr "未知"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:209
-#: ../sflphone-client-gnome/src/config/assistant.c:302
-#: ../sflphone-client-gnome/src/config/assistant.c:410
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
+#: ../sflphone-client-gnome/src/config/assistant.c:322
+#: ../sflphone-client-gnome/src/config/assistant.c:435
msgid "_Host name"
msgstr "主机名稱(H)"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:217
-#: ../sflphone-client-gnome/src/config/assistant.c:310
-#: ../sflphone-client-gnome/src/config/assistant.c:418
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
+#: ../sflphone-client-gnome/src/config/assistant.c:330
+#: ../sflphone-client-gnome/src/config/assistant.c:443
msgid "_User name"
msgstr "使用者名稱(U)"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:234
-#: ../sflphone-client-gnome/src/config/assistant.c:326
-#: ../sflphone-client-gnome/src/config/assistant.c:433
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:346
+#: ../sflphone-client-gnome/src/config/assistant.c:458
msgid "_Password"
msgstr "密碼(P)"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:254
-#: ../sflphone-client-gnome/src/config/assistant.c:344
-#: ../sflphone-client-gnome/src/config/assistant.c:449
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:363
+#: ../sflphone-client-gnome/src/config/assistant.c:473
+msgid "Show password"
+msgstr "密碼"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:368
+#: ../sflphone-client-gnome/src/config/assistant.c:478
msgid "_Voicemail number"
msgstr "語音郵箱(V)"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:340
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
msgid "Authentication"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:341
-#, fuzzy
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
msgid "Secret"
-msgstr "伺服器"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:466
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
msgid "Credential"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:501
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
msgid "Authentication name"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:512
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
msgid "Password"
msgstr "密碼"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:535
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:909
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:201
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
msgid "Security"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:547
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:213
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
msgid "Use TLS transport (sips)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:552
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:218
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
msgid "SRTP key exchange"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:558
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
-#, fuzzy
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
msgid "Disabled"
-msgstr "撥號面板"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
-#, fuzzy
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
msgid "Registration"
-msgstr "帳戶註冊"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:679
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
msgid "Registration expire"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
msgid "_Comply with RFC 3263"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
-msgid "Network"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
+msgid "Network Interface"
+msgstr "網路連線失敗"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:707
-#, fuzzy
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
msgid "Local address"
-msgstr "郵件地址"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:744
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
msgid "Local port"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:752
-msgid "Set published address and port:"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
+msgid "Published address"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:756
-msgid "Using STUN "
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+msgid "Using STUN"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:761
-msgid "Same as local parameters"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
+msgid "STUN server URL"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:764
-msgid "Manually"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
+msgid "Same as local parameters"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:769
-#, fuzzy
-msgid "Published address"
-msgstr "啟用地址簿"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
+msgid "Set published address and port:"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:777
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
msgid "Published port"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:785
-#, fuzzy
-msgid "STUN server URL"
-msgstr "STUN伺服器(S)"
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
msgid "Account settings"
msgstr "帳戶設置"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
msgid "Basic"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:904
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
msgid "Advanced"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:169
-msgid "Server returned \""
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:164
+#, c-format
+msgid "Server returned \"%s\" (%d)"
msgstr ""
#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
@@ -495,34 +676,18 @@ msgstr "帳戶"
msgid "Configured Accounts"
msgstr "已配置帳戶"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:505
-msgid "There "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "is "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "are "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:508
-#, fuzzy
-msgid " active account"
-msgstr "增加新帳戶"
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:509
-msgid "s"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
+#, c-format
+msgid "There is %d active account"
+msgid_plural "There are %d active accounts"
+msgstr[0] ""
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:514
-#, fuzzy
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
msgid "You have no active account"
-msgstr "未發現已註冊帳戶"
+msgstr ""
#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:443
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
msgid "General"
msgstr "常用配置"
@@ -567,225 +732,220 @@ 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:578
+#: ../sflphone-client-gnome/src/config/audioconf.c:577
msgid "Name"
msgstr "名稱"
-#: ../sflphone-client-gnome/src/config/assistant.c:69
+#: ../sflphone-client-gnome/src/config/assistant.c:75
#, c-format
msgid "This assistant is now finished."
msgstr "配置完成."
-#: ../sflphone-client-gnome/src/config/assistant.c:71
+#: ../sflphone-client-gnome/src/config/assistant.c:77
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/config/assistant.c:74
+#: ../sflphone-client-gnome/src/config/assistant.c:80
msgid "Alias"
msgstr "別稱"
-#: ../sflphone-client-gnome/src/config/assistant.c:78
+#: ../sflphone-client-gnome/src/config/assistant.c:84
msgid "Server"
msgstr "伺服器"
-#: ../sflphone-client-gnome/src/config/assistant.c:82
+#: ../sflphone-client-gnome/src/config/assistant.c:88
msgid "Username"
msgstr "使用者名稱"
-#: ../sflphone-client-gnome/src/config/assistant.c:86
+#: ../sflphone-client-gnome/src/config/assistant.c:92
msgid "Security: "
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:88
+#: ../sflphone-client-gnome/src/config/assistant.c:94
msgid "SRTP/ZRTP draft-zimmermann"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:90
-#: ../sflphone-client-gnome/src/config/assistant.c:182
+#: ../sflphone-client-gnome/src/config/assistant.c:96
msgid "None"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:210
+#: ../sflphone-client-gnome/src/config/assistant.c:229
msgid "SFLphone account creation wizard"
msgstr "SFLphone賬戶創建嚮導"
-#: ../sflphone-client-gnome/src/config/assistant.c:236
+#: ../sflphone-client-gnome/src/config/assistant.c:255
msgid "Welcome to the Account creation wizard of SFLphone!"
msgstr "歡迎使用SFLphone帳戶創建嚮導!"
-#: ../sflphone-client-gnome/src/config/assistant.c:237
+#: ../sflphone-client-gnome/src/config/assistant.c:256
msgid "This installation wizard will help you configure an account."
msgstr "安裝向導將幫助您配置帳戶"
-#: ../sflphone-client-gnome/src/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "VoIP Protocols"
msgstr "VoIP協議"
-#: ../sflphone-client-gnome/src/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "Select an account type"
msgstr "選擇帳戶類型"
-#: ../sflphone-client-gnome/src/config/assistant.c:253
+#: ../sflphone-client-gnome/src/config/assistant.c:272
msgid "SIP (Session Initiation Protocol)"
msgstr "SIP(會話初始化協議)"
-#: ../sflphone-client-gnome/src/config/assistant.c:255
+#: ../sflphone-client-gnome/src/config/assistant.c:274
msgid "IAX2 (InterAsterix Exchange)"
msgstr "IAX2(Asterisk內部交換協議)"
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Account"
msgstr "帳戶"
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Please select one of the following options"
msgstr "請選擇以下選項中的一個"
-#: ../sflphone-client-gnome/src/config/assistant.c:271
+#: ../sflphone-client-gnome/src/config/assistant.c:290
msgid "Create a free SIP/IAX2 account on sflphone.org"
msgstr "在sflphone.org上創建免費的SIP/IAX2帳戶"
-#: ../sflphone-client-gnome/src/config/assistant.c:273
+#: ../sflphone-client-gnome/src/config/assistant.c:292
msgid "Register an existing SIP or IAX2 account"
msgstr "註冊已存在的SIP或IAX2帳戶"
-#: ../sflphone-client-gnome/src/config/assistant.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:306
msgid "SIP account settings"
msgstr "SIP帳戶配置"
-#: ../sflphone-client-gnome/src/config/assistant.c:286
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "Please fill the following information"
msgstr "請填寫如下信息"
-#: ../sflphone-client-gnome/src/config/assistant.c:352
-#: ../sflphone-client-gnome/src/config/assistant.c:381
+#: ../sflphone-client-gnome/src/config/assistant.c:376
+#: ../sflphone-client-gnome/src/config/assistant.c:405
msgid "Secure communications with _ZRTP"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "Optional email address"
msgstr "可選郵件地址"
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "This email address will be used to send your voicemail messages."
msgstr "這個郵件地址將被用來發送您的語音"
-#: ../sflphone-client-gnome/src/config/assistant.c:373
+#: ../sflphone-client-gnome/src/config/assistant.c:397
msgid "_Email address"
msgstr "郵件地址(E)"
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "IAX2 account settings"
msgstr "IAX2帳戶配置"
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "Network Address Translation (NAT)"
msgstr "网络地址解析(NAT)"
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "You should probably enable this if you are behind a firewall."
msgstr "如果你使用網路防火牆，你很有可能需要設定該項."
-#: ../sflphone-client-gnome/src/config/assistant.c:476
+#: ../sflphone-client-gnome/src/config/assistant.c:505
msgid "E_nable STUN"
msgstr "啟用STUN(n)"
-#: ../sflphone-client-gnome/src/config/assistant.c:483
+#: ../sflphone-client-gnome/src/config/assistant.c:512
msgid "_STUN server"
msgstr "STUN伺服器(S)"
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Account Registration"
msgstr "帳戶註冊"
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Congratulations!"
msgstr "恭喜！"
-#: ../sflphone-client-gnome/src/config/audioconf.c:583
+#: ../sflphone-client-gnome/src/config/audioconf.c:582
msgid "Frequency"
msgstr "顰律"
-#: ../sflphone-client-gnome/src/config/audioconf.c:588
+#: ../sflphone-client-gnome/src/config/audioconf.c:587
msgid "Bitrate"
msgstr "比率"
-#: ../sflphone-client-gnome/src/config/audioconf.c:593
+#: ../sflphone-client-gnome/src/config/audioconf.c:592
msgid "Bandwidth"
msgstr "顰寬"
-#: ../sflphone-client-gnome/src/config/audioconf.c:673
+#: ../sflphone-client-gnome/src/config/audioconf.c:670
msgid "ALSA plugin"
msgstr "ALSA插件"
-#: ../sflphone-client-gnome/src/config/audioconf.c:695
+#: ../sflphone-client-gnome/src/config/audioconf.c:692
msgid "Output"
msgstr "輸出"
-#: ../sflphone-client-gnome/src/config/audioconf.c:717
+#: ../sflphone-client-gnome/src/config/audioconf.c:714
msgid "Input"
msgstr "輸入"
-#: ../sflphone-client-gnome/src/config/audioconf.c:752
+#: ../sflphone-client-gnome/src/config/audioconf.c:749
msgid "_Voice Activity Detection"
msgstr "聲音狀態檢測(V)"
-#: ../sflphone-client-gnome/src/config/audioconf.c:762
+#: ../sflphone-client-gnome/src/config/audioconf.c:759
msgid "_Noise Reduction (Narrow-Band Companding)"
msgstr "降噪處理-窄頻壓縮(N)"
-#: ../sflphone-client-gnome/src/config/audioconf.c:798
+#: ../sflphone-client-gnome/src/config/audioconf.c:800
msgid "Sound Manager"
msgstr "聲音管理器"
-#: ../sflphone-client-gnome/src/config/audioconf.c:807
+#: ../sflphone-client-gnome/src/config/audioconf.c:809
msgid "_Pulseaudio"
msgstr "Pulseaudio"
-#: ../sflphone-client-gnome/src/config/audioconf.c:811
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
msgid "_ALSA"
msgstr "ALSA"
-#: ../sflphone-client-gnome/src/config/audioconf.c:816
-msgid "_Mute other applications during a call"
-msgstr "當有來電時靜音其它應用程序(c)"
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:823
+#: ../sflphone-client-gnome/src/config/audioconf.c:819
msgid "ALSA settings"
msgstr "ALSA 配置"
-#: ../sflphone-client-gnome/src/config/audioconf.c:840
+#: ../sflphone-client-gnome/src/config/audioconf.c:836
msgid "Codecs"
msgstr "編碼"
-#: ../sflphone-client-gnome/src/config/audioconf.c:869
+#: ../sflphone-client-gnome/src/config/audioconf.c:865
msgid "Recordings"
msgstr "記錄"
-#: ../sflphone-client-gnome/src/config/audioconf.c:873
+#: ../sflphone-client-gnome/src/config/audioconf.c:869
msgid "Destination folder"
msgstr "目標文件夾"
-#: ../sflphone-client-gnome/src/config/audioconf.c:877
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
msgid "Select a folder"
msgstr "選擇文件夾"
-#: ../sflphone-client-gnome/src/config/audioconf.c:883
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
msgid "Ringtones"
msgstr "鈴聲"
-#: ../sflphone-client-gnome/src/config/audioconf.c:889
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
msgid "_Enable ringtones"
msgstr "啟動鈴聲(E)"
-#: ../sflphone-client-gnome/src/config/audioconf.c:895
+#: ../sflphone-client-gnome/src/config/audioconf.c:891
msgid "Choose a ringtone"
msgstr "鈴聲選擇"
-#: ../sflphone-client-gnome/src/config/audioconf.c:901
+#: ../sflphone-client-gnome/src/config/audioconf.c:897
msgid "Audio Files"
msgstr "音訊檔案"
@@ -822,87 +982,66 @@ msgstr "重設電話號碼"
msgid "_Prefix dialed numbers with"
msgstr "號碼前綴(P)"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:195
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
msgid ""
"This profile is used when you want to reach a remote peer simply by typing a "
"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
"also be used if no account can be matched to an incoming or outgoing call."
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:274
-msgid "SIP Port"
-msgstr "SIP端口"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:281
-msgid "UDP Transport"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:319
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
msgid "Desktop Notifications"
msgstr "桌面提示"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:323
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
msgid "_Enable notifications"
msgstr "啟動提示(E)"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:329
-msgid "Enable voicemail _notifications"
-msgstr "啟用語音郵箱提示(n)"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:341
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
msgid "System Tray Icon"
msgstr "系統托盤圖標"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
msgid "_Popup main window on incoming call"
msgstr "來電話時彈出主視窗(P)"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:349
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
msgid "Ne_ver popup main window"
msgstr "從不彈出主視窗(v)"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:353
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
msgid "Hide SFLphone window on _startup"
msgstr "在啟動時隱藏SFLphone主窗口"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:359
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
msgid "Calls History"
msgstr "打電話歷史"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:362
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
msgid "_Keep my history for at least"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:373
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
msgid "days"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:377
-#, fuzzy
-msgid "Configuration File"
-msgstr "Stun配置有誤"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:379
-msgid "Store SIP credentials as MD5 hash"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:423
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
msgid "Preferences"
msgstr "屬性"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:448
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
msgid "Audio"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
msgid "Address Book"
msgstr "地址簿"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:458
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
msgid "Hooks"
msgstr "鉤鍵"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:468
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
msgid "Direct IP calls"
msgstr ""
@@ -910,11 +1049,11 @@ msgstr ""
msgid "Advanced options for TLS"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:55
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:56
msgid "TLS transport"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:59
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:60
msgid ""
"TLS transport can be used along with UDP for those calls that would\n"
"require secure sip transactions (aka SIPS). You can configure a different\n"
@@ -923,55 +1062,55 @@ msgid ""
"port, different one from each other\n"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:100
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
msgid "Certificate of Authority list"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:104
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
msgid "Choose a CA list file (optional)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:115
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
msgid "Public endpoint certificate file"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:119
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
msgid "Choose a public endpoint certificate (optional)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:134
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
msgid "Choose a private key file (optional)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:145
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
msgid "Password for the private key"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:168
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
msgid "TLS protocol method"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:202
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
msgid "TLS cipher list"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:211
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
msgid "Server name instance for outgoing TLS connection"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:219
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
msgid "Negotiation timeout (sec:msec)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:236
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
msgid "Verify incoming certificates, as a server"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:242
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
msgid "Verify certificates from answer, as a client"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:248
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
msgid "Require certificate for incoming tls connections"
msgstr ""
@@ -979,45 +1118,60 @@ msgstr ""
msgid "ZRTP Options"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:68
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:69
msgid "Send Hello Hash in S_DP"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:74
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:75
msgid "Ask User to Confirm SAS"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:80
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:81
msgid "_Warn if ZRTP not supported"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:86
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:87
msgid "Display SAS once for hold events"
msgstr ""
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:58
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
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:59
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:72
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:84
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:96
msgid "Click here to change the search type"
msgstr "請點擊此處改變查詢方式"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:71
msgid "Search by missed call"
msgstr "從未接電話中查詢"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:83
msgid "Search by incoming call"
msgstr "從來電中查詢"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:95
msgid "Search by outgoing call"
msgstr "從撥出電話中查詢"
+#~ msgid "IP call - %s"
+#~ msgstr "IP電話- %s"
+
+#~ msgid "Codec"
+#~ msgstr "編碼"
+
+#~ msgid "_Mute other applications during a call"
+#~ msgstr "當有來電時靜音其它應用程序(c)"
+
+#~ msgid "SIP Port"
+#~ msgstr "SIP端口"
+
+#~ msgid "Enable voicemail _notifications"
+#~ msgstr "啟用語音郵箱提示(n)"
+
#~ msgid "Account creation wizard"
#~ msgstr "帳戶創建向導"
@@ -1038,9 +1192,6 @@ msgstr "從撥出電話中查詢"
#~ msgid "Default account"
#~ msgstr "默認帳戶"
-#~ msgid "Transfer to : "
-#~ msgstr "轉給: "
-
#~ msgid "SFLphone KDE Client"
#~ msgstr "SFLphone KDE客戶端"
@@ -1050,34 +1201,15 @@ msgstr "從撥出電話中查詢"
#~ msgid "Jérémy Quentin"
#~ msgstr "Jérémy Quentin"
-#~ msgctxt "NAME OF TRANSLATORS"
-#~ msgid "Your names"
-#~ msgstr ""
-#~ "Yun Liu, ,Launchpad Contributions:,Yun Liu, ,Launchpad Contributions:,"
-#~ "Emmanuel Milou,Yun Liu"
-
-#~ msgctxt "EMAIL OF TRANSLATORS"
-#~ msgid "Your emails"
-#~ msgstr "yunliu2000@gmail.com,,,,,,emmanuel.milou@savoirfairelinux.com,"
-
#~ msgid "Main screen"
#~ msgstr "主屏幕"
-#~ msgid "Call history"
-#~ msgstr "呼叫記錄"
-
-#~ msgid "Address book"
-#~ msgstr "地址簿"
-
#~ msgid "Configure SFLphone"
#~ msgstr "配置SFLphone"
#~ msgid "Display volume controls"
#~ msgstr "顯示音量控制"
-#~ msgid "Display dialpad"
-#~ msgstr "顯示撥號鍵盤"
-
#~ msgid "Incoming call"
#~ msgstr "來電"
@@ -1102,9 +1234,6 @@ msgstr "從撥出電話中查詢"
#~ msgid "Hold on"
#~ msgstr "呼叫保持"
-#~ msgid "Transfer"
-#~ msgstr "轉接"
-
#~ msgid "Record"
#~ msgstr "記錄"
@@ -1132,9 +1261,6 @@ msgstr "從撥出電話中查詢"
#~ "取消選擇則會禁用該賬戶。通過\"加\"\"減\"按鈕可以添加或刪除賬戶。點擊\"編輯"
#~ "\"按鈕可以改變賬戶的設置。"
-#~ msgid "Remove the selected account"
-#~ msgstr "刪除所選賬戶"
-
#~ 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 "
@@ -1249,9 +1375,6 @@ msgstr "從撥出電話中查詢"
#~ msgid "On start"
#~ msgstr "正在啟動"
-#~ msgid "Clear history"
-#~ msgstr "清空曆史記錄"
-
#~ msgid "Trigger on specific SIP header"
#~ msgstr "激活指定的SIP頭"
@@ -1264,33 +1387,12 @@ msgstr "從撥出電話中查詢"
#~ msgid "Prefix dialed numbers with"
#~ msgstr "號碼前綴"
-#~ msgid "History"
-#~ msgstr "歷史"
-
#~ msgid "Attention:number of results exceeds max displayed."
#~ msgstr "注意:結果超過可顯示的最大值"
-#~ msgid "_Help"
-#~ msgstr "幫助(H)"
-
#~ msgid "_Account creation wizard"
#~ msgstr "帳戶創建向導(A)"
-#~ msgid "_Call"
-#~ msgstr "電話"
-
-#~ msgid "Clear _history"
-#~ msgstr "清空曆史記錄(C)"
-
-#~ msgid "_Accounts"
-#~ msgstr "帳戶(A)"
-
-#~ msgid "_Edit"
-#~ msgstr "編輯(E)"
-
-#~ msgid "_View"
-#~ msgstr "查看(V)"
-
#~ msgid "_Enable this account"
#~ msgstr "啟用該賬戶(E)"
@@ -1300,9 +1402,6 @@ msgstr "從撥出電話中查詢"
#~ msgid "Port"
#~ msgstr "端口"
-#~ msgid "_Volume controls"
-#~ msgstr "音量控制(V)"
-
#~ msgctxt "Config section"
#~ msgid "Accounts"
#~ msgstr "帳戶"
@@ -1441,9 +1540,6 @@ msgstr "從撥出電話中查詢"
#~ msgid "\"Voicemail\" <%s>"
#~ msgstr "\"語音郵件\" <%s>"
-#~ msgid "Off Hold"
-#~ msgstr "恢复通話"
-
#~ msgid "Record a call"
#~ msgstr "記錄通話"
@@ -1595,3 +1691,16 @@ msgstr "從撥出電話中查詢"
#~ msgid "_STUN Server"
#~ msgstr "STUN伺服器(S)"
+
+#~ msgctxt "NAME OF TRANSLATORS"
+#~ msgid "Your names"
+#~ msgstr ""
+#~ "Yun Liu, ,Launchpad Contributions:,Yun Liu, ,Launchpad Contributions:,"
+#~ "Emmanuel Milou,Yun Liu, ,Launchpad Contributions:,Emmanuel Milou,Yun "
+#~ "Liu, ,Launchpad Contributions:,Emmanuel Milou,Yun Liu"
+
+#~ msgctxt "EMAIL OF TRANSLATORS"
+#~ msgid "Your emails"
+#~ msgstr ""
+#~ "yunliu2000@gmail.com,,,,,,emmanuel.milou@savoirfairelinux.com,,,,emmanuel."
+#~ "milou@savoirfairelinux.com,,,,emmanuel.milou@savoirfairelinux.com,"
diff --git a/lang/zh_TW/zh_TW.po b/lang/zh_TW/zh_TW.po
index dfc3c4a511c4d09cd1798911e6d8dd200f48533c..f7992fe2b8f76bbd50a4020b21be7c9adf76de4e 100644
--- a/lang/zh_TW/zh_TW.po
+++ b/lang/zh_TW/zh_TW.po
@@ -3,20 +3,19 @@
# This file is distributed under the same license as the sflphone package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
#
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:509
msgid ""
msgstr ""
"Project-Id-Version: sflphone\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-14 11:18-0400\n"
-"PO-Revision-Date: 2009-10-07 16:57+0000\n"
+"POT-Creation-Date: 2009-12-03 10:22-0500\n"
+"PO-Revision-Date: 2009-10-26 20:46+0000\n"
"Last-Translator: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>\n"
"Language-Team: Traditional Chinese <zh_TW@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-10-14 15:20+0000\n"
+"X-Launchpad-Export-Date: 2009-12-03 15:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: ../sflphone-client-gnome/src/accountlist.c:175
@@ -61,40 +60,26 @@ msgstr ""
msgid "Invalid"
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:83
-#: ../sflphone-client-gnome/src/actions.c:919
-#: ../sflphone-client-gnome/src/actions.c:926
+#: ../sflphone-client-gnome/src/actions.c:98
msgid "Using account"
msgstr ""
-#: ../sflphone-client-gnome/src/actions.c:89
+#: ../sflphone-client-gnome/src/actions.c:104
msgid "No registered accounts"
msgstr ""
-#: ../sflphone-client-gnome/src/actions.c:268
+#: ../sflphone-client-gnome/src/actions.c:285
msgid ""
"Unable to connect to the SFLphone server.\n"
"Make sure the daemon is running."
msgstr ""
-#: ../sflphone-client-gnome/src/actions.c:913
-#, c-format
-msgid "IP call - %s"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/actions.c:922
-msgid "Codec"
+#: ../sflphone-client-gnome/src/actions.c:589
+#: ../sflphone-client-gnome/src/actions.c:911
+msgid "Direct SIP call"
msgstr ""
-#: ../sflphone-client-gnome/src/actions.c:1119
+#: ../sflphone-client-gnome/src/actions.c:1103
#, c-format
msgid ""
"<b>Error: No audio codecs found.\n"
@@ -136,53 +121,53 @@ msgstr ""
msgid "Do you still want to quit?"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:299
+#: ../sflphone-client-gnome/src/mainwindow.c:298
msgid "SFLphone Error"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:391
+#: ../sflphone-client-gnome/src/mainwindow.c:392
#, c-format
msgid "ZRTP is not supported by peer %s\n"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:392
+#: ../sflphone-client-gnome/src/mainwindow.c:393
msgid "Secure Communication Unavailable"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:393
-#: ../sflphone-client-gnome/src/mainwindow.c:415
+#: ../sflphone-client-gnome/src/mainwindow.c:394
+#: ../sflphone-client-gnome/src/mainwindow.c:416
msgid "Continue"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:394
-#: ../sflphone-client-gnome/src/mainwindow.c:416
-#: ../sflphone-client-gnome/src/mainwindow.c:430
+#: ../sflphone-client-gnome/src/mainwindow.c:395
+#: ../sflphone-client-gnome/src/mainwindow.c:417
+#: ../sflphone-client-gnome/src/mainwindow.c:431
msgid "Stop Call"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:413
+#: ../sflphone-client-gnome/src/mainwindow.c:414
#, c-format
msgid ""
"A %s error forced the call with %s to fall under unencrypted mode.\n"
"Exact reason: %s\n"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:414
+#: ../sflphone-client-gnome/src/mainwindow.c:415
msgid "ZRTP negotiation failed"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:427
+#: ../sflphone-client-gnome/src/mainwindow.c:428
#, c-format
msgid ""
"%s wants to stop using secure communication. Confirm will resume "
"conversation without SRTP.\n"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:428
+#: ../sflphone-client-gnome/src/mainwindow.c:429
msgid "Confirm Go Clear"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:429
+#: ../sflphone-client-gnome/src/mainwindow.c:430
msgid "Confirm"
msgstr ""
@@ -197,6 +182,13 @@ msgstr ""
msgid "<i>From</i> %s"
msgstr ""
+#: ../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/sflnotify.c:111
#, c-format
msgid "Calling with %s account <i>%s</i>"
@@ -244,15 +236,15 @@ msgstr ""
msgid "Mic volume"
msgstr ""
-#: ../sflphone-client-gnome/src/statusicon.c:91
+#: ../sflphone-client-gnome/src/statusicon.c:96
msgid "_Show main window"
msgstr ""
-#: ../sflphone-client-gnome/src/statusicon.c:126
+#: ../sflphone-client-gnome/src/statusicon.c:131
msgid "SFLphone"
msgstr ""
-#: ../sflphone-client-gnome/src/statusicon.c:127
+#: ../sflphone-client-gnome/src/statusicon.c:132
#, c-format
msgid "%i account configured"
msgid_plural "%i accounts configured"
@@ -260,202 +252,399 @@ msgstr[0] ""
msgstr[1] ""
#: ../sflphone-client-gnome/src/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:750
+#: ../sflphone-client-gnome/src/uimanager.c:693
+#: ../sflphone-client-gnome/src/uimanager.c:727
msgid "Voicemail"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:403
+#: ../sflphone-client-gnome/src/uimanager.c:117
+msgid "No address book selected"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:137
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "Address book"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:279
+#, c-format
+msgid "Voicemail (%i)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:342
msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:406
+#: ../sflphone-client-gnome/src/uimanager.c:345
msgid "About SFLphone"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1028
+#: ../sflphone-client-gnome/src/uimanager.c:719
+msgid "Call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:1184
+msgid "_New call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+msgid "Place a new call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:979
msgid "_Pick up"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1040
-#: ../sflphone-client-gnome/src/uimanager.c:1081
+#: ../sflphone-client-gnome/src/uimanager.c:721
+msgid "Answer the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:991
+#: ../sflphone-client-gnome/src/uimanager.c:1032
msgid "_Hang up"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1052
-#: ../sflphone-client-gnome/src/uimanager.c:1093
-msgid "On _Hold"
+#: ../sflphone-client-gnome/src/uimanager.c:722
+msgid "Finish the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "O_n hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "Place the call on hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "O_ff hold"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1064
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "Place the call off hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:725
+#: ../sflphone-client-gnome/src/uimanager.c:1015
msgid "_Record"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1154
-msgid "_Call back"
+#: ../sflphone-client-gnome/src/uimanager.c:725
+msgid "Record the current conversation"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1226
-msgid "_New call"
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Configuration _Assistant"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Run the configuration assistant"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:727
+msgid "Call your voicemail"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "_Close"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "Minimize to system tray"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "_Quit"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "Quit the program"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:732
+msgid "_Edit"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "_Copy"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "Copy the selection"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "_Paste"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "Paste the clipboard"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear _history"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear the call history"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "_Accounts"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "Edit your accounts"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "_Preferences"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "Change your preferences"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:740
+msgid "_View"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:743
+msgid "_Help"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Contents"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Open the manual"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:745
+msgid "About this application"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "_Transfer"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "Transfer the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "_Show toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "Show the toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "_Dialpad"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "Show the dialpad"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "_Volume controls"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "Show the volume controls"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1300
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "_History"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "Calls history"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "_Address book"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:1003
+#: ../sflphone-client-gnome/src/uimanager.c:1044
+msgid "On _Hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:1107
+msgid "_Call back"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:1258
msgid "Edit phone number"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1311
+#: ../sflphone-client-gnome/src/uimanager.c:1269
msgid "Edit the phone number before making a call"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:164
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
msgid "Account Parameters"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:173
-#: ../sflphone-client-gnome/src/config/assistant.c:294
-#: ../sflphone-client-gnome/src/config/assistant.c:402
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
+#: ../sflphone-client-gnome/src/config/assistant.c:314
+#: ../sflphone-client-gnome/src/config/assistant.c:427
msgid "_Alias"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:181
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
msgid "_Protocol"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:199
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
msgid "Unknown"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:209
-#: ../sflphone-client-gnome/src/config/assistant.c:302
-#: ../sflphone-client-gnome/src/config/assistant.c:410
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
+#: ../sflphone-client-gnome/src/config/assistant.c:322
+#: ../sflphone-client-gnome/src/config/assistant.c:435
msgid "_Host name"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:217
-#: ../sflphone-client-gnome/src/config/assistant.c:310
-#: ../sflphone-client-gnome/src/config/assistant.c:418
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
+#: ../sflphone-client-gnome/src/config/assistant.c:330
+#: ../sflphone-client-gnome/src/config/assistant.c:443
msgid "_User name"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:234
-#: ../sflphone-client-gnome/src/config/assistant.c:326
-#: ../sflphone-client-gnome/src/config/assistant.c:433
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:346
+#: ../sflphone-client-gnome/src/config/assistant.c:458
msgid "_Password"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:254
-#: ../sflphone-client-gnome/src/config/assistant.c:344
-#: ../sflphone-client-gnome/src/config/assistant.c:449
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:363
+#: ../sflphone-client-gnome/src/config/assistant.c:473
+msgid "Show password"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:368
+#: ../sflphone-client-gnome/src/config/assistant.c:478
msgid "_Voicemail number"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:340
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
msgid "Authentication"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:341
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
msgid "Secret"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:466
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
msgid "Credential"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:501
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
msgid "Authentication name"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:512
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
msgid "Password"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:535
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:909
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:201
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
msgid "Security"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:547
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:213
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
msgid "Use TLS transport (sips)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:552
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:218
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
msgid "SRTP key exchange"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:558
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
msgid "Disabled"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
msgid "Registration"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:679
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
msgid "Registration expire"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
msgid "_Comply with RFC 3263"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
-msgid "Network"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
+msgid "Network Interface"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:707
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
msgid "Local address"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:744
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
msgid "Local port"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:752
-msgid "Set published address and port:"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
+msgid "Published address"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:756
-msgid "Using STUN "
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+msgid "Using STUN"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:761
-msgid "Same as local parameters"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
+msgid "STUN server URL"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:764
-msgid "Manually"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
+msgid "Same as local parameters"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:769
-msgid "Published address"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
+msgid "Set published address and port:"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:777
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
msgid "Published port"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:785
-msgid "STUN server URL"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
msgid "Account settings"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
msgid "Basic"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:904
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
msgid "Advanced"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:169
-msgid "Server returned \""
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:164
+#, c-format
+msgid "Server returned \"%s\" (%d)"
msgstr ""
#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
@@ -474,32 +663,18 @@ msgstr ""
msgid "Configured Accounts"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:505
-msgid "There "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "is "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "are "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:508
-msgid " active account"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:509
-msgid "s"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
+#, c-format
+msgid "There is %d active account"
+msgid_plural "There are %d active accounts"
+msgstr[0] ""
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:514
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
msgid "You have no active account"
msgstr ""
#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:443
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
msgid "General"
msgstr ""
@@ -544,225 +719,220 @@ 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:578
+#: ../sflphone-client-gnome/src/config/audioconf.c:577
msgid "Name"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:69
+#: ../sflphone-client-gnome/src/config/assistant.c:75
#, c-format
msgid "This assistant is now finished."
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:71
+#: ../sflphone-client-gnome/src/config/assistant.c:77
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/config/assistant.c:74
+#: ../sflphone-client-gnome/src/config/assistant.c:80
msgid "Alias"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:78
+#: ../sflphone-client-gnome/src/config/assistant.c:84
msgid "Server"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:82
+#: ../sflphone-client-gnome/src/config/assistant.c:88
msgid "Username"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:86
+#: ../sflphone-client-gnome/src/config/assistant.c:92
msgid "Security: "
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:88
+#: ../sflphone-client-gnome/src/config/assistant.c:94
msgid "SRTP/ZRTP draft-zimmermann"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:90
-#: ../sflphone-client-gnome/src/config/assistant.c:182
+#: ../sflphone-client-gnome/src/config/assistant.c:96
msgid "None"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:210
+#: ../sflphone-client-gnome/src/config/assistant.c:229
msgid "SFLphone account creation wizard"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:236
+#: ../sflphone-client-gnome/src/config/assistant.c:255
msgid "Welcome to the Account creation wizard of SFLphone!"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:237
+#: ../sflphone-client-gnome/src/config/assistant.c:256
msgid "This installation wizard will help you configure an account."
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "VoIP Protocols"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "Select an account type"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:253
+#: ../sflphone-client-gnome/src/config/assistant.c:272
msgid "SIP (Session Initiation Protocol)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:255
+#: ../sflphone-client-gnome/src/config/assistant.c:274
msgid "IAX2 (InterAsterix Exchange)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Account"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Please select one of the following options"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:271
+#: ../sflphone-client-gnome/src/config/assistant.c:290
msgid "Create a free SIP/IAX2 account on sflphone.org"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:273
+#: ../sflphone-client-gnome/src/config/assistant.c:292
msgid "Register an existing SIP or IAX2 account"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:306
msgid "SIP account settings"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:286
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "Please fill the following information"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:352
-#: ../sflphone-client-gnome/src/config/assistant.c:381
+#: ../sflphone-client-gnome/src/config/assistant.c:376
+#: ../sflphone-client-gnome/src/config/assistant.c:405
msgid "Secure communications with _ZRTP"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "Optional email address"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "This email address will be used to send your voicemail messages."
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:373
+#: ../sflphone-client-gnome/src/config/assistant.c:397
msgid "_Email address"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "IAX2 account settings"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "Network Address Translation (NAT)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "You should probably enable this if you are behind a firewall."
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:476
+#: ../sflphone-client-gnome/src/config/assistant.c:505
msgid "E_nable STUN"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:483
+#: ../sflphone-client-gnome/src/config/assistant.c:512
msgid "_STUN server"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Account Registration"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Congratulations!"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:583
+#: ../sflphone-client-gnome/src/config/audioconf.c:582
msgid "Frequency"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:588
+#: ../sflphone-client-gnome/src/config/audioconf.c:587
msgid "Bitrate"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:593
+#: ../sflphone-client-gnome/src/config/audioconf.c:592
msgid "Bandwidth"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:673
+#: ../sflphone-client-gnome/src/config/audioconf.c:670
msgid "ALSA plugin"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:695
+#: ../sflphone-client-gnome/src/config/audioconf.c:692
msgid "Output"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:717
+#: ../sflphone-client-gnome/src/config/audioconf.c:714
msgid "Input"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:752
+#: ../sflphone-client-gnome/src/config/audioconf.c:749
msgid "_Voice Activity Detection"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:762
+#: ../sflphone-client-gnome/src/config/audioconf.c:759
msgid "_Noise Reduction (Narrow-Band Companding)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:798
+#: ../sflphone-client-gnome/src/config/audioconf.c:800
msgid "Sound Manager"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:807
+#: ../sflphone-client-gnome/src/config/audioconf.c:809
msgid "_Pulseaudio"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:811
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
msgid "_ALSA"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:816
-msgid "_Mute other applications during a call"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:823
+#: ../sflphone-client-gnome/src/config/audioconf.c:819
msgid "ALSA settings"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:840
+#: ../sflphone-client-gnome/src/config/audioconf.c:836
msgid "Codecs"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:869
+#: ../sflphone-client-gnome/src/config/audioconf.c:865
msgid "Recordings"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:873
+#: ../sflphone-client-gnome/src/config/audioconf.c:869
msgid "Destination folder"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:877
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
msgid "Select a folder"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:883
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
msgid "Ringtones"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:889
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
msgid "_Enable ringtones"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:895
+#: ../sflphone-client-gnome/src/config/audioconf.c:891
msgid "Choose a ringtone"
msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:901
+#: ../sflphone-client-gnome/src/config/audioconf.c:897
msgid "Audio Files"
msgstr ""
@@ -799,86 +969,66 @@ msgstr ""
msgid "_Prefix dialed numbers with"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:195
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
msgid ""
"This profile is used when you want to reach a remote peer simply by typing a "
"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
"also be used if no account can be matched to an incoming or outgoing call."
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:274
-msgid "SIP Port"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:281
-msgid "UDP Transport"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:319
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
msgid "Desktop Notifications"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:323
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
msgid "_Enable notifications"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:329
-msgid "Enable voicemail _notifications"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:341
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
msgid "System Tray Icon"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
msgid "_Popup main window on incoming call"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:349
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
msgid "Ne_ver popup main window"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:353
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
msgid "Hide SFLphone window on _startup"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:359
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
msgid "Calls History"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:362
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
msgid "_Keep my history for at least"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:373
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
msgid "days"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:377
-msgid "Configuration File"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:379
-msgid "Store SIP credentials as MD5 hash"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:423
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
msgid "Preferences"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:448
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
msgid "Audio"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
msgid "Address Book"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:458
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
msgid "Hooks"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:468
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
msgid "Direct IP calls"
msgstr ""
@@ -886,11 +1036,11 @@ msgstr ""
msgid "Advanced options for TLS"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:55
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:56
msgid "TLS transport"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:59
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:60
msgid ""
"TLS transport can be used along with UDP for those calls that would\n"
"require secure sip transactions (aka SIPS). You can configure a different\n"
@@ -899,55 +1049,55 @@ msgid ""
"port, different one from each other\n"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:100
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
msgid "Certificate of Authority list"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:104
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
msgid "Choose a CA list file (optional)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:115
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
msgid "Public endpoint certificate file"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:119
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
msgid "Choose a public endpoint certificate (optional)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:134
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
msgid "Choose a private key file (optional)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:145
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
msgid "Password for the private key"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:168
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
msgid "TLS protocol method"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:202
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
msgid "TLS cipher list"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:211
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
msgid "Server name instance for outgoing TLS connection"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:219
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
msgid "Negotiation timeout (sec:msec)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:236
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
msgid "Verify incoming certificates, as a server"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:242
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
msgid "Verify certificates from answer, as a client"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:248
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
msgid "Require certificate for incoming tls connections"
msgstr ""
@@ -955,49 +1105,54 @@ msgstr ""
msgid "ZRTP Options"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:68
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:69
msgid "Send Hello Hash in S_DP"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:74
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:75
msgid "Ask User to Confirm SAS"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:80
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:81
msgid "_Warn if ZRTP not supported"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:86
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:87
msgid "Display SAS once for hold events"
msgstr ""
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:58
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
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:59
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:72
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:84
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:96
msgid "Click here to change the search type"
msgstr ""
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:71
msgid "Search by missed call"
msgstr ""
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:83
msgid "Search by incoming call"
msgstr ""
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:95
msgid "Search by outgoing call"
msgstr ""
#~ msgctxt "NAME OF TRANSLATORS"
#~ msgid "Your names"
-#~ msgstr ",Launchpad Contributions:, ,Launchpad Contributions:,Emmanuel Milou"
+#~ msgstr ""
+#~ ",Launchpad Contributions:, ,Launchpad Contributions:,Emmanuel Milou, ,"
+#~ "Launchpad Contributions:,Emmanuel Milou, ,Launchpad Contributions:,"
+#~ "Emmanuel Milou"
#~ msgctxt "EMAIL OF TRANSLATORS"
#~ msgid "Your emails"
-#~ msgstr ",,,,emmanuel.milou@savoirfairelinux.com"
+#~ msgstr ""
+#~ ",,,,emmanuel.milou@savoirfairelinux.com,,,emmanuel.milou@savoirfairelinux."
+#~ "com,,,emmanuel.milou@savoirfairelinux.com"
diff --git a/sflphone-client-gnome/Makefile.am b/sflphone-client-gnome/Makefile.am
index e8c86ca0787529348ee90f8d6841a1478098078b..47bb88964f5c83a99f19899f9227d279eb1befb8 100644
--- a/sflphone-client-gnome/Makefile.am
+++ b/sflphone-client-gnome/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src pixmaps tests man po
+SUBDIRS = src pixmaps tests man po doc
ACLOCAL_AMFLAGS = -I m4
diff --git a/sflphone-client-gnome/doc/C/figures/accounts_security.png b/sflphone-client-gnome/doc/C/figures/accounts_security.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca3f76c3d9a899589dc29b299a3117ae8ebe110f
Binary files /dev/null and b/sflphone-client-gnome/doc/C/figures/accounts_security.png differ
diff --git a/sflphone-client-gnome/doc/C/figures/addressbook-button.png b/sflphone-client-gnome/doc/C/figures/addressbook-button.png
index acf0c185b7621d0b4b05d58c16b118ff62eeeca3..90d6d8a0413e4bc0970bc6847fc0b7d74a3e0f72 100644
Binary files a/sflphone-client-gnome/doc/C/figures/addressbook-button.png and b/sflphone-client-gnome/doc/C/figures/addressbook-button.png differ
diff --git a/sflphone-client-gnome/doc/C/figures/answer.png b/sflphone-client-gnome/doc/C/figures/answer.png
index 14fda5f03aeac15f9819631a2d0d631b1516cbfa..cef5996aa2621a5494fb888e5a607521f86a3d2e 100644
Binary files a/sflphone-client-gnome/doc/C/figures/answer.png and b/sflphone-client-gnome/doc/C/figures/answer.png differ
diff --git a/sflphone-client-gnome/doc/C/figures/call-second.png b/sflphone-client-gnome/doc/C/figures/call-second.png
index e6527821f6c6b05d05b9697b5a80166a3539ed08..7b1d8df4f674a26c6102c0bc64ddb7eedef395a7 100644
Binary files a/sflphone-client-gnome/doc/C/figures/call-second.png and b/sflphone-client-gnome/doc/C/figures/call-second.png differ
diff --git a/sflphone-client-gnome/doc/C/figures/call.png b/sflphone-client-gnome/doc/C/figures/call.png
index 6361dec67a85d9a4df7a35eb79fe6d1a6d6d7b4a..e80b4eafa4a4167048e66693d3cb5ef8c0128e0a 100644
Binary files a/sflphone-client-gnome/doc/C/figures/call.png and b/sflphone-client-gnome/doc/C/figures/call.png differ
diff --git a/sflphone-client-gnome/doc/C/figures/dial.png b/sflphone-client-gnome/doc/C/figures/dial.png
index 2baf736e3072d38a4deba2fdb603ba59b8ed9ac4..0b3d44b95b0c18e74c18ee2888792e7401978283 100644
Binary files a/sflphone-client-gnome/doc/C/figures/dial.png and b/sflphone-client-gnome/doc/C/figures/dial.png differ
diff --git a/sflphone-client-gnome/doc/C/figures/hangup.png b/sflphone-client-gnome/doc/C/figures/hangup.png
index c2c2ef61c740f1fba7f10c926607f0916402b26a..dd895bb497821889d86c4540cfcda27ecb94ad6a 100644
Binary files a/sflphone-client-gnome/doc/C/figures/hangup.png and b/sflphone-client-gnome/doc/C/figures/hangup.png differ
diff --git a/sflphone-client-gnome/doc/C/figures/history.png b/sflphone-client-gnome/doc/C/figures/history.png
index e56aa52a5cd28a2006eb880593aec0458ad11d12..32b98810da8eb9cb75ca527c88356d29e4117d2c 100644
Binary files a/sflphone-client-gnome/doc/C/figures/history.png and b/sflphone-client-gnome/doc/C/figures/history.png differ
diff --git a/sflphone-client-gnome/doc/C/figures/holdoff.png b/sflphone-client-gnome/doc/C/figures/holdoff.png
index 73e02b9a992cb6eeb8c3c28dd345bc972b359726..7ecd9b4799bba0adff103aec8784b886ecd2d76c 100644
Binary files a/sflphone-client-gnome/doc/C/figures/holdoff.png and b/sflphone-client-gnome/doc/C/figures/holdoff.png differ
diff --git a/sflphone-client-gnome/doc/C/figures/holdon.png b/sflphone-client-gnome/doc/C/figures/holdon.png
index da849b9f525dbc7916cc254a39b8fdf019e7d425..78f39f8312f45adaccd0a0aebd5ea61cfa54a45a 100644
Binary files a/sflphone-client-gnome/doc/C/figures/holdon.png and b/sflphone-client-gnome/doc/C/figures/holdon.png differ
diff --git a/sflphone-client-gnome/doc/C/figures/record.png b/sflphone-client-gnome/doc/C/figures/record.png
index d10233a7597daa8d57493fb117842e6065057851..dc5635c3d5cd3bcbccdad13c38190dd2fcd3373f 100644
Binary files a/sflphone-client-gnome/doc/C/figures/record.png and b/sflphone-client-gnome/doc/C/figures/record.png differ
diff --git a/sflphone-client-gnome/doc/C/figures/refuse.png b/sflphone-client-gnome/doc/C/figures/refuse.png
index 8c5a0d2f9bfae155efcb5a17c8122694d25cc1cb..0b644fe9cf6996be804db2fb09508a0f5ff1cc09 100644
Binary files a/sflphone-client-gnome/doc/C/figures/refuse.png and b/sflphone-client-gnome/doc/C/figures/refuse.png differ
diff --git a/sflphone-client-gnome/doc/C/figures/srtp_enabled.png b/sflphone-client-gnome/doc/C/figures/srtp_enabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..68dabf1d368e614c3bf2326a0d8331eea4736154
Binary files /dev/null and b/sflphone-client-gnome/doc/C/figures/srtp_enabled.png differ
diff --git a/sflphone-client-gnome/doc/C/figures/transfer-go.png b/sflphone-client-gnome/doc/C/figures/transfer-go.png
index ba8633c279b7114584962c12bc88e7b17eda2501..a349431542843913866963826fdaae12d3cf389d 100644
Binary files a/sflphone-client-gnome/doc/C/figures/transfer-go.png and b/sflphone-client-gnome/doc/C/figures/transfer-go.png differ
diff --git a/sflphone-client-gnome/doc/C/figures/transfer.png b/sflphone-client-gnome/doc/C/figures/transfer.png
index 5da94915812aa22203ac012f673026bf4e6958c1..fcb2c4a33a3bdeb8e2a6b762b2e5ca155a35b7eb 100644
Binary files a/sflphone-client-gnome/doc/C/figures/transfer.png and b/sflphone-client-gnome/doc/C/figures/transfer.png differ
diff --git a/sflphone-client-gnome/doc/C/figures/voicemail.png b/sflphone-client-gnome/doc/C/figures/voicemail.png
index bcc3591335341d322f706495ba2f5b7fb1003855..77a4d4872ec4649ad828ae81b88238982d25c5d3 100644
Binary files a/sflphone-client-gnome/doc/C/figures/voicemail.png and b/sflphone-client-gnome/doc/C/figures/voicemail.png differ
diff --git a/sflphone-client-gnome/doc/C/figures/zrtp_options.png b/sflphone-client-gnome/doc/C/figures/zrtp_options.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9229d7b81f31aa6e4a66759bd1856959c82f233
Binary files /dev/null and b/sflphone-client-gnome/doc/C/figures/zrtp_options.png differ
diff --git a/sflphone-client-gnome/doc/C/sflphone-usermanual.pot b/sflphone-client-gnome/doc/C/sflphone-usermanual.pot
index 337598a62af903f823e212a357d4d48fa0ee08dd..5783d55d7c0d10f7c17df63ab9ef0153cf55b91c 100644
--- a/sflphone-client-gnome/doc/C/sflphone-usermanual.pot
+++ b/sflphone-client-gnome/doc/C/sflphone-usermanual.pot
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-10-26 15:41-0400\n"
+"POT-Creation-Date: 2009-12-08 13:58-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,121 +17,163 @@ msgstr ""
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
-#: sflphone.xml:296(None)
+#: sflphone.xml:281(None)
+msgid "@@image: 'figures/accounts_security.png'; md5=14161ae9857c046d571e5e9501c35fa5"
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:312(None)
msgid "@@image: 'figures/dial.png'; md5=81ff4280c293e62a49fad3a4b61b9bb5"
msgstr ""
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
-#: sflphone.xml:311(None)
+#: sflphone.xml:327(None)
msgid "@@image: 'figures/call-second.png'; md5=fa490e3b07eebaa9f4ff719f579d68ef"
msgstr ""
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
-#: sflphone.xml:330(None)
+#: sflphone.xml:346(None)
msgid "@@image: 'figures/call.png'; md5=ecd96beec76f808b5c1469ecc1293237"
msgstr ""
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
-#: sflphone.xml:348(None)
+#: sflphone.xml:364(None)
msgid "@@image: 'figures/answer.png'; md5=c168995c6b36b5d200c49d1c02c2ea52"
msgstr ""
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
-#: sflphone.xml:365(None)
+#: sflphone.xml:381(None)
msgid "@@image: 'figures/hangup.png'; md5=0cac4dfe3a9a4bdf4d12229f77e3723a"
msgstr ""
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
-#: sflphone.xml:385(None)
+#: sflphone.xml:401(None)
msgid "@@image: 'figures/refuse.png'; md5=34b6cbf068e56163058e79de3ca70c59"
msgstr ""
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
-#: sflphone.xml:403(None)
+#: sflphone.xml:419(None)
msgid "@@image: 'figures/holdon.png'; md5=655078b8b495ada29f65b58501187d16"
msgstr ""
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
-#: sflphone.xml:415(None)
+#: sflphone.xml:431(None)
msgid "@@image: 'figures/holdoff.png'; md5=e06b8eba03f1545cd18891630b22f281"
msgstr ""
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
-#: sflphone.xml:430(None)
+#: sflphone.xml:446(None)
msgid "@@image: 'figures/transfer.png'; md5=92f921c7c6ba4ee2487ccf6e02226d9a"
msgstr ""
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
-#: sflphone.xml:444(None)
+#: sflphone.xml:460(None)
msgid "@@image: 'figures/transfer-go.png'; md5=553b57d5a9fc9f248ba15cecc32d343f"
msgstr ""
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
-#: sflphone.xml:465(None)
+#: sflphone.xml:481(None)
msgid "@@image: 'figures/rec-settings.png'; md5=27d51e45ff23dde58b0512f90773f6ce"
msgstr ""
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
-#: sflphone.xml:478(None)
+#: sflphone.xml:494(None)
msgid "@@image: 'figures/record.png'; md5=7a594660924940e8def9ecfcee0e8cb4"
msgstr ""
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
-#: sflphone.xml:496(None)
+#: sflphone.xml:512(None)
msgid "@@image: 'figures/voicemail.png'; md5=36dbeb4bcc6a68519d474552a888ce1e"
msgstr ""
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
-#: sflphone.xml:684(None)
+#: sflphone.xml:548(None)
+msgid "@@image: 'figures/drag_n_drop.png'; md5=fed5f0da9f162ca96bda0d49935a5354"
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:560(None)
+msgid "@@image: 'figures/conference.png'; md5=36f68c0a1fd7450487009126fff544bd"
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:582(None)
+msgid "@@image: 'figures/conference_detached.png'; md5=145189452009ea3110bb569c92997a4c"
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:594(None)
+msgid "@@image: 'figures/conference_attached.png'; md5=73411e05f2f2b185c34b5935ef7c49f0"
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:663(None)
+msgid "@@image: 'figures/srtp_enabled.png'; md5=6d4679f6afec1a8b84ce69f617cb4fa7"
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:683(None)
+msgid "@@image: 'figures/zrtp_options.png'; md5=2468eca925b188356bcc0c341c3fd912"
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:849(None)
msgid "@@image: 'figures/addressbook-button.png'; md5=b4a820013ef8b8f48e7de780a66c7800"
msgstr ""
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
-#: sflphone.xml:719(None)
+#: sflphone.xml:884(None)
msgid "@@image: 'figures/desktop-notif-settings.png'; md5=2bca85d6d9871883399481b994bd3384"
msgstr ""
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
-#: sflphone.xml:738(None)
+#: sflphone.xml:903(None)
msgid "@@image: 'figures/notif-example.png'; md5=d09008bedcaee435b12cd165d42e39b7"
msgstr ""
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
-#: sflphone.xml:755(None)
+#: sflphone.xml:920(None)
msgid "@@image: 'figures/voicemail-notif.png'; md5=a33ed4ce4b693d67ee453b4ef1fa6c30"
msgstr ""
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
-#: sflphone.xml:774(None)
+#: sflphone.xml:939(None)
msgid "@@image: 'figures/systemtray-settings.png'; md5=638612a08eb31eb768c4f08ace9c909a"
msgstr ""
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
-#: sflphone.xml:814(None)
+#: sflphone.xml:979(None)
msgid "@@image: 'figures/callshistory-settings.png'; md5=287d8aed7d7c71752257c64e89a9127d"
msgstr ""
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
-#: sflphone.xml:838(None)
+#: sflphone.xml:1003(None)
msgid "@@image: 'figures/configfile-settings.png'; md5=eb4a5545f137b825dcdaf0396a9f1a7d"
msgstr ""
@@ -196,7 +238,7 @@ msgid "emmanuel.milou@savoirfairelinux.com"
msgstr ""
#: sflphone.xml:58(firstname)
-msgid "Jérémy"
+msgid "Jeremy"
msgstr ""
#: sflphone.xml:59(surname)
@@ -315,7 +357,7 @@ msgstr ""
msgid "To create a new account, perform the following steps:"
msgstr ""
-#: sflphone.xml:153(para) sflphone.xml:191(para) sflphone.xml:201(para)
+#: sflphone.xml:153(para) sflphone.xml:191(para) sflphone.xml:201(para) sflphone.xml:652(para)
msgid "Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Manage accounts</guimenuitem></menuchoice>."
msgstr ""
@@ -387,7 +429,7 @@ msgstr ""
msgid "To edit an existing account, perform the following steps:"
msgstr ""
-#: sflphone.xml:192(para)
+#: sflphone.xml:192(para) sflphone.xml:653(para)
msgid "Select in the list the account you would like to edit, then click on the <guilabel>Edit</guilabel> button."
msgstr ""
@@ -463,7 +505,7 @@ msgstr ""
msgid "To register to some VoIP services, you will need to set this value at at least 1600 seconds (Example: French VoIP server freephonie.net)."
msgstr ""
-#: sflphone.xml:244(title) sflphone.xml:873(title)
+#: sflphone.xml:244(title) sflphone.xml:1038(title)
msgid "Network"
msgstr ""
@@ -507,429 +549,589 @@ msgstr ""
msgid "Manually"
msgstr ""
-#: sflphone.xml:272(title)
+#: sflphone.xml:272(title) sflphone.xml:627(title)
msgid "Security features"
msgstr ""
-#: sflphone.xml:275(title)
-msgid "Secure RTP"
+#: sflphone.xml:274(para)
+msgid "Follow the indications to <link linkend=\"account_edit\">edit an account</link> and choose the <guimenu>Security</guimenu> tab."
msgstr ""
-#: sflphone.xml:278(title)
-msgid "TLS"
+#: sflphone.xml:277(title)
+msgid "Security features configuration panel"
+msgstr ""
+
+#: sflphone.xml:289(title)
+msgid "Credentials"
msgstr ""
-#: sflphone.xml:285(title)
+#: sflphone.xml:290(para)
+msgid "SFLphone supports multiple realms."
+msgstr ""
+
+#: sflphone.xml:294(title)
+msgid "Security"
+msgstr ""
+
+#: sflphone.xml:295(para)
+msgid "Please refer to the section <link linkend=\"detailed_security_features\">Security features</link> for detailed information about security features."
+msgstr ""
+
+#: sflphone.xml:301(title)
msgid "Call features"
msgstr ""
-#: sflphone.xml:287(para)
+#: sflphone.xml:303(para)
msgid "All the following features are available with both SIP and IAX2 accounts."
msgstr ""
-#: sflphone.xml:292(title)
+#: sflphone.xml:308(title)
msgid "Dial button"
msgstr ""
#. ==== End of Figure ====
-#: sflphone.xml:303(para)
+#: sflphone.xml:319(para)
msgid "You may have an unlimited number of calls at the same time, even with different accounts."
msgstr ""
-#: sflphone.xml:304(para)
+#: sflphone.xml:320(para)
msgid "To create a new call when you already have a current call, just click on the <guilabel>Dial</guilabel> button. The current call will automatically be put on hold."
msgstr ""
-#: sflphone.xml:307(title)
+#: sflphone.xml:323(title)
msgid "Make an other call"
msgstr ""
#. ==== End of Figure ====
-#: sflphone.xml:318(para)
+#: sflphone.xml:334(para)
msgid "Keyboard shortcut to perform this action: <accel>NUMPAD</accel> or almost any keys."
msgstr ""
-#: sflphone.xml:326(title)
+#: sflphone.xml:342(title)
msgid "Call button"
msgstr ""
#. ==== End of Figure ====
-#: sflphone.xml:337(para) sflphone.xml:355(para)
+#: sflphone.xml:353(para) sflphone.xml:371(para)
msgid "Keyboard shortcut to perform this action: <accel>Enter</accel>."
msgstr ""
-#: sflphone.xml:344(title)
+#: sflphone.xml:360(title)
msgid "Answer button"
msgstr ""
-#: sflphone.xml:361(title)
+#: sflphone.xml:377(title)
msgid "Hangup button"
msgstr ""
#. ==== End of Figure ====
-#: sflphone.xml:372(para) sflphone.xml:392(para)
+#: sflphone.xml:388(para) sflphone.xml:408(para)
msgid "Keyboard shortcut to perform this action: <accel>ESC</accel>."
msgstr ""
-#: sflphone.xml:377(para)
+#: sflphone.xml:393(para)
msgid "When you refuse a call, your caller is automatically redirected to your voicemail box, if applicable."
msgstr ""
-#: sflphone.xml:381(title)
+#: sflphone.xml:397(title)
msgid "Refuse button"
msgstr ""
-#: sflphone.xml:399(title)
+#: sflphone.xml:415(title)
msgid "Hold on button"
msgstr ""
-#: sflphone.xml:411(title)
+#: sflphone.xml:427(title)
msgid "Hold off button"
msgstr ""
-#: sflphone.xml:426(title)
+#: sflphone.xml:442(title)
msgid "Transfer button"
msgstr ""
#. ==== End of Figure ====
-#: sflphone.xml:437(para)
+#: sflphone.xml:453(para)
msgid "Then type the number you want to transfer the current call to."
msgstr ""
-#: sflphone.xml:440(title)
+#: sflphone.xml:456(title)
msgid "Validate the transfer"
msgstr ""
#. ==== End of Figure ====
-#: sflphone.xml:451(para)
+#: sflphone.xml:467(para)
msgid "And press <accel>Enter</accel>. Clicking again on the transfer button cancels the transfer."
msgstr ""
-#: sflphone.xml:457(para)
+#: sflphone.xml:473(para)
msgid "Go to <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem><guimenuitem>Audio</guimenuitem></menuchoice> to configure the recordings destination folder."
msgstr ""
-#: sflphone.xml:461(title)
+#: sflphone.xml:477(title)
msgid "Record settings"
msgstr ""
-#: sflphone.xml:474(title)
+#: sflphone.xml:490(title)
msgid "Record button"
msgstr ""
-#: sflphone.xml:488(caution)
+#: sflphone.xml:504(caution)
msgid "This feature is available only if you fill out the voicemail number information for your default account."
msgstr ""
-#: sflphone.xml:492(title)
+#: sflphone.xml:508(title)
msgid "Voicemail button"
msgstr ""
-#: sflphone.xml:506(para)
+#: sflphone.xml:522(para)
msgid "A direct IP call is a call established between two peers without any accounts. When dialing, such a call must prefixed with <guilabel>sip:</guilabel>."
msgstr ""
-#: sflphone.xml:508(para)
+#: sflphone.xml:524(para)
msgid "Direct IP calls use SIP protocol to establish communication and RTP to transport data. It is right now not available with IAX2."
msgstr ""
-#: sflphone.xml:510(para)
+#: sflphone.xml:526(para)
msgid "Go to <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem><guimenuitem>Direct IP calls</guimenuitem></menuchoice> to configure the advanced security features for this kind of calls."
msgstr ""
-#: sflphone.xml:514(para)
+#: sflphone.xml:530(para)
msgid "SFLphone now supports conference call hosting integrating server like features in a simple GUI."
msgstr ""
-#: sflphone.xml:520(guilabel)
+#: sflphone.xml:536(guilabel)
msgid "Create a conference"
msgstr ""
-#: sflphone.xml:521(para)
+#: sflphone.xml:537(para)
msgid "To host a conference, simply drag and drop one call on another. Additional participants are added the same way, dragging a call on the conference icon."
msgstr ""
-#: sflphone.xml:528(guilabel)
+#: sflphone.xml:544(title)
+msgid "Creating a new conference"
+msgstr ""
+
+#: sflphone.xml:556(title)
+msgid "Conference call"
+msgstr ""
+
+#: sflphone.xml:568(guilabel)
msgid "Leave a conference"
msgstr ""
-#: sflphone.xml:529(para)
-msgid "SFLphone conference model let you leave a conference that you are currently hosting to answer any other incoming communication or even initiate new ones. The conference is not interupted Double clicking the conference icon let you reintroduce the conference."
+#: sflphone.xml:569(para)
+msgid "SFLphone conference model let you leave a conference that you are currently hosting to answer any other incoming communication or even initiate new ones. The conference is not interupted, double clicking the conference icon let you reintroduce it at any momment."
+msgstr ""
+
+#: sflphone.xml:578(title)
+msgid "Conference detached"
+msgstr ""
+
+#: sflphone.xml:590(title)
+msgid "Conference attached"
msgstr ""
-#: sflphone.xml:538(guilabel)
+#: sflphone.xml:602(guilabel)
msgid "Multiple conference"
msgstr ""
-#: sflphone.xml:539(para)
+#: sflphone.xml:603(para)
msgid "SFLphone supports multiple conferences running simultaneously. Two conferences can be joined the same way they are created, dragging one on the other."
msgstr ""
-#: sflphone.xml:547(guilabel)
+#: sflphone.xml:611(guilabel)
msgid "Hangup/Hold a conference"
msgstr ""
-#: sflphone.xml:548(para)
-msgid "Right click the conference icon. Holding the conference put all participants on hold. Hangup a conference hangup all participants."
+#: sflphone.xml:612(para)
+msgid "Select the conference icon and press hangup/hold button on the toolbar. The selected action is applied on every conference participants."
+msgstr ""
+
+#: sflphone.xml:629(title)
+msgid "SRTP/ZRTP"
+msgstr ""
+
+#: sflphone.xml:631(title)
+msgid "SRTP and ZRTP, the big picture"
+msgstr ""
+
+#: sflphone.xml:632(para)
+msgid "RTP is the underlying protocol that is used in pair with the widely used SIP protocol to carry voice data. RTP alone does not provide any security features."
+msgstr ""
+
+#: sflphone.xml:633(para)
+msgid "Details for implementing Secure RTP (SRTP) were described independently in a separate document (RFC). However, in this paper, one aspect was deliberately left unspecified: how should the encryption keys be exchanged between the two parties involved in a secure RTP session ?"
+msgstr ""
+
+#: sflphone.xml:635(para)
+msgid "Mutiple solutions were proposed to fill in that blank. Among them, are SDES (RFC4568) and ZRTP which are probably the most popular today. For the 0.9.7 release, SFLphone integrates support for Secure RTP through the ZRTP protocol, and SDES is expected to be implemented in the very few next releases."
+msgstr ""
+
+#: sflphone.xml:637(para)
+msgid "As of today, blueprints for ZRTP are still laid out and are recognized under the name \"zrtp-draftzimmerman\" in the RFC machine. The author of ZRTP is Phil Zimmermann, that same person who brought us PGP. Therefore, it is not suprising that he designed ZRTP as an anti-PKI solution for key exchange."
+msgstr ""
+
+#: sflphone.xml:639(para)
+msgid "ZRTP makes possible for two parties to automatically establish a shared secret in a very simple way from the users's point of view. Indeed under SFLphone no special configuration is needed, appart from enabling the option itself."
msgstr ""
-#: sflphone.xml:565(title)
+#: sflphone.xml:641(para)
+msgid "If you want to use ZRTP, please take note that if you are connecting to a PBX, this one must have been configured to support ZRTP. Unfortunately, security for VoIP communications is still young and chances are that your PBX software won't support it."
+msgstr ""
+
+#: sflphone.xml:643(para)
+msgid "This does not mean that you want be able to benefit from ZRTP ! In fact, it turns out that you will be able to use it, as long as the server does not need to decode the RTP stream. This is often the case when the person you are calling to uses a codec that you don't support. In that case, the server will need to transcode the RTP packets and obviously need to be able to handle the ZRTP stream."
+msgstr ""
+
+#: sflphone.xml:645(para)
+msgid "Obviously, if you are calling another user (for example by prefixing the number with \"sip:\") directly, then this one will have to support ZRTP as well if you want to use it."
+msgstr ""
+
+#: sflphone.xml:649(title)
+msgid "Enabling SRTP/ZRTP"
+msgstr ""
+
+#: sflphone.xml:650(para)
+msgid "To enable ZRTP per account basis, perform the following steps:"
+msgstr ""
+
+#: sflphone.xml:654(para)
+msgid "Select the <guilabel>Security</guilabel> tab."
+msgstr ""
+
+#: sflphone.xml:655(para)
+msgid "Select <guilabel>ZRTP</guilabel> from the select box named <guilabel>SRTP Key Exchange</guilabel>."
+msgstr ""
+
+#: sflphone.xml:659(title)
+msgid "Enabling SRTP"
+msgstr ""
+
+#: sflphone.xml:672(title)
+msgid "Configuration options"
+msgstr ""
+
+#: sflphone.xml:674(para)
+msgid "After enabling SRTP, click the <guilabel>Preferences</guilabel> button."
+msgstr ""
+
+#: sflphone.xml:675(para)
+msgid "For basic usage, one don't have to worry about that."
+msgstr ""
+
+#: sflphone.xml:679(title)
+msgid "ZRTP configuration panel"
+msgstr ""
+
+#: sflphone.xml:693(guilabel)
+msgid "Send Hello Hash in SDP"
+msgstr ""
+
+#: sflphone.xml:694(para)
+msgid "Selecting this option will cause the program to compute an hash function over the \"Hello\" packet and send it as an SDP field \"zrtp-hash:\". The remote end might be interested in getting this value to add an additional layer of protection based on another communication channel. Upon receiving this value, the remote point can compute the hash function on the received hello packet and compare it."
+msgstr ""
+
+#: sflphone.xml:695(para)
+msgid "Take note that for 0.9.7, SFLPhone does not perform the comparasion on its side."
+msgstr ""
+
+#: sflphone.xml:699(guilabel)
+msgid "Ask user to confirm SAS"
+msgstr ""
+
+#: sflphone.xml:700(para)
+msgid "The short authentication mechanism is at the heart of the ZRTP protocol. Not requirering the user to manually check the SAS value presents a security risk over Man in the Middle type of attacks."
+msgstr ""
+
+#: sflphone.xml:702(para)
+msgid "Disabling this option will stop the program from prompting the user with the SAS."
+msgstr ""
+
+#: sflphone.xml:704(para)
+msgid "Such an option was motivated to be developped at that time by the the state of the libzrtpcpp library that SFLPhone was making use of. It is only from version x.x that this library can cache results of SAS computation between two peers."
+msgstr ""
+
+#: sflphone.xml:709(guilabel)
+msgid "Display SAS once for hold event"
+msgstr ""
+
+#: sflphone.xml:710(para)
+msgid "When call is put on hold, the RTP stream is stopped and reinitiated later. From the ZRTP point of view, this appears as a \"new call\". Therefore, the SAS will be redisplayed unless this option is selected."
+msgstr ""
+
+#: sflphone.xml:713(guilabel)
+msgid "ZRTP for direct peer-to-peer calls"
+msgstr ""
+
+#: sflphone.xml:714(para)
+msgid "If you want to use ZRTP for calls that are placed directly to a user (without an intervening PBX), you must enable the option under the \"Direct IP Calls\" tab in the \"configuration\" window, available from the \"edit\" menu."
+msgstr ""
+
+#: sflphone.xml:716(para)
+msgid "Configuration instruction from that point are the same as for configured accounts."
+msgstr ""
+
+#: sflphone.xml:723(title)
+msgid "TLS"
+msgstr ""
+
+#: sflphone.xml:730(title)
msgid "Audio configuration"
msgstr ""
-#: sflphone.xml:566(para)
+#: sflphone.xml:731(para)
msgid "ALSA and Pulseaudio native interfaces are available."
msgstr ""
-#: sflphone.xml:582(title)
+#: sflphone.xml:747(title)
msgid "Codecs overview"
msgstr ""
-#: sflphone.xml:583(para)
+#: sflphone.xml:748(para)
msgid "SFLphone supports several widely used audio codec:"
msgstr ""
-#: sflphone.xml:587(guilabel)
+#: sflphone.xml:752(guilabel)
msgid "PCMU/PCMA"
msgstr ""
-#: sflphone.xml:588(para)
+#: sflphone.xml:753(para)
msgid "ITU-T telefony standard PCM formats, 8kHz, 64 kbit/s, using logarithmic byte compression algorithm."
msgstr ""
-#: sflphone.xml:594(guilabel)
+#: sflphone.xml:759(guilabel)
msgid "GSM"
msgstr ""
-#: sflphone.xml:595(para)
+#: sflphone.xml:760(para)
msgid "Global System for Mobile communications (GSM) narrowband 8kHz standard based on linear prediction encoding."
msgstr ""
-#: sflphone.xml:601(guilabel)
+#: sflphone.xml:766(guilabel)
msgid "G722"
msgstr ""
-#: sflphone.xml:602(para)
+#: sflphone.xml:767(para)
msgid "ITU-T standard wideband 16kHz standard based on linear prediction."
msgstr ""
-#: sflphone.xml:607(guilabel)
+#: sflphone.xml:772(guilabel)
msgid "SPEEX"
msgstr ""
-#: sflphone.xml:608(para)
+#: sflphone.xml:773(para)
msgid "High quality voice encoding/decoding available in narrowband 8Khz, wideband 16khz (HD Voice), and ultra-wideband 32 kHz. Integrate additional features such as Variable Bit Rate (VBR) and noise reduction."
msgstr ""
-#: sflphone.xml:617(guilabel)
+#: sflphone.xml:782(guilabel)
msgid "CELT"
msgstr ""
-#: sflphone.xml:628(title)
+#: sflphone.xml:793(title)
msgid "Address books"
msgstr ""
-#: sflphone.xml:630(title)
+#: sflphone.xml:795(title)
msgid "Enable the address book support"
msgstr ""
-#: sflphone.xml:631(para)
+#: sflphone.xml:796(para)
msgid "To enable the address book, perform the following steps:"
msgstr ""
-#: sflphone.xml:634(para)
+#: sflphone.xml:799(para)
msgid "Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>."
msgstr ""
-#: sflphone.xml:638(para)
+#: sflphone.xml:803(para)
msgid "Select the <menuchoice><guimenu>Address book</guimenu></menuchoice> tab."
msgstr ""
-#: sflphone.xml:642(para)
+#: sflphone.xml:807(para)
msgid "Check the <guilabel>Use Evolution address books</guilabel> box."
msgstr ""
-#: sflphone.xml:645(para)
+#: sflphone.xml:810(para)
msgid "Every address books you configured in Evolution will be now available in <application>SFLphone</application>. Please be sure you selected at least one address book."
msgstr ""
-#: sflphone.xml:649(title)
+#: sflphone.xml:814(title)
msgid "Available options"
msgstr ""
-#: sflphone.xml:650(para)
+#: sflphone.xml:815(para)
msgid "In <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem><guimenuitem>Address book</guimenuitem></menuchoice>, you may select one or all of the following options:"
msgstr ""
-#: sflphone.xml:653(guilabel)
+#: sflphone.xml:818(guilabel)
msgid "Display contact photo if available"
msgstr ""
-#: sflphone.xml:654(para)
+#: sflphone.xml:819(para)
msgid "The contact photo will be displayed as a thumbnail beside the phone number."
msgstr ""
-#: sflphone.xml:659(guilabel)
+#: sflphone.xml:824(guilabel)
msgid "Fields from Evolution's address book"
msgstr ""
-#: sflphone.xml:660(para)
+#: sflphone.xml:825(para)
msgid "You may use one or all of these following information from your contact."
msgstr ""
-#: sflphone.xml:663(listitem)
+#: sflphone.xml:828(listitem)
msgid "Work phone number"
msgstr ""
-#: sflphone.xml:664(listitem)
+#: sflphone.xml:829(listitem)
msgid "Home phone number"
msgstr ""
-#: sflphone.xml:665(listitem)
+#: sflphone.xml:830(listitem)
msgid "Mobile phone number"
msgstr ""
-#: sflphone.xml:673(title)
+#: sflphone.xml:838(title)
msgid "Using the address book"
msgstr ""
-#: sflphone.xml:676(para)
+#: sflphone.xml:841(para)
msgid "On the toolbar, click on the following button to display the address book window:"
msgstr ""
-#: sflphone.xml:680(title)
+#: sflphone.xml:845(title)
msgid "Address book toolbar button"
msgstr ""
-#: sflphone.xml:693(para)
+#: sflphone.xml:858(para)
msgid "Search for a contact"
msgstr ""
-#: sflphone.xml:697(para)
+#: sflphone.xml:862(para)
msgid "New entries should have appeared in the window. Double click on it to call the contact. You may also <menuchoice><guimenu>Right click</guimenu><guimenuitem>Edit before calling</guimenuitem></menuchoice> to modify the entry before calling."
msgstr ""
-#: sflphone.xml:704(title)
+#: sflphone.xml:869(title)
msgid "Preferences"
msgstr ""
-#: sflphone.xml:706(para)
+#: sflphone.xml:871(para)
msgid "Go to <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> to access the configuration panel."
msgstr ""
-#: sflphone.xml:707(para)
+#: sflphone.xml:872(para)
msgid "Each section is detailed below."
msgstr ""
-#: sflphone.xml:710(title)
+#: sflphone.xml:875(title)
msgid "General"
msgstr ""
-#: sflphone.xml:711(para)
+#: sflphone.xml:876(para)
msgid "This section provides the user general settings regarding the application."
msgstr ""
-#: sflphone.xml:715(title)
+#: sflphone.xml:880(title)
msgid "Desktop notifications options"
msgstr ""
-#: sflphone.xml:729(guilabel)
+#: sflphone.xml:894(guilabel)
msgid "Enable notifications"
msgstr ""
-#: sflphone.xml:730(para)
+#: sflphone.xml:895(para)
msgid "Both clients use their desktop environment notification system. If checked, you will receive desktop notifications for events such as incoming calls and system messages."
msgstr ""
-#: sflphone.xml:734(title)
+#: sflphone.xml:899(title)
msgid "Example of an incoming call notification"
msgstr ""
-#: sflphone.xml:746(guilabel)
+#: sflphone.xml:911(guilabel)
msgid "Enable voicemail notifications"
msgstr ""
-#: sflphone.xml:747(para)
+#: sflphone.xml:912(para)
msgid "The voicemail notifications are handled separatly. If checked, you will be notified with the number of unread voicemails for your accounts."
msgstr ""
-#: sflphone.xml:751(title)
+#: sflphone.xml:916(title)
msgid "Example of a voicemail notification"
msgstr ""
-#: sflphone.xml:770(title)
+#: sflphone.xml:935(title)
msgid "System tray options"
msgstr ""
-#: sflphone.xml:784(guilabel)
+#: sflphone.xml:949(guilabel)
msgid "Popup main window on incoming call"
msgstr ""
-#: sflphone.xml:785(para)
+#: sflphone.xml:950(para)
msgid "If SFLphone is closed on the system tray, pops the main window up on foreground when receiving an incoming call."
msgstr ""
-#: sflphone.xml:790(guilabel)
+#: sflphone.xml:955(guilabel)
msgid "Never popup main window"
msgstr ""
-#: sflphone.xml:791(para)
+#: sflphone.xml:956(para)
msgid "If SFLphone is closed on the system tray, never pops the main window up on foreground when receiving an incoming call."
msgstr ""
-#: sflphone.xml:796(guilabel)
+#: sflphone.xml:961(guilabel)
msgid "Hide SFLphone window on startup"
msgstr ""
-#: sflphone.xml:797(para)
+#: sflphone.xml:962(para)
msgid "On startup, SFLphone will go directly on the system tray."
msgstr ""
-#: sflphone.xml:810(title)
+#: sflphone.xml:975(title)
msgid "Calls history options"
msgstr ""
-#: sflphone.xml:823(guilabel)
+#: sflphone.xml:988(guilabel)
msgid "Keep my history for at least n days"
msgstr ""
-#: sflphone.xml:824(para)
+#: sflphone.xml:989(para)
msgid "If checked, calls will be kept up to N days in the history. You may select a custom number of days. Do not check it if you don't want to use this feature."
msgstr ""
-#: sflphone.xml:834(title)
+#: sflphone.xml:999(title)
msgid "Configuration file options"
msgstr ""
-#: sflphone.xml:847(guilabel)
+#: sflphone.xml:1012(guilabel)
msgid "Store SIP credentials as MD5 hash"
msgstr ""
-#: sflphone.xml:848(para)
+#: sflphone.xml:1013(para)
msgid "If checked, your password information will be encrypted in the configuration file, instead of plain text."
msgstr ""
-#: sflphone.xml:859(title)
+#: sflphone.xml:1024(title)
msgid "Audio"
msgstr ""
-#: sflphone.xml:863(title)
+#: sflphone.xml:1028(title)
msgid "Address book"
msgstr ""
-#: sflphone.xml:865(para)
+#: sflphone.xml:1030(para)
msgid "Refer to the <link linkend=\"addressbook\">Address books</link> section for more information."
msgstr ""
-#: sflphone.xml:869(title)
+#: sflphone.xml:1034(title)
msgid "Hooks"
msgstr ""
-#: sflphone.xml:877(title)
+#: sflphone.xml:1042(title)
msgid "Direct IP calls"
msgstr ""
-#: sflphone.xml:878(para)
+#: sflphone.xml:1043(para)
msgid "Refer to the <link linkend=\"directip\">Direct IP calls</link> section for more information."
msgstr ""
diff --git a/sflphone-client-gnome/doc/C/sflphone.xml b/sflphone-client-gnome/doc/C/sflphone.xml
index b104b8b2f8493a28a289d5a41f861170ddbadcf5..64861bea86727339f40c9243d92b5e718a580399 100644
--- a/sflphone-client-gnome/doc/C/sflphone.xml
+++ b/sflphone-client-gnome/doc/C/sflphone.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V4.1//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
<!ENTITY app "SFLphone">
- <!ENTITY appversion "0.9.7 beta">
+ <!ENTITY appversion "0.9.7">
+ <!ENTITY docversion "1.0">
]>
<!-- =============Document Header ============================= -->
@@ -9,7 +10,7 @@
<!-- please do not change the id; for translations, change lang to -->
<!-- appropriate code -->
<articleinfo>
- <title>SFLphone Manual v1.0</title>
+ <title>SFLphone Manual v&docversion;</title>
<copyright>
<year>2006</year>
@@ -73,7 +74,7 @@
<revhistory>
<revision>
- <revnumber>SFLphone Manual V1.0</revnumber>
+ <revnumber>SFLphone Manual v1.0</revnumber>
<date>September 2009</date>
<revdescription>
<para role="author">SFLphone team</para>
@@ -82,7 +83,7 @@
</revision>
</revhistory>
-<releaseinfo>This manual describes version 0.9.7 of SFLphone.</releaseinfo>
+<releaseinfo>This manual describes SFLphone version &appversion;.</releaseinfo>
</articleinfo>
@@ -117,7 +118,7 @@
<sect1 id="getting-started">
<title>Getting started</title>
<para>
- The first time you start up sflphone, you will be ask to complete a wizard to set up your(s) account(s). This account configuration manager offers you two possibilities:
+ The first time you start up SFLphone, you will be ask to complete a wizard to set up your(s) account(s). This account configuration manager offers you two possibilities:
<itemizedlist>
<listitem>
<para><guilabel>Create a free SIP/IAX2 account on sflphone.org</guilabel></para>
@@ -159,7 +160,7 @@
</listitem>
<listitem>
<para><guilabel>Protocol</guilabel></para>
- <para>Select SIP or IAX2. The most commons are SIP accounts.</para>
+ <para>Select SIP or IAX2. The most commonly used protocol is SIP.</para>
</listitem>
<listitem>
<para><guilabel>Host name</guilabel></para>
@@ -181,7 +182,8 @@
</listitem>
<listitem><para>Click the <menuchoice><guimenu>Apply</guimenu></menuchoice> button.</para></listitem>
</orderedlist>
- <para>You may now check the state of your account(s). You may have as many setup accounts as you wish. If it is registered, you may now use it to make calls.</para>
+ <para>You may now check the state of your account(s). If it is registered, you may now use it to make calls.</para>
+ <note>You can setup as many accounts as you wish.</note>
</sect3>
<sect3 id="account_edit">
@@ -205,7 +207,7 @@
<sect3 id="account_selection">
<title>Selecting a default account</title>
- <para>As it is possible to have an unlimited number of registered accounts at the same time, which account will be used when making a call ? You can not only set up a default account to be used every time you are making a call, but an entire priority list. To do that, perform the following steps:</para>
+ <para>Since it is possible to have an unlimited number of registered accounts at the same time, which account will be used when making a call ? You can not only set up a default account to be used every time you are making a call, but an entire priority list. To do that, perform the following steps:</para>
<orderedlist>
<listitem><para>Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Manage accounts</guimenuitem></menuchoice> to access the accounts list.</para></listitem>
<listitem>
@@ -236,8 +238,8 @@
<sect3 id="accounts_registration">
<title>Registration</title>
<para>You may set the expires header for a contact.</para>
- <para>It basically represents the duration your registration will remain active. If you don't register again within that time, calls will no longer be routed to you. it should be not used as a keepalive mechanism though. The default value is 600 seconds (ten minutes).</para>
- <note>To register to some VoIP services, you will need to set this value at at least 1600 seconds (Example: French VoIP server freephonie.net).
+ <para>It basically represents the duration your registration will remain active. If you don't register again within that time, calls will no longer be routed to you. It should not be used as a keepalive mechanism though. The default value is 600 seconds (ten minutes).</para>
+ <note>Some VoIP services requires that you set this value at at least 1600 seconds (e.g. the French VoIP server freephonie.net).
</note>
</sect3>
<sect3 id="accounts_stun">
@@ -270,21 +272,37 @@
</sect2>
<sect2 id="account_security">
<title>Security features</title>
- <para>These features are only available with SIP.</para>
- <sect3 id="accounts_zrtp">
- <title>Secure RTP</title>
+ <para>These features are only available with SIP.</para>
+ <para>Follow the indications to <link linkend='account_edit'>edit an account</link> and choose the <guimenu>Security</guimenu> tab.</para>
+ <!-- ==== Figure ==== -->
+ <figure id="account-security-fig">
+ <title>Security features configuration panel</title>
+ <screenshot>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/accounts_security.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ </screenshot>
+ </figure>
+ <!-- ==== End of Figure ==== -->
+
+ <sect3 id="realms">
+ <title>Credentials</title>
+ <para>SFLphone supports multiple realms.</para>
</sect3>
- <sect3 id="accounts_tls">
- <title>TLS</title>
+
+ <sect3 id="security_frame">
+ <title>Security </title>
+ <para>Please refer to the section <link linkend="detailed_security_features">Security features</link> for detailed information about security features.</para>
</sect3>
</sect2>
-
</sect1>
<sect1 id="call_features">
<title>Call features</title>
- <para>All the following features are available with both SIP and IAX2 accounts.</para>
+ <para>The following features are available with both SIP and IAX2 accounts.</para>
<sect2 label="Dialing a number">
<!-- ==== Figure ==== -->
@@ -554,8 +572,8 @@
SFLphone conference model let you leave a conference that
you are currently hosting to answer any other incoming
communication or even initiate new ones. The conference is
- not interupted, double clicking the conference icon
- let you reintroduce it at any momment.
+ not interrupted, double clicking the conference icon
+ let you reintroduce it at any moment.
</para>
<!-- ==== Figure ==== -->
<figure id="conference_detached-fig">
@@ -607,10 +625,113 @@
</sect1>
+<sect1 id="detailed_security_features">
+ <title>Security features</title>
+ <sect2 id="zrtp_srtp">
+ <title>SRTP/ZRTP</title>
+ <sect3 id="zrtp_srtp_definition">
+ <title>SRTP and ZRTP, the big picture</title>
+ <para>RTP is the underlying protocol that is used in pair with the widely used SIP protocol to carry voice data. RTP alone does not provide any security features.</para>
+ <para>Details for implementing Secure RTP (SRTP) were described independently in a separate document (RFC). However, in this paper, one aspect was deliberately left unspecified: how should the encryption keys be exchanged between the two parties involved in a secure RTP session ?</para>
+
+ <para>Multiple solutions were proposed to fill in that blank. Among them, are SDES (RFC4568) and ZRTP which are probably the most popular today. For the 0.9.7 release, SFLphone integrates support for Secure RTP through the ZRTP protocol, and SDES is expected to be implemented in the very few next releases.</para>
+
+ <para>As of today, blueprints for ZRTP are still laid out and are recognized under the name "zrtp-draftzimmerman" in the RFC machine. The author of ZRTP is Phil Zimmermann, that same person who brought us PGP. Therefore, it is not surprising that he designed ZRTP as an anti-PKI solution for key exchange.</para>
+
+ <para>ZRTP makes possible for two parties to automatically establish a shared secret in a very simple way from the user's point of view. Indeed under SFLphone no special configuration is needed, apart from enabling the option itself.</para>
+
+ <para>If you want to use ZRTP, please take note that if you are connecting to a PBX, this one must have been configured to support ZRTP. Unfortunately, security for VoIP communications is still young and chances are that your PBX software won't support it.</para>
+
+ <para>This does not mean that you want be able to benefit from ZRTP ! In fact, it turns out that you will be able to use it, as long as the server does not need to decode the RTP stream. This is often the case when the person you are calling to uses a codec that you don't support. In that case, the server will need to transcode the RTP packets and obviously need to be able to handle the ZRTP stream.</para>
+
+ <para>Obviously, if you are calling another user (for example by prefixing the number with "sip:") directly, then this one will have to support ZRTP as well if you want to use it.</para>
+ </sect3>
+
+ <sect3 id="enabling_srtp">
+ <title>Enabling SRTP/ZRTP</title>
+ <para>To enable ZRTP per account basis, perform the following steps:</para>
+ <orderedlist>
+ <listitem><para>Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Manage accounts</guimenuitem></menuchoice>.</para></listitem>
+ <listitem><para>Select in the list the account you would like to edit, then click on the <guilabel>Edit</guilabel> button.</para></listitem>
+ <listitem><para>Select the <guilabel>Security</guilabel> tab.</para></listitem>
+ <listitem><para>Select <guilabel>ZRTP</guilabel> from the select box named <guilabel>SRTP Key Exchange</guilabel>.</para></listitem>
+ </orderedlist>
+ <!-- ==== Figure ==== -->
+ <figure id="srtp-enabled-fig">
+ <title>Enabling SRTP</title>
+ <screenshot>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/srtp_enabled.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ </screenshot>
+ </figure>
+ <!-- ==== End of Figure ==== -->
+ </sect3>
+
+ <sect3 id="account_zrtp">
+ <title>Configuration options</title>
+
+ <para>After enabling SRTP, click the <guilabel>Preferences</guilabel> button.</para>
+ <para>For basic usage, one don't have to worry about that.</para>
+
+ <!-- ==== Figure ==== -->
+ <figure id="zrtp-options-fig">
+ <title>ZRTP configuration panel</title>
+ <screenshot>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/zrtp_options.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ </screenshot>
+ </figure>
+ <!-- ==== End of Figure ==== -->
+
+
+ <variablelist>
+ <varlistentry>
+ <term><guilabel>Send Hello Hash in SDP</guilabel></term>
+ <listitem><para>Selecting this option will cause the program to compute an hash function over the "Hello" packet and send it as an SDP field "zrtp-hash:". The remote end might be interested in getting this value to add an additional layer of protection based on another communication channel. Upon receiving this value, the remote point can compute the hash function on the received hello packet and compare it.</para>
+ <para>Take note that for 0.9.7, SFLphone does not perform the comparison on its side.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guilabel>Ask user to confirm SAS</guilabel></term>
+ <listitem><para>The short authentication mechanism is at the heart of the ZRTP protocol. Not requiring the user to manually check the SAS value presents a security risk over Man in the Middle type of attacks.</para>
+
+ <para>Disabling this option will stop the program from prompting the user with the SAS.</para>
+
+ <para>Such an option was motivated to be developed at that time by the the state of the libzrtpcpp library that SFLphone was making use of. It is only from version x.x that this library can cache results of SAS computation between two peers.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guilabel>Display SAS once for hold event</guilabel></term>
+ <listitem><para>When call is put on hold, the RTP stream is stopped and reinitiated later. From the ZRTP point of view, this appears as a "new call". Therefore, the SAS will be redisplayed unless this option is selected.</para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><guilabel>ZRTP for direct peer-to-peer calls</guilabel></term>
+ <listitem><para>If you want to use ZRTP for calls that are placed directly to a user (without an intervening PBX), you must enable the option under the "Direct IP Calls" tab in the "configuration" window, available from the "edit" menu.</para>
+
+ <para>Configuration instruction from that point are the same as for configured accounts.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </sect3>
+ </sect2>
+ <sect2 id="accounts_tls">
+ <title>TLS</title>
+ </sect2>
+</sect1>
+
+
+
<sect1 id="audio_interfaces">
<title>Audio configuration</title>
<para>
- ALSA and Pulseaudio native interfaces are available.
+ ALSA and PulseAudio native interfaces are available.
</para>
<sect2 label="Pulseaudio">
@@ -626,13 +747,13 @@
<sect1 id="codecs_overview">
<title>Codecs overview</title>
- <para>SFLphone supports several widely used audio codec:</para>
+ <para>SFLphone supports several widely used audio codecs:</para>
<para>
<itemizedlist>
<listitem>
<guilabel>PCMU/PCMA</guilabel>
<para>
- ITU-T telefony standard PCM formats, 8kHz, 64
+ ITU-T telephony standard PCM formats, 8kHz, 64
kbit/s, using logarithmic byte compression algorithm.
</para>
</listitem>
@@ -653,7 +774,7 @@
<guilabel>SPEEX</guilabel>
<para>
High quality voice encoding/decoding available
- in narrowband 8Khz, wideband 16khz (HD Voice),
+ in narrowband 8kHz, wideband 16kHz (HD Voice),
and ultra-wideband 32 kHz.
Integrate additional features such as Variable Bit
Rate (VBR) and noise reduction.
@@ -791,7 +912,7 @@
<varlistentry>
<term><guilabel>Enable voicemail notifications</guilabel></term>
<listitem><para>
- The voicemail notifications are handled separatly. If checked, you will be notified with the number of unread voicemails for your accounts.
+ The voicemail notifications are handled separately. If checked, you will be notified with the number of unread voicemails for your accounts.
</para>
<figure id="voicemail-notif-fig">
<title>Example of a voicemail notification</title>
diff --git a/sflphone-client-gnome/doc/Makefile.am b/sflphone-client-gnome/doc/Makefile.am
index 2993072194d2eb793d34df550ab2eb2439f2b3ca..6727048ed8b2627be0c82e25f8555fd0cb40c51f 100644
--- a/sflphone-client-gnome/doc/Makefile.am
+++ b/sflphone-client-gnome/doc/Makefile.am
@@ -24,8 +24,11 @@ DOC_FIGURES = figures/addressbook-button.png \
figures/systemtray-settings.png \
figures/voicemail-notif.png \
figures/account_advanced.png \
+ figures/accounts_security.png \
figures/drag_n_drop.png \
figures/conference.png \
figures/conference_detached.png \
- figures/conference_attached.png
-DOC_LINGUAS = fr de es it zh_TW zh_HK zh_CN ko pl pt_BR pt ru
+ figures/conference_attached.png \
+ figures/srtp_enabled.png \
+ figures/zrtp_options.png
+DOC_LINGUAS = fr es
diff --git a/sflphone-client-gnome/doc/es/es.po b/sflphone-client-gnome/doc/es/es.po
new file mode 100644
index 0000000000000000000000000000000000000000..2d243741c05756549b4ea9bd29ad2b1849021b57
--- /dev/null
+++ b/sflphone-client-gnome/doc/es/es.po
@@ -0,0 +1,1356 @@
+# Spanish translation for sflphone
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the sflphone package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: sflphone\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-10-26 15:41-0400\n"
+"PO-Revision-Date: 2009-12-09 15:04+0000\n"
+"Last-Translator: Maxime Chambreuil <maxime.chambreuil@gmail.com>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-12-09 20:52+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:230(None)
+msgid ""
+"@@image: 'figures/account_advanced.png'; md5=8cc040a5f56fe61566ad7b0fa83955d9"
+msgstr ""
+"@@image: 'figures/account_advanced.png'; md5=8cc040a5f56fe61566ad7b0fa83955d9"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:296(None)
+msgid "@@image: 'figures/dial.png'; md5=81ff4280c293e62a49fad3a4b61b9bb5"
+msgstr "@@image: 'figures/dial.png'; md5=81ff4280c293e62a49fad3a4b61b9bb5"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:311(None)
+msgid ""
+"@@image: 'figures/call-second.png'; md5=fa490e3b07eebaa9f4ff719f579d68ef"
+msgstr ""
+"@@image: 'figures/call-second.png'; md5=fa490e3b07eebaa9f4ff719f579d68ef"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:330(None)
+msgid "@@image: 'figures/call.png'; md5=ecd96beec76f808b5c1469ecc1293237"
+msgstr "@@image: 'figures/call.png'; md5=ecd96beec76f808b5c1469ecc1293237"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:348(None)
+msgid "@@image: 'figures/answer.png'; md5=c168995c6b36b5d200c49d1c02c2ea52"
+msgstr "@@image: 'figures/answer.png'; md5=c168995c6b36b5d200c49d1c02c2ea52"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:365(None)
+msgid "@@image: 'figures/hangup.png'; md5=0cac4dfe3a9a4bdf4d12229f77e3723a"
+msgstr "@@image: 'figures/hangup.png'; md5=0cac4dfe3a9a4bdf4d12229f77e3723a"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:385(None)
+msgid "@@image: 'figures/refuse.png'; md5=34b6cbf068e56163058e79de3ca70c59"
+msgstr "@@image: 'figures/refuse.png'; md5=34b6cbf068e56163058e79de3ca70c59"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:403(None)
+msgid "@@image: 'figures/holdon.png'; md5=655078b8b495ada29f65b58501187d16"
+msgstr "@@image: 'figures/holdon.png'; md5=655078b8b495ada29f65b58501187d16"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:415(None)
+msgid "@@image: 'figures/holdoff.png'; md5=e06b8eba03f1545cd18891630b22f281"
+msgstr "@@image: 'figures/holdoff.png'; md5=e06b8eba03f1545cd18891630b22f281"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:430(None)
+msgid "@@image: 'figures/transfer.png'; md5=92f921c7c6ba4ee2487ccf6e02226d9a"
+msgstr ""
+"@@image: 'figures/transfer.png'; md5=92f921c7c6ba4ee2487ccf6e02226d9a"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:444(None)
+msgid ""
+"@@image: 'figures/transfer-go.png'; md5=553b57d5a9fc9f248ba15cecc32d343f"
+msgstr ""
+"@@image: 'figures/transfer-go.png'; md5=553b57d5a9fc9f248ba15cecc32d343f"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:465(None)
+msgid ""
+"@@image: 'figures/rec-settings.png'; md5=27d51e45ff23dde58b0512f90773f6ce"
+msgstr ""
+"@@image: 'figures/rec-settings.png'; md5=27d51e45ff23dde58b0512f90773f6ce"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:478(None)
+msgid "@@image: 'figures/record.png'; md5=7a594660924940e8def9ecfcee0e8cb4"
+msgstr "@@image: 'figures/record.png'; md5=7a594660924940e8def9ecfcee0e8cb4"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:496(None)
+msgid ""
+"@@image: 'figures/voicemail.png'; md5=36dbeb4bcc6a68519d474552a888ce1e"
+msgstr ""
+"@@image: 'figures/voicemail.png'; md5=36dbeb4bcc6a68519d474552a888ce1e"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:684(None)
+msgid ""
+"@@image: 'figures/addressbook-button.png'; "
+"md5=b4a820013ef8b8f48e7de780a66c7800"
+msgstr ""
+"@@image: 'figures/addressbook-button.png'; "
+"md5=b4a820013ef8b8f48e7de780a66c7800"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:719(None)
+msgid ""
+"@@image: 'figures/desktop-notif-settings.png'; "
+"md5=2bca85d6d9871883399481b994bd3384"
+msgstr ""
+"@@image: 'figures/desktop-notif-settings.png'; "
+"md5=2bca85d6d9871883399481b994bd3384"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:738(None)
+msgid ""
+"@@image: 'figures/notif-example.png'; md5=d09008bedcaee435b12cd165d42e39b7"
+msgstr ""
+"@@image: 'figures/notif-example.png'; md5=d09008bedcaee435b12cd165d42e39b7"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:755(None)
+msgid ""
+"@@image: 'figures/voicemail-notif.png'; md5=a33ed4ce4b693d67ee453b4ef1fa6c30"
+msgstr ""
+"@@image: 'figures/voicemail-notif.png'; md5=a33ed4ce4b693d67ee453b4ef1fa6c30"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:774(None)
+msgid ""
+"@@image: 'figures/systemtray-settings.png'; "
+"md5=638612a08eb31eb768c4f08ace9c909a"
+msgstr ""
+"@@image: 'figures/systemtray-settings.png'; "
+"md5=638612a08eb31eb768c4f08ace9c909a"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:814(None)
+msgid ""
+"@@image: 'figures/callshistory-settings.png'; "
+"md5=287d8aed7d7c71752257c64e89a9127d"
+msgstr ""
+"@@image: 'figures/callshistory-settings.png'; "
+"md5=287d8aed7d7c71752257c64e89a9127d"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:838(None)
+msgid ""
+"@@image: 'figures/configfile-settings.png'; "
+"md5=eb4a5545f137b825dcdaf0396a9f1a7d"
+msgstr ""
+"@@image: 'figures/configfile-settings.png'; "
+"md5=eb4a5545f137b825dcdaf0396a9f1a7d"
+
+#: sflphone.xml:12(title)
+msgid "SFLphone Manual v1.0"
+msgstr "Manual v1.0 de SFLphone"
+
+#: sflphone.xml:15(year)
+msgid "2006"
+msgstr "2006"
+
+#: sflphone.xml:16(year)
+msgid "2007"
+msgstr "2007"
+
+#: sflphone.xml:17(year)
+msgid "2008"
+msgstr "2008"
+
+#: sflphone.xml:18(year)
+msgid "2009"
+msgstr "2009"
+
+#: sflphone.xml:19(holder) sflphone.xml:32(publishername) sflphone.xml:80(para)
+msgid "Savoir-faire Linux"
+msgstr "Savoir-faire Linux"
+
+#: sflphone.xml:26(para)
+msgid ""
+"SFLphone is an enterprise-class SIP/IAX2 compatible softphone for GNU/Linux, "
+"published under the GPLv3 license."
+msgstr ""
+"SFLphone es un softphone de clase empresarial compatible con SIP y IAX2 para "
+"GNU/Linux, publicado bajo la licencia GPLv3."
+
+#: sflphone.xml:36(para)
+msgid ""
+"Permission is granted to copy, distribute and/or modify this document under "
+"the terms of the GNU Free Documentation Licence (GFDL), Version 1.1 or any "
+"later version published by the Free Software Foundation with no Invariant "
+"Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
+"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"in the file COPYING-DOCS distributed with this manual."
+msgstr ""
+"Se concede permiso para copiar, distribuir y/o modificar este documento bajo "
+"los términos de la Licencia de Documentación Libre de GNU, Versión 1.1 o "
+"cualquier otra versión posterior publicada por la Free Software Foundation; "
+"sin Secciones Invariantes ni Textos de Cubierta Delantera ni Textos de "
+"Cubierta Trasera. Una copia de la licencia está incluida <ulink "
+"type=\"help\" url=\"ghelp:fdl\">aqui</ulink> o en al archivo COPYING-DOCS "
+"distribuido con ese manual."
+
+#: sflphone.xml:37(para)
+msgid ""
+"This manual is part of a collection of GNOME manuals distributed under the "
+"GFDL. If you want to distribute this manual separately from the collection, "
+"you can do so by adding a copy of the licence to the manual, as described in "
+"section 6 of the licence."
+msgstr ""
+"Ese manual es parte de los manuales de GNOME, distribuidos bajo la GFDL. Si "
+"quiere distribuir ese manual separadamente de la colecciòn, puede hacerlo "
+"añando una copia de la licencia a ese manual, como describiendo a la secciòn "
+"6 de la licencia."
+
+#: sflphone.xml:42(firstname)
+msgid "Pierre-Luc"
+msgstr "Pierre-Luc"
+
+#: sflphone.xml:43(surname)
+msgid "Bacon"
+msgstr "Bacon"
+
+#: sflphone.xml:45(email)
+msgid "pierre-luc.bacon@savoirfairelinux.com"
+msgstr "pierre-luc.bacon@savoirfairelinux.com"
+
+#: sflphone.xml:50(firstname)
+msgid "Emmanuel"
+msgstr "Emmanuel"
+
+#: sflphone.xml:51(surname)
+msgid "Milou"
+msgstr "Milou"
+
+#: sflphone.xml:53(email)
+msgid "emmanuel.milou@savoirfairelinux.com"
+msgstr "emmanuel.milou@savoirfairelinux.com"
+
+#: sflphone.xml:58(firstname)
+msgid "Jérémy"
+msgstr "Jérémy"
+
+#: sflphone.xml:59(surname)
+msgid "Quentin"
+msgstr "Quentin"
+
+#: sflphone.xml:61(email)
+msgid "jeremy.quentin@savoirfairelinux.com"
+msgstr "jeremy.quentin@savoirfairelinux.com"
+
+#: sflphone.xml:66(firstname)
+msgid "Alexandre"
+msgstr "Alexandre"
+
+#: sflphone.xml:67(surname)
+msgid "Savard"
+msgstr "Savard"
+
+#: sflphone.xml:69(email)
+msgid "alexandre.savard@savoirfairelinux.com"
+msgstr "alexandre.savard@savoirfairelinux.com"
+
+#: sflphone.xml:76(revnumber)
+msgid "SFLphone Manual V1.0"
+msgstr "Manual v. 1.0 de SFLphone"
+
+#: sflphone.xml:77(date)
+msgid "September 2009"
+msgstr "Septiembre del 2009"
+
+#: sflphone.xml:79(para)
+msgid "SFLphone team"
+msgstr "Equipo de SFLphone"
+
+#: sflphone.xml:85(releaseinfo)
+msgid "This manual describes version 0.9.7 of SFLphone."
+msgstr "Este manual describe la versión 0.9.7 de SFLphone."
+
+#: sflphone.xml:90(primary)
+msgid "SFLphone"
+msgstr "SFLphone"
+
+#: sflphone.xml:94(title)
+msgid "Introduction"
+msgstr "Introducción"
+
+#: sflphone.xml:95(para)
+msgid ""
+"<application>SFLphone</application> is a SIP/IAX2 softphone and VoIP client "
+"for GNU/Linux. It aims at being a robust enterprise-class desktop phone and "
+"has been designed with a hundred-calls-a-day receptionist in mind."
+msgstr ""
+"<application>SFLphone</application> es un softphone SIP y IAX2 y cliente "
+"VoIP para GNU/Linux. Està dirigido a ser un telefono robusto de clase "
+"empresarial y fue diseñado por una recepcionista de cien llamadas al dia."
+
+#: sflphone.xml:98(para)
+msgid ""
+"<application>SFLphone</application> is a free software and is distributed "
+"under the GNU General Public License version 3. It is developed by Savoir-"
+"Faire Linux, a Canadian Linux consulting company, in partnership with the "
+"global community."
+msgstr ""
+"<application>SFLphone</application> es un software libre distribuido bajo la "
+"Licencia Pública General de GNU versión 3. Esta desarrollando por Savoir-"
+"Faire Linux, una empresa canadiense de consultorio Linux, en colaboración "
+"con la comunidad global."
+
+#: sflphone.xml:101(para)
+msgid ""
+"Among the many features we developed for you, we could highlight the high "
+"definition sound (wide-band audio codecs - speex, G722, Celt), multiple "
+"conference call, audio recording, voicemail notification, and call history. "
+"More than a simple softphone, <application>SFLphone</application> supports "
+"advanced enterprise-class call features: unlimited number of calls, call "
+"transfer, and on/off hold option."
+msgstr ""
+"Entre las muchas características que desarrollamos para usted, nosotros "
+"podría destacar el alto sonido de la definición (codificadores-decodificador "
+"audios de la banda ancha - speex, G722, Celt), la audioconferencia múltiple, "
+"la grabación audio, la notificación del buzón de voz, y la historia de "
+"llamada. Más que un softphone simple, <application>SFLphone</application> "
+"soporta características de llamadas avanzadas de clase empresarial : número "
+"ilimitado de llamadas, transferencia de llamadas, y opción de llamadas en "
+"espera."
+
+#: sflphone.xml:108(para)
+msgid ""
+"This release also provides advanced security features (secure RTP and TLS)."
+msgstr ""
+"Esta versión también tiene características avanzadas de seguridad (RTP "
+"seguro y TLS)."
+
+#: sflphone.xml:112(para)
+msgid ""
+"Besides the native ALSA interface, <application>SFLphone</application> now "
+"fully supports PulseAudio sound server so you could experience the great "
+"possibilities it offers (sound mixing, per application volume control, ...)."
+msgstr ""
+"Además del interfaz nativo ALSA, <application>SFLphone</application> ahora "
+"soporta completamente el servidor de sonidos PulseAudio así que usted podría "
+"experimentar las grandes posibilidades que ofrece (mezcla de sonidos, "
+"control de volumen por aplicación,…)."
+
+#: sflphone.xml:118(title)
+msgid "Getting started"
+msgstr "Cómo empezar"
+
+#: sflphone.xml:123(guilabel)
+msgid "Create a free SIP/IAX2 account on sflphone.org"
+msgstr "Crear una cuenta SIP/IAS2 gratuita en sflphone.org"
+
+#: sflphone.xml:124(para)
+msgid ""
+"Savoir-faire Linux provides free SIP/IAX2 accounts on an Asterisk server. By "
+"clicking this option, you will be created an account to make test calls. The "
+"echo service is available, you may also call other accounts registered to "
+"the same server."
+msgstr ""
+"Savoir-faire Linux proporciona cuentas libres SIP y IAX2 en un servidor "
+"Asterisk. Chascando esta opción, le crearán una cuenta para hacer llamadas "
+"de prueba. El servicio de echo está disponible, usted puede también llamar "
+"otras cuentas registradas al mismo servidor."
+
+#: sflphone.xml:126(para)
+msgid ""
+"By filling out your email address information, you will receive voicemail "
+"notifications by email. This information is not mandatory to get your free "
+"account."
+msgstr ""
+"Completando su información de correo electronico, usted recibirá "
+"notificaciones del buzón de voz por correo. Esta información no es "
+"obligatoria para conseguir su cuenta libre."
+
+#: sflphone.xml:129(guilabel)
+msgid "Register an existing SIP or IAX2 account"
+msgstr "Registrar una cuenta SIP o IAX2 existente"
+
+#: sflphone.xml:130(para)
+msgid ""
+"Click there if you already have an account and you want to use it with "
+"SFLphone. You will be prompted to select the account type (SIP or IAX2) and "
+"to fill out your account information. <application>SFLphone</application> "
+"will then try to register it so you could start using it."
+msgstr ""
+"Chasque allí si usted tiene ya una cuenta y quiere utilizarla con SFLphone. "
+"Le preguntarán a seleccionar el tipo de la cuenta (SIP o IAX2) y completar "
+"su información de cuenta. <application>SFLphone</application> intentará "
+"registrarla así que usted podría comenzar a usarla."
+
+#: sflphone.xml:119(para)
+msgid ""
+"The first time you start up sflphone, you will be ask to complete a wizard "
+"to set up your(s) account(s). This account configuration manager offers you "
+"two possibilities: <placeholder-1/>"
+msgstr ""
+"La primera vez que usted inicià sflphone, usted será pidiendo terminar a un "
+"mago para configurar su(s) cuenta(s). Este encargado de configuración de "
+"cuenta ofrece dos posibilidades: <placeholder-1/>"
+
+#: sflphone.xml:135(para)
+msgid ""
+"You can always access the account creation manager: "
+"<menuchoice><guimenu>Edit</guimenu><guimenuitem>Account creation "
+"assistant</guimenuitem></menuchoice>."
+msgstr ""
+"Usted puede tener acceso siempre al encargado de creación de cuenta: "
+"<menuchoice><guimenu>Editar</guimenu><guimenuitem>Asistante de creación de "
+"cuenta</guimenuitem></menuchoice>"
+
+#: sflphone.xml:141(title)
+msgid "Managing your accounts"
+msgstr "Administrar sus cuentas"
+
+#: sflphone.xml:142(para)
+msgid ""
+"<application>SFLphone</application> supports both IAX2 and SIP accounts."
+msgstr "<application>SFLphone</application> soporta cuentas IAX2 y SIP."
+
+#: sflphone.xml:148(title)
+msgid "Basic features"
+msgstr "Características básicas"
+
+#: sflphone.xml:150(title)
+msgid "Creating a new account"
+msgstr "Crear una cuenta nueva"
+
+#: sflphone.xml:151(para)
+msgid "To create a new account, perform the following steps:"
+msgstr "Para crear una cuenta nueva, sigue los siguientes pasos:"
+
+#: sflphone.xml:153(para) sflphone.xml:191(para) sflphone.xml:201(para)
+msgid ""
+"Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Manage "
+"accounts</guimenuitem></menuchoice>."
+msgstr ""
+"Escoje <menuchoice><guimenu>Editar</guimenu><guimenuitem>Administrar "
+"cuentas</guimenuitem></menuchoice>."
+
+#: sflphone.xml:154(para)
+msgid ""
+"Click on the <guilabel>Add</guilabel> button. Fill out the following "
+"information:"
+msgstr ""
+"Chasque <guilabel>Añadir</guilabel>botón. Complete la información siguiente:"
+
+#: sflphone.xml:157(guilabel)
+msgid "Alias"
+msgstr "Alias"
+
+#: sflphone.xml:158(para)
+msgid ""
+"The name to identify your account in the list. It is not used for the "
+"communications"
+msgstr ""
+"El nombre para identificar tu cuenta en la lista. No se usará para las "
+"comunicaciones."
+
+#: sflphone.xml:161(guilabel)
+msgid "Protocol"
+msgstr "Protocolo"
+
+#: sflphone.xml:162(para)
+msgid "Select SIP or IAX2. The most commons are SIP accounts."
+msgstr "Selecciona SIP o IAX2. Las más comunes son las cuentas SIP."
+
+#: sflphone.xml:165(guilabel)
+msgid "Host name"
+msgstr "Nombre del equipo"
+
+#: sflphone.xml:166(para)
+msgid "The name or the IP address of the server you want to register on."
+msgstr "Nombre o dirección IP del servidor en el que quieres registrarte."
+
+#: sflphone.xml:169(guilabel)
+msgid "User name"
+msgstr "Nombre de usuario"
+
+#: sflphone.xml:170(para)
+msgid "The name or the extension for your account."
+msgstr "El nombre o la extensiòn de su cuenta."
+
+#: sflphone.xml:173(guilabel)
+msgid "Password"
+msgstr "Contraseña"
+
+#: sflphone.xml:174(para)
+msgid "The password for your account."
+msgstr "La contraseña para tu cuenta."
+
+#: sflphone.xml:177(guilabel)
+msgid "Voicemail number"
+msgstr "Número de buzón de voz"
+
+#: sflphone.xml:178(para)
+msgid ""
+"The number to dial to reach your voicemail. Example: 888, or *97. It will be "
+"used as a quick dial button on the main interface."
+msgstr ""
+"El número para alcanzar su buzón de voz. Ejemplo: 888, o *97. Será utilizado "
+"como botón para marcar rápido en el interfaz principal."
+
+#: sflphone.xml:182(para)
+msgid "Click the <menuchoice><guimenu>Apply</guimenu></menuchoice> button."
+msgstr ""
+"Da le clic al buttòn <menuchoice><guimenu>Aplicar</guimenu></menuchoice>."
+
+#: sflphone.xml:184(para)
+msgid ""
+"You may now check the state of your account(s). You may have as many setup "
+"accounts as you wish. If it is registered, you may now use it to make calls."
+msgstr ""
+"Usted puede ahora comprobar el estado de sus cuentas. Usted puede tener "
+"tantas cuentas como usted desea. Si se registra, usted puede ahora "
+"utilizarla para hacer llamadas."
+
+#: sflphone.xml:188(title)
+msgid "Editing a configured account"
+msgstr "Editar una cuenta configurada"
+
+#: sflphone.xml:189(para)
+msgid "To edit an existing account, perform the following steps:"
+msgstr "Para editar una cuenta existente, sigue los pasos siguientes:"
+
+#: sflphone.xml:192(para)
+msgid ""
+"Select in the list the account you would like to edit, then click on the "
+"<guilabel>Edit</guilabel> button."
+msgstr ""
+"Seleccione en la lista la cuenta que usted quisiera corregir, después "
+"chasque encendido el botón de <guilabel>Editar</guilabel>."
+
+#: sflphone.xml:193(para)
+msgid ""
+"Make your modifications, then click on the <guilabel>Apply</guilabel> button."
+msgstr ""
+"Haga sus modificaciones, después chasque encendido el botón de "
+"<guilabel>Aplicar</guilabel>."
+
+#: sflphone.xml:198(title)
+msgid "Deleting an account"
+msgstr "Borrar una cuenta"
+
+#: sflphone.xml:199(para)
+msgid "To delete an existing account, perform the following steps:"
+msgstr "Para borrar una cuenta existente, sigue los pasos siguientes:"
+
+#: sflphone.xml:202(para)
+msgid ""
+"Select in the list the account you would like to delete, then click on the "
+"<guibutton>Delete</guibutton> button."
+msgstr ""
+"Seleccione en la lista la cuenta que usted quisiera suprimir, después "
+"chasque encendido el botón de <guibutton>Suprimir</guibutton>."
+
+#: sflphone.xml:207(title)
+msgid "Selecting a default account"
+msgstr "Selección de una cuenta por defecto"
+
+#: sflphone.xml:208(para)
+msgid ""
+"As it is possible to have an unlimited number of registered accounts at the "
+"same time, which account will be used when making a call ? You can not only "
+"set up a default account to be used every time you are making a call, but an "
+"entire priority list. To do that, perform the following steps:"
+msgstr ""
+"¿Pues es posible tener un número ilimitado de cuentas registradas al mismo "
+"tiempo, cual cuenta será utilizada para hacer una llamada? No sólo usted "
+"puede fijar una cuenta por defecto que se utilizarán cada vez que usted está "
+"haciendo una llamada, pero tambien una lista de prioridad. Para hacer eso, "
+"realice los pasos siguientes:"
+
+#: sflphone.xml:210(para)
+msgid ""
+"Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Manage "
+"accounts</guimenuitem></menuchoice> to access the accounts list."
+msgstr ""
+"Escoje <menuchoice><guimenu>Editar</guimenu><guimenuitem>Administrar "
+"cuentas</guimenuitem></menuchoice> para ver la lista de cuentas."
+
+#: sflphone.xml:212(para)
+msgid ""
+"The first account in the account in list will be used as the default account "
+"to make calls with. If it is not registered, SFLphone will try to use the "
+"second in the list, if still not registered, the third, and so one ..."
+msgstr ""
+"La primera cuenta en la lista será utilizada como la cuenta por defecto para "
+"hacer llamadas. Si no se registra, SFLphone intentará utilizar la segunda en "
+"la lista, si tampoco se registra, la tercera, etc…"
+
+#: sflphone.xml:213(para)
+msgid ""
+"To reorder the accounts as you wish, select an account and click on the "
+"<menuchoice><guimenu>Up</guimenu></menuchoice> or "
+"<menuchoice><guimenu>Down</guimenu></menuchoice> button."
+msgstr ""
+"Para reordenar las cuentas como usted desea, seleccione una cuenta y chasque "
+"encendido el botón de <menuchoice><guimenu>Arribá</guimenu></menuchoice> o "
+"de <menuchoice><guimenu>Abajo</guimenu></menuchoice>."
+
+#: sflphone.xml:216(para)
+msgid ""
+"Note that you also can select an account to make a call with when dialing by "
+"right-clicking on it."
+msgstr ""
+"Observe que usted también puede seleccionar una cuenta para hacer una "
+"llamada, cuando usted esta marcando, haciendo clic con el botón derecho en "
+"la llamada."
+
+#: sflphone.xml:221(title)
+msgid "Advanced features"
+msgstr "Características avanzadas"
+
+#: sflphone.xml:222(para) sflphone.xml:273(para)
+msgid "These features are only available with SIP."
+msgstr "Estas características sólo están disponibles con SIP."
+
+#: sflphone.xml:223(para)
+msgid ""
+"Follow the indications to <link linkend=\"account_edit\">edit an "
+"account</link> and choose the <guimenu>Advanced</guimenu> tab."
+msgstr ""
+"Siga las indicaciones para <link linkend=\"account_edit\">editar una "
+"cuenta</link> y elija la pestaña <guimenu>Avanzadas</guimenu>."
+
+#: sflphone.xml:226(title)
+msgid "Advanced features configuration panel"
+msgstr "Panel de configuración de características avanzadas"
+
+#: sflphone.xml:237(title)
+msgid "Registration"
+msgstr "Registro"
+
+#: sflphone.xml:238(para)
+msgid "You may set the expires header for a contact."
+msgstr "Usted puede fijar el encabezamiento expira para un contacto."
+
+#: sflphone.xml:239(para)
+msgid ""
+"It basically represents the duration your registration will remain active. "
+"If you don't register again within that time, calls will no longer be routed "
+"to you. it should be not used as a keepalive mechanism though. The default "
+"value is 600 seconds (ten minutes)."
+msgstr ""
+"Representa básicamente la duración que su registro seguirá siendo activo. Si "
+"usted no se registra otra vez dentro de ese tiempo, las llamadas no serán "
+"encaminadas a usted. Sin embargo no debe ser utilizado como mecanismo de "
+"keepalive. El valor prefijado es 600 segundos (diez minutos)."
+
+#: sflphone.xml:240(note)
+msgid ""
+"To register to some VoIP services, you will need to set this value at at "
+"least 1600 seconds (Example: French VoIP server freephonie.net)."
+msgstr ""
+"Para registrarse a algunos servicios de VoIP, usted necesitará fijar este "
+"valor a por lo menos 1600 segundos (ejemplo: Servidor de VoIP francés "
+"freephonie.net)."
+
+#: sflphone.xml:244(title) sflphone.xml:873(title)
+msgid "Network"
+msgstr "Red"
+
+#: sflphone.xml:245(para)
+msgid "This section enables you to set advanced network parameters."
+msgstr "Esta sección le permite fijar parámetros de red avanzados."
+
+#: sflphone.xml:248(guilabel)
+msgid "Local address"
+msgstr "Dirección local"
+
+#: sflphone.xml:249(para)
+msgid ""
+"it is initialized to your private/local IP address. Calls will be routed to "
+"this address by default."
+msgstr ""
+"se inicializa a su dirección IP privada/local. Las llamadas serán "
+"encaminadas a esta dirección por defecto."
+
+#: sflphone.xml:252(guilabel)
+msgid "Local port"
+msgstr "Puerto local"
+
+#: sflphone.xml:253(para)
+msgid "It is initialized to the default SIP port, 5060."
+msgstr "Se inicia al puerto SIP por defecto, 5060."
+
+#: sflphone.xml:256(guilabel)
+msgid "Set published address and port"
+msgstr "Fije la dirección publicada y el puerto"
+
+#: sflphone.xml:260(para)
+msgid ""
+"If enabled, the core will try to initialize an UDP transport on the mapped "
+"address/port number that the NAT (Network Address Translator) has allocated "
+"to <application>SFLphone</application>."
+msgstr ""
+"Si está activada, la base intentará inicializar un transporte UDP con la "
+"dirección y puerto que el NAT (traductor de dirección de red) ha asignado a "
+"<application>SFLphone</application>."
+
+#: sflphone.xml:259(listitem)
+msgid "Using STUN <placeholder-1/>"
+msgstr "Usando STUN <placeholder-1/>"
+
+#: sflphone.xml:261(listitem)
+msgid "Same as local parameters"
+msgstr "Igual que parámetros locales"
+
+#: sflphone.xml:263(listitem)
+msgid "Manually"
+msgstr "Manualmente"
+
+#: sflphone.xml:272(title)
+msgid "Security features"
+msgstr "Características de seguridad"
+
+#: sflphone.xml:275(title)
+msgid "Secure RTP"
+msgstr "RTP seguro"
+
+#: sflphone.xml:278(title)
+msgid "TLS"
+msgstr "TLS"
+
+#: sflphone.xml:285(title)
+msgid "Call features"
+msgstr "Características de llamada"
+
+#: sflphone.xml:287(para)
+msgid ""
+"All the following features are available with both SIP and IAX2 accounts."
+msgstr ""
+"Todas las características siguientes están disponibles con las cuentas SIP e "
+"IAX2."
+
+#: sflphone.xml:292(title)
+msgid "Dial button"
+msgstr "Botón de marcado"
+
+#. ==== End of Figure ====
+#: sflphone.xml:303(para)
+msgid ""
+"You may have an unlimited number of calls at the same time, even with "
+"different accounts."
+msgstr ""
+"Usted puede tener un número ilimitado de llamadas al mismo tiempo, incluso "
+"con diferentes cuentas."
+
+#: sflphone.xml:304(para)
+msgid ""
+"To create a new call when you already have a current call, just click on the "
+"<guilabel>Dial</guilabel> button. The current call will automatically be put "
+"on hold."
+msgstr ""
+"Para crear una nueva llamada cuando usted tiene ya una llamada actual, "
+"apenas chasque encendido el botón de <guilabel>Marcar</guilabel>. La llamada "
+"actual será automáticamente en espera."
+
+#: sflphone.xml:307(title)
+msgid "Make an other call"
+msgstr "Realizar otra llamada"
+
+#. ==== End of Figure ====
+#: sflphone.xml:318(para)
+msgid ""
+"Keyboard shortcut to perform this action: <accel>NUMPAD</accel> or almost "
+"any keys."
+msgstr ""
+"Atajo de teclado para realizar esta acción: <accel>NUMPAD</accel> o casi "
+"cualquier clave."
+
+#: sflphone.xml:326(title)
+msgid "Call button"
+msgstr "Botón de llamada"
+
+#. ==== End of Figure ====
+#: sflphone.xml:337(para) sflphone.xml:355(para)
+msgid "Keyboard shortcut to perform this action: <accel>Enter</accel>."
+msgstr "Atajo de teclado para realizar esta acción: <accel>Enter</accel>."
+
+#: sflphone.xml:344(title)
+msgid "Answer button"
+msgstr "Botón de respuesta"
+
+#: sflphone.xml:361(title)
+msgid "Hangup button"
+msgstr "Botón de colgado"
+
+#. ==== End of Figure ====
+#: sflphone.xml:372(para) sflphone.xml:392(para)
+msgid "Keyboard shortcut to perform this action: <accel>ESC</accel>."
+msgstr "Atajo de teclado para realizar esta acción: <accel>ESC</accel>."
+
+#: sflphone.xml:377(para)
+msgid ""
+"When you refuse a call, your caller is automatically redirected to your "
+"voicemail box, if applicable."
+msgstr ""
+"Cuando usted rechaza una llamada, su llamador esta redirigido "
+"automáticamente a su caja de buzón de voz, si fuera aplicable."
+
+#: sflphone.xml:381(title)
+msgid "Refuse button"
+msgstr "Botón de rechazar"
+
+#: sflphone.xml:399(title)
+msgid "Hold on button"
+msgstr "Botón es espera"
+
+#: sflphone.xml:411(title)
+msgid "Hold off button"
+msgstr "Botón seguir"
+
+#: sflphone.xml:426(title)
+msgid "Transfer button"
+msgstr "Botón transferir"
+
+#. ==== End of Figure ====
+#: sflphone.xml:437(para)
+msgid "Then type the number you want to transfer the current call to."
+msgstr "Despuès marca el número para transferir la llamada actual."
+
+#: sflphone.xml:440(title)
+msgid "Validate the transfer"
+msgstr "Valide la transferencia"
+
+#. ==== End of Figure ====
+#: sflphone.xml:451(para)
+msgid ""
+"And press <accel>Enter</accel>. Clicking again on the transfer button "
+"cancels the transfer."
+msgstr ""
+"Y prensa <accel>Enter</accel>. Chascar otra vez en el botón de la "
+"transferencia cancela la transferencia."
+
+#: sflphone.xml:457(para)
+msgid ""
+"Go to "
+"<menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem><gui"
+"menuitem>Audio</guimenuitem></menuchoice> to configure the recordings "
+"destination folder."
+msgstr ""
+"Vaya a "
+"<menuchoice><guimenu>Editar</guimenu><guimenuitem>Preferencias</guimenuitem><"
+"guimenuitem>Audio</guimenuitem></menuchoice> para configurar la carpeta de "
+"la destinación de las grabaciones."
+
+#: sflphone.xml:461(title)
+msgid "Record settings"
+msgstr "Recordar parámetros"
+
+#: sflphone.xml:474(title)
+msgid "Record button"
+msgstr "Botón de grabación"
+
+#: sflphone.xml:488(caution)
+msgid ""
+"This feature is available only if you fill out the voicemail number "
+"information for your default account."
+msgstr ""
+"Esta característica está disponible solamente si usted completa la "
+"información del número del buzón de voz para su cuenta por defecto."
+
+#: sflphone.xml:492(title)
+msgid "Voicemail button"
+msgstr "Botón del buzón de voz"
+
+#: sflphone.xml:506(para)
+msgid ""
+"A direct IP call is a call established between two peers without any "
+"accounts. When dialing, such a call must prefixed with "
+"<guilabel>sip:</guilabel>."
+msgstr ""
+"Una llamada IP directa es una llamada establecida entre dos pares sin "
+"ningunas cuentas. Al marcar, ese typo de lamada debe ser prefijada con "
+"<guilabel>sip: </guilabel>."
+
+#: sflphone.xml:508(para)
+msgid ""
+"Direct IP calls use SIP protocol to establish communication and RTP to "
+"transport data. It is right now not available with IAX2."
+msgstr ""
+"Llamadas IP directas usan el protocolo SIP para establecer la comunicación y "
+"RTP para transportar datos. No está ahora disponible con IAX2."
+
+#: sflphone.xml:510(para)
+msgid ""
+"Go to "
+"<menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem><gui"
+"menuitem>Direct IP calls</guimenuitem></menuchoice> to configure the "
+"advanced security features for this kind of calls."
+msgstr ""
+"Vaya a "
+"<menuchoice><guimenu>Editar</guimenu><guimenuitem>Preferencias</guimenuitem><"
+"guimenuitem>Llamadas IP directas</guimenuitem></menuchoice> para configurar "
+"los parámetros de seguridad avanzados para esta clase de llamadas."
+
+#: sflphone.xml:514(para)
+msgid ""
+"SFLphone now supports conference call hosting integrating server like "
+"features in a simple GUI."
+msgstr ""
+"SFLphone ahora apoya el recibimiento de la audioconferencia, integrando "
+"características de servidor en un GUI fácil."
+
+#: sflphone.xml:520(guilabel)
+msgid "Create a conference"
+msgstr "Crear conferencia"
+
+#: sflphone.xml:521(para)
+msgid ""
+"To host a conference, simply drag and drop one call on another. Additional "
+"participants are added the same way, dragging a call on the conference icon."
+msgstr ""
+"Para recibir una conferencia, simplemente arrastre - y - caen una llamada "
+"sobre la otra. Agrega los participantes adicionales de la misma manera, "
+"arrastrando una llamada en el icono de la conferencia."
+
+#: sflphone.xml:528(guilabel)
+msgid "Leave a conference"
+msgstr "Salir de la conferencia"
+
+#: sflphone.xml:529(para)
+msgid ""
+"SFLphone conference model let you leave a conference that you are currently "
+"hosting to answer any other incoming communication or even initiate new "
+"ones. The conference is not interupted Double clicking the conference icon "
+"let you reintroduce the conference."
+msgstr ""
+"El modelo de la conferencia de SFLphone le dejó dejar una conferencia que "
+"usted está recibiendo actualmente para contestar a cualquier otras nuevas "
+"llamadas o iniciar otras. La conferencia no es cortada, doble chasca el "
+"icono de la conferencia le dejó regresar a la conferencia."
+
+#: sflphone.xml:538(guilabel)
+msgid "Multiple conference"
+msgstr "Conferencia múltiple"
+
+#: sflphone.xml:539(para)
+msgid ""
+"SFLphone supports multiple conferences running simultaneously. Two "
+"conferences can be joined the same way they are created, dragging one on the "
+"other."
+msgstr ""
+"SFLphone apoya múltiples conferencias que funcionan simultáneamente. Dos "
+"conferencias se pueden ensamblar de la misma manera que se crean, "
+"arrastrando una en la otra."
+
+#: sflphone.xml:547(guilabel)
+msgid "Hangup/Hold a conference"
+msgstr "Poner una conferencia en espera/Retrasar una conferencia"
+
+#: sflphone.xml:548(para)
+msgid ""
+"Right click the conference icon. Holding the conference put all participants "
+"on hold. Hangup a conference hangup all participants."
+msgstr ""
+"Derecho chasque el icono de la conferencia. Poner la conferencia en espera "
+"puso todos los participantes en espera. Retrasar una conferencia retrasa "
+"todos los participantes."
+
+#: sflphone.xml:565(title)
+msgid "Audio configuration"
+msgstr "Configuración de sonido"
+
+#: sflphone.xml:566(para)
+msgid "ALSA and Pulseaudio native interfaces are available."
+msgstr "Los interfaces nativos ALSA y Pulseaudio están disponibles."
+
+#: sflphone.xml:582(title)
+msgid "Codecs overview"
+msgstr "Descripción de los codificadores-decodificador"
+
+#: sflphone.xml:583(para)
+msgid "SFLphone supports several widely used audio codec:"
+msgstr ""
+"SFLphone apoya varios codificador-decodificador audio ampliamente utilizado:"
+
+#: sflphone.xml:587(guilabel)
+msgid "PCMU/PCMA"
+msgstr "PCMU/PCMA"
+
+#: sflphone.xml:588(para)
+msgid ""
+"ITU-T telefony standard PCM formats, 8kHz, 64 kbit/s, using logarithmic byte "
+"compression algorithm."
+msgstr ""
+"Formatos PCM del estándar de telefonia de ITU-T, 8kHz, 64 kbit/s, usando "
+"algoritmo logarítmico de compresión del octeto."
+
+#: sflphone.xml:594(guilabel)
+msgid "GSM"
+msgstr "GSM"
+
+#: sflphone.xml:595(para)
+msgid ""
+"Global System for Mobile communications (GSM) narrowband 8kHz standard based "
+"on linear prediction encoding."
+msgstr ""
+"Estándar de banda estrecha 8kHz de la comunicaciones Sistema Global para "
+"Movíl (GSM) basado en la codificación de predicción linear."
+
+#: sflphone.xml:601(guilabel)
+msgid "G722"
+msgstr "G722"
+
+#: sflphone.xml:602(para)
+msgid "ITU-T standard wideband 16kHz standard based on linear prediction."
+msgstr ""
+"Estándar de la banda ancha 16kHz de ITU-T basado en la predicción linear."
+
+#: sflphone.xml:607(guilabel)
+msgid "SPEEX"
+msgstr "SPEEX"
+
+#: sflphone.xml:608(para)
+msgid ""
+"High quality voice encoding/decoding available in narrowband 8Khz, wideband "
+"16khz (HD Voice), and ultra-wideband 32 kHz. Integrate additional features "
+"such as Variable Bit Rate (VBR) and noise reduction."
+msgstr ""
+"Codificación/Decodificación de voz de alta calidad disponible en la banda "
+"estrecha 8Khz, la banda ancha 16khz (voz HD), y la ultra-banda ancha 32 kHz. "
+"Integre las características adicionales tal como índice binario variable "
+"(VBR) y reducción del nivel de ruidos."
+
+#: sflphone.xml:617(guilabel)
+msgid "CELT"
+msgstr "CELT"
+
+#: sflphone.xml:628(title)
+msgid "Address books"
+msgstr "Agenda de direcciones"
+
+#: sflphone.xml:630(title)
+msgid "Enable the address book support"
+msgstr "Activar el soporte para agenda de direcciones"
+
+#: sflphone.xml:631(para)
+msgid "To enable the address book, perform the following steps:"
+msgstr "Para activar la agenda de direcciones, sigue los siguientes pasos:"
+
+#: sflphone.xml:634(para)
+msgid ""
+"Choose "
+"<menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></me"
+"nuchoice>."
+msgstr ""
+"Escoje "
+"<menuchoice><guimenu>Editar</guimenu><guimenuitem>Preferencias</guimenuitem><"
+"/menuchoice>."
+
+#: sflphone.xml:638(para)
+msgid ""
+"Select the <menuchoice><guimenu>Address book</guimenu></menuchoice> tab."
+msgstr ""
+"Seleccione la pestaña <menuchoice><guimenu>Libreta de "
+"contactos</guimenu></menuchoice>."
+
+#: sflphone.xml:642(para)
+msgid "Check the <guilabel>Use Evolution address books</guilabel> box."
+msgstr ""
+"Escoje la checkbox <guilabel>Usar libretas de contactos Evolution</guilabel>."
+
+#: sflphone.xml:645(para)
+msgid ""
+"Every address books you configured in Evolution will be now available in "
+"<application>SFLphone</application>. Please be sure you selected at least "
+"one address book."
+msgstr ""
+"Cada libreta de contactos configurada en Evolución estara disponible en "
+"<application>SFLphone</application>. Por favor de asegurarse de seleccionar "
+"por lo menos una libreta."
+
+#: sflphone.xml:649(title)
+msgid "Available options"
+msgstr "Opciones disponibles"
+
+#: sflphone.xml:650(para)
+msgid ""
+"In "
+"<menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem><gui"
+"menuitem>Address book</guimenuitem></menuchoice>, you may select one or all "
+"of the following options:"
+msgstr ""
+"En "
+"<menuchoice><guimenu>Editar</guimenu><guimenuitem>Preferencias</guimenuitem><"
+"guimenuitem>Libretas de contactos</guimenuitem></menuchoice>, usted puede "
+"seleccionar una o todas las opciones siguientes:"
+
+#: sflphone.xml:653(guilabel)
+msgid "Display contact photo if available"
+msgstr "Mostrar la foto del contacto si está disponible"
+
+#: sflphone.xml:654(para)
+msgid ""
+"The contact photo will be displayed as a thumbnail beside the phone number."
+msgstr ""
+"La foto del contacto será exhibida como un thumbnail al lado del número de "
+"teléfono."
+
+#: sflphone.xml:659(guilabel)
+msgid "Fields from Evolution's address book"
+msgstr "Campos de la agenda de direcciones de Evolution"
+
+#: sflphone.xml:660(para)
+msgid ""
+"You may use one or all of these following information from your contact."
+msgstr ""
+"Usted puede utilizar una o todas las informaciónes siguientes de su contacto."
+
+#: sflphone.xml:663(listitem)
+msgid "Work phone number"
+msgstr "Número de teléfono profesional"
+
+#: sflphone.xml:664(listitem)
+msgid "Home phone number"
+msgstr "Número de teléfono personal"
+
+#: sflphone.xml:665(listitem)
+msgid "Mobile phone number"
+msgstr "Número de teléfono móvil"
+
+#: sflphone.xml:673(title)
+msgid "Using the address book"
+msgstr "Usando la agenda de direcciones"
+
+#: sflphone.xml:676(para)
+msgid ""
+"On the toolbar, click on the following button to display the address book "
+"window:"
+msgstr ""
+"En la barra de herramientas, chasque encendido el botón siguiente para "
+"exhibir la ventana de libreta de contactos:"
+
+#: sflphone.xml:680(title)
+msgid "Address book toolbar button"
+msgstr "Botón de la barra de herramientas de libretas de contactos"
+
+#: sflphone.xml:693(para)
+msgid "Search for a contact"
+msgstr "Buscar un contacto"
+
+#: sflphone.xml:697(para)
+msgid ""
+"New entries should have appeared in the window. Double click on it to call "
+"the contact. You may also <menuchoice><guimenu>Right "
+"click</guimenu><guimenuitem>Edit before calling</guimenuitem></menuchoice> "
+"to modify the entry before calling."
+msgstr ""
+"Las nuevas entradas deben haber aparecidas en la ventana. Doble chasqúela "
+"encendido para llamar el contacto. Usted puede también "
+"<menuchoice><guimenu>Derecho - chasque</guimenu><guimenuitem>Editar antes de "
+"llamar</guimenuitem></menuchoice> para modificar la entrada antes de llamar."
+
+#: sflphone.xml:704(title)
+msgid "Preferences"
+msgstr "Configuración"
+
+#: sflphone.xml:706(para)
+msgid ""
+"Go to "
+"<menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></me"
+"nuchoice> to access the configuration panel."
+msgstr ""
+"Vaya a "
+"<menuchoice><guimenu>Editar</guimenu><guimenuitem>Preferencias</guimenuitem><"
+"/menuchoice> para acceder al panel de la configuración."
+
+#: sflphone.xml:707(para)
+msgid "Each section is detailed below."
+msgstr "Cada sección se detalla abajo"
+
+#: sflphone.xml:710(title)
+msgid "General"
+msgstr "Opciones Generales"
+
+#: sflphone.xml:711(para)
+msgid ""
+"This section provides the user general settings regarding the application."
+msgstr "Esta sección provee al usuario las opciones general de la aplicación"
+
+#: sflphone.xml:715(title)
+msgid "Desktop notifications options"
+msgstr "Opciones de notificación de escritorio"
+
+#: sflphone.xml:729(guilabel)
+msgid "Enable notifications"
+msgstr "Activar notificaciones"
+
+#: sflphone.xml:730(para)
+msgid ""
+"Both clients use their desktop environment notification system. If checked, "
+"you will receive desktop notifications for events such as incoming calls and "
+"system messages."
+msgstr ""
+"Ambos clientes usan su sistema de notificación del entorno de escritorio. Si "
+"está activado, recibirás notificaciones de escritorio para eventos como las "
+"llamadas entrantes y mensajes del sistema."
+
+#: sflphone.xml:734(title)
+msgid "Example of an incoming call notification"
+msgstr "Ejemplo de notificación para una llamada entrante"
+
+#: sflphone.xml:746(guilabel)
+msgid "Enable voicemail notifications"
+msgstr "Activar notificaciones de correo de voz"
+
+#: sflphone.xml:747(para)
+msgid ""
+"The voicemail notifications are handled separatly. If checked, you will be "
+"notified with the number of unread voicemails for your accounts."
+msgstr ""
+"Las notificaciones del buzón de voz se manejan separadamente. Si está "
+"comprobado, le notificara el número de buzones de voz sin de sus cuentas."
+
+#: sflphone.xml:751(title)
+msgid "Example of a voicemail notification"
+msgstr "Ejemplo de notificacion de correo de voz"
+
+#: sflphone.xml:770(title)
+msgid "System tray options"
+msgstr "Opciones de la bandeja del sistema"
+
+#: sflphone.xml:784(guilabel)
+msgid "Popup main window on incoming call"
+msgstr "Mostrar ventana principal al recibir una llamada"
+
+#: sflphone.xml:785(para)
+msgid ""
+"If SFLphone is closed on the system tray, pops the main window up on "
+"foreground when receiving an incoming call."
+msgstr ""
+"Si SFLphone esta cerrado en la bandeja del sistema, exhibe la ventana "
+"principal emergente en primero plano para recibir una llamada entrante."
+
+#: sflphone.xml:790(guilabel)
+msgid "Never popup main window"
+msgstr "Nuncà exhibe la ventana principal emergente"
+
+#: sflphone.xml:791(para)
+msgid ""
+"If SFLphone is closed on the system tray, never pops the main window up on "
+"foreground when receiving an incoming call."
+msgstr ""
+"Si SFLphone esta cerrado en la bandeja del sistema, nunca exhibe la ventana "
+"principal emergente en primero plano para recibir una llamada entrante."
+
+#: sflphone.xml:796(guilabel)
+msgid "Hide SFLphone window on startup"
+msgstr "Esconder la pantalla de SFLphone al principio"
+
+#: sflphone.xml:797(para)
+msgid "On startup, SFLphone will go directly on the system tray."
+msgstr "Al principio, SFLphone ira directamente a la bandeja del sistema."
+
+#: sflphone.xml:810(title)
+msgid "Calls history options"
+msgstr "Opciones del historial de llamadas"
+
+#: sflphone.xml:823(guilabel)
+msgid "Keep my history for at least n days"
+msgstr "Mantener mi historial por al menos n días"
+
+#: sflphone.xml:824(para)
+msgid ""
+"If checked, calls will be kept up to N days in the history. You may select a "
+"custom number of days. Do not check it if you don't want to use this feature."
+msgstr ""
+"Si está activado, las llamadas se mantendrán hasta N días en el historial. "
+"Puedes seleccionar un número concreto de días. No lo actives si no quieres "
+"usar esta opción."
+
+#: sflphone.xml:834(title)
+msgid "Configuration file options"
+msgstr "Opciones del archivo de configuración"
+
+#: sflphone.xml:847(guilabel)
+msgid "Store SIP credentials as MD5 hash"
+msgstr "Guarda información SIP como hash MD5"
+
+#: sflphone.xml:848(para)
+msgid ""
+"If checked, your password information will be encrypted in the configuration "
+"file, instead of plain text."
+msgstr ""
+"Si está activo, tu información de contraseñas se almacenarán cifradas en el "
+"archivo de configuración, en vez de en texto plano."
+
+#: sflphone.xml:859(title)
+msgid "Audio"
+msgstr "Sonido"
+
+#: sflphone.xml:863(title)
+msgid "Address book"
+msgstr "Libreta de direcciones"
+
+#: sflphone.xml:865(para)
+msgid ""
+"Refer to the <link linkend=\"addressbook\">Address books</link> section for "
+"more information."
+msgstr ""
+"Refierese a la secciòn <link linkend=\"addressbook\">Libretas de "
+"contactos</link> para màs informaciones."
+
+#: sflphone.xml:869(title)
+msgid "Hooks"
+msgstr "Disparadores"
+
+#: sflphone.xml:877(title)
+msgid "Direct IP calls"
+msgstr "Llamadas IP directas"
+
+#: sflphone.xml:878(para)
+msgid ""
+"Refer to the <link linkend=\"directip\">Direct IP calls</link> section for "
+"more information."
+msgstr ""
+"Refierese a la secciòn <link linkend=\"directip\">Llamadas directas "
+"IP</link> para màs informaciones."
+
+#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
+#: sflphone.xml:0(None)
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+" Alfonso E. Romero https://launchpad.net/~alfonsoeromero\n"
+" DiegoJ https://launchpad.net/~diegojromerolopez\n"
+" Maxime Chambreuil https://launchpad.net/~max3903"
diff --git a/sflphone-client-gnome/doc/fr/fr.po b/sflphone-client-gnome/doc/fr/fr.po
new file mode 100644
index 0000000000000000000000000000000000000000..f9da713d2e1fe72e9b6a9ab7bec1443868098220
--- /dev/null
+++ b/sflphone-client-gnome/doc/fr/fr.po
@@ -0,0 +1,1284 @@
+# French translation for sflphone
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the sflphone package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: sflphone\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-10-26 15:41-0400\n"
+"PO-Revision-Date: 2009-12-09 15:38+0000\n"
+"Last-Translator: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>\n"
+"Language-Team: French <fr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-12-09 20:52+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:230(None)
+msgid ""
+"@@image: 'figures/account_advanced.png'; md5=8cc040a5f56fe61566ad7b0fa83955d9"
+msgstr "not used"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:296(None)
+msgid "@@image: 'figures/dial.png'; md5=81ff4280c293e62a49fad3a4b61b9bb5"
+msgstr "not used"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:311(None)
+msgid ""
+"@@image: 'figures/call-second.png'; md5=fa490e3b07eebaa9f4ff719f579d68ef"
+msgstr "not used"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:330(None)
+msgid "@@image: 'figures/call.png'; md5=ecd96beec76f808b5c1469ecc1293237"
+msgstr "not used"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:348(None)
+msgid "@@image: 'figures/answer.png'; md5=c168995c6b36b5d200c49d1c02c2ea52"
+msgstr "not used"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:365(None)
+msgid "@@image: 'figures/hangup.png'; md5=0cac4dfe3a9a4bdf4d12229f77e3723a"
+msgstr "not used"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:385(None)
+msgid "@@image: 'figures/refuse.png'; md5=34b6cbf068e56163058e79de3ca70c59"
+msgstr "not used."
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:403(None)
+msgid "@@image: 'figures/holdon.png'; md5=655078b8b495ada29f65b58501187d16"
+msgstr "not used"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:415(None)
+msgid "@@image: 'figures/holdoff.png'; md5=e06b8eba03f1545cd18891630b22f281"
+msgstr "not used"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:430(None)
+msgid "@@image: 'figures/transfer.png'; md5=92f921c7c6ba4ee2487ccf6e02226d9a"
+msgstr "not used"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:444(None)
+msgid ""
+"@@image: 'figures/transfer-go.png'; md5=553b57d5a9fc9f248ba15cecc32d343f"
+msgstr "not used"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:465(None)
+msgid ""
+"@@image: 'figures/rec-settings.png'; md5=27d51e45ff23dde58b0512f90773f6ce"
+msgstr "not used"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:478(None)
+msgid "@@image: 'figures/record.png'; md5=7a594660924940e8def9ecfcee0e8cb4"
+msgstr "not used"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:496(None)
+msgid ""
+"@@image: 'figures/voicemail.png'; md5=36dbeb4bcc6a68519d474552a888ce1e"
+msgstr "not used"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:684(None)
+msgid ""
+"@@image: 'figures/addressbook-button.png'; "
+"md5=b4a820013ef8b8f48e7de780a66c7800"
+msgstr "not used"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:719(None)
+msgid ""
+"@@image: 'figures/desktop-notif-settings.png'; "
+"md5=2bca85d6d9871883399481b994bd3384"
+msgstr "not used"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:738(None)
+msgid ""
+"@@image: 'figures/notif-example.png'; md5=d09008bedcaee435b12cd165d42e39b7"
+msgstr "not used"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:755(None)
+msgid ""
+"@@image: 'figures/voicemail-notif.png'; md5=a33ed4ce4b693d67ee453b4ef1fa6c30"
+msgstr "not used"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:774(None)
+msgid ""
+"@@image: 'figures/systemtray-settings.png'; "
+"md5=638612a08eb31eb768c4f08ace9c909a"
+msgstr "not used"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:814(None)
+msgid ""
+"@@image: 'figures/callshistory-settings.png'; "
+"md5=287d8aed7d7c71752257c64e89a9127d"
+msgstr "not used"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: sflphone.xml:838(None)
+msgid ""
+"@@image: 'figures/configfile-settings.png'; "
+"md5=eb4a5545f137b825dcdaf0396a9f1a7d"
+msgstr "not used"
+
+#: sflphone.xml:12(title)
+msgid "SFLphone Manual v1.0"
+msgstr "Manuel d'utilisateur de SFLphone v1.0"
+
+#: sflphone.xml:15(year)
+msgid "2006"
+msgstr "2006"
+
+#: sflphone.xml:16(year)
+msgid "2007"
+msgstr "2007"
+
+#: sflphone.xml:17(year)
+msgid "2008"
+msgstr "2008"
+
+#: sflphone.xml:18(year)
+msgid "2009"
+msgstr "2009"
+
+#: sflphone.xml:19(holder) sflphone.xml:32(publishername) sflphone.xml:80(para)
+msgid "Savoir-faire Linux"
+msgstr "Savoir-faire Linux"
+
+#: sflphone.xml:26(para)
+msgid ""
+"SFLphone is an enterprise-class SIP/IAX2 compatible softphone for GNU/Linux, "
+"published under the GPLv3 license."
+msgstr ""
+"SFLphone est téléphone logiciel de voix sur IP pour GNU/LINUX destiné aux "
+"entreprises, compatible avec les protocoles SIP et IAX2. Il est distribué "
+"sous licence GPLv3."
+
+#: sflphone.xml:36(para)
+msgid ""
+"Permission is granted to copy, distribute and/or modify this document under "
+"the terms of the GNU Free Documentation Licence (GFDL), Version 1.1 or any "
+"later version published by the Free Software Foundation with no Invariant "
+"Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
+"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"in the file COPYING-DOCS distributed with this manual."
+msgstr ""
+
+#: sflphone.xml:37(para)
+msgid ""
+"This manual is part of a collection of GNOME manuals distributed under the "
+"GFDL. If you want to distribute this manual separately from the collection, "
+"you can do so by adding a copy of the licence to the manual, as described in "
+"section 6 of the licence."
+msgstr ""
+
+#: sflphone.xml:42(firstname)
+msgid "Pierre-Luc"
+msgstr "Pierre-Luc"
+
+#: sflphone.xml:43(surname)
+msgid "Bacon"
+msgstr "Bacon"
+
+#: sflphone.xml:45(email)
+msgid "pierre-luc.bacon@savoirfairelinux.com"
+msgstr "pierre-luc.bacon@savoirfairelinux.com"
+
+#: sflphone.xml:50(firstname)
+msgid "Emmanuel"
+msgstr "Emmanuel"
+
+#: sflphone.xml:51(surname)
+msgid "Milou"
+msgstr "Milou"
+
+#: sflphone.xml:53(email)
+msgid "emmanuel.milou@savoirfairelinux.com"
+msgstr "emmanuel.milou@savoirfairelinux.com"
+
+#: sflphone.xml:58(firstname)
+msgid "Jérémy"
+msgstr "Jérémy"
+
+#: sflphone.xml:59(surname)
+msgid "Quentin"
+msgstr "Quentin"
+
+#: sflphone.xml:61(email)
+msgid "jeremy.quentin@savoirfairelinux.com"
+msgstr "jeremy.quentin@savoirfairelinux.com"
+
+#: sflphone.xml:66(firstname)
+msgid "Alexandre"
+msgstr "Alexandre"
+
+#: sflphone.xml:67(surname)
+msgid "Savard"
+msgstr "Savard"
+
+#: sflphone.xml:69(email)
+msgid "alexandre.savard@savoirfairelinux.com"
+msgstr "alexandre.savard@savoirfairelinux.com"
+
+#: sflphone.xml:76(revnumber)
+msgid "SFLphone Manual V1.0"
+msgstr "Manuel de l'utilisateur pour SFLphone V1.0"
+
+#: sflphone.xml:77(date)
+msgid "September 2009"
+msgstr "Septembre 2009"
+
+#: sflphone.xml:79(para)
+msgid "SFLphone team"
+msgstr "Équipe SFLphone"
+
+#: sflphone.xml:85(releaseinfo)
+msgid "This manual describes version 0.9.7 of SFLphone."
+msgstr "Ce manuel décrit la version 0.9.7 de SFLphone."
+
+#: sflphone.xml:90(primary)
+msgid "SFLphone"
+msgstr "SFLphone"
+
+#: sflphone.xml:94(title)
+msgid "Introduction"
+msgstr "Introduction"
+
+#: sflphone.xml:95(para)
+msgid ""
+"<application>SFLphone</application> is a SIP/IAX2 softphone and VoIP client "
+"for GNU/Linux. It aims at being a robust enterprise-class desktop phone and "
+"has been designed with a hundred-calls-a-day receptionist in mind."
+msgstr ""
+"<application>SFLphone</application> est un softphone compatible avec SIP et "
+"IAX2 et un client de voix sur IP pour GNU/Linux. Notre but est d'offrir un "
+"téléphone logiciel intégré au bureau, robuste, destiné à une utilisation "
+"professionnelle."
+
+#: sflphone.xml:98(para)
+msgid ""
+"<application>SFLphone</application> is a free software and is distributed "
+"under the GNU General Public License version 3. It is developed by Savoir-"
+"Faire Linux, a Canadian Linux consulting company, in partnership with the "
+"global community."
+msgstr ""
+"<application>SFLphone</application> est un logiciel open-source distribué "
+"sous licence GNU GPL version 3. Il est développé par la compagnie de "
+"consultation canadienne Savoir-faire Linux, en collaboration avec la "
+"communauté."
+
+#: sflphone.xml:101(para)
+msgid ""
+"Among the many features we developed for you, we could highlight the high "
+"definition sound (wide-band audio codecs - speex, G722, Celt), multiple "
+"conference call, audio recording, voicemail notification, and call history. "
+"More than a simple softphone, <application>SFLphone</application> supports "
+"advanced enterprise-class call features: unlimited number of calls, call "
+"transfer, and on/off hold option."
+msgstr ""
+"Parmi les nombreuses fonctionnalités de SFLphone, on peut noter notamment la "
+"qualité de son haute-définition (codecs audio large bande - speex, G722, "
+"Celt), conférences multiples, enregistrement d'appel, notification de "
+"messages vocaux and historique d'appels. Plus qu'un simple téléphone "
+"logiciel, <application>SFLphone</application> supporte des fonctionnalités "
+"avancées destinées aux entreprises: nombre illimité d'appels, transfert, "
+"mise en attente."
+
+#: sflphone.xml:108(para)
+msgid ""
+"This release also provides advanced security features (secure RTP and TLS)."
+msgstr ""
+"Cette nouvelle version implémente des fonctionnalités de sécurité avancées "
+"(RTP sécurisé et TLS)."
+
+#: sflphone.xml:112(para)
+msgid ""
+"Besides the native ALSA interface, <application>SFLphone</application> now "
+"fully supports PulseAudio sound server so you could experience the great "
+"possibilities it offers (sound mixing, per application volume control, ...)."
+msgstr ""
+"En plus de l'interface native ALSA, <application>SFLphone</application> "
+"supporte nativement le serveur de son PulseAudio. Profitez ainsi pleinement "
+"des possibiltés qu'il apporte (mixage logiciel, gestion des volumes par "
+"application, ...)."
+
+#: sflphone.xml:118(title)
+msgid "Getting started"
+msgstr "Premiers pas"
+
+#: sflphone.xml:123(guilabel)
+msgid "Create a free SIP/IAX2 account on sflphone.org"
+msgstr "Créer un compte SIP/IAX2 gratuit sur sflphone.org"
+
+#: sflphone.xml:124(para)
+msgid ""
+"Savoir-faire Linux provides free SIP/IAX2 accounts on an Asterisk server. By "
+"clicking this option, you will be created an account to make test calls. The "
+"echo service is available, you may also call other accounts registered to "
+"the same server."
+msgstr ""
+"Savoir-faire Linux fournit des comptes SIP/IAX2 gratuits sur un serveur "
+"Asterisk central. En choisissant cette option, nous vous créons un compte "
+"de test. Le service echo vous est offert, ainsi que des appels vers d'autres "
+"comptes enregistrés sur ce serveur."
+
+#: sflphone.xml:126(para)
+msgid ""
+"By filling out your email address information, you will receive voicemail "
+"notifications by email. This information is not mandatory to get your free "
+"account."
+msgstr ""
+"En remplissant votre adresse courriel, vous pourrez recevoir vos messages "
+"vocaux par email. Cette information n'est cependant pas obligatoire."
+
+#: sflphone.xml:129(guilabel)
+msgid "Register an existing SIP or IAX2 account"
+msgstr "Enregistrer un compte SIP ou IAX2 existant"
+
+#: sflphone.xml:130(para)
+msgid ""
+"Click there if you already have an account and you want to use it with "
+"SFLphone. You will be prompted to select the account type (SIP or IAX2) and "
+"to fill out your account information. <application>SFLphone</application> "
+"will then try to register it so you could start using it."
+msgstr ""
+"Choisissez cette option si vous avez déjà un compte et désirez l'utiliser "
+"avec SFLphone. Il faut ensuite choisir le type de compte (SIP ou IAX2) et "
+"remplir les informations nécessaires."
+
+#: sflphone.xml:119(para)
+msgid ""
+"The first time you start up sflphone, you will be ask to complete a wizard "
+"to set up your(s) account(s). This account configuration manager offers you "
+"two possibilities: <placeholder-1/>"
+msgstr ""
+"La première fois que vous lancez SFLphone, un assistant se lance pour vous "
+"aider à configurer vos comptes. Vous avez alors deux "
+"possibilités:<placeholder-1/>"
+
+#: sflphone.xml:135(para)
+msgid ""
+"You can always access the account creation manager: "
+"<menuchoice><guimenu>Edit</guimenu><guimenuitem>Account creation "
+"assistant</guimenuitem></menuchoice>."
+msgstr ""
+"Vous pouvez à tout moment accéder à l'assistant de création de compte: "
+"<menuchoice><guimenu>Éditer</guimenu><guimenuitem>Assistant de création de "
+"compte/guimenuitem></menuchoice>."
+
+#: sflphone.xml:141(title)
+msgid "Managing your accounts"
+msgstr "Gérer vos comptes"
+
+#: sflphone.xml:142(para)
+msgid ""
+"<application>SFLphone</application> supports both IAX2 and SIP accounts."
+msgstr ""
+"<application>SFLphone</application> supporte des comptes IAX2 et SIP."
+
+#: sflphone.xml:148(title)
+msgid "Basic features"
+msgstr "Fonctionnalités de base"
+
+#: sflphone.xml:150(title)
+msgid "Creating a new account"
+msgstr "Créer un nouveau compte"
+
+#: sflphone.xml:151(para)
+msgid "To create a new account, perform the following steps:"
+msgstr "Pour créer un nouveau compte, suivez les étapes suivantes:"
+
+#: sflphone.xml:153(para) sflphone.xml:191(para) sflphone.xml:201(para)
+msgid ""
+"Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Manage "
+"accounts</guimenuitem></menuchoice>."
+msgstr ""
+"Sélectionnez "
+"<menuchoice><guimenu>Éditer</guimenu><guimenuitem>Comptes</guimenuitem></menu"
+"choice>."
+
+#: sflphone.xml:154(para)
+msgid ""
+"Click on the <guilabel>Add</guilabel> button. Fill out the following "
+"information:"
+msgstr ""
+"Cliquez sur le bouton <guilabel>Ajouter</guilabel>. Remplissez les "
+"informations suivantes:"
+
+#: sflphone.xml:157(guilabel)
+msgid "Alias"
+msgstr "Alias"
+
+#: sflphone.xml:158(para)
+msgid ""
+"The name to identify your account in the list. It is not used for the "
+"communications"
+msgstr ""
+"Le nom pour identifier ce compte dans la liste des comptes. il n'est pas "
+"utilisé pour les communications"
+
+#: sflphone.xml:161(guilabel)
+msgid "Protocol"
+msgstr "Protocole"
+
+#: sflphone.xml:162(para)
+msgid "Select SIP or IAX2. The most commons are SIP accounts."
+msgstr "Choisissez SIP ou IAX2. Les plus courants sont les comptes SIP."
+
+#: sflphone.xml:165(guilabel)
+msgid "Host name"
+msgstr "Nom du hôte"
+
+#: sflphone.xml:166(para)
+msgid "The name or the IP address of the server you want to register on."
+msgstr ""
+"Le nom ou l'adresse IP du serveur auprès duquel vous voulez enregistrer le "
+"compte."
+
+#: sflphone.xml:169(guilabel)
+msgid "User name"
+msgstr "Nom d'utilisateur"
+
+#: sflphone.xml:170(para)
+msgid "The name or the extension for your account."
+msgstr "Le nom d'utilisateur ou l'extension de votre compte."
+
+#: sflphone.xml:173(guilabel)
+msgid "Password"
+msgstr "Mot de passe"
+
+#: sflphone.xml:174(para)
+msgid "The password for your account."
+msgstr "Le mot de passe associé à votre compte."
+
+#: sflphone.xml:177(guilabel)
+msgid "Voicemail number"
+msgstr "Numéro de boîte vocale"
+
+#: sflphone.xml:178(para)
+msgid ""
+"The number to dial to reach your voicemail. Example: 888, or *97. It will be "
+"used as a quick dial button on the main interface."
+msgstr ""
+"Le numéro à composer pour joindre la boîte vocale associée à ce compte. "
+"Exemple: 888, ou *97. Ce numéro sera utilisé comme raccourci pour appeler "
+"votre bote vocale dans l'interface principale."
+
+#: sflphone.xml:182(para)
+msgid "Click the <menuchoice><guimenu>Apply</guimenu></menuchoice> button."
+msgstr ""
+"Cliquez sur le bouton <menuchoice><guimenu>Appliquer</guimenu></menuchoice>."
+
+#: sflphone.xml:184(para)
+msgid ""
+"You may now check the state of your account(s). You may have as many setup "
+"accounts as you wish. If it is registered, you may now use it to make calls."
+msgstr ""
+"Vous pouvez maintenant vérifier l'état de votre compte. S'il est enregistré, "
+"vous pouvez maintenant passer un nouvel appel. Vous pouvez configurer autant "
+"de comptes que vous le désirez."
+
+#: sflphone.xml:188(title)
+msgid "Editing a configured account"
+msgstr "Éditer un compte existant"
+
+#: sflphone.xml:189(para)
+msgid "To edit an existing account, perform the following steps:"
+msgstr "Pour éditer un compte, suivez les étapes suivantes:"
+
+#: sflphone.xml:192(para)
+msgid ""
+"Select in the list the account you would like to edit, then click on the "
+"<guilabel>Edit</guilabel> button."
+msgstr ""
+"Sélectionnez le compte que vous voulez éditer dans la liste des comptes, "
+"puis cliquez sur le bouton <guilabel>Éditer</guilabel>."
+
+#: sflphone.xml:193(para)
+msgid ""
+"Make your modifications, then click on the <guilabel>Apply</guilabel> button."
+msgstr ""
+"Faîtes vos modifications, puis cliquez sur le bouton "
+"<guilabel>Appliquer</guilabel> pour sauvegarder vos changements."
+
+#: sflphone.xml:198(title)
+msgid "Deleting an account"
+msgstr "Supprimer un compte"
+
+#: sflphone.xml:199(para)
+msgid "To delete an existing account, perform the following steps:"
+msgstr "Pour supprimer un compte, suivez les étapes suivantes:"
+
+#: sflphone.xml:202(para)
+msgid ""
+"Select in the list the account you would like to delete, then click on the "
+"<guibutton>Delete</guibutton> button."
+msgstr ""
+"Sélectionnez le compte que vous voulez supprimer dans la liste des comptes, "
+"puis cliquez sur le bouton <guilabel>Supprimer</guilabel>."
+
+#: sflphone.xml:207(title)
+msgid "Selecting a default account"
+msgstr "Choisir un compte par défaut"
+
+#: sflphone.xml:208(para)
+msgid ""
+"As it is possible to have an unlimited number of registered accounts at the "
+"same time, which account will be used when making a call ? You can not only "
+"set up a default account to be used every time you are making a call, but an "
+"entire priority list. To do that, perform the following steps:"
+msgstr ""
+"Comme il est possible d'avoir un nombre illimité de comptes enregistrés en "
+"même temps, quel compte va être utilisé pour passer un appel? Il est "
+"possible de configurer une liste de priorité des comptes pour passer des "
+"appels. Pour cela, suivre les étapes suivantes:"
+
+#: sflphone.xml:210(para)
+msgid ""
+"Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Manage "
+"accounts</guimenuitem></menuchoice> to access the accounts list."
+msgstr ""
+"Sélectionner "
+"<menuchoice><guimenu>Éditer</guimenu><guimenuitem>Comptes</guimenuitem></menu"
+"choice> pour accéder à la liste des comptes."
+
+#: sflphone.xml:212(para)
+msgid ""
+"The first account in the account in list will be used as the default account "
+"to make calls with. If it is not registered, SFLphone will try to use the "
+"second in the list, if still not registered, the third, and so one ..."
+msgstr ""
+"Le premier compte dans la lsite sera utilisé comme le compte par défaut pour "
+"passer des appels. Si ce compte n'est pas enregistré, SFLphone va essayer "
+"d'utiliser le suivant dans la liste, etc ..."
+
+#: sflphone.xml:213(para)
+msgid ""
+"To reorder the accounts as you wish, select an account and click on the "
+"<menuchoice><guimenu>Up</guimenu></menuchoice> or "
+"<menuchoice><guimenu>Down</guimenu></menuchoice> button."
+msgstr ""
+"Pour ordonner les comptes comme vous le désirez, sélectionnez un compte et "
+"cliquez sur le bouton <menuchoice><guimenu>Monter</guimenu></menuchoice> ou "
+"<menuchoice><guimenu>Descendre</guimenu></menuchoice>."
+
+#: sflphone.xml:216(para)
+msgid ""
+"Note that you also can select an account to make a call with when dialing by "
+"right-clicking on it."
+msgstr ""
+"Il est possible de sélectionner rapidement un compte pour un appel en "
+"faisant un clic-droit sur l'appel en train d'être composé."
+
+#: sflphone.xml:221(title)
+msgid "Advanced features"
+msgstr "Fonctionnalités avancées"
+
+#: sflphone.xml:222(para) sflphone.xml:273(para)
+msgid "These features are only available with SIP."
+msgstr "Ces fonctionnalités sont seulement disponibles pour SIP."
+
+#: sflphone.xml:223(para)
+msgid ""
+"Follow the indications to <link linkend=\"account_edit\">edit an "
+"account</link> and choose the <guimenu>Advanced</guimenu> tab."
+msgstr ""
+"Suivre les indications pour <link linkend=\"account_edit\">éditer un "
+"compte</link> et choisir l'onglet <guimenu>Avancé</guimenu>."
+
+#: sflphone.xml:226(title)
+msgid "Advanced features configuration panel"
+msgstr "Panneau de configuration des options avancées"
+
+#: sflphone.xml:237(title)
+msgid "Registration"
+msgstr "Enregistrement"
+
+#: sflphone.xml:238(para)
+msgid "You may set the expires header for a contact."
+msgstr "Vous pouvez configurer l'en-tête expiration pour un contact."
+
+#: sflphone.xml:239(para)
+msgid ""
+"It basically represents the duration your registration will remain active. "
+"If you don't register again within that time, calls will no longer be routed "
+"to you. it should be not used as a keepalive mechanism though. The default "
+"value is 600 seconds (ten minutes)."
+msgstr ""
+
+#: sflphone.xml:240(note)
+msgid ""
+"To register to some VoIP services, you will need to set this value at at "
+"least 1600 seconds (Example: French VoIP server freephonie.net)."
+msgstr ""
+"Pour vous enregistrer auprés de certains services de voix sur IP, vous avez "
+"besoin de configurer cette valeur au minimum à 1 600 secondes (Exemple: "
+"Serveur Free freephonie.net)."
+
+#: sflphone.xml:244(title) sflphone.xml:873(title)
+msgid "Network"
+msgstr "Réseau"
+
+#: sflphone.xml:245(para)
+msgid "This section enables you to set advanced network parameters."
+msgstr ""
+"Cette section vous permet de configurer les paramètres réseau avancés."
+
+#: sflphone.xml:248(guilabel)
+msgid "Local address"
+msgstr "Adresse locale"
+
+#: sflphone.xml:249(para)
+msgid ""
+"it is initialized to your private/local IP address. Calls will be routed to "
+"this address by default."
+msgstr ""
+"Elle est initialisée avec votre adresse IP locale/privée. Les appels seront "
+"routés par défaut par cette adresse."
+
+#: sflphone.xml:252(guilabel)
+msgid "Local port"
+msgstr "Port local"
+
+#: sflphone.xml:253(para)
+msgid "It is initialized to the default SIP port, 5060."
+msgstr "Il est initialisé au port SIP par défaut, 5060"
+
+#: sflphone.xml:256(guilabel)
+msgid "Set published address and port"
+msgstr "Configurer l'adresse et le port de publication"
+
+#: sflphone.xml:260(para)
+msgid ""
+"If enabled, the core will try to initialize an UDP transport on the mapped "
+"address/port number that the NAT (Network Address Translator) has allocated "
+"to <application>SFLphone</application>."
+msgstr ""
+
+#: sflphone.xml:259(listitem)
+msgid "Using STUN <placeholder-1/>"
+msgstr "Utiliser STUN <placeholder-1/>"
+
+#: sflphone.xml:261(listitem)
+msgid "Same as local parameters"
+msgstr "Identique aux paramètres locaux"
+
+#: sflphone.xml:263(listitem)
+msgid "Manually"
+msgstr "Manuelle"
+
+#: sflphone.xml:272(title)
+msgid "Security features"
+msgstr "Fonctionnalités de sécurité"
+
+#: sflphone.xml:275(title)
+msgid "Secure RTP"
+msgstr "RTP sécurisé"
+
+#: sflphone.xml:278(title)
+msgid "TLS"
+msgstr "TLS"
+
+#: sflphone.xml:285(title)
+msgid "Call features"
+msgstr "Fonctionnalités d'appel"
+
+#: sflphone.xml:287(para)
+msgid ""
+"All the following features are available with both SIP and IAX2 accounts."
+msgstr "Les fonctionnalités suivantes sont disponibles pour SIP et IAX2"
+
+#: sflphone.xml:292(title)
+msgid "Dial button"
+msgstr "Bouton composer"
+
+#. ==== End of Figure ====
+#: sflphone.xml:303(para)
+msgid ""
+"You may have an unlimited number of calls at the same time, even with "
+"different accounts."
+msgstr ""
+"Vous pouvez avoir un nombre illimité d'appels en même temps, même avec des "
+"comptes différents."
+
+#: sflphone.xml:304(para)
+msgid ""
+"To create a new call when you already have a current call, just click on the "
+"<guilabel>Dial</guilabel> button. The current call will automatically be put "
+"on hold."
+msgstr ""
+"Pour créer un appel alors que vous avez déjà un appel courant, cliquez sur "
+"le bouton <guilabel>Composer</guilabel>. L'appel courant sera alors "
+"automatiquement mis en attente."
+
+#: sflphone.xml:307(title)
+msgid "Make an other call"
+msgstr "Faire un auitre appel"
+
+#. ==== End of Figure ====
+#: sflphone.xml:318(para)
+msgid ""
+"Keyboard shortcut to perform this action: <accel>NUMPAD</accel> or almost "
+"any keys."
+msgstr ""
+"Raccourci clavier pour faire cette action: <accel>NUMPAD</accel> ou à peu "
+"près n'importe quelle touche."
+
+#: sflphone.xml:326(title)
+msgid "Call button"
+msgstr "Bouton appeler"
+
+#. ==== End of Figure ====
+#: sflphone.xml:337(para) sflphone.xml:355(para)
+msgid "Keyboard shortcut to perform this action: <accel>Enter</accel>."
+msgstr "Raccourci clavier pour faire cette action: <accel>Entrée</accel>."
+
+#: sflphone.xml:344(title)
+msgid "Answer button"
+msgstr "Bouton décrocher"
+
+#: sflphone.xml:361(title)
+msgid "Hangup button"
+msgstr "Bouton raccrocher"
+
+#. ==== End of Figure ====
+#: sflphone.xml:372(para) sflphone.xml:392(para)
+msgid "Keyboard shortcut to perform this action: <accel>ESC</accel>."
+msgstr "Raccourci clavier pour faire cette action: <accel>Echap</accel>."
+
+#: sflphone.xml:377(para)
+msgid ""
+"When you refuse a call, your caller is automatically redirected to your "
+"voicemail box, if applicable."
+msgstr ""
+"Quand un appel est refusé, votre correspondant est automatiquement redirigé "
+"vers votre boîte vocale, s'il y en a une de configurée."
+
+#: sflphone.xml:381(title)
+msgid "Refuse button"
+msgstr "Bouton refuser"
+
+#: sflphone.xml:399(title)
+msgid "Hold on button"
+msgstr "Bouton mettre en attente"
+
+#: sflphone.xml:411(title)
+msgid "Hold off button"
+msgstr "Bouton reprendre"
+
+#: sflphone.xml:426(title)
+msgid "Transfer button"
+msgstr "Bouton transférer"
+
+#. ==== End of Figure ====
+#: sflphone.xml:437(para)
+msgid "Then type the number you want to transfer the current call to."
+msgstr "Puis entrez le numéro vers lequel vous voulez transférer l'appel."
+
+#: sflphone.xml:440(title)
+msgid "Validate the transfer"
+msgstr "Valider le transfert"
+
+#. ==== End of Figure ====
+#: sflphone.xml:451(para)
+msgid ""
+"And press <accel>Enter</accel>. Clicking again on the transfer button "
+"cancels the transfer."
+msgstr ""
+"Et appuyez sur <accel>Entrée</accel>. Cliquer à nouveau sur le bouton "
+"transfert annule le transfert en cours."
+
+#: sflphone.xml:457(para)
+msgid ""
+"Go to "
+"<menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem><gui"
+"menuitem>Audio</guimenuitem></menuchoice> to configure the recordings "
+"destination folder."
+msgstr ""
+"Aller à "
+"<menuchoice><guimenu>Éditer</guimenu><guimenuitem>Préférences</guimenuitem><g"
+"uimenuitem>Audio</guimenuitem></menuchoice> pour configurer le dossier de "
+"destination des enregistrements."
+
+#: sflphone.xml:461(title)
+msgid "Record settings"
+msgstr "Paramètres d'enregistrement"
+
+#: sflphone.xml:474(title)
+msgid "Record button"
+msgstr "Bouton enregistrer"
+
+#: sflphone.xml:488(caution)
+msgid ""
+"This feature is available only if you fill out the voicemail number "
+"information for your default account."
+msgstr ""
+"Cette fonctionnalité n'est disponible que si vous avez spécifié le numéro de "
+"votre boîte vocale pour le compte courant."
+
+#: sflphone.xml:492(title)
+msgid "Voicemail button"
+msgstr "Bouton Boite vocale"
+
+#: sflphone.xml:506(para)
+msgid ""
+"A direct IP call is a call established between two peers without any "
+"accounts. When dialing, such a call must prefixed with "
+"<guilabel>sip:</guilabel>."
+msgstr ""
+"Un appel direct IP est un appel sans utiliser de registrar entre deux "
+"personnes. Vous devez ajouter <guilabel>sip:</guilabel> devant le numéro à "
+"composer pour faire un appel direct."
+
+#: sflphone.xml:508(para)
+msgid ""
+"Direct IP calls use SIP protocol to establish communication and RTP to "
+"transport data. It is right now not available with IAX2."
+msgstr ""
+"Les appels directs SIP utilisent le protocole SIP pour établir la "
+"communication et RTP pour envoyer les données de voix. Cette fonctionnalité "
+"n'est pour l'instant pas disponible avec IAx2."
+
+#: sflphone.xml:510(para)
+msgid ""
+"Go to "
+"<menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem><gui"
+"menuitem>Direct IP calls</guimenuitem></menuchoice> to configure the "
+"advanced security features for this kind of calls."
+msgstr ""
+"Aller à "
+"<menuchoice><guimenu>Éditer</guimenu><guimenuitem>Préférences</guimenuitem><g"
+"uimenuitem>Appel direct SIP</guimenuitem></menuchoice> pour configurer le "
+"comportement de ce type d'appel."
+
+#: sflphone.xml:514(para)
+msgid ""
+"SFLphone now supports conference call hosting integrating server like "
+"features in a simple GUI."
+msgstr ""
+
+#: sflphone.xml:520(guilabel)
+msgid "Create a conference"
+msgstr "Créer une conférence"
+
+#: sflphone.xml:521(para)
+msgid ""
+"To host a conference, simply drag and drop one call on another. Additional "
+"participants are added the same way, dragging a call on the conference icon."
+msgstr ""
+
+#: sflphone.xml:528(guilabel)
+msgid "Leave a conference"
+msgstr "Quitter une conférence"
+
+#: sflphone.xml:529(para)
+msgid ""
+"SFLphone conference model let you leave a conference that you are currently "
+"hosting to answer any other incoming communication or even initiate new "
+"ones. The conference is not interupted Double clicking the conference icon "
+"let you reintroduce the conference."
+msgstr ""
+
+#: sflphone.xml:538(guilabel)
+msgid "Multiple conference"
+msgstr "Conférence multiple"
+
+#: sflphone.xml:539(para)
+msgid ""
+"SFLphone supports multiple conferences running simultaneously. Two "
+"conferences can be joined the same way they are created, dragging one on the "
+"other."
+msgstr ""
+
+#: sflphone.xml:547(guilabel)
+msgid "Hangup/Hold a conference"
+msgstr "Raccrocher/Mettre en attente une conférence"
+
+#: sflphone.xml:548(para)
+msgid ""
+"Right click the conference icon. Holding the conference put all participants "
+"on hold. Hangup a conference hangup all participants."
+msgstr ""
+
+#: sflphone.xml:565(title)
+msgid "Audio configuration"
+msgstr "Paramètres audio"
+
+#: sflphone.xml:566(para)
+msgid "ALSA and Pulseaudio native interfaces are available."
+msgstr "Les interfaces natives ALSA et Pulseaudio sont disponibles"
+
+#: sflphone.xml:582(title)
+msgid "Codecs overview"
+msgstr "Présentation des codecs"
+
+#: sflphone.xml:583(para)
+msgid "SFLphone supports several widely used audio codec:"
+msgstr "SFlphone supporte de nombreux codecs très populaires:"
+
+#: sflphone.xml:587(guilabel)
+msgid "PCMU/PCMA"
+msgstr "PCMU/PCMA"
+
+#: sflphone.xml:588(para)
+msgid ""
+"ITU-T telefony standard PCM formats, 8kHz, 64 kbit/s, using logarithmic byte "
+"compression algorithm."
+msgstr ""
+
+#: sflphone.xml:594(guilabel)
+msgid "GSM"
+msgstr "GSM"
+
+#: sflphone.xml:595(para)
+msgid ""
+"Global System for Mobile communications (GSM) narrowband 8kHz standard based "
+"on linear prediction encoding."
+msgstr ""
+
+#: sflphone.xml:601(guilabel)
+msgid "G722"
+msgstr "G722"
+
+#: sflphone.xml:602(para)
+msgid "ITU-T standard wideband 16kHz standard based on linear prediction."
+msgstr ""
+
+#: sflphone.xml:607(guilabel)
+msgid "SPEEX"
+msgstr "SPEEX"
+
+#: sflphone.xml:608(para)
+msgid ""
+"High quality voice encoding/decoding available in narrowband 8Khz, wideband "
+"16khz (HD Voice), and ultra-wideband 32 kHz. Integrate additional features "
+"such as Variable Bit Rate (VBR) and noise reduction."
+msgstr ""
+
+#: sflphone.xml:617(guilabel)
+msgid "CELT"
+msgstr "CELT"
+
+#: sflphone.xml:628(title)
+msgid "Address books"
+msgstr "Carnets d'adresse"
+
+#: sflphone.xml:630(title)
+msgid "Enable the address book support"
+msgstr "Activer le support du carnet d'adresse"
+
+#: sflphone.xml:631(para)
+msgid "To enable the address book, perform the following steps:"
+msgstr ""
+"pour activer le support du carnet d'adresse, voici les étapes à suivre:"
+
+#: sflphone.xml:634(para)
+msgid ""
+"Choose "
+"<menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></me"
+"nuchoice>."
+msgstr ""
+"Sélectionnez "
+"<menuchoice><guimenu>Éditer</guimenu><guimenuitem>Préférences</guimenuitem></"
+"menuchoice>."
+
+#: sflphone.xml:638(para)
+msgid ""
+"Select the <menuchoice><guimenu>Address book</guimenu></menuchoice> tab."
+msgstr ""
+"Selectionner l'onglet<menuchoice><guimenu>Carnet "
+"d'adresse</guimenu></menuchoice>."
+
+#: sflphone.xml:642(para)
+msgid "Check the <guilabel>Use Evolution address books</guilabel> box."
+msgstr ""
+"Cochez la case <guilabel>Utiliser le carnet d'adresse d'Evolution</guilabel>"
+
+#: sflphone.xml:645(para)
+msgid ""
+"Every address books you configured in Evolution will be now available in "
+"<application>SFLphone</application>. Please be sure you selected at least "
+"one address book."
+msgstr ""
+"Tous les carnets d'adresse configurés dans Evolution sont accessibles dans "
+"<application>SFLphone</application>. Attention à bien vérifier que au moins "
+"un carnet d'adresse est sélectionné."
+
+#: sflphone.xml:649(title)
+msgid "Available options"
+msgstr "Options disponibles"
+
+#: sflphone.xml:650(para)
+msgid ""
+"In "
+"<menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem><gui"
+"menuitem>Address book</guimenuitem></menuchoice>, you may select one or all "
+"of the following options:"
+msgstr ""
+"Dans "
+"<menuchoice><guimenu>Éditer</guimenu><guimenuitem>Préférences</guimenuitem><g"
+"uimenuitem>Carnet d'adresse</guimenuitem></menuchoice>, vous pouvez une ou "
+"plusieurs des options suivantes:"
+
+#: sflphone.xml:653(guilabel)
+msgid "Display contact photo if available"
+msgstr "Afficher la photo du contact si elle est disponible"
+
+#: sflphone.xml:654(para)
+msgid ""
+"The contact photo will be displayed as a thumbnail beside the phone number."
+msgstr "La photo sera affichée à côté du numéro de téléphone."
+
+#: sflphone.xml:659(guilabel)
+msgid "Fields from Evolution's address book"
+msgstr "Champs du carnet d'adresse Evolution"
+
+#: sflphone.xml:660(para)
+msgid ""
+"You may use one or all of these following information from your contact."
+msgstr ""
+"Vous pouvez recevoir une ou plusieurs des informations suivantes pour vos "
+"contacts."
+
+#: sflphone.xml:663(listitem)
+msgid "Work phone number"
+msgstr "Tel Bureau"
+
+#: sflphone.xml:664(listitem)
+msgid "Home phone number"
+msgstr "Tel Domicile"
+
+#: sflphone.xml:665(listitem)
+msgid "Mobile phone number"
+msgstr "Tel Portable"
+
+#: sflphone.xml:673(title)
+msgid "Using the address book"
+msgstr "Utiliser le carnet d'adresse"
+
+#: sflphone.xml:676(para)
+msgid ""
+"On the toolbar, click on the following button to display the address book "
+"window:"
+msgstr ""
+"Dans la barre d'outil, cliquez sur le bouton suivant pour afficher le carnet "
+"d'adresse:"
+
+#: sflphone.xml:680(title)
+msgid "Address book toolbar button"
+msgstr "Carnet d'adresse dans la barre d'outil"
+
+#: sflphone.xml:693(para)
+msgid "Search for a contact"
+msgstr "Chercher un contact"
+
+#: sflphone.xml:697(para)
+msgid ""
+"New entries should have appeared in the window. Double click on it to call "
+"the contact. You may also <menuchoice><guimenu>Right "
+"click</guimenu><guimenuitem>Edit before calling</guimenuitem></menuchoice> "
+"to modify the entry before calling."
+msgstr ""
+
+#: sflphone.xml:704(title)
+msgid "Preferences"
+msgstr "Préférences"
+
+#: sflphone.xml:706(para)
+msgid ""
+"Go to "
+"<menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></me"
+"nuchoice> to access the configuration panel."
+msgstr ""
+"Aller dans "
+"<menuchoice><guimenu>Éditer</guimenu><guimenuitem>Préférences</guimenuitem></"
+"menuchoice> pour accéder au panneau de configuration."
+
+#: sflphone.xml:707(para)
+msgid "Each section is detailed below."
+msgstr "Chaque section est détaillée ci-dessous."
+
+#: sflphone.xml:710(title)
+msgid "General"
+msgstr "Général"
+
+#: sflphone.xml:711(para)
+msgid ""
+"This section provides the user general settings regarding the application."
+msgstr ""
+"Cette partie permet à l'utilisateur de configurer des paramètres globaux de "
+"l'application."
+
+#: sflphone.xml:715(title)
+msgid "Desktop notifications options"
+msgstr "Notifications de bureau"
+
+#: sflphone.xml:729(guilabel)
+msgid "Enable notifications"
+msgstr "Activer les notifications"
+
+#: sflphone.xml:730(para)
+msgid ""
+"Both clients use their desktop environment notification system. If checked, "
+"you will receive desktop notifications for events such as incoming calls and "
+"system messages."
+msgstr ""
+
+#: sflphone.xml:734(title)
+msgid "Example of an incoming call notification"
+msgstr "Exemple d'une notification d'appel entrant"
+
+#: sflphone.xml:746(guilabel)
+msgid "Enable voicemail notifications"
+msgstr "Activer les notifications de messages vocaux"
+
+#: sflphone.xml:747(para)
+msgid ""
+"The voicemail notifications are handled separatly. If checked, you will be "
+"notified with the number of unread voicemails for your accounts."
+msgstr ""
+
+#: sflphone.xml:751(title)
+msgid "Example of a voicemail notification"
+msgstr "Exempel d'une notification de message vocal"
+
+#: sflphone.xml:770(title)
+msgid "System tray options"
+msgstr "Options de la barre des tâches"
+
+#: sflphone.xml:784(guilabel)
+msgid "Popup main window on incoming call"
+msgstr "Popup la fenêtre principale lors de l'arrivée d'un appel"
+
+#: sflphone.xml:785(para)
+msgid ""
+"If SFLphone is closed on the system tray, pops the main window up on "
+"foreground when receiving an incoming call."
+msgstr ""
+"Si SFLphone est réduit dans la barre des tâches, faire apparaître la fenêtre "
+"principale sur les appels entrants."
+
+#: sflphone.xml:790(guilabel)
+msgid "Never popup main window"
+msgstr "Ne jamais faire apparaître la fenêtre principale"
+
+#: sflphone.xml:791(para)
+msgid ""
+"If SFLphone is closed on the system tray, never pops the main window up on "
+"foreground when receiving an incoming call."
+msgstr ""
+"Si SFLphone est réduit dans la barre des tâches, ne jamais ouvrir la fenêtre "
+"au premier plan sur les appels entrants."
+
+#: sflphone.xml:796(guilabel)
+msgid "Hide SFLphone window on startup"
+msgstr "Cacher SFLphone au démarrage"
+
+#: sflphone.xml:797(para)
+msgid "On startup, SFLphone will go directly on the system tray."
+msgstr "Au démarrage, SFLphone se met directement dans la barre des tâches."
+
+#: sflphone.xml:810(title)
+msgid "Calls history options"
+msgstr "Historique des appels"
+
+#: sflphone.xml:823(guilabel)
+msgid "Keep my history for at least n days"
+msgstr "Garder mon historique pour au moins n jours"
+
+#: sflphone.xml:824(para)
+msgid ""
+"If checked, calls will be kept up to N days in the history. You may select a "
+"custom number of days. Do not check it if you don't want to use this feature."
+msgstr ""
+
+#: sflphone.xml:834(title)
+msgid "Configuration file options"
+msgstr "Fichier de configuration"
+
+#: sflphone.xml:847(guilabel)
+msgid "Store SIP credentials as MD5 hash"
+msgstr ""
+"Stocker les informations d'authentification sour forme encryptée (MD5)"
+
+#: sflphone.xml:848(para)
+msgid ""
+"If checked, your password information will be encrypted in the configuration "
+"file, instead of plain text."
+msgstr ""
+
+#: sflphone.xml:859(title)
+msgid "Audio"
+msgstr "Audio"
+
+#: sflphone.xml:863(title)
+msgid "Address book"
+msgstr "Carnet d'adresse"
+
+#: sflphone.xml:865(para)
+msgid ""
+"Refer to the <link linkend=\"addressbook\">Address books</link> section for "
+"more information."
+msgstr ""
+"Se référer à la section <link linkend=\"addressbook\">Carnet "
+"d'adresse</link> pour plus d'informations."
+
+#: sflphone.xml:869(title)
+msgid "Hooks"
+msgstr "Ancrage"
+
+#: sflphone.xml:877(title)
+msgid "Direct IP calls"
+msgstr "Appels IP"
+
+#: sflphone.xml:878(para)
+msgid ""
+"Refer to the <link linkend=\"directip\">Direct IP calls</link> section for "
+"more information."
+msgstr ""
+
+#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
+#: sflphone.xml:0(None)
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+" Emmanuel Milou https://launchpad.net/~manumilou"
diff --git a/sflphone-client-gnome/globals.mak b/sflphone-client-gnome/globals.mak
index 027c152adb7defd6cd9acbf4a3f1d593e5fe2e78..8fe5ee180b5b23c08aaff4dda0927d41bdbdeb32 100644
--- a/sflphone-client-gnome/globals.mak
+++ b/sflphone-client-gnome/globals.mak
@@ -18,5 +18,6 @@ AM_CPPFLAGS = $(DEPS_CFLAGS) \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-DDATADIR=\""$(datadir)"\" \
-DLIBDIR=\""$(libdir)"\" \
+ -DLOCALEDIR=\""$(localedir)"\" \
-DSFLPHONE_UIDIR=\""$(datadir)/sflphone/ui"\"
diff --git a/sflphone-client-gnome/pixmaps/Makefile.am b/sflphone-client-gnome/pixmaps/Makefile.am
index 19b166b39662b2acca08edf04b288487321d5a47..ee8fcf97c525a23827e41726a12ebd2bd6be4534 100644
--- a/sflphone-client-gnome/pixmaps/Makefile.am
+++ b/sflphone-client-gnome/pixmaps/Makefile.am
@@ -26,6 +26,7 @@ buttons_DATA = current.svg \
sflphone.svg \
sflphone_small.svg \
sflphone_notif.svg \
+ sflphone_offline.svg \
stock_person.svg \
icon_rec.svg \
rec_call.svg \
diff --git a/sflphone-client-gnome/pixmaps/sflphone_offline.svg b/sflphone-client-gnome/pixmaps/sflphone_offline.svg
new file mode 100644
index 0000000000000000000000000000000000000000..6cff90be09b24776d8cab50f5508796c0befd08a
--- /dev/null
+++ b/sflphone-client-gnome/pixmaps/sflphone_offline.svg
@@ -0,0 +1,415 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="120"
+ height="120"
+ id="svg5875"
+ sodipodi:version="0.32"
+ inkscape:version="0.47pre4 r22446"
+ version="1.0"
+ sodipodi:docname="sflphone_offline.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs5877">
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3803">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop3805" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3807" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient4684">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop4686" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop4688" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient4669">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop4671" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop4673" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3859">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop3861" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3863" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient5850">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop5852" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop5854" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5850"
+ id="linearGradient5856"
+ x1="476.3125"
+ y1="439.0293"
+ x2="477.3125"
+ y2="514.42188"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient4999">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop5001" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop5003" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4999"
+ id="linearGradient5862"
+ gradientUnits="userSpaceOnUse"
+ x1="698.38525"
+ y1="245.5472"
+ x2="702.81964"
+ y2="977.78302" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient4991">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop4993" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop4995" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4991"
+ id="radialGradient4997"
+ cx="736.5"
+ cy="640.93073"
+ fx="736.5"
+ fy="640.93073"
+ r="91.964203"
+ gradientTransform="matrix(1,0,0,0.8097086,0,99.14184)"
+ gradientUnits="userSpaceOnUse" />
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective5883" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3859"
+ id="linearGradient3873"
+ x1="352.19498"
+ y1="451.55289"
+ x2="106.34038"
+ y2="658.39594"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-3.8268196,-1.7394634)" />
+ <inkscape:perspective
+ id="perspective2422"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective2437"
+ inkscape:persp3d-origin="168.5 : 109.33333 : 1"
+ inkscape:vp_z="337 : 164 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 164 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4669"
+ id="linearGradient4675"
+ x1="-20.657925"
+ y1="-244.41351"
+ x2="184.57913"
+ y2="789.61469"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="pad" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4684"
+ id="linearGradient4690"
+ x1="52.987782"
+ y1="-84.148399"
+ x2="127.02813"
+ y2="99.500687"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4669"
+ id="linearGradient5149"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="pad"
+ x1="-20.657925"
+ y1="-244.41351"
+ x2="184.57913"
+ y2="789.61469" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4991"
+ id="radialGradient5297"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.8097086,0,99.14184)"
+ cx="736.5"
+ cy="640.93073"
+ fx="736.5"
+ fy="640.93073"
+ r="91.964203" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4999"
+ id="linearGradient5299"
+ gradientUnits="userSpaceOnUse"
+ x1="698.38525"
+ y1="245.5472"
+ x2="702.81964"
+ y2="977.78302" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4684"
+ id="linearGradient5301"
+ gradientUnits="userSpaceOnUse"
+ x1="52.987782"
+ y1="-84.148399"
+ x2="127.02813"
+ y2="99.500687" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4684"
+ id="linearGradient5308"
+ gradientUnits="userSpaceOnUse"
+ x1="52.987782"
+ y1="-84.148399"
+ x2="127.02813"
+ y2="99.500687"
+ gradientTransform="matrix(0.6453907,0,0,0.6453907,0.8651337,0.4352828)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3803"
+ id="linearGradient3809"
+ x1="12.663443"
+ y1="8.5301828"
+ x2="41.858654"
+ y2="57.533279"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.0054518,0,0,1.0054518,-4.7165106e-3,-0.4345682)" />
+ <inkscape:perspective
+ id="perspective2881"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ gridtolerance="10000"
+ guidetolerance="10"
+ objecttolerance="10"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="4.6527672"
+ inkscape:cx="71.125906"
+ inkscape:cy="59.641316"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer2"
+ showgrid="false"
+ inkscape:window-width="1910"
+ inkscape:window-height="1068"
+ inkscape:window-x="47"
+ inkscape:window-y="41"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:window-maximized="0" />
+ <metadata
+ id="metadata5880">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Icône SFL</dc:title>
+ <dc:date>2009-04-29</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Jérôme Oufella</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:rights>
+ <cc:Agent>
+ <dc:title>(c) 2009 Savoir-faire Linux inc.</dc:title>
+ </cc:Agent>
+ </dc:rights>
+ <dc:subject>
+ <rdf:Bag>
+ <rdf:li>sfl icon</rdf:li>
+ </rdf:Bag>
+ </dc:subject>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Circle"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-182.15973,-428.80763)"
+ style="display:inline">
+ <g
+ style="display:inline"
+ id="g5868"
+ transform="matrix(0.6453907,0,0,0.6453907,-86.103074,148.01517)">
+ <path
+ transform="matrix(0.9959566,0,0,1.2202117,1.6861043,-136.53125)"
+ d="m 602,544.5 c 0,41.6975 -41.41366,75.5 -92.5,75.5 -51.08634,0 -92.5,-33.8025 -92.5,-75.5 0,-41.6975 41.41366,-75.5 92.5,-75.5 51.08634,0 92.5,33.8025 92.5,75.5 z"
+ sodipodi:ry="75.5"
+ sodipodi:rx="92.5"
+ sodipodi:cy="544.5"
+ sodipodi:cx="509.5"
+ id="path4987"
+ style="fill:#00252b;fill-opacity:1;fill-rule:evenodd"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.9200853,0,0,1.1406537,-168.51683,-66.406557)"
+ d="m 827,521 c 0,40.31679 -40.51823,73 -90.5,73 -49.98177,0 -90.5,-32.68321 -90.5,-73 0,-40.31679 40.51823,-73 90.5,-73 49.98177,0 90.5,32.68321 90.5,73 z"
+ sodipodi:ry="73"
+ sodipodi:rx="90.5"
+ sodipodi:cy="521"
+ sodipodi:cx="736.5"
+ id="path4989"
+ style="opacity:0.83064515;fill:url(#radialGradient5297);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5299);stroke-width:2.92839932;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ sodipodi:type="arc" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="Bg logo"
+ style="display:inline">
+ <path
+ style="opacity:1;fill:#006f82;fill-opacity:0;fill-rule:evenodd;stroke:#006f82;stroke-width:1.04566979;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+ d="M 10.55114,62.033695 L 10.545872,59.631821 L 11.329656,63.53366 L 11.321088,59.630621 L 12.621458,63.431585 L 12.611584,58.928074 L 13.657722,64.630914 L 13.897019,55.923735 L 14.696183,66.831029 L 15.959008,53.518653 L 16.252311,69.430662 L 17.258279,56.819227 L 18.052818,65.624884 L 18.551844,57.51777 L 19.347918,67.023975 L 19.833546,52.812112 L 21.424823,71.42421 L 20.85641,47.906685 L 23.760575,76.024188 L 22.924102,48.103639 L 25.312097,76.522171 L 24.213925,47.100857 L 25.814204,69.816155 L 26.299177,55.304046 L 27.10579,69.613998 L 28.100546,51.898595 L 28.133486,66.910282 L 29.383802,47.893475 L 29.17479,70.411424 L 30.42269,50.293743 L 30.995926,76.012977 L 32.479618,45.586876 L 32.810259,78.51213 L 34.022583,42.181821 L 34.623699,80.610954 L 35.567529,39.677469 L 36.17744,82.1097 L 36.856708,38.374457 L 38.250165,84.608465 L 38.159277,43.176196 L 39.275226,80.703832 L 39.72003,47.877458 L 40.557601,76.298395 L 41.022589,52.6792 L 42.361163,73.89372 L 42.575221,53.677574 L 43.394126,73.59189 L 44.128072,54.776031 L 45.197477,71.087148 L 44.64642,55.475777 L 46.746157,70.284115 L 46.201462,57.575013 L 47.766387,64.177753 L 48.157374,33.559644 L 49.574786,63.974798 L 49.737044,29.057192 L 50.608848,64.173352 L 52.072146,33.362224 L 52.237957,82.20545 L 53.618404,31.455993 L 54.269604,83.80121 L 54.704307,28.546169 L 56.569731,89.992521 L 56.233651,27.84325 L 58.106058,92.475088 L 58.237615,25.734393 L 59.462018,94.871346 L 59.308802,25.029251 L 60.997751,97.080654 L 60.859237,25.026847 L 63.348005,99.381156 L 63.493128,47.740542 L 64.432585,95.86912 L 64.276032,51.242071 L 66.685102,98.180342 L 65.570911,52.541084 L 66.563781,98.275324 L 64.993727,25.020443 L 69.064999,96.16276 L 66.029984,26.219775 L 70.373503,94.756118 L 68.436272,27.318084 L 72.677618,93.850086 L 72.234352,27.4111 C 72.234352,27.4111 73.940422,98.363981 74.456142,97.862784 C 74.971847,97.361592 75.595153,28.106441 75.595153,28.106441 L 75.739811,94.046666 L 76.890923,29.805765 L 77.049624,93.24225 L 78.18426,30.404231 L 78.338812,91.945712 L 80.000344,33.704002 L 80.38199,89.886658 L 82.071758,35.602278 L 82.1985,84.464362 L 83.409266,38.505999 L 84.494194,70.81025 L 85.482229,41.108345 L 86.300623,69.703651 L 88.312822,44.609637 L 89.401506,78.617548 L 89.890557,48.126952 L 91.245045,76.60551 L 91.663323,49.515327 L 93.046215,73.100561 L 93.514555,51.012458 L 95.564594,69.900023 L 95.350428,54.413452 L 97.176303,71.094351 L 97.42119,56.012671 L 100.17281,68.095581 L 100.26537,56.803022 L 102.33474,68.598489 L 102.41415,58.300276 L 104.15368,64.27997 L 104.55185,54.777789 L 105.28904,66.085499 L 105.9731,60.189794 C 105.9731,60.189794 107.07326,63.772713 107.07216,63.272322 C 107.07105,62.771937 108.5787,61.082943 108.31828,60.182636 C 108.05791,59.282342 109.41561,62.475103 109.41561,62.475103"
+ id="path4922"
+ sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscccccccccccccccccccccccccccccccccccc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Handset"
+ style="display:inline">
+ <path
+ style="opacity:0.07000002;fill:url(#linearGradient5308);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12.29699993;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+ d="M 59.151985,7.5345809 C 30.967536,8.249433 8.3274641,31.354675 8.3274641,59.710388 C 8.3274641,68.222065 10.375495,76.246983 13.994802,83.347823 C 13.107834,79.536662 12.643515,75.568677 12.643515,71.488769 C 12.643515,42.682964 36.013519,19.292793 64.819322,19.292793 C 85.110516,19.292792 102.69706,30.904841 111.32779,47.831165 C 105.9454,24.743656 85.222311,7.5345809 60.503272,7.5345809 C 60.05318,7.5345809 59.599356,7.5232342 59.151985,7.5345809 z"
+ id="path4679" />
+ <path
+ id="path3760"
+ d="M 88.906874,94.063359 C 88.559935,94.977556 84.966023,98.376 83.289215,99.375481 L 81.43556,100.48037 L 73.808785,90.541207 L 66.182003,80.602053 L 67.494791,79.241241 C 68.779544,77.909476 72.634516,75.322497 73.887671,74.951128 C 74.431745,74.789888 75.528139,76.078361 81.782999,84.229651 C 85.777928,89.435809 88.983679,93.860981 88.906874,94.063359 z M 50.73329,44.477271 C 50.446627,45.232636 45.91138,49.09897 44.433331,49.848034 L 43.090474,50.528569 L 35.573545,40.555914 L 28.056608,30.583254 L 30.64475,28.448397 C 32.068233,27.274223 33.934924,26.023758 34.792949,25.669578 L 36.352996,25.025619 L 43.633459,34.513458 C 48.514886,40.874896 50.854403,44.158138 50.73329,44.477271 z M 80.086522,101.40574 C 80.038294,101.53261 79.197946,102.04305 78.219084,102.54005 C 70.526609,106.44583 58.163118,101.84815 46.523718,90.753346 C 42.403963,86.826338 33.905571,76.306559 30.548319,70.978095 C 24.069511,60.695264 21.022718,52.062253 21.112522,44.242002 C 21.168568,39.361513 22.770354,35.243539 25.642678,32.595536 L 26.627564,31.687563 L 34.18264,41.386253 L 41.737722,51.084944 L 41.126672,52.143343 C 40.282652,53.605243 40.435321,55.522605 41.628037,58.4399 C 43.124949,62.101227 55.001116,77.570343 58.187294,80.008903 C 60.691108,81.925211 62.231437,82.484651 64.082727,82.150099 L 65.393673,81.913192 L 72.783941,91.544137 C 76.848589,96.841159 80.134755,101.27887 80.086522,101.40574 z"
+ style="opacity:0.32000002;fill:#000000;fill-opacity:1" />
+ <path
+ style="fill:#dfdfdf;fill-opacity:1"
+ d="M 92.518066,90.452167 C 92.171127,91.366364 88.577215,94.764808 86.900407,95.764289 L 85.046752,96.869181 L 77.419976,86.930015 L 69.793194,76.990861 L 71.105983,75.63005 C 72.390736,74.298285 76.245707,71.711305 77.498862,71.339937 C 78.042936,71.178697 79.13933,72.46717 85.394191,80.61846 C 89.389119,85.824618 92.59487,90.24979 92.518066,90.452167 z M 54.344481,40.86608 C 54.057819,41.621444 49.522571,45.487778 48.044523,46.236842 L 46.701666,46.917377 L 39.184735,36.944723 L 31.6678,26.972063 L 34.255941,24.837205 C 35.679425,23.663032 37.546115,22.412566 38.404141,22.058387 L 39.964188,21.414427 L 47.24465,30.902267 C 52.126078,37.263706 54.465594,40.546946 54.344481,40.86608 z M 83.697713,97.79455 C 83.649486,97.921417 82.809137,98.431852 81.830276,98.928861 C 74.137801,102.83464 61.774308,98.236957 50.134909,87.142154 C 46.015154,83.215146 37.516762,72.695367 34.159511,67.366904 C 27.680702,57.084073 24.63391,48.451062 24.723714,40.63081 C 24.77976,35.750321 26.381546,31.632348 29.253869,28.984346 L 30.238755,28.076371 L 37.793832,37.775063 L 45.348913,47.473754 L 44.737863,48.532152 C 43.893844,49.994052 44.046513,51.911414 45.239229,54.828709 C 46.73614,58.490035 58.612307,73.959152 61.798485,76.397711 C 64.3023,78.31402 65.842629,78.87346 67.693918,78.538907 L 69.004865,78.302 L 76.395132,87.932945 C 80.459781,93.229968 83.745947,97.667682 83.697713,97.79455 z"
+ id="path3218" />
+ <g
+ transform="matrix(0.6018652,0,0,0.6018652,-106.46243,-252.67476)"
+ id="g3787"
+ style="fill:#ffffff;fill-opacity:0">
+ <path
+ id="path3789"
+ d="M 324.6064,576.10592 C 324.02996,577.62486 318.05867,583.27138 315.27265,584.93202 L 312.1928,586.7678 L 299.5209,570.25386 L 286.84899,553.73994 L 289.03019,551.47895 C 291.16481,549.26622 297.56985,544.96795 299.65197,544.35092 C 300.55595,544.08302 302.37761,546.22382 312.77007,559.7672 C 319.40765,568.41724 324.73401,575.76967 324.6064,576.10592 z M 261.18093,493.71856 C 260.70464,494.9736 253.16932,501.39752 250.71354,502.64209 L 248.48238,503.7728 L 235.99299,487.20322 L 223.50359,470.63363 L 227.80379,467.08656 C 230.16891,465.13567 233.27042,463.05802 234.69603,462.46955 L 237.28805,461.39961 L 249.38455,477.16367 C 257.49505,487.73321 261.38216,493.18832 261.18093,493.71856 z M 309.95137,588.3053 C 309.87124,588.51609 308.475,589.36418 306.84862,590.18996 C 294.06756,596.67941 273.5256,589.04036 254.18672,570.60633 C 247.34174,564.0816 233.22165,546.60297 227.64357,537.74972 C 216.87902,520.66478 211.81677,506.32102 211.96598,493.32766 C 212.0591,485.21872 214.72047,478.3767 219.49284,473.97704 L 221.12923,472.46844 L 233.682,488.58283 L 246.23478,504.69722 L 245.21952,506.45575 C 243.81718,508.8847 244.07084,512.0704 246.05254,516.91749 C 248.53966,523.00079 268.27193,548.70275 273.56577,552.75442 C 277.72586,555.93837 280.28512,556.86788 283.36104,556.31202 L 285.53918,555.9184 L 297.81812,571.92023 C 304.57154,580.72124 310.03151,588.09451 309.95137,588.3053 z"
+ style="opacity:0.32000002;fill:#ffffff;fill-opacity:0" />
+ <path
+ style="fill:#ffffff;fill-opacity:0"
+ d="M 330.6064,570.10592 C 330.02996,571.62486 324.05867,577.27138 321.27265,578.93202 L 318.1928,580.7678 L 305.5209,564.25386 L 292.84899,547.73994 L 295.03019,545.47895 C 297.16481,543.26622 303.56985,538.96795 305.65197,538.35092 C 306.55595,538.08302 308.37761,540.22382 318.77007,553.7672 C 325.40765,562.41724 330.73401,569.76967 330.6064,570.10592 z M 267.18093,487.71856 C 266.70464,488.9736 259.16932,495.39752 256.71354,496.64209 L 254.48238,497.7728 L 241.99299,481.20322 L 229.50359,464.63363 L 233.80379,461.08656 C 236.16891,459.13567 239.27042,457.05802 240.69603,456.46955 L 243.28805,455.39961 L 255.38455,471.16367 C 263.49505,481.73321 267.38216,487.18832 267.18093,487.71856 z M 315.95137,582.3053 C 315.87124,582.51609 314.475,583.36418 312.84862,584.18996 C 300.06756,590.67941 279.5256,583.04036 260.18672,564.60633 C 253.34174,558.0816 239.22165,540.60297 233.64357,531.74972 C 222.87902,514.66478 217.81677,500.32102 217.96598,487.32766 C 218.0591,479.21872 220.72047,472.3767 225.49284,467.97704 L 227.12923,466.46844 L 239.682,482.58283 L 252.23478,498.69722 L 251.21952,500.45575 C 249.81718,502.8847 250.07084,506.0704 252.05254,510.91749 C 254.53966,517.00079 274.27193,542.70275 279.56577,546.75442 C 283.72586,549.93837 286.28512,550.86788 289.36104,550.31202 L 291.53918,549.9184 L 303.81812,565.92023 C 310.57154,574.72124 316.03151,582.09451 315.95137,582.3053 z"
+ id="path3791" />
+ </g>
+ <path
+ style="fill:url(#linearGradient3809);fill-opacity:1;stroke:none"
+ d="M 39.961991,21.402587 L 38.390972,22.062415 C 37.532947,22.416594 35.666967,23.653234 34.243484,24.827407 L 31.667014,26.963992 L 39.176482,36.955669 L 43.166868,42.23429 C 44.833493,39.007648 46.844812,36.037923 49.105318,33.342326 C 48.501731,32.545758 47.962788,31.818462 47.251516,30.891538 L 39.961991,21.402587 z M 30.253097,28.063705 L 29.247645,28.974895 C 26.375322,31.622897 24.779157,35.751365 24.723113,40.631852 C 24.633309,48.452104 27.670415,57.087755 34.149223,67.370584 C 35.036506,68.778836 36.301396,70.544757 37.731145,72.460684 C 37.518951,70.51226 37.385521,68.535071 37.385521,66.522234 C 37.385521,58.29228 39.192461,50.526372 42.412779,43.742468 L 37.793985,37.772598 L 30.253097,28.063705 z"
+ id="path3798" />
+ <g
+ id="g3398"
+ transform="matrix(7.5387238,0,0,7.5387238,1.1454138,0.16950363)">
+ <rect
+ ry="0.82081318"
+ rx="0.82081318"
+ inkscape:r_cy="true"
+ inkscape:r_cx="true"
+ y="8.6409912"
+ x="8.1562767"
+ height="7.0576959"
+ width="7.4291534"
+ id="rect1686"
+ style="color:#000000;fill:#a40000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.37145764;marker:none;visibility:visible;display:inline;overflow:visible" />
+ <g
+ inkscape:r_cy="true"
+ inkscape:r_cx="true"
+ transform="matrix(0.4225522,0,0,0.4225522,6.497738,-3.4645944)"
+ id="g2254">
+ <path
+ style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2.56729817;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+ d="M 8,32 18,42"
+ id="path1377"
+ inkscape:r_cx="true"
+ inkscape:r_cy="true" />
+ <path
+ inkscape:r_cy="true"
+ inkscape:r_cx="true"
+ id="path2252"
+ d="M 18,32 8,42"
+ style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2.56729817;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+ </g>
+ </g>
+ </g>
+</svg>
diff --git a/sflphone-client-gnome/po/Makefile.am b/sflphone-client-gnome/po/Makefile.am
index 04a94d39ffd2bb8f125d4328a3000a2b1c37203d..2f8eebd1ccf3f00a642c4b16581e2af010f67dbb 100644
--- a/sflphone-client-gnome/po/Makefile.am
+++ b/sflphone-client-gnome/po/Makefile.am
@@ -11,7 +11,8 @@ POFILES=\
zh_HK/zh_HK.po \
ru/ru.po \
it/it.po \
- pt_BR/pt_BR.po
+ pt_BR/pt_BR.po \
+ da/da.po
MOFILES=\
fr/fr.mo \
@@ -21,7 +22,8 @@ MOFILES=\
zh_HK/zh_HK.mo \
ru/ru.mo \
it/it.mo \
- pt_BR/pt_BR.mo
+ pt_BR/pt_BR.mo \
+ da/da.mo
MSGFMT=msgfmt
@@ -36,7 +38,7 @@ SUFFIXES=.po .mo
.po.mo:
$(MSGFMT) -o $@ $<
-install-data-local:
+install-data-local: $(MOFILES)
@catalogs='$(MOFILES)'; \
for i in $$catalogs; do \
destdir=$(locale_installdir); \
@@ -56,4 +58,4 @@ uninstall-local:
done
clean-local:
- rm -rf *.mo
+ rm -f $(MOFILES)
diff --git a/sflphone-client-gnome/po/da/da.po b/sflphone-client-gnome/po/da/da.po
new file mode 100644
index 0000000000000000000000000000000000000000..1c011969aca5c2afa3b9a4cc76db3e748bcd6bc2
--- /dev/null
+++ b/sflphone-client-gnome/po/da/da.po
@@ -0,0 +1,1215 @@
+# Danish translation for sflphone
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the sflphone package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: sflphone\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-12-03 10:22-0500\n"
+"PO-Revision-Date: 2009-11-03 03:52+0000\n"
+"Last-Translator: Jonas Fonseca <fonseca@diku.dk>\n"
+"Language-Team: Danish <da@li.org>\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"
+"X-Launchpad-Export-Date: 2009-12-03 15:32+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: ../sflphone-client-gnome/src/accountlist.c:175
+msgid "Registered"
+msgstr "Registreret"
+
+#: ../sflphone-client-gnome/src/accountlist.c:178
+msgid "Not Registered"
+msgstr "Ikke registreret"
+
+#: ../sflphone-client-gnome/src/accountlist.c:181
+msgid "Trying..."
+msgstr "Forsøger..."
+
+#: ../sflphone-client-gnome/src/accountlist.c:184
+#: ../sflphone-client-gnome/src/sflnotify.c:131
+#: ../sflphone-client-gnome/src/sflnotify.c:148
+msgid "Error"
+msgstr "Fejl"
+
+#: ../sflphone-client-gnome/src/accountlist.c:187
+msgid "Authentication Failed"
+msgstr "Godkendelse mislykkedes"
+
+#: ../sflphone-client-gnome/src/accountlist.c:190
+msgid "Network unreachable"
+msgstr "Netværk kan ikke nås"
+
+#: ../sflphone-client-gnome/src/accountlist.c:193
+msgid "Host unreachable"
+msgstr "Vært kan ikke nås"
+
+#: ../sflphone-client-gnome/src/accountlist.c:196
+msgid "Stun configuration error"
+msgstr "Stun konfigureringsfejl"
+
+#: ../sflphone-client-gnome/src/accountlist.c:199
+msgid "Stun server invalid"
+msgstr "Stun server ugyldig"
+
+#: ../sflphone-client-gnome/src/accountlist.c:202
+msgid "Invalid"
+msgstr "Ugyldig"
+
+#: ../sflphone-client-gnome/src/actions.c:98
+msgid "Using account"
+msgstr "Benytter konto"
+
+#: ../sflphone-client-gnome/src/actions.c:104
+msgid "No registered accounts"
+msgstr "Ingen registrerede konti"
+
+#: ../sflphone-client-gnome/src/actions.c:285
+msgid ""
+"Unable to connect to the SFLphone server.\n"
+"Make sure the daemon is running."
+msgstr ""
+"Forbindelse til SFLphone serveren kan ikke oprettes.\n"
+"Sørg for at server-dæmonen kører."
+
+#: ../sflphone-client-gnome/src/actions.c:589
+#: ../sflphone-client-gnome/src/actions.c:911
+msgid "Direct SIP call"
+msgstr "Direkte IP opkald"
+
+#: ../sflphone-client-gnome/src/actions.c:1103
+#, 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>Fejl: Ingen audio-codec fundet\n"
+"\n"
+"</b>SFL audio-codecs skal installeres i <i>%s</i> eller i mappen <b>."
+"sflphone</b> i dit hjemmekatalog (<i>%s</i>)"
+
+#: ../sflphone-client-gnome/src/errors.c:29
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening playback device"
+msgstr ""
+"ALSA meddelelse\n"
+"\n"
+"Fejl opstod mens afspilningsenhed blev åbnet"
+
+#: ../sflphone-client-gnome/src/errors.c:32
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening capture device"
+msgstr ""
+"ALSA meddelelse\n"
+"\n"
+"Fejl opstod mens optageenhed blev åbnet"
+
+#: ../sflphone-client-gnome/src/errors.c:35
+msgid ""
+"Pulseaudio notification\n"
+"\n"
+"Pulseaudio is not running"
+msgstr ""
+"PulseAudio meddelelse\n"
+"\n"
+"PulseAudio er tilgængelig"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:73
+msgid "There is one call in progress."
+msgstr "Et igangværende opkald eksisterer"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:77
+msgid "There are calls in progress."
+msgstr "Igangværende opkald eksisterer"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:86
+msgid "Do you still want to quit?"
+msgstr "Ønsker du stadig at afslutte"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:298
+msgid "SFLphone Error"
+msgstr "SFLphone fejl"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:392
+#, c-format
+msgid "ZRTP is not supported by peer %s\n"
+msgstr "ZRTP er ikke understøttet af modtageren %s\n"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:393
+msgid "Secure Communication Unavailable"
+msgstr "Sikker kommunikation ikke tilgængelig"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:394
+#: ../sflphone-client-gnome/src/mainwindow.c:416
+msgid "Continue"
+msgstr "Fortsæt"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:395
+#: ../sflphone-client-gnome/src/mainwindow.c:417
+#: ../sflphone-client-gnome/src/mainwindow.c:431
+msgid "Stop Call"
+msgstr "Afslut opkald"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:414
+#, c-format
+msgid ""
+"A %s error forced the call with %s to fall under unencrypted mode.\n"
+"Exact reason: %s\n"
+msgstr ""
+"En \"%s\"-fejl medførte at opkaldet til %s blev ændret til ukrypteret "
+"tilstand.\n"
+"Den præcise årsag: %s\n"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:415
+msgid "ZRTP negotiation failed"
+msgstr "ZRTP-forhandling mislykkedes"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:428
+#, c-format
+msgid ""
+"%s wants to stop using secure communication. Confirm will resume "
+"conversation without SRTP.\n"
+msgstr ""
+"%s ønsker at afslutte brugen af sikker kommunikation. Ved at godkende vil "
+"samtalen fortætte uden SRTP\n"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:429
+msgid "Confirm Go Clear"
+msgstr "Godkend sikkerhedsændring"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:430
+msgid "Confirm"
+msgstr "Godkend"
+
+#: ../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>Fra</i> %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+#, c-format
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] "%d indtalt besked"
+msgstr[1] "%d indtalte beskeder"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:111
+#, c-format
+msgid "Calling with %s account <i>%s</i>"
+msgstr "Kalder op med %s konto <i>%s</i>"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:115
+msgid "Current account"
+msgstr "Nuværende konto"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:130
+msgid "You have no accounts set up"
+msgstr "Du har ingen oprettede konti"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:147
+msgid "You have no registered accounts"
+msgstr "Du har ingen registrerede konti"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:190
+#, c-format
+msgid ""
+"<i>With:</i> %s \n"
+"using %s"
+msgstr ""
+"<i>Med:</i> %s \n"
+"benyttende %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:205
+#, c-format
+msgid "%s does not support ZRTP."
+msgstr "%s understøtter ikke ZRTP."
+
+#: ../sflphone-client-gnome/src/sflnotify.c:220
+#, c-format
+msgid "ZRTP negotiation failed with %s"
+msgstr "ZRTP forhandling mislykkedes med %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:235
+#, c-format
+msgid "<i>With:</i> %s"
+msgstr "<i>Med:</i> %s"
+
+#: ../sflphone-client-gnome/src/sliders.c:162
+msgid "Speakers volume"
+msgstr "Højtaler lydstyrke"
+
+#: ../sflphone-client-gnome/src/sliders.c:164
+msgid "Mic volume"
+msgstr "Mikrofon lydstyrke"
+
+#: ../sflphone-client-gnome/src/statusicon.c:96
+msgid "_Show main window"
+msgstr "_Vis hovedvindue"
+
+#: ../sflphone-client-gnome/src/statusicon.c:131
+msgid "SFLphone"
+msgstr "SFLphone"
+
+#: ../sflphone-client-gnome/src/statusicon.c:132
+#, c-format
+msgid "%i account configured"
+msgid_plural "%i accounts configured"
+msgstr[0] "%i konto oprettet"
+msgstr[1] "%i konti oprettet"
+
+#: ../sflphone-client-gnome/src/toolbar.c:38
+#: ../sflphone-client-gnome/src/uimanager.c:693
+#: ../sflphone-client-gnome/src/uimanager.c:727
+msgid "Voicemail"
+msgstr "Talebesked"
+
+#: ../sflphone-client-gnome/src/uimanager.c:117
+msgid "No address book selected"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:137
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "Address book"
+msgstr "Adressebog"
+
+#: ../sflphone-client-gnome/src/uimanager.c:279
+msgid "Voicemail (%i)"
+msgstr "Talebesked"
+
+#: ../sflphone-client-gnome/src/uimanager.c:342
+msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr "SFLphone er en VoIP-klient kompatibel med SIP og IAX2 protokoller"
+
+#: ../sflphone-client-gnome/src/uimanager.c:345
+msgid "About SFLphone"
+msgstr "Om SFLphone"
+
+#: ../sflphone-client-gnome/src/uimanager.c:719
+msgid "Call"
+msgstr "Afslut opkald"
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:1184
+msgid "_New call"
+msgstr "_Nyt opkald"
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+msgid "Place a new call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:979
+msgid "_Pick up"
+msgstr "_Svar"
+
+#: ../sflphone-client-gnome/src/uimanager.c:721
+msgid "Answer the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:991
+#: ../sflphone-client-gnome/src/uimanager.c:1032
+msgid "_Hang up"
+msgstr "_Læg på"
+
+#: ../sflphone-client-gnome/src/uimanager.c:722
+msgid "Finish the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "O_n hold"
+msgstr "I _venteposition"
+
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "Place the call on hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "O_ff hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "Place the call off hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:725
+#: ../sflphone-client-gnome/src/uimanager.c:1015
+msgid "_Record"
+msgstr "_Optag"
+
+#: ../sflphone-client-gnome/src/uimanager.c:725
+msgid "Record the current conversation"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Configuration _Assistant"
+msgstr "Konfigurationsfil"
+
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Run the configuration assistant"
+msgstr "Stun konfigureringsfejl"
+
+#: ../sflphone-client-gnome/src/uimanager.c:727
+msgid "Call your voicemail"
+msgstr "%d indtalt besked"
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "_Close"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "Minimize to system tray"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "_Quit"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "Quit the program"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:732
+msgid "_Edit"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "_Copy"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "Copy the selection"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "_Paste"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "Paste the clipboard"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear _history"
+msgstr "Opkaldshistorik"
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear the call history"
+msgstr "Opkaldshistorik"
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "_Accounts"
+msgstr "Konti"
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "Edit your accounts"
+msgstr "Nuværende konto"
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "_Preferences"
+msgstr "Indstillinger"
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "Change your preferences"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:740
+msgid "_View"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:743
+msgid "_Help"
+msgstr "_Hjem"
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Contents"
+msgstr "Fortsæt"
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Open the manual"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:745
+msgid "About this application"
+msgstr "Godkendelse"
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "_Transfer"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "Transfer the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "_Show toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "Show the toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "_Dialpad"
+msgstr "Deaktiveret"
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "Show the dialpad"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "_Volume controls"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "Show the volume controls"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "_History"
+msgstr "Opkaldshistorik"
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "Calls history"
+msgstr "Opkaldshistorik"
+
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "_Address book"
+msgstr "Adressebog"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1003
+#: ../sflphone-client-gnome/src/uimanager.c:1044
+msgid "On _Hold"
+msgstr "I _venteposition"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1107
+msgid "_Call back"
+msgstr "_Besvar opkald"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1258
+msgid "Edit phone number"
+msgstr "Ændre telefonnummer"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1269
+msgid "Edit the phone number before making a call"
+msgstr "Ændre telefonnummeret før opkald"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
+msgid "Account Parameters"
+msgstr "Kontoparametre"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
+#: ../sflphone-client-gnome/src/config/assistant.c:314
+#: ../sflphone-client-gnome/src/config/assistant.c:427
+msgid "_Alias"
+msgstr "_Alias"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
+msgid "_Protocol"
+msgstr "_Protokol"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
+msgid "Unknown"
+msgstr "Ukendt"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
+#: ../sflphone-client-gnome/src/config/assistant.c:322
+#: ../sflphone-client-gnome/src/config/assistant.c:435
+msgid "_Host name"
+msgstr "_Værtsnavn"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
+#: ../sflphone-client-gnome/src/config/assistant.c:330
+#: ../sflphone-client-gnome/src/config/assistant.c:443
+msgid "_User name"
+msgstr "_Brugernavn"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:346
+#: ../sflphone-client-gnome/src/config/assistant.c:458
+msgid "_Password"
+msgstr "_Adgangskode"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:363
+#: ../sflphone-client-gnome/src/config/assistant.c:473
+msgid "Show password"
+msgstr "Adgangskode"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:368
+#: ../sflphone-client-gnome/src/config/assistant.c:478
+msgid "_Voicemail number"
+msgstr "_Nummer for talebesked"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
+msgid "Authentication"
+msgstr "Godkendelse"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
+msgid "Secret"
+msgstr "Hemmelig"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
+msgid "Credential"
+msgstr "Legitimationsoplysning"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
+msgid "Authentication name"
+msgstr "Godkendelsesnavn"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
+msgid "Password"
+msgstr "Adgangskode"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
+msgid "Security"
+msgstr "Sikkerhed"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
+msgid "Use TLS transport (sips)"
+msgstr "Benyt TLS transport (sips)"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
+msgid "SRTP key exchange"
+msgstr "SRTP-nøgleudveksling"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
+msgid "Disabled"
+msgstr "Deaktiveret"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
+msgid "Registration"
+msgstr "Registrering"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
+msgid "Registration expire"
+msgstr "Forældelse af registrering"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
+msgid "_Comply with RFC 3263"
+msgstr "_Overhold RFC 3263"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
+msgid "Network Interface"
+msgstr "Netværk kan ikke nås"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
+msgid "Local address"
+msgstr "Lokal adresse"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
+msgid "Local port"
+msgstr "Lokal port"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
+msgid "Published address"
+msgstr "Offentliggjort adresse"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+msgid "Using STUN"
+msgstr "Ved brug af STUN "
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
+msgid "STUN server URL"
+msgstr "STUN serveradresse"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
+msgid "Same as local parameters"
+msgstr "Samme som lokale parametre"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
+msgid "Set published address and port:"
+msgstr "Konfigurer offentliggjort adresse og port:"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
+msgid "Published port"
+msgstr "Offentliggjort port"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
+msgid "Account settings"
+msgstr "Kontoindstillinger"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
+msgid "Basic"
+msgstr "Grundlæggende"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
+msgid "Advanced"
+msgstr "Advanceret"
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:164
+msgid "Server returned \"%s\" (%d)"
+msgstr "Server svarede \""
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
+msgid "Protocol"
+msgstr "Protokol"
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:396
+msgid "Status"
+msgstr "Status"
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:474
+msgid "Accounts"
+msgstr "Konti"
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:484
+msgid "Configured Accounts"
+msgstr "Oprettede konti"
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
+msgid "There is %d active account"
+msgid_plural "There are %d active accounts"
+msgstr[0] " aktiv konto"
+msgstr[1] " aktiv konto"
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
+msgid "You have no active account"
+msgstr "Der er ingen aktive konti"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
+msgid "General"
+msgstr "Generelt"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:312
+msgid "_Use Evolution address books"
+msgstr "_Benyt Evolution adressekartotek"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:319
+msgid "Download limit :"
+msgstr "Download begrænsning :"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:327
+msgid "cards"
+msgstr "kort"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:333
+msgid "_Display contact photo if available"
+msgstr "Vis _kontaktbillede hvis tilgængeligt"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:341
+msgid "Fields from Evolution's address books"
+msgstr "Felter fra Evolutions adressekartotek"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:345
+msgid "_Work"
+msgstr "_Arbejde"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:351
+msgid "_Home"
+msgstr "_Hjem"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:357
+msgid "_Mobile"
+msgstr "_Mobil"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:364
+msgid "Address Books"
+msgstr "Adressekartoteker"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:368
+msgid "Select which Evolution address books to use"
+msgstr "Vælg hvilke af Evolutions adressekartoteker skal benyttes"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:404
+#: ../sflphone-client-gnome/src/config/audioconf.c:577
+msgid "Name"
+msgstr "Navn"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:75
+#, c-format
+msgid "This assistant is now finished."
+msgstr "Denne vejledning er nu fuldført"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:77
+msgid ""
+"You can at any time check your registration state or modify your accounts "
+"parameters in the Options/Accounts window."
+msgstr ""
+"Du kan til enhver tid undersøge din registrering eller ændre dine kontis "
+"parametre i vinduet Indstillinger/Konti"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:80
+msgid "Alias"
+msgstr "Alias"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:84
+msgid "Server"
+msgstr "Server"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:88
+msgid "Username"
+msgstr "Brugernavn"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:92
+msgid "Security: "
+msgstr "Sikkerhed: "
+
+#: ../sflphone-client-gnome/src/config/assistant.c:94
+msgid "SRTP/ZRTP draft-zimmermann"
+msgstr "SRTP/ZRTP draft-zimmermann"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:96
+msgid "None"
+msgstr "Ingen"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:229
+msgid "SFLphone account creation wizard"
+msgstr "SFLphone-guiden til oprettelse af konto"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:255
+msgid "Welcome to the Account creation wizard of SFLphone!"
+msgstr "Velkommen til kontooperettelsesvejledning for SFLphone"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:256
+msgid "This installation wizard will help you configure an account."
+msgstr ""
+"Denne installeringsvejledning vil hjælpe dig med at konfigurere en konto"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:270
+msgid "VoIP Protocols"
+msgstr "VoIP protokoller"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:270
+msgid "Select an account type"
+msgstr "Vælg en kontotype"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:272
+msgid "SIP (Session Initiation Protocol)"
+msgstr "SIP (Session Initiation Protocol)"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:274
+msgid "IAX2 (InterAsterix Exchange)"
+msgstr "IAX2 (InterAsterix Exchange)"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:288
+msgid "Account"
+msgstr "Konto"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:288
+msgid "Please select one of the following options"
+msgstr "Vælg en af følgende indstillinger"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:290
+msgid "Create a free SIP/IAX2 account on sflphone.org"
+msgstr "Opret en gratis SIP/IAX2 konto hos sflphone.org"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:292
+msgid "Register an existing SIP or IAX2 account"
+msgstr "Registrer en eksisterende SIP eller IAX2 konto"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:306
+msgid "SIP account settings"
+msgstr "SIP kontoindstillinger"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:419
+msgid "Please fill the following information"
+msgstr "Udfyld venligst følgende information"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:376
+#: ../sflphone-client-gnome/src/config/assistant.c:405
+msgid "Secure communications with _ZRTP"
+msgstr "Sikker kommunikation med _ZRTP"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:389
+msgid "Optional email address"
+msgstr "Valgfri emailadresse"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:389
+msgid "This email address will be used to send your voicemail messages."
+msgstr "Denne emailadresse vil blive brugt til at sende dig indtalte beskeder"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:397
+msgid "_Email address"
+msgstr "_Emailadresse"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:419
+msgid "IAX2 account settings"
+msgstr "IAX2 kontoindstillinger"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:496
+msgid "Network Address Translation (NAT)"
+msgstr "Network Address Translation (NAT)"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:496
+msgid "You should probably enable this if you are behind a firewall."
+msgstr "Du opfordres til at aktivere dette hvis du er bag en firewall"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:505
+msgid "E_nable STUN"
+msgstr "_Benyt STUN"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:512
+msgid "_STUN server"
+msgstr "_STUN server"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:526
+msgid "Account Registration"
+msgstr "Kontoregistrering"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:526
+msgid "Congratulations!"
+msgstr "Tillykke!"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:582
+msgid "Frequency"
+msgstr "Frekvens"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:587
+msgid "Bitrate"
+msgstr "Bithastighed"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:592
+msgid "Bandwidth"
+msgstr "Båndbredde"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:670
+msgid "ALSA plugin"
+msgstr "ALSA plugin"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:692
+msgid "Output"
+msgstr "Uddata"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:714
+msgid "Input"
+msgstr "Inddata"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:749
+msgid "_Voice Activity Detection"
+msgstr "_Detektering af taleaktivitet"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:759
+msgid "_Noise Reduction (Narrow-Band Companding)"
+msgstr "_Støjreducering (Narrow-Band Companding)"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:800
+msgid "Sound Manager"
+msgstr "Lydhåndtering"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:809
+msgid "_Pulseaudio"
+msgstr "_PulseAudio"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
+msgid "_ALSA"
+msgstr "_ALSA"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:819
+msgid "ALSA settings"
+msgstr "ALSA indstillinger"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:836
+msgid "Codecs"
+msgstr "Codecs"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:865
+msgid "Recordings"
+msgstr "Optagelser"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:869
+msgid "Destination folder"
+msgstr "Destinationsmappe"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
+msgid "Select a folder"
+msgstr "Vælg en mappe"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
+msgid "Ringtones"
+msgstr "Ringetoner"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
+msgid "_Enable ringtones"
+msgstr "Aktiver _ringetoner"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:891
+msgid "Choose a ringtone"
+msgstr "Vælg en ringetone"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:897
+msgid "Audio Files"
+msgstr "Lydfiler"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:130
+msgid "URL Argument"
+msgstr "Adresseargument"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:135
+msgid "Custom commands on incoming calls with URL"
+msgstr "Brugerdefinerede kommandoer ved indgående opkald med webadresse"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:138
+#, c-format
+msgid "%s will be replaced with the passed URL."
+msgstr "%s vil blive erstattet med den givne webadresse."
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:141
+msgid "Trigger on specific _SIP header"
+msgstr "Udløse ved specifik _SIP protokolhoved"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:150
+msgid "Trigger on _IAX2 URL"
+msgstr "Udløse ved _IAX2 webadresse"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:155
+msgid "Command to _run"
+msgstr "Kommando som skal _kaldes"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:165
+msgid "Phone number rewriting"
+msgstr "Omskrivning af telefonnummer"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:169
+msgid "_Prefix dialed numbers with"
+msgstr "_Præfiks for indtastede numre"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
+msgid ""
+"This profile is used when you want to reach a remote peer simply by typing a "
+"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
+"also be used if no account can be matched to an incoming or outgoing call."
+msgstr ""
+"Denne profil benyttes når du ønsker at kontakte en ekstern peer ved blot at "
+"indtaste en sip-adresse såsom <b>sip:eksternpeer</b>. De indstillinger som "
+"du definerer her vil også benyttes hvis ingen konto kan tilknyttes et "
+"indgående eller udgående opkald."
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
+msgid "Desktop Notifications"
+msgstr "Meddelelser"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
+msgid "_Enable notifications"
+msgstr "_Aktiver meddelelser"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
+msgid "System Tray Icon"
+msgstr "Systembakke-ikon"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+msgid "_Popup main window on incoming call"
+msgstr "_Vis hovedvindue ved indgående opkald"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
+msgid "Ne_ver popup main window"
+msgstr "Aldrig _pop-op hovedvindue"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
+msgid "Hide SFLphone window on _startup"
+msgstr "Skjul SFLphone vinduet ved _start"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
+msgid "Calls History"
+msgstr "Opkaldshistorik"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
+msgid "_Keep my history for at least"
+msgstr "_Gem min historik i mindst"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
+msgid "days"
+msgstr "dage"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
+msgid "Preferences"
+msgstr "Indstillinger"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
+msgid "Audio"
+msgstr "Audio"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
+msgid "Address Book"
+msgstr "Adressebog"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
+msgid "Hooks"
+msgstr "Hooks"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
+msgid "Direct IP calls"
+msgstr "Direkte IP opkald"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:38
+msgid "Advanced options for TLS"
+msgstr "Advancerede indstillinger for TLS"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:56
+msgid "TLS transport"
+msgstr "TLS transport"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:60
+msgid ""
+"TLS transport can be used along with UDP for those calls that would\n"
+"require secure sip transactions (aka SIPS). You can configure a different\n"
+"TLS transport for each account. However, each of them will run on a "
+"dedicated\n"
+"port, different one from each other\n"
+msgstr ""
+"TLS transport kan benyttes sammen med UDP for de opkald som kræver\n"
+"sikker sip transaktion (også kaldet SIPS). Du kan konfigurere forskellige\n"
+"TLS transporter for de enkelte konti. Bemærk dog at de hver vil benytte\n"
+"en dedikeret port forskellig fra hinanden.\n"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
+msgid "Certificate of Authority list"
+msgstr "Autoritetscertifikatsliste"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
+msgid "Choose a CA list file (optional)"
+msgstr "Vælg en fil med en autoritetscertifikatsliste (valgfri)"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
+msgid "Public endpoint certificate file"
+msgstr "Offentlig endpoint certifikatsfil"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
+msgid "Choose a public endpoint certificate (optional)"
+msgstr "Vælg et offentligt endpoint-certifikat (valgfri)"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
+msgid "Choose a private key file (optional)"
+msgstr "Vælg en privat nøglefil (valgfri)"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
+msgid "Password for the private key"
+msgstr "Adgangskode for den private nøgle"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
+msgid "TLS protocol method"
+msgstr "TLS protokolmetode"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
+msgid "TLS cipher list"
+msgstr "TLS cifferliste"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
+msgid "Server name instance for outgoing TLS connection"
+msgstr "Server navneinstans for udgående TLS forbindelse"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
+msgid "Negotiation timeout (sec:msec)"
+msgstr "Forhandlingstimeout"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
+msgid "Verify incoming certificates, as a server"
+msgstr "Udfør kontrol af indgående certifikater, som en server"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
+msgid "Verify certificates from answer, as a client"
+msgstr "Udfør kontrol af certifikater fra svar, som en klient"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
+msgid "Require certificate for incoming tls connections"
+msgstr "Kræv certifikat for indgående TLS forbindelser"
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:49
+msgid "ZRTP Options"
+msgstr "ZRTP indstillinger"
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:69
+msgid "Send Hello Hash in S_DP"
+msgstr "Send \"Hello Hash\" i S_DP"
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:75
+msgid "Ask User to Confirm SAS"
+msgstr "_Spørg bruger om at godkende SAS"
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:81
+msgid "_Warn if ZRTP not supported"
+msgstr "_Advar hvis ZRTP ikke understøttes"
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:87
+msgid "Display SAS once for hold events"
+msgstr "_Vis SAS en enkelt gang for vente-hændelser"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:58
+msgid "Search all"
+msgstr "Søg alle"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:59
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:72
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:84
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:96
+msgid "Click here to change the search type"
+msgstr "Klik her for at ændre søgningstypen"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:71
+msgid "Search by missed call"
+msgstr "Søg i ubesvarede opkald"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:83
+msgid "Search by incoming call"
+msgstr "Søg i indgående opkald"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:95
+msgid "Search by outgoing call"
+msgstr "Søg i udgående opkald"
+
+#~ msgid "IP call - %s"
+#~ msgstr "IP opkald - %s"
+
+#~ msgid "Codec"
+#~ msgstr "Kodning"
+
+#~ msgid "Network"
+#~ msgstr "Netværk"
+
+#~ msgid "Manually"
+#~ msgstr "Manuelt"
+
+#~ msgid "There "
+#~ msgstr "Der "
+
+#~ msgid "is "
+#~ msgstr "er "
+
+#~ msgid "are "
+#~ msgstr "er "
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#~ msgid "_Mute other applications during a call"
+#~ msgstr "_Dæmp andre programmer ved opkald"
+
+#~ msgid "SIP Port"
+#~ msgstr "SIP Port"
+
+#~ msgid "UDP Transport"
+#~ msgstr "UDP transport"
+
+#~ msgid "Enable voicemail _notifications"
+#~ msgstr "Aktiver _talebeskedsmeddelelser"
+
+#~ msgid "Store SIP credentials as MD5 hash"
+#~ msgstr "Gem SIP-legitimationsoplysninger som _MD5-hash-værdi"
diff --git a/sflphone-client-gnome/po/de/de.po b/sflphone-client-gnome/po/de/de.po
index 7459095a3906ed0ec4b4a2bfbc536c27aefbce96..ca1afd15a46c3577ef7821d053d5730e495373e1 100644
--- a/sflphone-client-gnome/po/de/de.po
+++ b/sflphone-client-gnome/po/de/de.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: sflphone\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-14 11:18-0400\n"
-"PO-Revision-Date: 2009-10-15 00:00+0000\n"
+"POT-Creation-Date: 2009-12-03 10:22-0500\n"
+"PO-Revision-Date: 2009-10-26 20:46+0000\n"
"Last-Translator: Maxime Chambreuil <maxime.chambreuil@gmail.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"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-10-26 15:48+0000\n"
+"X-Launchpad-Export-Date: 2009-12-03 15:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: ../sflphone-client-gnome/src/accountlist.c:175
@@ -60,25 +60,15 @@ msgstr "Ungültiger Stun server"
msgid "Invalid"
msgstr "Ungültig"
-#: ../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:83
-#: ../sflphone-client-gnome/src/actions.c:919
-#: ../sflphone-client-gnome/src/actions.c:926
+#: ../sflphone-client-gnome/src/actions.c:98
msgid "Using account"
msgstr "Mit Konto"
-#: ../sflphone-client-gnome/src/actions.c:89
+#: ../sflphone-client-gnome/src/actions.c:104
msgid "No registered accounts"
msgstr "Kein registriertes Konto"
-#: ../sflphone-client-gnome/src/actions.c:268
+#: ../sflphone-client-gnome/src/actions.c:285
msgid ""
"Unable to connect to the SFLphone server.\n"
"Make sure the daemon is running."
@@ -86,22 +76,18 @@ msgstr ""
"SFLphone Server kann nicht verbunden werden. Stellen Sie sicher, dass der "
"Dämon läuft."
-#: ../sflphone-client-gnome/src/actions.c:913
-#, c-format
-msgid "IP call - %s"
-msgstr "IP Anruf - %s"
-
-#: ../sflphone-client-gnome/src/actions.c:922
-msgid "Codec"
-msgstr "Codec"
+#: ../sflphone-client-gnome/src/actions.c:589
+#: ../sflphone-client-gnome/src/actions.c:911
+msgid "Direct SIP call"
+msgstr ""
-#: ../sflphone-client-gnome/src/actions.c:1119
+#: ../sflphone-client-gnome/src/actions.c:1103
#, 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> )"
+"</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"
@@ -150,55 +136,55 @@ msgstr "Laufende Anrufe."
msgid "Do you still want to quit?"
msgstr "Bitte bestätigen, dass Sie die Anwendung beenden möchten"
-#: ../sflphone-client-gnome/src/mainwindow.c:299
+#: ../sflphone-client-gnome/src/mainwindow.c:298
msgid "SFLphone Error"
msgstr "SFLphone Fehler"
-#: ../sflphone-client-gnome/src/mainwindow.c:391
+#: ../sflphone-client-gnome/src/mainwindow.c:392
#, c-format
msgid "ZRTP is not supported by peer %s\n"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:392
-msgid "Secure Communication Unavailable"
-msgstr ""
-
#: ../sflphone-client-gnome/src/mainwindow.c:393
-#: ../sflphone-client-gnome/src/mainwindow.c:415
-msgid "Continue"
-msgstr ""
+msgid "Secure Communication Unavailable"
+msgstr "Sichere Verbindung nicht verfügbar"
#: ../sflphone-client-gnome/src/mainwindow.c:394
#: ../sflphone-client-gnome/src/mainwindow.c:416
-#: ../sflphone-client-gnome/src/mainwindow.c:430
+msgid "Continue"
+msgstr "Weiter"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:395
+#: ../sflphone-client-gnome/src/mainwindow.c:417
+#: ../sflphone-client-gnome/src/mainwindow.c:431
msgid "Stop Call"
-msgstr ""
+msgstr "Anruf beenden"
-#: ../sflphone-client-gnome/src/mainwindow.c:413
+#: ../sflphone-client-gnome/src/mainwindow.c:414
#, c-format
msgid ""
"A %s error forced the call with %s to fall under unencrypted mode.\n"
"Exact reason: %s\n"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:414
+#: ../sflphone-client-gnome/src/mainwindow.c:415
msgid "ZRTP negotiation failed"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:427
+#: ../sflphone-client-gnome/src/mainwindow.c:428
#, c-format
msgid ""
"%s wants to stop using secure communication. Confirm will resume "
"conversation without SRTP.\n"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:428
+#: ../sflphone-client-gnome/src/mainwindow.c:429
msgid "Confirm Go Clear"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:429
+#: ../sflphone-client-gnome/src/mainwindow.c:430
msgid "Confirm"
-msgstr ""
+msgstr "Bestätigen"
#: ../sflphone-client-gnome/src/sflnotify.c:71
#: ../sflphone-client-gnome/src/sflnotify.c:91
@@ -211,6 +197,13 @@ msgstr "Konto %s : %s"
msgid "<i>From</i> %s"
msgstr "<i>Von</i> %s"
+#: ../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/sflnotify.c:111
#, c-format
msgid "Calling with %s account <i>%s</i>"
@@ -258,15 +251,15 @@ msgstr "Lautsprecher Lautstärke"
msgid "Mic volume"
msgstr "Mikro Lautstärke"
-#: ../sflphone-client-gnome/src/statusicon.c:91
+#: ../sflphone-client-gnome/src/statusicon.c:96
msgid "_Show main window"
msgstr "_Hauptfenster anzeigen"
-#: ../sflphone-client-gnome/src/statusicon.c:126
+#: ../sflphone-client-gnome/src/statusicon.c:131
msgid "SFLphone"
msgstr "SFLphone"
-#: ../sflphone-client-gnome/src/statusicon.c:127
+#: ../sflphone-client-gnome/src/statusicon.c:132
#, c-format
msgid "%i account configured"
msgid_plural "%i accounts configured"
@@ -274,203 +267,398 @@ msgstr[0] "%i Konto konfiguriert"
msgstr[1] "%i Konten konfiguriert"
#: ../sflphone-client-gnome/src/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:750
+#: ../sflphone-client-gnome/src/uimanager.c:693
+#: ../sflphone-client-gnome/src/uimanager.c:727
msgid "Voicemail"
msgstr "Voicemail"
-#: ../sflphone-client-gnome/src/uimanager.c:403
+#: ../sflphone-client-gnome/src/uimanager.c:117
+msgid "No address book selected"
+msgstr "Adressbuch"
+
+#: ../sflphone-client-gnome/src/uimanager.c:137
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "Address book"
+msgstr "Adressbuch"
+
+#: ../sflphone-client-gnome/src/uimanager.c:279
+msgid "Voicemail (%i)"
+msgstr "Voicemail (%i)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:342
msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
-msgstr ""
-"SFLphone ist ein VoIP Client (kompatibel mit SIP und IAX2 Protokolle)"
+msgstr "SFLphone ist ein VoIP Client (kompatibel mit SIP und IAX2 Protokolle)"
-#: ../sflphone-client-gnome/src/uimanager.c:406
+#: ../sflphone-client-gnome/src/uimanager.c:345
msgid "About SFLphone"
msgstr "Über SFLphone"
-#: ../sflphone-client-gnome/src/uimanager.c:1028
+#: ../sflphone-client-gnome/src/uimanager.c:719
+msgid "Call"
+msgstr "_Anruf"
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:1184
+msgid "_New call"
+msgstr "_Neuer Anruf"
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+msgid "Place a new call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:979
msgid "_Pick up"
msgstr "_Abnehmen"
-#: ../sflphone-client-gnome/src/uimanager.c:1040
-#: ../sflphone-client-gnome/src/uimanager.c:1081
+#: ../sflphone-client-gnome/src/uimanager.c:721
+msgid "Answer the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:991
+#: ../sflphone-client-gnome/src/uimanager.c:1032
msgid "_Hang up"
msgstr "A_uflegen"
-#: ../sflphone-client-gnome/src/uimanager.c:1052
-#: ../sflphone-client-gnome/src/uimanager.c:1093
-msgid "On _Hold"
+#: ../sflphone-client-gnome/src/uimanager.c:722
+msgid "Finish the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "O_n hold"
msgstr "in _Warteschleife"
-#: ../sflphone-client-gnome/src/uimanager.c:1064
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "Place the call on hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "O_ff hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "Place the call off hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:725
+#: ../sflphone-client-gnome/src/uimanager.c:1015
msgid "_Record"
msgstr "_Gespräch aufzeichnen"
-#: ../sflphone-client-gnome/src/uimanager.c:1154
+#: ../sflphone-client-gnome/src/uimanager.c:725
+msgid "Record the current conversation"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Configuration _Assistant"
+msgstr "Einrichtungsdatei"
+
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Run the configuration assistant"
+msgstr "Stun: Konfigurationsfehler"
+
+#: ../sflphone-client-gnome/src/uimanager.c:727
+msgid "Call your voicemail"
+msgstr "%d Voice Nachricht"
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "_Close"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "Minimize to system tray"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "_Quit"
+msgstr "_Editieren"
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "Quit the program"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:732
+msgid "_Edit"
+msgstr "_Editieren"
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "_Copy"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "Copy the selection"
+msgstr "Entfernen Sie das ausgewählte Konto"
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "_Paste"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "Paste the clipboard"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear _history"
+msgstr "Liste der vorherigen Anrufen _leeren"
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear the call history"
+msgstr "Vorherigen Anrufen leeren"
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "_Accounts"
+msgstr "_Konten"
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "Edit your accounts"
+msgstr "Aktuelles Konto"
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "_Preferences"
+msgstr "Einstellungen"
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "Change your preferences"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:740
+msgid "_View"
+msgstr "_Anzeigen"
+
+#: ../sflphone-client-gnome/src/uimanager.c:743
+msgid "_Help"
+msgstr "_Hilfe"
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Contents"
+msgstr "Weiter"
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Open the manual"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:745
+msgid "About this application"
+msgstr "Authentifizierung"
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "_Transfer"
+msgstr "Weiterleiten"
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "Transfer the call"
+msgstr "Weiterleiten zu : "
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "_Show toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "Show the toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "_Dialpad"
+msgstr "_Wählscheibe"
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "Show the dialpad"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "_Volume controls"
+msgstr "Lautstärke-Regler anzeigen"
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "Show the volume controls"
+msgstr "Lautstärke-Regler anzeigen"
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "_History"
+msgstr "Vorherige Anrufe"
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "Calls history"
+msgstr "Liste der vorherigen Anrufen"
+
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "_Address book"
+msgstr "Adressbuch"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1003
+#: ../sflphone-client-gnome/src/uimanager.c:1044
+msgid "On _Hold"
+msgstr "in _Warteschleife"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1107
msgid "_Call back"
msgstr "_Zurückrufen"
-#: ../sflphone-client-gnome/src/uimanager.c:1226
-msgid "_New call"
-msgstr "_Neuer Anruf"
-
-#: ../sflphone-client-gnome/src/uimanager.c:1300
+#: ../sflphone-client-gnome/src/uimanager.c:1258
msgid "Edit phone number"
msgstr "Nummer editieren"
-#: ../sflphone-client-gnome/src/uimanager.c:1311
+#: ../sflphone-client-gnome/src/uimanager.c:1269
msgid "Edit the phone number before making a call"
msgstr "Nummer vor dem Anruf editieren"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:164
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
msgid "Account Parameters"
-msgstr ""
+msgstr "Konto parameter"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:173
-#: ../sflphone-client-gnome/src/config/assistant.c:294
-#: ../sflphone-client-gnome/src/config/assistant.c:402
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
+#: ../sflphone-client-gnome/src/config/assistant.c:314
+#: ../sflphone-client-gnome/src/config/assistant.c:427
msgid "_Alias"
msgstr "_Alias"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:181
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
msgid "_Protocol"
msgstr "_Protokoll"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:199
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
msgid "Unknown"
msgstr "Unbekannt"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:209
-#: ../sflphone-client-gnome/src/config/assistant.c:302
-#: ../sflphone-client-gnome/src/config/assistant.c:410
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
+#: ../sflphone-client-gnome/src/config/assistant.c:322
+#: ../sflphone-client-gnome/src/config/assistant.c:435
msgid "_Host name"
msgstr "_Hostname"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:217
-#: ../sflphone-client-gnome/src/config/assistant.c:310
-#: ../sflphone-client-gnome/src/config/assistant.c:418
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
+#: ../sflphone-client-gnome/src/config/assistant.c:330
+#: ../sflphone-client-gnome/src/config/assistant.c:443
msgid "_User name"
msgstr "_Benutzername"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:234
-#: ../sflphone-client-gnome/src/config/assistant.c:326
-#: ../sflphone-client-gnome/src/config/assistant.c:433
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:346
+#: ../sflphone-client-gnome/src/config/assistant.c:458
msgid "_Password"
msgstr "_Passwort"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:254
-#: ../sflphone-client-gnome/src/config/assistant.c:344
-#: ../sflphone-client-gnome/src/config/assistant.c:449
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:363
+#: ../sflphone-client-gnome/src/config/assistant.c:473
+msgid "Show password"
+msgstr "Passwort"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:368
+#: ../sflphone-client-gnome/src/config/assistant.c:478
msgid "_Voicemail number"
msgstr "_Voicemail Nummer"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:340
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
msgid "Authentication"
-msgstr ""
+msgstr "Authentifizierung"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:341
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
msgid "Secret"
-msgstr ""
+msgstr "Geheim"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:466
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
msgid "Credential"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:501
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
msgid "Authentication name"
-msgstr ""
+msgstr "Authentifizierung Name"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:512
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
msgid "Password"
msgstr "Passwort"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:535
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:909
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:201
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
msgid "Security"
msgstr "Sicherheit"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:547
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:213
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
msgid "Use TLS transport (sips)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:552
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:218
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
msgid "SRTP key exchange"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:558
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
msgid "Disabled"
-msgstr ""
+msgstr "Deaktiviert"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
msgid "Registration"
-msgstr ""
+msgstr "Anmeldung"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:679
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
msgid "Registration expire"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
msgid "_Comply with RFC 3263"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
-msgid "Network"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
+msgid "Network Interface"
+msgstr "Kein netzwerk"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:707
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
msgid "Local address"
-msgstr ""
+msgstr "Adresse (lokal)"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:744
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
msgid "Local port"
+msgstr "Port (lokal)"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
+msgid "Published address"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:752
-msgid "Set published address and port:"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+msgid "Using STUN"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:756
-msgid "Using STUN "
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
+msgid "STUN server URL"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:761
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
msgid "Same as local parameters"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:764
-msgid "Manually"
-msgstr "Manuell"
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:769
-msgid "Published address"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
+msgid "Set published address and port:"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:777
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
msgid "Published port"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:785
-msgid "STUN server URL"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
msgid "Account settings"
msgstr "Kontoeinstellungen"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
msgid "Basic"
-msgstr ""
+msgstr "Allgemein"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:904
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
msgid "Advanced"
-msgstr ""
+msgstr "Erweitert"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:169
-msgid "Server returned \""
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:164
+#, c-format
+msgid "Server returned \"%s\" (%d)"
msgstr ""
#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
@@ -483,40 +671,26 @@ msgstr "Status"
#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:474
msgid "Accounts"
-msgstr ""
+msgstr "Konten"
#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:484
msgid "Configured Accounts"
msgstr "Konfigurierten Konten"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:505
-msgid "There "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "is "
-msgstr ""
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
+msgid "There is %d active account"
+msgid_plural "There are %d active accounts"
+msgstr[0] " aktive Konten"
+msgstr[1] " aktive Konten"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "are "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:508
-msgid " active account"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:509
-msgid "s"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:514
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
msgid "You have no active account"
-msgstr ""
+msgstr "Sie haben kein aktives Konto"
#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:443
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
msgid "General"
-msgstr ""
+msgstr "Allgemein"
#: ../sflphone-client-gnome/src/config/addressbook-config.c:312
msgid "_Use Evolution address books"
@@ -559,16 +733,16 @@ msgid "Select which Evolution address books to use"
msgstr "Adressbücher von Evolution zum verwenden auswählen"
#: ../sflphone-client-gnome/src/config/addressbook-config.c:404
-#: ../sflphone-client-gnome/src/config/audioconf.c:578
+#: ../sflphone-client-gnome/src/config/audioconf.c:577
msgid "Name"
msgstr "Name"
-#: ../sflphone-client-gnome/src/config/assistant.c:69
+#: ../sflphone-client-gnome/src/config/assistant.c:75
#, c-format
msgid "This assistant is now finished."
msgstr "Assistent beendet."
-#: ../sflphone-client-gnome/src/config/assistant.c:71
+#: ../sflphone-client-gnome/src/config/assistant.c:77
msgid ""
"You can at any time check your registration state or modify your accounts "
"parameters in the Options/Accounts window."
@@ -576,213 +750,207 @@ msgstr ""
"Sie können jederzeit Ihres Registrierungsstatus überprüfen oder "
"IhreKontoparameter ändern (Optionen/Konten)."
-#: ../sflphone-client-gnome/src/config/assistant.c:74
+#: ../sflphone-client-gnome/src/config/assistant.c:80
msgid "Alias"
msgstr "Alias"
-#: ../sflphone-client-gnome/src/config/assistant.c:78
+#: ../sflphone-client-gnome/src/config/assistant.c:84
msgid "Server"
msgstr "Server"
-#: ../sflphone-client-gnome/src/config/assistant.c:82
+#: ../sflphone-client-gnome/src/config/assistant.c:88
msgid "Username"
msgstr "Benutzername"
-#: ../sflphone-client-gnome/src/config/assistant.c:86
+#: ../sflphone-client-gnome/src/config/assistant.c:92
msgid "Security: "
-msgstr ""
+msgstr "Sicherheit: "
-#: ../sflphone-client-gnome/src/config/assistant.c:88
+#: ../sflphone-client-gnome/src/config/assistant.c:94
msgid "SRTP/ZRTP draft-zimmermann"
msgstr "SRTP/ZRTP draft-zimmermann"
-#: ../sflphone-client-gnome/src/config/assistant.c:90
-#: ../sflphone-client-gnome/src/config/assistant.c:182
+#: ../sflphone-client-gnome/src/config/assistant.c:96
msgid "None"
msgstr "Nichts"
-#: ../sflphone-client-gnome/src/config/assistant.c:210
+#: ../sflphone-client-gnome/src/config/assistant.c:229
msgid "SFLphone account creation wizard"
msgstr "SFLphone Konto (Konfigurationsassistent)"
-#: ../sflphone-client-gnome/src/config/assistant.c:236
+#: ../sflphone-client-gnome/src/config/assistant.c:255
msgid "Welcome to the Account creation wizard of SFLphone!"
msgstr "Wilkommen zu SFLphone!"
-#: ../sflphone-client-gnome/src/config/assistant.c:237
+#: ../sflphone-client-gnome/src/config/assistant.c:256
msgid "This installation wizard will help you configure an account."
msgstr ""
"The Installationsassistent wird Ihnen helfen, ein Konto zu konfigurieren."
-#: ../sflphone-client-gnome/src/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "VoIP Protocols"
msgstr "VoIP Protokoll"
-#: ../sflphone-client-gnome/src/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "Select an account type"
msgstr "Kontotyp auswählen"
-#: ../sflphone-client-gnome/src/config/assistant.c:253
+#: ../sflphone-client-gnome/src/config/assistant.c:272
msgid "SIP (Session Initiation Protocol)"
msgstr "SIP (Session Initiation Protocol)"
-#: ../sflphone-client-gnome/src/config/assistant.c:255
+#: ../sflphone-client-gnome/src/config/assistant.c:274
msgid "IAX2 (InterAsterix Exchange)"
msgstr "IAX2 (InterAsterisk Exchange)"
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Account"
msgstr "Konto"
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Please select one of the following options"
msgstr "Bitte eine Option auswählen"
-#: ../sflphone-client-gnome/src/config/assistant.c:271
+#: ../sflphone-client-gnome/src/config/assistant.c:290
msgid "Create a free SIP/IAX2 account on sflphone.org"
msgstr "SIP/IAX2 Konto bei sflphone.org erstellen lassen"
-#: ../sflphone-client-gnome/src/config/assistant.c:273
+#: ../sflphone-client-gnome/src/config/assistant.c:292
msgid "Register an existing SIP or IAX2 account"
msgstr "Existierendes SIP/IAX2 Konto registrieren"
-#: ../sflphone-client-gnome/src/config/assistant.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:306
msgid "SIP account settings"
msgstr "Konfiguration des SIP Konto"
-#: ../sflphone-client-gnome/src/config/assistant.c:286
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "Please fill the following information"
msgstr "Folgende Informationen bitte ausfühlen"
-#: ../sflphone-client-gnome/src/config/assistant.c:352
-#: ../sflphone-client-gnome/src/config/assistant.c:381
+#: ../sflphone-client-gnome/src/config/assistant.c:376
+#: ../sflphone-client-gnome/src/config/assistant.c:405
msgid "Secure communications with _ZRTP"
-msgstr ""
+msgstr "Sichere Kommunikation mit _ZRTP"
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "Optional email address"
msgstr "Fakultative E-mail-Adresse"
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
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-gnome/src/config/assistant.c:373
+#: ../sflphone-client-gnome/src/config/assistant.c:397
msgid "_Email address"
msgstr "_Email"
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "IAX2 account settings"
msgstr "Konfiguration des IAX2 Konto"
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "Network Address Translation (NAT)"
msgstr "Network Address Translation (NAT)"
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "You should probably enable this if you are behind a firewall."
-msgstr ""
-"Sie sollten dieses einschalten, falls Sie hinter einer Firewall sind."
+msgstr "Sie sollten dieses einschalten, falls Sie hinter einer Firewall sind."
-#: ../sflphone-client-gnome/src/config/assistant.c:476
+#: ../sflphone-client-gnome/src/config/assistant.c:505
msgid "E_nable STUN"
msgstr "STUN Ei_nschalten"
-#: ../sflphone-client-gnome/src/config/assistant.c:483
+#: ../sflphone-client-gnome/src/config/assistant.c:512
msgid "_STUN server"
msgstr "_STUN Server"
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Account Registration"
msgstr "Konto Registrierung"
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Congratulations!"
msgstr "Gratulation!"
-#: ../sflphone-client-gnome/src/config/audioconf.c:583
+#: ../sflphone-client-gnome/src/config/audioconf.c:582
msgid "Frequency"
msgstr "Frequenz"
-#: ../sflphone-client-gnome/src/config/audioconf.c:588
+#: ../sflphone-client-gnome/src/config/audioconf.c:587
msgid "Bitrate"
msgstr "Bitrate"
-#: ../sflphone-client-gnome/src/config/audioconf.c:593
+#: ../sflphone-client-gnome/src/config/audioconf.c:592
msgid "Bandwidth"
msgstr "Bandbreite"
-#: ../sflphone-client-gnome/src/config/audioconf.c:673
+#: ../sflphone-client-gnome/src/config/audioconf.c:670
msgid "ALSA plugin"
msgstr "ALSA Plugin"
-#: ../sflphone-client-gnome/src/config/audioconf.c:695
+#: ../sflphone-client-gnome/src/config/audioconf.c:692
msgid "Output"
msgstr "Ausgabe"
-#: ../sflphone-client-gnome/src/config/audioconf.c:717
+#: ../sflphone-client-gnome/src/config/audioconf.c:714
msgid "Input"
msgstr "Eingabe"
-#: ../sflphone-client-gnome/src/config/audioconf.c:752
+#: ../sflphone-client-gnome/src/config/audioconf.c:749
msgid "_Voice Activity Detection"
msgstr "\"Voice Activity\" Erkennung"
-#: ../sflphone-client-gnome/src/config/audioconf.c:762
+#: ../sflphone-client-gnome/src/config/audioconf.c:759
msgid "_Noise Reduction (Narrow-Band Companding)"
msgstr "_Geräuschreduzierung (Narrow-Band Companding)"
-#: ../sflphone-client-gnome/src/config/audioconf.c:798
+#: ../sflphone-client-gnome/src/config/audioconf.c:800
msgid "Sound Manager"
msgstr "Sound Manager"
-#: ../sflphone-client-gnome/src/config/audioconf.c:807
+#: ../sflphone-client-gnome/src/config/audioconf.c:809
msgid "_Pulseaudio"
msgstr "Pulseaudio"
-#: ../sflphone-client-gnome/src/config/audioconf.c:811
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
msgid "_ALSA"
msgstr "ALSA"
-#: ../sflphone-client-gnome/src/config/audioconf.c:816
-msgid "_Mute other applications during a call"
-msgstr "_Während eines Anrufs andere Anwendungen stumm schalten"
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:823
+#: ../sflphone-client-gnome/src/config/audioconf.c:819
msgid "ALSA settings"
msgstr "ALSA Konfiguration"
-#: ../sflphone-client-gnome/src/config/audioconf.c:840
+#: ../sflphone-client-gnome/src/config/audioconf.c:836
msgid "Codecs"
msgstr "Codecs"
-#: ../sflphone-client-gnome/src/config/audioconf.c:869
+#: ../sflphone-client-gnome/src/config/audioconf.c:865
msgid "Recordings"
-msgstr ""
+msgstr "Aufnahmen"
-#: ../sflphone-client-gnome/src/config/audioconf.c:873
+#: ../sflphone-client-gnome/src/config/audioconf.c:869
msgid "Destination folder"
msgstr "Zielverzeichnis"
-#: ../sflphone-client-gnome/src/config/audioconf.c:877
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
msgid "Select a folder"
msgstr "Verzeichnis auswählen"
-#: ../sflphone-client-gnome/src/config/audioconf.c:883
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
msgid "Ringtones"
msgstr "Klingeltöne"
-#: ../sflphone-client-gnome/src/config/audioconf.c:889
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
msgid "_Enable ringtones"
msgstr "Klingeltöne _einschalten"
-#: ../sflphone-client-gnome/src/config/audioconf.c:895
+#: ../sflphone-client-gnome/src/config/audioconf.c:891
msgid "Choose a ringtone"
msgstr "Klingelton auswählen"
-#: ../sflphone-client-gnome/src/config/audioconf.c:901
+#: ../sflphone-client-gnome/src/config/audioconf.c:897
msgid "Audio Files"
msgstr "Audio Dateien"
@@ -819,86 +987,66 @@ msgstr "Telefonnummer umformen"
msgid "_Prefix dialed numbers with"
msgstr "_Präfix vor Nummern einfügen"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:195
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
msgid ""
"This profile is used when you want to reach a remote peer simply by typing a "
"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
"also be used if no account can be matched to an incoming or outgoing call."
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:274
-msgid "SIP Port"
-msgstr "SIP Port"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:281
-msgid "UDP Transport"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:319
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
msgid "Desktop Notifications"
msgstr "Desktopbenachrichtigungen"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:323
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
msgid "_Enable notifications"
msgstr "Benachrichtigungen _einschalten"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:329
-msgid "Enable voicemail _notifications"
-msgstr "_Benachrichtigung für Voice Nachrichten"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:341
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
msgid "System Tray Icon"
msgstr "Benachrichtigungsfeld (\"System Tray\") Icon"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
msgid "_Popup main window on incoming call"
msgstr "Hauptfenster anzeigen wenn eingehendes Gespräch"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:349
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
msgid "Ne_ver popup main window"
msgstr "_Hauptfenster nie anzeigen"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:353
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
msgid "Hide SFLphone window on _startup"
msgstr "_Unsichtbar beim Start"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:359
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
msgid "Calls History"
msgstr "Liste der vorherigen Anrufen"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:362
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
msgid "_Keep my history for at least"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:373
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
msgid "days"
msgstr "Tage"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:377
-msgid "Configuration File"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:379
-msgid "Store SIP credentials as MD5 hash"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:423
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
msgid "Preferences"
msgstr "Einstellungen"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:448
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
msgid "Audio"
msgstr "Audio"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
msgid "Address Book"
msgstr "Adressbuch"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:458
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
msgid "Hooks"
msgstr "Hooks"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:468
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
msgid "Direct IP calls"
msgstr ""
@@ -906,11 +1054,11 @@ msgstr ""
msgid "Advanced options for TLS"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:55
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:56
msgid "TLS transport"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:59
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:60
msgid ""
"TLS transport can be used along with UDP for those calls that would\n"
"require secure sip transactions (aka SIPS). You can configure a different\n"
@@ -919,101 +1067,134 @@ msgid ""
"port, different one from each other\n"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:100
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
msgid "Certificate of Authority list"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:104
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
msgid "Choose a CA list file (optional)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:115
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
msgid "Public endpoint certificate file"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:119
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
msgid "Choose a public endpoint certificate (optional)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:134
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
msgid "Choose a private key file (optional)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:145
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
msgid "Password for the private key"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:168
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
msgid "TLS protocol method"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:202
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
msgid "TLS cipher list"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:211
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
msgid "Server name instance for outgoing TLS connection"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:219
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
msgid "Negotiation timeout (sec:msec)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:236
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
msgid "Verify incoming certificates, as a server"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:242
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
msgid "Verify certificates from answer, as a client"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:248
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
msgid "Require certificate for incoming tls connections"
msgstr ""
#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:49
msgid "ZRTP Options"
-msgstr ""
+msgstr "ZRTP Optionen"
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:68
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:69
msgid "Send Hello Hash in S_DP"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:74
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:75
msgid "Ask User to Confirm SAS"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:80
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:81
msgid "_Warn if ZRTP not supported"
-msgstr ""
+msgstr "_Warnung wenn ZRTP nicht unterstüzt"
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:86
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:87
msgid "Display SAS once for hold events"
msgstr ""
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:58
msgid "Search all"
msgstr "Suche alle"
-#: ../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
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:59
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:72
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:84
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:96
msgid "Click here to change the search type"
msgstr "Klicken Sie hier, um Suchtyp zu wechseln"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:71
msgid "Search by missed call"
msgstr "Suche nach Anruf in Abwesenheit"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:83
msgid "Search by incoming call"
msgstr "Suche nach eingehenden Anruf"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:95
msgid "Search by outgoing call"
msgstr "Suche nach ausgehenden Anru"
+#~ msgid "IP call - %s"
+#~ msgstr "IP Anruf - %s"
+
+#~ msgid "Codec"
+#~ msgstr "Codec"
+
+#~ msgid "Network"
+#~ msgstr "Netzwerk"
+
+#~ msgid "Manually"
+#~ msgstr "Manuell"
+
+#~ msgid "There "
+#~ msgstr "Es "
+
+#~ msgid "is "
+#~ msgstr "gibt "
+
+#~ msgid "are "
+#~ msgstr "gibt "
+
+#~ msgid "_Mute other applications during a call"
+#~ msgstr "_Während eines Anrufs andere Anwendungen stumm schalten"
+
+#~ msgid "SIP Port"
+#~ msgstr "SIP Port"
+
+#~ msgid "UDP Transport"
+#~ msgstr "UDP Transport"
+
+#~ msgid "Enable voicemail _notifications"
+#~ msgstr "_Benachrichtigung für Voice Nachrichten"
+
#~ msgctxt "account state"
#~ msgid "Error"
#~ msgstr "Fehler"
@@ -1050,9 +1231,6 @@ msgstr "Suche nach ausgehenden Anru"
#~ msgid "Default account"
#~ msgstr "Default Konto"
-#~ msgid "Transfer to : "
-#~ msgstr "Weiterleiten zu : "
-
#~ msgid "SFLphone KDE Client"
#~ msgstr "SFLphone KDE Client"
@@ -1062,14 +1240,6 @@ msgstr "Suche nach ausgehenden Anru"
#~ msgid "Jérémy Quentin"
#~ msgstr "Jérémy Quentin"
-#~ msgctxt "NAME OF TRANSLATORS"
-#~ msgid "Your names"
-#~ msgstr "Ihre Namen, ,Launchpad Contributions:,Maxime Chambreuil,Sven Werlen"
-
-#~ msgctxt "EMAIL OF TRANSLATORS"
-#~ msgid "Your emails"
-#~ msgstr "Ihre E-Mail-Adressen,,,maxime.chambreuil@gmail.com,"
-
#~ msgid "Incoming call"
#~ msgstr "Eingehende Anrufe"
@@ -1085,12 +1255,6 @@ msgstr "Suche nach ausgehenden Anru"
#~ msgid "Main screen"
#~ msgstr "Hauptbildschirm"
-#~ msgid "Call history"
-#~ msgstr "Liste der vorherigen Anrufen"
-
-#~ msgid "Address book"
-#~ msgstr "Adressbuch"
-
#~ msgid "Edit before call"
#~ msgstr "Vor Aufruf bearbeiten"
@@ -1103,9 +1267,6 @@ msgstr "Suche nach ausgehenden Anru"
#~ msgid "Hold on"
#~ msgstr "In Warteschleife"
-#~ msgid "Transfer"
-#~ msgstr "Weiterleiten"
-
#~ msgid "Record"
#~ msgstr "Gespräch aufzeichnen"
@@ -1124,22 +1285,19 @@ msgstr "Suche nach ausgehenden Anru"
#~ 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."
+#~ "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."
-
-#~ msgid "Remove the selected account"
-#~ msgstr "Entfernen Sie das ausgewählte Konto"
+#~ "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."
#~ 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."
+#~ "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."
@@ -1161,8 +1319,9 @@ msgstr "Suche nach ausgehenden Anru"
#~ "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 verwendet das erste \"registrierte\" Konto in der Liste, wenn "
+#~ "Sie anrufen. Benutzen Sie die Pfeile, um die Anordnung der Kontos zu "
+#~ "ändern."
#~ msgid "Down"
#~ msgstr "Unten"
@@ -1248,9 +1407,6 @@ msgstr "Suche nach ausgehenden Anru"
#~ msgid "On start"
#~ msgstr "Beim Start"
-#~ msgid "Clear history"
-#~ msgstr "Vorherigen Anrufen leeren"
-
#~ msgid "Connection"
#~ msgstr "Anbindung"
@@ -1266,15 +1422,9 @@ msgstr "Suche nach ausgehenden Anru"
#~ msgid "Prefix dialed numbers with"
#~ msgstr "Präfix vor Nummern einfügen"
-#~ msgid "History"
-#~ msgstr "Vorherige Anrufe"
-
#~ msgid "Configure SFLphone"
#~ msgstr "Konfigurieren SFLphone"
-#~ msgid "Display volume controls"
-#~ msgstr "Lautstärke-Regler anzeigen"
-
#~ msgid "Display dialpad"
#~ msgstr "Wählscheibe anzeigen"
@@ -1285,27 +1435,6 @@ msgstr "Suche nach ausgehenden Anru"
#~ msgid "Attention:number of results exceeds max displayed."
#~ msgstr "Warnung: Anzahl Resultate überschreit definiertes Maximum"
-#~ msgid "_Help"
-#~ msgstr "_Hilfe"
-
-#~ msgid "_Call"
-#~ msgstr "_Anruf"
-
-#~ msgid "Clear _history"
-#~ msgstr "Liste der vorherigen Anrufen _leeren"
-
-#~ msgid "_Accounts"
-#~ msgstr "_Konten"
-
-#~ msgid "_Edit"
-#~ msgstr "_Editieren"
-
-#~ msgid "_Dialpad"
-#~ msgstr "_Wählscheibe"
-
-#~ msgid "_View"
-#~ msgstr "_Anzeigen"
-
#~ msgid "%s - %s"
#~ msgstr "%s - %s"
@@ -1317,3 +1446,15 @@ msgstr "Suche nach ausgehenden Anru"
#~ msgid "Port"
#~ msgstr "Port"
+
+#~ msgctxt "NAME OF TRANSLATORS"
+#~ msgid "Your names"
+#~ msgstr ""
+#~ "Ihre Namen, ,Launchpad Contributions:,Maxime Chambreuil,Sven Werlen, ,"
+#~ "Launchpad Contributions:,Maxime Chambreuil,Sven Werlen,Sven Werlen"
+
+#~ msgctxt "EMAIL OF TRANSLATORS"
+#~ msgid "Your emails"
+#~ msgstr ""
+#~ "Ihre E-Mail-Adressen,,,maxime.chambreuil@gmail.com,,,,maxime."
+#~ "chambreuil@gmail.com,,sven.werlen@gmail.com"
diff --git a/sflphone-client-gnome/po/es/es.po b/sflphone-client-gnome/po/es/es.po
index 3ec57681b12ed5d5eec3ed3c97bceb0784480856..a40c09ce90e8d1106ba4f53f66c7d832e4701a63 100644
--- a/sflphone-client-gnome/po/es/es.po
+++ b/sflphone-client-gnome/po/es/es.po
@@ -9,15 +9,15 @@ msgid ""
msgstr ""
"Project-Id-Version: SFLphone 0.9.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-14 11:18-0400\n"
-"PO-Revision-Date: 2009-10-14 23:39+0000\n"
+"POT-Creation-Date: 2009-12-03 10:22-0500\n"
+"PO-Revision-Date: 2009-10-26 20:46+0000\n"
"Last-Translator: Maxime Chambreuil <maxime.chambreuil@gmail.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"
-"X-Launchpad-Export-Date: 2009-10-26 15:48+0000\n"
+"X-Launchpad-Export-Date: 2009-12-03 15:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: ../sflphone-client-gnome/src/accountlist.c:175
@@ -62,25 +62,15 @@ msgstr "Servidor stun inválido"
msgid "Invalid"
msgstr "Inválido"
-#: ../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:83
-#: ../sflphone-client-gnome/src/actions.c:919
-#: ../sflphone-client-gnome/src/actions.c:926
+#: ../sflphone-client-gnome/src/actions.c:98
msgid "Using account"
msgstr "Usando la cuenta"
-#: ../sflphone-client-gnome/src/actions.c:89
+#: ../sflphone-client-gnome/src/actions.c:104
msgid "No registered accounts"
msgstr "Ninguna cuenta registrada"
-#: ../sflphone-client-gnome/src/actions.c:268
+#: ../sflphone-client-gnome/src/actions.c:285
msgid ""
"Unable to connect to the SFLphone server.\n"
"Make sure the daemon is running."
@@ -88,22 +78,18 @@ msgstr ""
"Incapaz de conectar con el servidor SFLphone.\n"
" Asegúrese que el demonio esté funcionando."
-#: ../sflphone-client-gnome/src/actions.c:913
-#, c-format
-msgid "IP call - %s"
-msgstr "Llamada IP - %s"
-
-#: ../sflphone-client-gnome/src/actions.c:922
-msgid "Codec"
-msgstr "Códec"
+#: ../sflphone-client-gnome/src/actions.c:589
+#: ../sflphone-client-gnome/src/actions.c:911
+msgid "Direct SIP call"
+msgstr "Llamadas IP directas"
-#: ../sflphone-client-gnome/src/actions.c:1119
+#: ../sflphone-client-gnome/src/actions.c:1103
#, 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> )"
+"</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"
@@ -152,31 +138,31 @@ msgstr "Hay llamadas en curso."
msgid "Do you still want to quit?"
msgstr "Aún quiere salir ?"
-#: ../sflphone-client-gnome/src/mainwindow.c:299
+#: ../sflphone-client-gnome/src/mainwindow.c:298
msgid "SFLphone Error"
msgstr "Error SFLphone"
-#: ../sflphone-client-gnome/src/mainwindow.c:391
+#: ../sflphone-client-gnome/src/mainwindow.c:392
#, c-format
msgid "ZRTP is not supported by peer %s\n"
msgstr "ZRTP no es compatible con %s\n"
-#: ../sflphone-client-gnome/src/mainwindow.c:392
+#: ../sflphone-client-gnome/src/mainwindow.c:393
msgid "Secure Communication Unavailable"
msgstr "Comunicación segura no disponible"
-#: ../sflphone-client-gnome/src/mainwindow.c:393
-#: ../sflphone-client-gnome/src/mainwindow.c:415
+#: ../sflphone-client-gnome/src/mainwindow.c:394
+#: ../sflphone-client-gnome/src/mainwindow.c:416
msgid "Continue"
msgstr "Seguir"
-#: ../sflphone-client-gnome/src/mainwindow.c:394
-#: ../sflphone-client-gnome/src/mainwindow.c:416
-#: ../sflphone-client-gnome/src/mainwindow.c:430
+#: ../sflphone-client-gnome/src/mainwindow.c:395
+#: ../sflphone-client-gnome/src/mainwindow.c:417
+#: ../sflphone-client-gnome/src/mainwindow.c:431
msgid "Stop Call"
msgstr "Terminar llamada"
-#: ../sflphone-client-gnome/src/mainwindow.c:413
+#: ../sflphone-client-gnome/src/mainwindow.c:414
#, c-format
msgid ""
"A %s error forced the call with %s to fall under unencrypted mode.\n"
@@ -185,11 +171,11 @@ msgstr ""
"Un error de %s obliga la llamada con %s a caer bajo un modo decifrado.\n"
"Razón exacta: %s\n"
-#: ../sflphone-client-gnome/src/mainwindow.c:414
+#: ../sflphone-client-gnome/src/mainwindow.c:415
msgid "ZRTP negotiation failed"
msgstr "Negociación ZRTP fracasada"
-#: ../sflphone-client-gnome/src/mainwindow.c:427
+#: ../sflphone-client-gnome/src/mainwindow.c:428
#, c-format
msgid ""
"%s wants to stop using secure communication. Confirm will resume "
@@ -198,11 +184,11 @@ msgstr ""
"%s quiere parar la comunicación segura. Confirmar reanudará la conversación "
"sin SRTP.\n"
-#: ../sflphone-client-gnome/src/mainwindow.c:428
+#: ../sflphone-client-gnome/src/mainwindow.c:429
msgid "Confirm Go Clear"
msgstr "Confirmar"
-#: ../sflphone-client-gnome/src/mainwindow.c:429
+#: ../sflphone-client-gnome/src/mainwindow.c:430
msgid "Confirm"
msgstr "Confirmar"
@@ -217,6 +203,13 @@ msgstr "%s cuenta : %s"
msgid "<i>From</i> %s"
msgstr "<i>De</i> %s"
+#: ../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/sflnotify.c:111
#, c-format
msgid "Calling with %s account <i>%s</i>"
@@ -266,15 +259,15 @@ msgstr "Volumen de altavoces"
msgid "Mic volume"
msgstr "Volumen del micrófono"
-#: ../sflphone-client-gnome/src/statusicon.c:91
+#: ../sflphone-client-gnome/src/statusicon.c:96
msgid "_Show main window"
msgstr "Mostrar ventana principal"
-#: ../sflphone-client-gnome/src/statusicon.c:126
+#: ../sflphone-client-gnome/src/statusicon.c:131
msgid "SFLphone"
msgstr "SFLphone"
-#: ../sflphone-client-gnome/src/statusicon.c:127
+#: ../sflphone-client-gnome/src/statusicon.c:132
#, c-format
msgid "%i account configured"
msgid_plural "%i accounts configured"
@@ -282,203 +275,397 @@ msgstr[0] "%i cuenta configurada"
msgstr[1] "%i cuentas configuradas"
#: ../sflphone-client-gnome/src/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:750
+#: ../sflphone-client-gnome/src/uimanager.c:693
+#: ../sflphone-client-gnome/src/uimanager.c:727
msgid "Voicemail"
msgstr "Mensaje de voz"
-#: ../sflphone-client-gnome/src/uimanager.c:403
+#: ../sflphone-client-gnome/src/uimanager.c:117
+msgid "No address book selected"
+msgstr "Libreta de contactos"
+
+#: ../sflphone-client-gnome/src/uimanager.c:137
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "Address book"
+msgstr "Libreta de contactos"
+
+#: ../sflphone-client-gnome/src/uimanager.c:279
+msgid "Voicemail (%i)"
+msgstr "Mensaje de voz (%i)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:342
msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
-msgstr ""
-"SFLphone es un teléfono VoIP compatible con los protocolos SIP y IAX2"
+msgstr "SFLphone es un teléfono VoIP compatible con los protocolos SIP y IAX2"
-#: ../sflphone-client-gnome/src/uimanager.c:406
+#: ../sflphone-client-gnome/src/uimanager.c:345
msgid "About SFLphone"
msgstr "Sobre SFLphone"
-#: ../sflphone-client-gnome/src/uimanager.c:1028
+#: ../sflphone-client-gnome/src/uimanager.c:719
+msgid "Call"
+msgstr "_Llamar"
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:1184
+msgid "_New call"
+msgstr "_Nueva llamada"
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+msgid "Place a new call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:979
msgid "_Pick up"
msgstr "_Descolgar"
-#: ../sflphone-client-gnome/src/uimanager.c:1040
-#: ../sflphone-client-gnome/src/uimanager.c:1081
+#: ../sflphone-client-gnome/src/uimanager.c:721
+msgid "Answer the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:991
+#: ../sflphone-client-gnome/src/uimanager.c:1032
msgid "_Hang up"
msgstr "_Colgar"
-#: ../sflphone-client-gnome/src/uimanager.c:1052
-#: ../sflphone-client-gnome/src/uimanager.c:1093
-msgid "On _Hold"
+#: ../sflphone-client-gnome/src/uimanager.c:722
+msgid "Finish the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "O_n hold"
msgstr "En _Espera"
-#: ../sflphone-client-gnome/src/uimanager.c:1064
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "Place the call on hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "O_ff hold"
+msgstr "Seguir"
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "Place the call off hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:725
+#: ../sflphone-client-gnome/src/uimanager.c:1015
msgid "_Record"
msgstr "G_rabar"
-#: ../sflphone-client-gnome/src/uimanager.c:1154
+#: ../sflphone-client-gnome/src/uimanager.c:725
+msgid "Record the current conversation"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Configuration _Assistant"
+msgstr "Archivo de configuración"
+
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Run the configuration assistant"
+msgstr "Error de configuración Stun"
+
+#: ../sflphone-client-gnome/src/uimanager.c:727
+msgid "Call your voicemail"
+msgstr "%d mensaje de voz"
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "_Close"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "Minimize to system tray"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "_Quit"
+msgstr "_Editar"
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "Quit the program"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:732
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "_Copy"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "Copy the selection"
+msgstr "Eliminar la cuenta seleccionada"
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "_Paste"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "Paste the clipboard"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear _history"
+msgstr "_Limpiar historial"
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear the call history"
+msgstr "Limpiar historial"
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "_Accounts"
+msgstr "_Cuentas"
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "Edit your accounts"
+msgstr "Cuenta actual"
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "_Preferences"
+msgstr "Preferencias"
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "Change your preferences"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:740
+msgid "_View"
+msgstr "_Ver"
+
+#: ../sflphone-client-gnome/src/uimanager.c:743
+msgid "_Help"
+msgstr "_Ayuda"
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Contents"
+msgstr "Seguir"
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Open the manual"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:745
+msgid "About this application"
+msgstr "Autentificación"
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "_Transfer"
+msgstr "Transferir"
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "Transfer the call"
+msgstr "Transferir a : "
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "_Show toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "Show the toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "_Dialpad"
+msgstr "Desactivado"
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "Show the dialpad"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "_Volume controls"
+msgstr "_Controles de volumen"
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "Show the volume controls"
+msgstr "_Controles de volumen"
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "_History"
+msgstr "Historia de Llamada"
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "Calls history"
+msgstr "Historia de Llamada"
+
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "_Address book"
+msgstr "Libreta de contactos"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1003
+#: ../sflphone-client-gnome/src/uimanager.c:1044
+msgid "On _Hold"
+msgstr "En _Espera"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1107
msgid "_Call back"
msgstr "_Llamar"
-#: ../sflphone-client-gnome/src/uimanager.c:1226
-msgid "_New call"
-msgstr "_Nueva llamada"
-
-#: ../sflphone-client-gnome/src/uimanager.c:1300
+#: ../sflphone-client-gnome/src/uimanager.c:1258
msgid "Edit phone number"
msgstr "Editar número de teléfono"
-#: ../sflphone-client-gnome/src/uimanager.c:1311
+#: ../sflphone-client-gnome/src/uimanager.c:1269
msgid "Edit the phone number before making a call"
msgstr "Editar el número de teléfono antes de llamar"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:164
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
msgid "Account Parameters"
msgstr "Parámetros de cuenta"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:173
-#: ../sflphone-client-gnome/src/config/assistant.c:294
-#: ../sflphone-client-gnome/src/config/assistant.c:402
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
+#: ../sflphone-client-gnome/src/config/assistant.c:314
+#: ../sflphone-client-gnome/src/config/assistant.c:427
msgid "_Alias"
msgstr "_Alias"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:181
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
msgid "_Protocol"
msgstr "_Protocolo"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:199
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
msgid "Unknown"
msgstr "Desconocido"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:209
-#: ../sflphone-client-gnome/src/config/assistant.c:302
-#: ../sflphone-client-gnome/src/config/assistant.c:410
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
+#: ../sflphone-client-gnome/src/config/assistant.c:322
+#: ../sflphone-client-gnome/src/config/assistant.c:435
msgid "_Host name"
msgstr "_Nombre de equipo"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:217
-#: ../sflphone-client-gnome/src/config/assistant.c:310
-#: ../sflphone-client-gnome/src/config/assistant.c:418
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
+#: ../sflphone-client-gnome/src/config/assistant.c:330
+#: ../sflphone-client-gnome/src/config/assistant.c:443
msgid "_User name"
msgstr "_Usuario"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:234
-#: ../sflphone-client-gnome/src/config/assistant.c:326
-#: ../sflphone-client-gnome/src/config/assistant.c:433
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:346
+#: ../sflphone-client-gnome/src/config/assistant.c:458
msgid "_Password"
msgstr "_Contraseña"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:254
-#: ../sflphone-client-gnome/src/config/assistant.c:344
-#: ../sflphone-client-gnome/src/config/assistant.c:449
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:363
+#: ../sflphone-client-gnome/src/config/assistant.c:473
+msgid "Show password"
+msgstr "Contraseña"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:368
+#: ../sflphone-client-gnome/src/config/assistant.c:478
msgid "_Voicemail number"
msgstr "_Número de buzón de voz"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:340
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
msgid "Authentication"
msgstr "Autentificación"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:341
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
msgid "Secret"
msgstr "Secreto"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:466
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
msgid "Credential"
msgstr "Informaciónes"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:501
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
msgid "Authentication name"
msgstr "Nombre de autentificación"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:512
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
msgid "Password"
msgstr "Contraseña"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:535
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:909
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:201
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
msgid "Security"
msgstr "Seguridad"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:547
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:213
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
msgid "Use TLS transport (sips)"
msgstr "Usa transporte TLS (sips)"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:552
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:218
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
msgid "SRTP key exchange"
msgstr "Intercambió de clave SRTP"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:558
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
msgid "Disabled"
msgstr "Desactivado"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
msgid "Registration"
msgstr "Registración"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:679
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
msgid "Registration expire"
msgstr "Registracíon expira"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
msgid "_Comply with RFC 3263"
msgstr "_Cumplir con RFC 3263"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
-msgid "Network"
-msgstr "Red"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
+msgid "Network Interface"
+msgstr "Red Inaccesible"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:707
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
msgid "Local address"
msgstr "Dirección local"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:744
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
msgid "Local port"
msgstr "Puerto local"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:752
-msgid "Set published address and port:"
-msgstr "Publicar dirección y puerto:"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
+msgid "Published address"
+msgstr "Dirección publicada"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:756
-msgid "Using STUN "
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+msgid "Using STUN"
msgstr "Usando STUN "
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:761
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
+msgid "STUN server URL"
+msgstr "URL del servidor STUN"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
msgid "Same as local parameters"
msgstr "Igual que parámetros locales"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:764
-msgid "Manually"
-msgstr "Manualmente"
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:769
-msgid "Published address"
-msgstr "Dirección publicada"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
+msgid "Set published address and port:"
+msgstr "Publicar dirección y puerto:"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:777
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
msgid "Published port"
msgstr "Puerto publicado"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:785
-msgid "STUN server URL"
-msgstr "URL del servidor STUN"
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
msgid "Account settings"
msgstr "Configuración de cuentas"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
msgid "Basic"
msgstr "Básico"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:904
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
msgid "Advanced"
msgstr "Avanzado"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:169
-msgid "Server returned \""
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:164
+msgid "Server returned \"%s\" (%d)"
msgstr "Servidor contesta \""
#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
@@ -497,32 +684,18 @@ msgstr "Cuentas"
msgid "Configured Accounts"
msgstr "Cuentas Configuradas"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:505
-msgid "There "
-msgstr "Alla "
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "is "
-msgstr "es "
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "are "
-msgstr "son "
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:508
-msgid " active account"
-msgstr " cuenta activada"
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
+msgid "There is %d active account"
+msgid_plural "There are %d active accounts"
+msgstr[0] " cuenta activada"
+msgstr[1] " cuenta activada"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:509
-msgid "s"
-msgstr "s"
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:514
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
msgid "You have no active account"
msgstr "No tienes ninguna cuenta activada"
#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:443
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
msgid "General"
msgstr "General"
@@ -544,8 +717,7 @@ msgstr "_Mostrar fotos de contactos, si están disponibles"
#: ../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:"
+msgstr "Usar los siguientes campos de la libreta de direcciones de Evolution:"
#: ../sflphone-client-gnome/src/config/addressbook-config.c:345
msgid "_Work"
@@ -568,16 +740,16 @@ msgid "Select which Evolution address books to use"
msgstr "Seleccione la libreta de contactos de Evolution a usar"
#: ../sflphone-client-gnome/src/config/addressbook-config.c:404
-#: ../sflphone-client-gnome/src/config/audioconf.c:578
+#: ../sflphone-client-gnome/src/config/audioconf.c:577
msgid "Name"
msgstr "Nombre"
-#: ../sflphone-client-gnome/src/config/assistant.c:69
+#: ../sflphone-client-gnome/src/config/assistant.c:75
#, c-format
msgid "This assistant is now finished."
msgstr "El asistente ha finalizado"
-#: ../sflphone-client-gnome/src/config/assistant.c:71
+#: ../sflphone-client-gnome/src/config/assistant.c:77
msgid ""
"You can at any time check your registration state or modify your accounts "
"parameters in the Options/Accounts window."
@@ -585,211 +757,205 @@ 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/config/assistant.c:74
+#: ../sflphone-client-gnome/src/config/assistant.c:80
msgid "Alias"
msgstr "Alias"
-#: ../sflphone-client-gnome/src/config/assistant.c:78
+#: ../sflphone-client-gnome/src/config/assistant.c:84
msgid "Server"
msgstr "Servidor"
-#: ../sflphone-client-gnome/src/config/assistant.c:82
+#: ../sflphone-client-gnome/src/config/assistant.c:88
msgid "Username"
msgstr "Usuario"
-#: ../sflphone-client-gnome/src/config/assistant.c:86
+#: ../sflphone-client-gnome/src/config/assistant.c:92
msgid "Security: "
msgstr "Seguridad: "
-#: ../sflphone-client-gnome/src/config/assistant.c:88
+#: ../sflphone-client-gnome/src/config/assistant.c:94
msgid "SRTP/ZRTP draft-zimmermann"
msgstr "SRTP/ZRTP draft-zimmermann"
-#: ../sflphone-client-gnome/src/config/assistant.c:90
-#: ../sflphone-client-gnome/src/config/assistant.c:182
+#: ../sflphone-client-gnome/src/config/assistant.c:96
msgid "None"
msgstr "Ninguno"
-#: ../sflphone-client-gnome/src/config/assistant.c:210
+#: ../sflphone-client-gnome/src/config/assistant.c:229
msgid "SFLphone account creation wizard"
msgstr "Asistente de creación de cuentas"
-#: ../sflphone-client-gnome/src/config/assistant.c:236
+#: ../sflphone-client-gnome/src/config/assistant.c:255
msgid "Welcome to the Account creation wizard of SFLphone!"
msgstr "¡Bienvenido al asistente de configuración de cuentas de SFLphone"
-#: ../sflphone-client-gnome/src/config/assistant.c:237
+#: ../sflphone-client-gnome/src/config/assistant.c:256
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/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "VoIP Protocols"
msgstr "Protocolos VoIP"
-#: ../sflphone-client-gnome/src/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "Select an account type"
msgstr "Escoja un tipo de cuenta"
-#: ../sflphone-client-gnome/src/config/assistant.c:253
+#: ../sflphone-client-gnome/src/config/assistant.c:272
msgid "SIP (Session Initiation Protocol)"
msgstr "SIP (Session Initiation Protocol)"
-#: ../sflphone-client-gnome/src/config/assistant.c:255
+#: ../sflphone-client-gnome/src/config/assistant.c:274
msgid "IAX2 (InterAsterix Exchange)"
msgstr "IAX2 (InterAsterix Exchange)"
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Account"
msgstr "Cuenta"
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Please select one of the following options"
msgstr "Por favor, elija una de las siguientes opciones"
-#: ../sflphone-client-gnome/src/config/assistant.c:271
+#: ../sflphone-client-gnome/src/config/assistant.c:290
msgid "Create a free SIP/IAX2 account on sflphone.org"
msgstr "Crear una cuenta SIP/IAX2 gratis en sflphone.org"
-#: ../sflphone-client-gnome/src/config/assistant.c:273
+#: ../sflphone-client-gnome/src/config/assistant.c:292
msgid "Register an existing SIP or IAX2 account"
msgstr "Registrar una cuenta SIP o IAX2 existente"
-#: ../sflphone-client-gnome/src/config/assistant.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:306
msgid "SIP account settings"
msgstr "Configuración de cuenta SIP"
-#: ../sflphone-client-gnome/src/config/assistant.c:286
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "Please fill the following information"
msgstr "Por favor, ingrese la siguiente información"
-#: ../sflphone-client-gnome/src/config/assistant.c:352
-#: ../sflphone-client-gnome/src/config/assistant.c:381
+#: ../sflphone-client-gnome/src/config/assistant.c:376
+#: ../sflphone-client-gnome/src/config/assistant.c:405
msgid "Secure communications with _ZRTP"
msgstr "Communicaciòn segura con _ZRTP"
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "Optional email address"
msgstr "Dirección de correo opcional"
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
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-gnome/src/config/assistant.c:373
+#: ../sflphone-client-gnome/src/config/assistant.c:397
msgid "_Email address"
msgstr "_Correo"
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "IAX2 account settings"
msgstr "Configuración de cuenta IAX2"
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "Network Address Translation (NAT)"
msgstr "Conversión de Dirección de Red (NAT)"
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
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."
+msgstr "Probablemente tiene que activar esto si está detrás de un cortafuegos."
-#: ../sflphone-client-gnome/src/config/assistant.c:476
+#: ../sflphone-client-gnome/src/config/assistant.c:505
msgid "E_nable STUN"
msgstr "A_ctivar STUN"
-#: ../sflphone-client-gnome/src/config/assistant.c:483
+#: ../sflphone-client-gnome/src/config/assistant.c:512
msgid "_STUN server"
msgstr "_Servidor STUN"
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Account Registration"
msgstr "Registro de cuenta"
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Congratulations!"
msgstr "¡Enhorabuena!"
-#: ../sflphone-client-gnome/src/config/audioconf.c:583
+#: ../sflphone-client-gnome/src/config/audioconf.c:582
msgid "Frequency"
msgstr "Frecuencia"
-#: ../sflphone-client-gnome/src/config/audioconf.c:588
+#: ../sflphone-client-gnome/src/config/audioconf.c:587
msgid "Bitrate"
msgstr "Tasa de transferencia"
-#: ../sflphone-client-gnome/src/config/audioconf.c:593
+#: ../sflphone-client-gnome/src/config/audioconf.c:592
msgid "Bandwidth"
msgstr "Ancho de banda"
-#: ../sflphone-client-gnome/src/config/audioconf.c:673
+#: ../sflphone-client-gnome/src/config/audioconf.c:670
msgid "ALSA plugin"
msgstr "Plugin ALSA"
-#: ../sflphone-client-gnome/src/config/audioconf.c:695
+#: ../sflphone-client-gnome/src/config/audioconf.c:692
msgid "Output"
msgstr "Salida"
-#: ../sflphone-client-gnome/src/config/audioconf.c:717
+#: ../sflphone-client-gnome/src/config/audioconf.c:714
msgid "Input"
msgstr "Entrada"
-#: ../sflphone-client-gnome/src/config/audioconf.c:752
+#: ../sflphone-client-gnome/src/config/audioconf.c:749
msgid "_Voice Activity Detection"
msgstr "_Detección de actividad de voz"
-#: ../sflphone-client-gnome/src/config/audioconf.c:762
+#: ../sflphone-client-gnome/src/config/audioconf.c:759
msgid "_Noise Reduction (Narrow-Band Companding)"
msgstr "_Reducción de ruido"
-#: ../sflphone-client-gnome/src/config/audioconf.c:798
+#: ../sflphone-client-gnome/src/config/audioconf.c:800
msgid "Sound Manager"
msgstr "Gestor de audio"
-#: ../sflphone-client-gnome/src/config/audioconf.c:807
+#: ../sflphone-client-gnome/src/config/audioconf.c:809
msgid "_Pulseaudio"
msgstr "_Pulseaudio"
-#: ../sflphone-client-gnome/src/config/audioconf.c:811
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
msgid "_ALSA"
msgstr "_ALSA"
-#: ../sflphone-client-gnome/src/config/audioconf.c:816
-msgid "_Mute other applications during a call"
-msgstr "Silenciar otras aplicaciones durante una llamada"
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:823
+#: ../sflphone-client-gnome/src/config/audioconf.c:819
msgid "ALSA settings"
msgstr "Configuración de ALSA"
-#: ../sflphone-client-gnome/src/config/audioconf.c:840
+#: ../sflphone-client-gnome/src/config/audioconf.c:836
msgid "Codecs"
msgstr "Códecs"
-#: ../sflphone-client-gnome/src/config/audioconf.c:869
+#: ../sflphone-client-gnome/src/config/audioconf.c:865
msgid "Recordings"
msgstr "Grabaciones"
-#: ../sflphone-client-gnome/src/config/audioconf.c:873
+#: ../sflphone-client-gnome/src/config/audioconf.c:869
msgid "Destination folder"
msgstr "Carpeta de destino"
-#: ../sflphone-client-gnome/src/config/audioconf.c:877
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
msgid "Select a folder"
msgstr "Seleccione una carpeta"
-#: ../sflphone-client-gnome/src/config/audioconf.c:883
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
msgid "Ringtones"
msgstr "Tonos de llamada"
-#: ../sflphone-client-gnome/src/config/audioconf.c:889
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
msgid "_Enable ringtones"
msgstr "_Habilitar tonos de llamada"
-#: ../sflphone-client-gnome/src/config/audioconf.c:895
+#: ../sflphone-client-gnome/src/config/audioconf.c:891
msgid "Choose a ringtone"
msgstr "Elija un tono de llmada"
-#: ../sflphone-client-gnome/src/config/audioconf.c:901
+#: ../sflphone-client-gnome/src/config/audioconf.c:897
msgid "Audio Files"
msgstr "Archivos de Audio"
@@ -826,7 +992,7 @@ msgstr "Reescritura de número de teléfono"
msgid "_Prefix dialed numbers with"
msgstr "_Prefijar los números marcados con"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:195
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
msgid ""
"This profile is used when you want to reach a remote peer simply by typing a "
"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
@@ -837,79 +1003,59 @@ msgstr ""
"usted define aqui serán también utilizados si ninguná cuenta puede ser "
"igualada a una llamada entrante o saliente."
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:274
-msgid "SIP Port"
-msgstr "Puerto SIP"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:281
-msgid "UDP Transport"
-msgstr "Transporte UDP"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:319
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
msgid "Desktop Notifications"
msgstr "Notificación de escritorio"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:323
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
msgid "_Enable notifications"
msgstr "_Activar notificaciones"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:329
-msgid "Enable voicemail _notifications"
-msgstr "Activar _notificaciones de mensajes de voz"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:341
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
msgid "System Tray Icon"
msgstr "Icono de bandeja del sistema"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
msgid "_Popup main window on incoming call"
msgstr "_Popup ventana principal al recibir llamadas"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:349
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
msgid "Ne_ver popup main window"
msgstr "_Nunca mostrar ventana principal"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:353
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
msgid "Hide SFLphone window on _startup"
msgstr "Esconder SFLphone al principio"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:359
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
msgid "Calls History"
msgstr "Historia de llamadas"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:362
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
msgid "_Keep my history for at least"
msgstr "_Guardar mi historia por lo menos"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:373
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
msgid "days"
msgstr "días"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:377
-msgid "Configuration File"
-msgstr "Archivo de configuración"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:379
-msgid "Store SIP credentials as MD5 hash"
-msgstr "Guarda informaciòn SIP como hash MD5"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:423
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
msgid "Preferences"
msgstr "Preferencias"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:448
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
msgid "Audio"
msgstr "Sonido"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
msgid "Address Book"
msgstr "Libreta de Direcciones"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:458
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
msgid "Hooks"
msgstr "Disparadores"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:468
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
msgid "Direct IP calls"
msgstr "Llamadas IP directas"
@@ -917,11 +1063,11 @@ msgstr "Llamadas IP directas"
msgid "Advanced options for TLS"
msgstr "Opciones avanzadas por TLS"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:55
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:56
msgid "TLS transport"
msgstr "Transporte TLS"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:59
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:60
msgid ""
"TLS transport can be used along with UDP for those calls that would\n"
"require secure sip transactions (aka SIPS). You can configure a different\n"
@@ -934,55 +1080,55 @@ msgstr ""
"diferente transporte TLS para cada cuenta. De cualquier forma, cada uno de "
"ellos usará un puerto dedicado, diferente el uno del otro.\n"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:100
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
msgid "Certificate of Authority list"
msgstr "Lista de Certificados de Autoridad"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:104
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
msgid "Choose a CA list file (optional)"
msgstr "Escoge un archivo de lista de CA (opcional)"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:115
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
msgid "Public endpoint certificate file"
msgstr "Archivo del certificado del par público"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:119
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
msgid "Choose a public endpoint certificate (optional)"
msgstr "Escoge un certificado de par público (opcional)"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:134
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
msgid "Choose a private key file (optional)"
msgstr "Escoge un archivo de clave privada"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:145
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
msgid "Password for the private key"
msgstr "Contraseña de clave privada"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:168
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
msgid "TLS protocol method"
msgstr "Método de protocolo TLS"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:202
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
msgid "TLS cipher list"
msgstr "Lista de cifrado TLS"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:211
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
msgid "Server name instance for outgoing TLS connection"
msgstr "Nombre del servidor para conección TLS saliente"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:219
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
msgid "Negotiation timeout (sec:msec)"
msgstr "Negociación expirada"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:236
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
msgid "Verify incoming certificates, as a server"
msgstr "Checar certificados entrantes, como un servidor"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:242
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
msgid "Verify certificates from answer, as a client"
msgstr "Checar certificados de la respuesta, como cliente"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:248
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
msgid "Require certificate for incoming tls connections"
msgstr "Requiere certificado para conecciones TLS entrantes"
@@ -990,45 +1136,84 @@ msgstr "Requiere certificado para conecciones TLS entrantes"
msgid "ZRTP Options"
msgstr "Opciones ZRTP"
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:68
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:69
msgid "Send Hello Hash in S_DP"
msgstr "Enviar Hello Hash en S_DP"
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:74
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:75
msgid "Ask User to Confirm SAS"
msgstr "Preguntar al usuario de confirmar SAS"
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:80
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:81
msgid "_Warn if ZRTP not supported"
msgstr "_Prevenir si ZRTP no es compatible"
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:86
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:87
msgid "Display SAS once for hold events"
msgstr "Presentar SAS una vez para eventos en espera"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:58
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
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:59
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:72
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:84
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:96
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
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:71
msgid "Search by missed call"
msgstr "Buscar en llamadas pérdidas"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:83
msgid "Search by incoming call"
msgstr "Buscar en llamadas entrantes"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:95
msgid "Search by outgoing call"
msgstr "Buscar en llamadas salientes"
+#~ msgid "IP call - %s"
+#~ msgstr "Llamada IP - %s"
+
+#~ msgid "Codec"
+#~ msgstr "Códec"
+
+#~ msgid "Network"
+#~ msgstr "Red"
+
+#~ msgid "Manually"
+#~ msgstr "Manualmente"
+
+#~ msgid "There "
+#~ msgstr "Alla "
+
+#~ msgid "is "
+#~ msgstr "es "
+
+#~ msgid "are "
+#~ msgstr "son "
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#~ msgid "_Mute other applications during a call"
+#~ msgstr "Silenciar otras aplicaciones durante una llamada"
+
+#~ msgid "SIP Port"
+#~ msgstr "Puerto SIP"
+
+#~ msgid "UDP Transport"
+#~ msgstr "Transporte UDP"
+
+#~ msgid "Enable voicemail _notifications"
+#~ msgstr "Activar _notificaciones de mensajes de voz"
+
+#~ msgid "Store SIP credentials as MD5 hash"
+#~ msgstr "Guarda informaciòn SIP como hash MD5"
+
#~ msgctxt "account state"
#~ msgid "Registered"
#~ msgstr "Registrado"
@@ -1047,9 +1232,6 @@ msgstr "Buscar en llamadas salientes"
#~ msgid "Stun Server"
#~ msgstr "Servidor STUN"
-#~ msgid "Transfer to : "
-#~ msgstr "Transferir a : "
-
#~ msgid "Default account"
#~ msgstr "Cuenta por defecto"
@@ -1065,9 +1247,6 @@ msgstr "Buscar en llamadas salientes"
#~ msgid "Incoming call"
#~ msgstr "Llamada entrante"
-#~ msgid "Transfer"
-#~ msgstr "Transferir"
-
#~ msgid "Hang up"
#~ msgstr "Colgar"
@@ -1090,9 +1269,6 @@ msgstr "Buscar en llamadas salientes"
#~ msgid "Recordings"
#~ msgstr "Grabaciones"
-#~ msgid "Remove the selected account"
-#~ msgstr "Eliminar la cuenta seleccionada"
-
#~ msgid "Remove"
#~ msgstr "Eliminar"
@@ -1130,21 +1306,6 @@ msgstr "Buscar en llamadas salientes"
#~ msgid "Configure SFLphone"
#~ msgstr "Configurar SFLphone"
-#~ msgid "_Help"
-#~ msgstr "_Ayuda"
-
-#~ msgid "_Call"
-#~ msgstr "_Llamar"
-
-#~ msgid "_Edit"
-#~ msgstr "_Editar"
-
-#~ msgid "_Accounts"
-#~ msgstr "_Cuentas"
-
-#~ msgid "_View"
-#~ msgstr "_Ver"
-
#~ msgid "Port"
#~ msgstr "Puerto"
@@ -1198,12 +1359,6 @@ msgstr "Buscar en llamadas salientes"
#~ msgid "Address book loading..."
#~ msgstr "Cargando el directorio..."
-#~ msgid "Call history"
-#~ msgstr "Historia de Llamada"
-
-#~ msgid "Address book"
-#~ msgstr "Libreta de contactos"
-
#~ msgid "Edit before call"
#~ msgstr "Editar antes de llamar"
@@ -1294,18 +1449,12 @@ msgstr "Buscar en llamadas salientes"
#~ msgid "Prefix dialed numbers with"
#~ msgstr "Prefijar los números marcados con"
-#~ msgid "History"
-#~ msgstr "Historia de Llamada"
-
#~ msgid "Attention:number of results exceeds max displayed."
#~ msgstr "Cuidado:número de resultatos excede el maximo a mostrar."
#~ msgid "_Account creation wizard"
#~ msgstr "Asistente de configuración de cuentas"
-#~ msgid "_Volume controls"
-#~ msgstr "_Controles de volumen"
-
#~ msgid "_Enable this account"
#~ msgstr "_Habilitar esta cuenta"
@@ -1435,9 +1584,6 @@ msgstr "Buscar en llamadas salientes"
#~ msgid "\"Voicemail\" <%s>"
#~ msgstr "\"Mensaje\" <%s>"
-#~ msgid "Off Hold"
-#~ msgstr "Seguir"
-
#~ msgid "Record a call"
#~ msgstr "Grabar una llamada"
@@ -1535,20 +1681,20 @@ msgstr "Buscar en llamadas salientes"
#~ msgstr "Retomar"
#~ 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."
+#~ "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. Asegúrese "
-#~ "de no necesitarla más. Si cree que la pueda necesitar más adelante, "
-#~ "simplemente quité la selección."
+#~ "Este botón elimina la cuenta seleccionada en la siguiente lista. "
+#~ "Asegúrese de no necesitarla más. Si cree que la pueda necesitar más "
+#~ "adelante, simplemente quité la selección."
#~ msgid ""
-#~ "This button enables you to initialize a new account. You will then be able "
-#~ "to edit it using the form on the right."
+#~ "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á corregirlo "
-#~ "con el formulario a la derecha."
+#~ "Este botón le permite inicializar una nueva cuenta. Usted podrá "
+#~ "corregirlo con el formulario a la derecha."
#~ msgid ""
#~ "By default, when you place a call, sflphone will use the first account in "
@@ -1571,18 +1717,12 @@ msgstr "Buscar en llamadas salientes"
#~ msgid "Display phone numbers of these types :"
#~ msgstr "Mostrar números de este tipo:"
-#~ msgid "Clear history"
-#~ msgstr "Limpiar historial"
-
#~ msgid "Display dialpad"
#~ msgstr "Mostrar teclado"
#~ msgid "Command to run"
#~ msgstr "Comando a ejecutar"
-#~ msgid "Clear _history"
-#~ msgstr "_Limpiar historial"
-
#~ msgid "Keep my history for at least"
#~ msgstr "Guardar el historial al menos"
@@ -1598,11 +1738,11 @@ msgstr "Buscar en llamadas salientes"
#~ msgstr "NAT Traversal"
#~ msgid ""
-#~ "Pressing \"apply\" will restart the network layer. Otherwise, SFLPhone would "
-#~ "have to be restarted."
+#~ "Pressing \"apply\" will restart the network layer. Otherwise, SFLPhone "
+#~ "would have to be restarted."
#~ msgstr ""
-#~ "Presionar “aplica” recomenzará la capa de red. Si no, SFLPhone tendría que "
-#~ "ser reiniciado."
+#~ "Presionar “aplica” recomenzará la capa de red. Si no, SFLPhone tendría "
+#~ "que ser reiniciado."
#~ msgid "_Volume Controls"
#~ msgstr "_Controles de Volumen"
@@ -1619,26 +1759,29 @@ msgstr "Buscar en llamadas salientes"
#~ 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."
+#~ "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, cuando usted realiza una llamada, sflphone usará la primera "
-#~ "cuenta en esta lista que este \"registrada\". Cambie el orden de las cuentas "
-#~ "usando las flechas \"Arriba\" y \"Abajo\". Las Activa/desactiva marcando la "
-#~ "opción de la izquierda. Adiciona o elimina con los botones de \"Más\" o "
-#~ "\"Menos\". Edita la cuenta seleccionada con el formulario a la derecha."
+#~ "cuenta en esta lista que este \"registrada\". Cambie el orden de las "
+#~ "cuentas usando las flechas \"Arriba\" y \"Abajo\". Las Activa/desactiva "
+#~ "marcando la opción de la izquierda. Adiciona o elimina con los botones de "
+#~ "\"Más\" o \"Menos\". Edita la cuenta seleccionada con el formulario a la "
+#~ "derecha."
#~ msgctxt "NAME OF TRANSLATORS"
#~ msgid "Your names"
#~ msgstr ""
#~ "Maxime Chambreuil, ,Launchpad Contributions:,Andres Mujica,Maxime "
-#~ "Chambreuil, ,Launchpad Contributions:,Andres Mujica,Maxime Chambreuil, "
-#~ ",Launchpad Contributions:,Andres Mujica,Maxime Chambreuil"
+#~ "Chambreuil, ,Launchpad Contributions:,Andres Mujica,Maxime Chambreuil, ,"
+#~ "Launchpad Contributions:,Andres Mujica,Maxime Chambreuil, ,Launchpad "
+#~ "Contributions:,Andres Mujica,Maxime Chambreuil"
#~ msgctxt "EMAIL OF TRANSLATORS"
#~ msgid "Your emails"
#~ msgstr ""
-#~ "maxime.chambreuil@savoirfairelinux.com,,,andres.mujica@seaq.com.co,maxime.cha"
-#~ "mbreuil@gmail.com,,,andres.mujica@seaq.com.co,maxime.chambreuil@gmail.com,,,a"
-#~ "ndres.mujica@seaq.com.co,maxime.chambreuil@gmail.com"
+#~ "maxime.chambreuil@savoirfairelinux.com,,,andres.mujica@seaq.com.co,maxime."
+#~ "chambreuil@gmail.com,,,andres.mujica@seaq.com.co,maxime.chambreuil@gmail."
+#~ "com,,,andres.mujica@seaq.com.co,maxime.chambreuil@gmail.com,,,andres."
+#~ "mujica@seaq.com.co,maxime.chambreuil@gmail.com"
diff --git a/sflphone-client-gnome/po/fr/fr.po b/sflphone-client-gnome/po/fr/fr.po
index 53cac6638613f2ce611ffda87dd6705d08ee6c59..c7ace4f55b20cd568eb48572c1eb71af406ac753 100644
--- a/sflphone-client-gnome/po/fr/fr.po
+++ b/sflphone-client-gnome/po/fr/fr.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: SFLphone 0.9.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-12 14:02-0500\n"
+"POT-Creation-Date: 2009-12-03 10:22-0500\n"
"PO-Revision-Date: 2009-10-26 20:46+0000\n"
"Last-Translator: Maxime Chambreuil <maxime.chambreuil@gmail.com>\n"
"Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n"
@@ -62,15 +62,15 @@ msgstr "Serveur Stun invalide"
msgid "Invalid"
msgstr "Non valide"
-#: ../sflphone-client-gnome/src/actions.c:72
+#: ../sflphone-client-gnome/src/actions.c:98
msgid "Using account"
msgstr "Utilise le compte"
-#: ../sflphone-client-gnome/src/actions.c:78
+#: ../sflphone-client-gnome/src/actions.c:104
msgid "No registered accounts"
msgstr "Pas de compte enregistré"
-#: ../sflphone-client-gnome/src/actions.c:259
+#: ../sflphone-client-gnome/src/actions.c:285
msgid ""
"Unable to connect to the SFLphone server.\n"
"Make sure the daemon is running."
@@ -78,11 +78,12 @@ msgstr ""
"Impossible de se connecter au serveur SFLphone.\n"
" Assurez-vous que le démon est lancé."
-#: ../sflphone-client-gnome/src/actions.c:879
+#: ../sflphone-client-gnome/src/actions.c:589
+#: ../sflphone-client-gnome/src/actions.c:911
msgid "Direct SIP call"
msgstr "Appel direct SIP"
-#: ../sflphone-client-gnome/src/actions.c:1071
+#: ../sflphone-client-gnome/src/actions.c:1103
#, c-format
msgid ""
"<b>Error: No audio codecs found.\n"
@@ -137,31 +138,31 @@ msgstr "Vous avez des appels en cours."
msgid "Do you still want to quit?"
msgstr "Voulez-vous quitter?"
-#: ../sflphone-client-gnome/src/mainwindow.c:297
+#: ../sflphone-client-gnome/src/mainwindow.c:298
msgid "SFLphone Error"
msgstr "Erreur SFLphone"
-#: ../sflphone-client-gnome/src/mainwindow.c:391
+#: ../sflphone-client-gnome/src/mainwindow.c:392
#, c-format
msgid "ZRTP is not supported by peer %s\n"
msgstr "ZRTP n'est pas supporté par %s\n"
-#: ../sflphone-client-gnome/src/mainwindow.c:392
+#: ../sflphone-client-gnome/src/mainwindow.c:393
msgid "Secure Communication Unavailable"
msgstr "Communications sécurisées non disponibles"
-#: ../sflphone-client-gnome/src/mainwindow.c:393
-#: ../sflphone-client-gnome/src/mainwindow.c:415
+#: ../sflphone-client-gnome/src/mainwindow.c:394
+#: ../sflphone-client-gnome/src/mainwindow.c:416
msgid "Continue"
msgstr "Continuer"
-#: ../sflphone-client-gnome/src/mainwindow.c:394
-#: ../sflphone-client-gnome/src/mainwindow.c:416
-#: ../sflphone-client-gnome/src/mainwindow.c:430
+#: ../sflphone-client-gnome/src/mainwindow.c:395
+#: ../sflphone-client-gnome/src/mainwindow.c:417
+#: ../sflphone-client-gnome/src/mainwindow.c:431
msgid "Stop Call"
msgstr "Arrêter l'appel"
-#: ../sflphone-client-gnome/src/mainwindow.c:413
+#: ../sflphone-client-gnome/src/mainwindow.c:414
#, c-format
msgid ""
"A %s error forced the call with %s to fall under unencrypted mode.\n"
@@ -170,11 +171,11 @@ msgstr ""
"L'appel avec %s est passé en mode non-crypté à cause d'une erreur %s.\n"
"Raison exacte: %s\n"
-#: ../sflphone-client-gnome/src/mainwindow.c:414
+#: ../sflphone-client-gnome/src/mainwindow.c:415
msgid "ZRTP negotiation failed"
msgstr "Erreur d'authentification"
-#: ../sflphone-client-gnome/src/mainwindow.c:427
+#: ../sflphone-client-gnome/src/mainwindow.c:428
#, c-format
msgid ""
"%s wants to stop using secure communication. Confirm will resume "
@@ -183,11 +184,11 @@ msgstr ""
"%s ne désire plus utiliser la communication sécurisée. Confirmer que vous "
"voulez continuer sans ZRTP.\n"
-#: ../sflphone-client-gnome/src/mainwindow.c:428
+#: ../sflphone-client-gnome/src/mainwindow.c:429
msgid "Confirm Go Clear"
msgstr "Confirmer Communication en clair"
-#: ../sflphone-client-gnome/src/mainwindow.c:429
+#: ../sflphone-client-gnome/src/mainwindow.c:430
msgid "Confirm"
msgstr "Confirmer"
@@ -258,15 +259,15 @@ msgstr "Volume des hauts-parleurs"
msgid "Mic volume"
msgstr "Volume du micro"
-#: ../sflphone-client-gnome/src/statusicon.c:91
+#: ../sflphone-client-gnome/src/statusicon.c:96
msgid "_Show main window"
msgstr "_Afficher la fenêtre principale"
-#: ../sflphone-client-gnome/src/statusicon.c:126
+#: ../sflphone-client-gnome/src/statusicon.c:131
msgid "SFLphone"
msgstr "SFLphone"
-#: ../sflphone-client-gnome/src/statusicon.c:127
+#: ../sflphone-client-gnome/src/statusicon.c:132
#, c-format
msgid "%i account configured"
msgid_plural "%i accounts configured"
@@ -274,388 +275,395 @@ msgstr[0] "%i compte configuré"
msgstr[1] "%i comptes configurés"
#: ../sflphone-client-gnome/src/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:628
-#: ../sflphone-client-gnome/src/uimanager.c:662
+#: ../sflphone-client-gnome/src/uimanager.c:693
+#: ../sflphone-client-gnome/src/uimanager.c:727
msgid "Voicemail"
msgstr "Boite vocale"
-#: ../sflphone-client-gnome/src/uimanager.c:115
+#: ../sflphone-client-gnome/src/uimanager.c:117
msgid "No address book selected"
msgstr "Aucun carnet d'adresses sélectionné"
-#: ../sflphone-client-gnome/src/uimanager.c:135
-#: ../sflphone-client-gnome/src/uimanager.c:691
+#: ../sflphone-client-gnome/src/uimanager.c:137
+#: ../sflphone-client-gnome/src/uimanager.c:756
msgid "Address book"
msgstr "Carnet d'adresses"
-#: ../sflphone-client-gnome/src/uimanager.c:237
+#: ../sflphone-client-gnome/src/uimanager.c:279
#, c-format
msgid "Voicemail (%i)"
msgstr "Boite vocale (%i)"
-#: ../sflphone-client-gnome/src/uimanager.c:300
+#: ../sflphone-client-gnome/src/uimanager.c:342
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/uimanager.c:303
+#: ../sflphone-client-gnome/src/uimanager.c:345
msgid "About SFLphone"
msgstr "A propos de SFLphone"
-#: ../sflphone-client-gnome/src/uimanager.c:654
+#: ../sflphone-client-gnome/src/uimanager.c:719
msgid "Call"
msgstr "Actions"
-#: ../sflphone-client-gnome/src/uimanager.c:655
-#: ../sflphone-client-gnome/src/uimanager.c:1119
+#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:1184
msgid "_New call"
msgstr "_Nouvel appel"
-#: ../sflphone-client-gnome/src/uimanager.c:655
+#: ../sflphone-client-gnome/src/uimanager.c:720
msgid "Place a new call"
msgstr "Appeler"
-#: ../sflphone-client-gnome/src/uimanager.c:656
-#: ../sflphone-client-gnome/src/uimanager.c:914
+#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:979
msgid "_Pick up"
msgstr "_Décrocher"
-#: ../sflphone-client-gnome/src/uimanager.c:656
+#: ../sflphone-client-gnome/src/uimanager.c:721
msgid "Answer the call"
msgstr "Répondre à l'appel"
-#: ../sflphone-client-gnome/src/uimanager.c:657
-#: ../sflphone-client-gnome/src/uimanager.c:926
-#: ../sflphone-client-gnome/src/uimanager.c:967
+#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:991
+#: ../sflphone-client-gnome/src/uimanager.c:1032
msgid "_Hang up"
msgstr "_Raccrocher"
-#: ../sflphone-client-gnome/src/uimanager.c:657
+#: ../sflphone-client-gnome/src/uimanager.c:722
msgid "Finish the call"
msgstr "Terminer l'appel"
-#: ../sflphone-client-gnome/src/uimanager.c:658
+#: ../sflphone-client-gnome/src/uimanager.c:723
msgid "O_n hold"
msgstr "Mettre en attente"
-#: ../sflphone-client-gnome/src/uimanager.c:658
+#: ../sflphone-client-gnome/src/uimanager.c:723
msgid "Place the call on hold"
msgstr "Mettre l'appel en attente"
-#: ../sflphone-client-gnome/src/uimanager.c:659
+#: ../sflphone-client-gnome/src/uimanager.c:724
msgid "O_ff hold"
msgstr "Reprendre"
-#: ../sflphone-client-gnome/src/uimanager.c:659
+#: ../sflphone-client-gnome/src/uimanager.c:724
msgid "Place the call off hold"
msgstr "Reprendre l'appel"
-#: ../sflphone-client-gnome/src/uimanager.c:660
-#: ../sflphone-client-gnome/src/uimanager.c:950
+#: ../sflphone-client-gnome/src/uimanager.c:725
+#: ../sflphone-client-gnome/src/uimanager.c:1015
msgid "_Record"
msgstr "Enregistrer"
-#: ../sflphone-client-gnome/src/uimanager.c:660
+#: ../sflphone-client-gnome/src/uimanager.c:725
msgid "Record the current conversation"
msgstr "Enregistrer la conversation courante"
-#: ../sflphone-client-gnome/src/uimanager.c:661
+#: ../sflphone-client-gnome/src/uimanager.c:726
msgid "Configuration _Assistant"
msgstr "_Assistant de configuration"
-#: ../sflphone-client-gnome/src/uimanager.c:661
+#: ../sflphone-client-gnome/src/uimanager.c:726
msgid "Run the configuration assistant"
msgstr "Lancer l'assistant de configuration"
-#: ../sflphone-client-gnome/src/uimanager.c:662
+#: ../sflphone-client-gnome/src/uimanager.c:727
msgid "Call your voicemail"
msgstr "Appeler la boite vocale"
-#: ../sflphone-client-gnome/src/uimanager.c:663
+#: ../sflphone-client-gnome/src/uimanager.c:728
msgid "_Close"
msgstr "_Fermer"
-#: ../sflphone-client-gnome/src/uimanager.c:663
+#: ../sflphone-client-gnome/src/uimanager.c:728
msgid "Minimize to system tray"
msgstr "Minimiser dans la barre des tâches"
-#: ../sflphone-client-gnome/src/uimanager.c:664
+#: ../sflphone-client-gnome/src/uimanager.c:729
msgid "_Quit"
msgstr "_Quitter"
-#: ../sflphone-client-gnome/src/uimanager.c:664
+#: ../sflphone-client-gnome/src/uimanager.c:729
msgid "Quit the program"
msgstr "Quitter le programme"
-#: ../sflphone-client-gnome/src/uimanager.c:667
+#: ../sflphone-client-gnome/src/uimanager.c:732
msgid "_Edit"
msgstr "_Editer"
-#: ../sflphone-client-gnome/src/uimanager.c:668
+#: ../sflphone-client-gnome/src/uimanager.c:733
msgid "_Copy"
msgstr "_Copier"
-#: ../sflphone-client-gnome/src/uimanager.c:668
+#: ../sflphone-client-gnome/src/uimanager.c:733
msgid "Copy the selection"
msgstr "Copier la sélection"
-#: ../sflphone-client-gnome/src/uimanager.c:669
+#: ../sflphone-client-gnome/src/uimanager.c:734
msgid "_Paste"
msgstr "C_oller"
-#: ../sflphone-client-gnome/src/uimanager.c:669
+#: ../sflphone-client-gnome/src/uimanager.c:734
msgid "Paste the clipboard"
msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:670
+#: ../sflphone-client-gnome/src/uimanager.c:735
msgid "Clear _history"
msgstr "Effacer l'_historique"
-#: ../sflphone-client-gnome/src/uimanager.c:670
+#: ../sflphone-client-gnome/src/uimanager.c:735
msgid "Clear the call history"
msgstr "Effacer l'historique"
-#: ../sflphone-client-gnome/src/uimanager.c:671
+#: ../sflphone-client-gnome/src/uimanager.c:736
msgid "_Accounts"
msgstr "Co_mptes"
-#: ../sflphone-client-gnome/src/uimanager.c:671
+#: ../sflphone-client-gnome/src/uimanager.c:736
msgid "Edit your accounts"
msgstr "Éditer les comptes"
-#: ../sflphone-client-gnome/src/uimanager.c:672
+#: ../sflphone-client-gnome/src/uimanager.c:737
msgid "_Preferences"
msgstr "Préférences"
-#: ../sflphone-client-gnome/src/uimanager.c:672
+#: ../sflphone-client-gnome/src/uimanager.c:737
msgid "Change your preferences"
msgstr "Modifier les préférences"
-#: ../sflphone-client-gnome/src/uimanager.c:675
+#: ../sflphone-client-gnome/src/uimanager.c:740
msgid "_View"
msgstr "A_ffichage"
-#: ../sflphone-client-gnome/src/uimanager.c:678
+#: ../sflphone-client-gnome/src/uimanager.c:743
msgid "_Help"
msgstr "A_ide"
-#: ../sflphone-client-gnome/src/uimanager.c:679
+#: ../sflphone-client-gnome/src/uimanager.c:744
msgid "Contents"
msgstr "Sommaire"
-#: ../sflphone-client-gnome/src/uimanager.c:679
+#: ../sflphone-client-gnome/src/uimanager.c:744
msgid "Open the manual"
msgstr "Ouvrir le manuel"
-#: ../sflphone-client-gnome/src/uimanager.c:680
+#: ../sflphone-client-gnome/src/uimanager.c:745
msgid "About this application"
msgstr "À propos de cette application"
-#: ../sflphone-client-gnome/src/uimanager.c:686
+#: ../sflphone-client-gnome/src/uimanager.c:751
msgid "_Transfer"
msgstr "Transférer"
-#: ../sflphone-client-gnome/src/uimanager.c:686
+#: ../sflphone-client-gnome/src/uimanager.c:751
msgid "Transfer the call"
msgstr "Transférer à : "
-#: ../sflphone-client-gnome/src/uimanager.c:687
+#: ../sflphone-client-gnome/src/uimanager.c:752
msgid "_Show toolbar"
msgstr "Afficher la _barre d'outil"
-#: ../sflphone-client-gnome/src/uimanager.c:687
+#: ../sflphone-client-gnome/src/uimanager.c:752
msgid "Show the toolbar"
msgstr "Afficher la barre d'outil"
-#: ../sflphone-client-gnome/src/uimanager.c:688
+#: ../sflphone-client-gnome/src/uimanager.c:753
msgid "_Dialpad"
msgstr "_Clavier"
-#: ../sflphone-client-gnome/src/uimanager.c:688
+#: ../sflphone-client-gnome/src/uimanager.c:753
msgid "Show the dialpad"
msgstr "Afficher le clavier"
-#: ../sflphone-client-gnome/src/uimanager.c:689
+#: ../sflphone-client-gnome/src/uimanager.c:754
msgid "_Volume controls"
msgstr "Contrôle du _volume"
-#: ../sflphone-client-gnome/src/uimanager.c:689
+#: ../sflphone-client-gnome/src/uimanager.c:754
msgid "Show the volume controls"
msgstr "Afficher les controles du volume"
-#: ../sflphone-client-gnome/src/uimanager.c:690
+#: ../sflphone-client-gnome/src/uimanager.c:755
msgid "_History"
msgstr "Historique"
-#: ../sflphone-client-gnome/src/uimanager.c:690
+#: ../sflphone-client-gnome/src/uimanager.c:755
msgid "Calls history"
msgstr "Historique d'appels"
-#: ../sflphone-client-gnome/src/uimanager.c:691
+#: ../sflphone-client-gnome/src/uimanager.c:756
msgid "_Address book"
msgstr "Carnet d'adresses"
-#: ../sflphone-client-gnome/src/uimanager.c:938
-#: ../sflphone-client-gnome/src/uimanager.c:979
+#: ../sflphone-client-gnome/src/uimanager.c:1003
+#: ../sflphone-client-gnome/src/uimanager.c:1044
msgid "On _Hold"
msgstr "_Mettre en attente"
-#: ../sflphone-client-gnome/src/uimanager.c:1042
+#: ../sflphone-client-gnome/src/uimanager.c:1107
msgid "_Call back"
msgstr "_Rappeler"
-#: ../sflphone-client-gnome/src/uimanager.c:1193
+#: ../sflphone-client-gnome/src/uimanager.c:1258
msgid "Edit phone number"
msgstr "Éditer le numéro"
-#: ../sflphone-client-gnome/src/uimanager.c:1204
+#: ../sflphone-client-gnome/src/uimanager.c:1269
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/config/accountconfigdialog.c:172
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
msgid "Account Parameters"
msgstr "Paramètres du Compte"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:181
-#: ../sflphone-client-gnome/src/config/assistant.c:307
-#: ../sflphone-client-gnome/src/config/assistant.c:415
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
+#: ../sflphone-client-gnome/src/config/assistant.c:314
+#: ../sflphone-client-gnome/src/config/assistant.c:427
msgid "_Alias"
msgstr "A_lias"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
msgid "_Protocol"
msgstr "P_rotocole"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:207
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
msgid "Unknown"
msgstr "Inconnu"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:217
-#: ../sflphone-client-gnome/src/config/assistant.c:315
-#: ../sflphone-client-gnome/src/config/assistant.c:423
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
+#: ../sflphone-client-gnome/src/config/assistant.c:322
+#: ../sflphone-client-gnome/src/config/assistant.c:435
msgid "_Host name"
msgstr "_Serveur"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
-#: ../sflphone-client-gnome/src/config/assistant.c:323
-#: ../sflphone-client-gnome/src/config/assistant.c:431
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
+#: ../sflphone-client-gnome/src/config/assistant.c:330
+#: ../sflphone-client-gnome/src/config/assistant.c:443
msgid "_User name"
msgstr "Usa_ger"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:242
-#: ../sflphone-client-gnome/src/config/assistant.c:339
-#: ../sflphone-client-gnome/src/config/assistant.c:446
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:346
+#: ../sflphone-client-gnome/src/config/assistant.c:458
msgid "_Password"
msgstr "_Mot de passe"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:262
-#: ../sflphone-client-gnome/src/config/assistant.c:357
-#: ../sflphone-client-gnome/src/config/assistant.c:462
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:363
+#: ../sflphone-client-gnome/src/config/assistant.c:473
+#, fuzzy
+msgid "Show password"
+msgstr "Mot de passe"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:368
+#: ../sflphone-client-gnome/src/config/assistant.c:478
msgid "_Voicemail number"
msgstr "_Boite vocale #"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:348
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
msgid "Authentication"
msgstr "Identification"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:349
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
msgid "Secret"
msgstr "Mot de passe"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:579
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
msgid "Credential"
msgstr "Informations"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:614
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
msgid "Authentication name"
msgstr "Nom d'authentification"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:625
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
msgid "Password"
msgstr "Mot de passe"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:649
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1029
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:306
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
msgid "Security"
msgstr "Sécurité"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:662
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:318
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
msgid "Use TLS transport (sips)"
msgstr "Utiliser un transport TLS (sips)"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:668
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:323
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
msgid "SRTP key exchange"
msgstr "Échange de clé SRTP"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:329
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
msgid "Disabled"
msgstr "Désactivé"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:770
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
msgid "Registration"
msgstr "Expiration d'enregistrement"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:775
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
msgid "Registration expire"
msgstr "Expiration d'enregistrement"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:784
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
msgid "_Comply with RFC 3263"
msgstr "Respecter RFC 3263"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:791
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:221
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
msgid "Network Interface"
msgstr "Interface réseau"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:805
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:236
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
msgid "Local address"
msgstr "Adresse locale"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:855
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:292
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
msgid "Local port"
msgstr "Port local"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:868
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:903
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
msgid "Published address"
msgstr "Adresse de publication"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:874
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
msgid "Using STUN"
msgstr "Utiliser STUN "
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:881
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
msgid "STUN server URL"
msgstr "URL du serveur STUN"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:889
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
msgid "Same as local parameters"
msgstr "Identique aux paramètres locaux"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:892
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
msgid "Set published address and port:"
msgstr "Configurer l'adresse et le port à publier"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:911
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
msgid "Published port"
msgstr "Port de publication"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1000
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
msgid "Account settings"
msgstr "Paramètre des comptes"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1019
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
msgid "Basic"
msgstr "Général"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1024
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
msgid "Advanced"
msgstr "Avancé"
@@ -664,35 +672,35 @@ msgstr "Avancé"
msgid "Server returned \"%s\" (%d)"
msgstr "Le serveur a répondu \"%s\" (%d)"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:387
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
msgid "Protocol"
msgstr "Protocole"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:394
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:396
msgid "Status"
msgstr "Statut"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:472
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:474
msgid "Accounts"
msgstr "Comptes"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:482
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:484
msgid "Configured Accounts"
msgstr "Comptes Configurés"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:499
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
#, c-format
msgid "There is %d active account"
msgid_plural "There are %d active accounts"
msgstr[0] " %d compte actif"
msgstr[1] " %d comptes actifs"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:505
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
msgid "You have no active account"
msgstr "Vous n'avez aucun compte actif"
#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:537
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
msgid "General"
msgstr "Général"
@@ -741,12 +749,12 @@ msgstr "Sélectionnez les carnets d'adresses d'Evolution à utiliser"
msgid "Name"
msgstr "Nom"
-#: ../sflphone-client-gnome/src/config/assistant.c:69
+#: ../sflphone-client-gnome/src/config/assistant.c:75
#, c-format
msgid "This assistant is now finished."
msgstr "Cet assistant est maintenant terminé."
-#: ../sflphone-client-gnome/src/config/assistant.c:71
+#: ../sflphone-client-gnome/src/config/assistant.c:77
msgid ""
"You can at any time check your registration state or modify your accounts "
"parameters in the Options/Accounts window."
@@ -754,127 +762,127 @@ 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/config/assistant.c:74
+#: ../sflphone-client-gnome/src/config/assistant.c:80
msgid "Alias"
msgstr "Alias"
-#: ../sflphone-client-gnome/src/config/assistant.c:78
+#: ../sflphone-client-gnome/src/config/assistant.c:84
msgid "Server"
msgstr "Serveur"
-#: ../sflphone-client-gnome/src/config/assistant.c:82
+#: ../sflphone-client-gnome/src/config/assistant.c:88
msgid "Username"
msgstr "Nom d'utilisateur"
-#: ../sflphone-client-gnome/src/config/assistant.c:86
+#: ../sflphone-client-gnome/src/config/assistant.c:92
msgid "Security: "
msgstr "Sécurité: "
-#: ../sflphone-client-gnome/src/config/assistant.c:88
+#: ../sflphone-client-gnome/src/config/assistant.c:94
msgid "SRTP/ZRTP draft-zimmermann"
msgstr "SRTP/ZRTP draft-zimmermann"
-#: ../sflphone-client-gnome/src/config/assistant.c:90
+#: ../sflphone-client-gnome/src/config/assistant.c:96
msgid "None"
msgstr "Aucun"
-#: ../sflphone-client-gnome/src/config/assistant.c:223
+#: ../sflphone-client-gnome/src/config/assistant.c:229
msgid "SFLphone account creation wizard"
msgstr "Assistant de création de compte de SFLphone"
-#: ../sflphone-client-gnome/src/config/assistant.c:249
+#: ../sflphone-client-gnome/src/config/assistant.c:255
msgid "Welcome to the Account creation wizard of SFLphone!"
msgstr "Bienvenue dans l'assistant de création de compte de SFLphone !"
-#: ../sflphone-client-gnome/src/config/assistant.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:256
msgid "This installation wizard will help you configure an account."
msgstr "Cet assistant vous guidera dans la configuration d'un compte."
-#: ../sflphone-client-gnome/src/config/assistant.c:264
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "VoIP Protocols"
msgstr "Protocoles VoIP"
-#: ../sflphone-client-gnome/src/config/assistant.c:264
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "Select an account type"
msgstr "Sélectionnez un type de compte"
-#: ../sflphone-client-gnome/src/config/assistant.c:266
+#: ../sflphone-client-gnome/src/config/assistant.c:272
msgid "SIP (Session Initiation Protocol)"
msgstr "SIP (Session Initiation Protocol)"
-#: ../sflphone-client-gnome/src/config/assistant.c:268
+#: ../sflphone-client-gnome/src/config/assistant.c:274
msgid "IAX2 (InterAsterix Exchange)"
msgstr "IAX2 (InterAsterix Exchange)"
-#: ../sflphone-client-gnome/src/config/assistant.c:282
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Account"
msgstr "Compte"
-#: ../sflphone-client-gnome/src/config/assistant.c:282
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Please select one of the following options"
msgstr "Veuillez sélectionner une des options suivantes"
-#: ../sflphone-client-gnome/src/config/assistant.c:284
+#: ../sflphone-client-gnome/src/config/assistant.c:290
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/config/assistant.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:292
msgid "Register an existing SIP or IAX2 account"
msgstr "Enregistrer un compte SIP ou IAX2 existant"
-#: ../sflphone-client-gnome/src/config/assistant.c:299
+#: ../sflphone-client-gnome/src/config/assistant.c:306
msgid "SIP account settings"
msgstr "Paramètres de compte SIP"
-#: ../sflphone-client-gnome/src/config/assistant.c:299
-#: ../sflphone-client-gnome/src/config/assistant.c:407
+#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "Please fill the following information"
msgstr "Veuillez remplir les champs suivants"
-#: ../sflphone-client-gnome/src/config/assistant.c:365
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:376
+#: ../sflphone-client-gnome/src/config/assistant.c:405
msgid "Secure communications with _ZRTP"
msgstr "Communications sécurisées avec _ZRTP"
-#: ../sflphone-client-gnome/src/config/assistant.c:378
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "Optional email address"
msgstr "Adresse courriel optionnelle"
-#: ../sflphone-client-gnome/src/config/assistant.c:378
+#: ../sflphone-client-gnome/src/config/assistant.c:389
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-gnome/src/config/assistant.c:386
+#: ../sflphone-client-gnome/src/config/assistant.c:397
msgid "_Email address"
msgstr "A_dresse courriel"
-#: ../sflphone-client-gnome/src/config/assistant.c:407
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "IAX2 account settings"
msgstr "Paramètres de compte IAX2"
-#: ../sflphone-client-gnome/src/config/assistant.c:480
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "Network Address Translation (NAT)"
msgstr "Network Address Translation (NAT)"
-#: ../sflphone-client-gnome/src/config/assistant.c:480
+#: ../sflphone-client-gnome/src/config/assistant.c:496
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/config/assistant.c:489
+#: ../sflphone-client-gnome/src/config/assistant.c:505
msgid "E_nable STUN"
msgstr "A_ctiver STUN"
-#: ../sflphone-client-gnome/src/config/assistant.c:496
+#: ../sflphone-client-gnome/src/config/assistant.c:512
msgid "_STUN server"
msgstr "S_erveur STUN"
-#: ../sflphone-client-gnome/src/config/assistant.c:510
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Account Registration"
msgstr "Enregistrement du compte"
-#: ../sflphone-client-gnome/src/config/assistant.c:510
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Congratulations!"
msgstr "Félicitations!"
@@ -910,51 +918,51 @@ msgstr "Détection de l'activité de la voix"
msgid "_Noise Reduction (Narrow-Band Companding)"
msgstr "Réduction du bruit (Compresseur extenseur LBR)"
-#: ../sflphone-client-gnome/src/config/audioconf.c:795
+#: ../sflphone-client-gnome/src/config/audioconf.c:800
msgid "Sound Manager"
msgstr "Interface Audio"
-#: ../sflphone-client-gnome/src/config/audioconf.c:804
+#: ../sflphone-client-gnome/src/config/audioconf.c:809
msgid "_Pulseaudio"
msgstr "_Pulseaudio"
-#: ../sflphone-client-gnome/src/config/audioconf.c:808
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
msgid "_ALSA"
msgstr "_ALSA"
-#: ../sflphone-client-gnome/src/config/audioconf.c:814
+#: ../sflphone-client-gnome/src/config/audioconf.c:819
msgid "ALSA settings"
msgstr "Paramètres ALSA"
-#: ../sflphone-client-gnome/src/config/audioconf.c:831
+#: ../sflphone-client-gnome/src/config/audioconf.c:836
msgid "Codecs"
msgstr "Codecs"
-#: ../sflphone-client-gnome/src/config/audioconf.c:860
+#: ../sflphone-client-gnome/src/config/audioconf.c:865
msgid "Recordings"
msgstr "Enregistrements"
-#: ../sflphone-client-gnome/src/config/audioconf.c:864
+#: ../sflphone-client-gnome/src/config/audioconf.c:869
msgid "Destination folder"
msgstr "Dossier de destination"
-#: ../sflphone-client-gnome/src/config/audioconf.c:868
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
msgid "Select a folder"
msgstr "Choisissez un dossier"
-#: ../sflphone-client-gnome/src/config/audioconf.c:874
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
msgid "Ringtones"
msgstr "Sonneries"
-#: ../sflphone-client-gnome/src/config/audioconf.c:880
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
msgid "_Enable ringtones"
msgstr "_Activer les sonneries"
-#: ../sflphone-client-gnome/src/config/audioconf.c:886
+#: ../sflphone-client-gnome/src/config/audioconf.c:891
msgid "Choose a ringtone"
msgstr "Sélectionner une sonnerie"
-#: ../sflphone-client-gnome/src/config/audioconf.c:892
+#: ../sflphone-client-gnome/src/config/audioconf.c:897
msgid "Audio Files"
msgstr "Fichier Audio"
@@ -991,7 +999,7 @@ msgstr "Réécriture des numéros appelés"
msgid "_Prefix dialed numbers with"
msgstr "_Préfixer les numéros composés par"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:212
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
msgid ""
"This profile is used when you want to reach a remote peer simply by typing a "
"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
@@ -1002,67 +1010,59 @@ msgstr ""
"sont aussi utilisé si aucun compte ne peut être attribué à un appel entrant "
"ou sortant."
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:425
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
msgid "Desktop Notifications"
msgstr "Notifications de Bureau"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:429
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
msgid "_Enable notifications"
msgstr "_Activer les notifications"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:435
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
msgid "System Tray Icon"
msgstr "Icône dans la barre des tâches"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:438
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
msgid "_Popup main window on incoming call"
msgstr "Faire apparaître la fenêtre _principale lors d'appel entrant"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:443
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
msgid "Ne_ver popup main window"
msgstr "Ne _jamais afficher la fenêtre principale"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:447
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
msgid "Hide SFLphone window on _startup"
msgstr "_Cacher la fenêtre de SFLphone au démarrage"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
msgid "Calls History"
msgstr "Historique des appels"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:456
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
msgid "_Keep my history for at least"
msgstr "Garder mon historique au moins"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:467
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
msgid "days"
msgstr "jours"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:471
-msgid "Configuration File"
-msgstr "Fichier de configuration"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:473
-msgid "Store SIP credentials as MD5 hash"
-msgstr "Stocker les informations d'authentification sour forme encryptée (MD5)"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:517
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
msgid "Preferences"
msgstr "Préférences"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:542
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
msgid "Audio"
msgstr "Audio"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:547
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
msgid "Address Book"
msgstr "Carnet d'adresse"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:552
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
msgid "Hooks"
msgstr "Ancrage"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:562
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
msgid "Direct IP calls"
msgstr "Appels IP"
@@ -1070,11 +1070,11 @@ msgstr "Appels IP"
msgid "Advanced options for TLS"
msgstr "Options avancées TLS"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:55
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:56
msgid "TLS transport"
msgstr "Transport TLS"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:59
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:60
msgid ""
"TLS transport can be used along with UDP for those calls that would\n"
"require secure sip transactions (aka SIPS). You can configure a different\n"
@@ -1087,55 +1087,55 @@ msgstr ""
"TLS différent pour chaque compte. Cependant, chacun écoutera sur un port "
"différent.\n"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:100
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
msgid "Certificate of Authority list"
msgstr "Liste des autorités de certification"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:104
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
msgid "Choose a CA list file (optional)"
msgstr "Choisir une liste d'AC (optionnel)"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:128
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
msgid "Public endpoint certificate file"
msgstr "Fichier de certificats de l'extrémité public"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:132
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
msgid "Choose a public endpoint certificate (optional)"
msgstr "Sélectionner le certificat de l'extrémité public"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:156
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
msgid "Choose a private key file (optional)"
msgstr "Choisir une clé privée (optionnel)"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:178
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
msgid "Password for the private key"
msgstr "Mot de passe pour la clé privée"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:201
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
msgid "TLS protocol method"
msgstr "Méthode pour TLS"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:235
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
msgid "TLS cipher list"
msgstr "Liste de cryptogramme TLS"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:244
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
msgid "Server name instance for outgoing TLS connection"
msgstr "Instance du serveur pour les connections TLS sortantes"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:252
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
msgid "Negotiation timeout (sec:msec)"
msgstr "Expiration de la négociation"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:269
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
msgid "Verify incoming certificates, as a server"
msgstr "En tant que serveur, vérifier les certificats entrants"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:275
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
msgid "Verify certificates from answer, as a client"
msgstr "En tant que client, vérifier les certificats dans les réponses"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:281
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
msgid "Require certificate for incoming tls connections"
msgstr "Exiger un certificat pour les connexions TLS entrantes"
@@ -1159,29 +1159,36 @@ msgstr "_Avertir si ZRTP n'est pas supporté"
msgid "Display SAS once for hold events"
msgstr "Afficher le SAS seulement une fois sur les mises en attente"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:58
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
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:59
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:72
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:84
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:96
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
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:71
msgid "Search by missed call"
msgstr "Rechercher dans les appels manqués"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:83
msgid "Search by incoming call"
msgstr "Rechercher dans les appels entrants"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:95
msgid "Search by outgoing call"
msgstr "Rechercher dans les appels sortants"
+#~ msgid "Configuration File"
+#~ msgstr "Fichier de configuration"
+
+#~ msgid "Store SIP credentials as MD5 hash"
+#~ msgstr ""
+#~ "Stocker les informations d'authentification sour forme encryptée (MD5)"
+
#~ msgid "IP call - %s"
#~ msgstr "Appel IP - %s"
diff --git a/sflphone-client-gnome/po/it/it.po b/sflphone-client-gnome/po/it/it.po
index 88fc58458f6e365dd5d030203af3e1d5057ccf11..cf8644aea926a034434257d7637e4c5c02e5a84c 100644
--- a/sflphone-client-gnome/po/it/it.po
+++ b/sflphone-client-gnome/po/it/it.po
@@ -1,21 +1,21 @@
-# SFLphone italian translation.
+# 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.
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.9.7\n"
+"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-14 11:18-0400\n"
+"POT-Creation-Date: 2009-12-03 10:22-0500\n"
"PO-Revision-Date: 2009-10-14 17:47+0000\n"
-"Last-Translator: Stefano Scamuzzo <stefano.scamuzzo@eng.it>\n"
+"Last-Translator: Maxime Chambreuil <maxime.chambreuil@gmail.com>\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=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-10-26 15:48+0000\n"
+"X-Launchpad-Export-Date: 2009-12-03 15:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: ../sflphone-client-gnome/src/accountlist.c:175
@@ -60,25 +60,15 @@ msgstr "Server STUN non valido"
msgid "Invalid"
msgstr "Non valido"
-#: ../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 messaggio vocale"
-msgstr[1] "%d messaggi vocali"
-
-#: ../sflphone-client-gnome/src/actions.c:83
-#: ../sflphone-client-gnome/src/actions.c:919
-#: ../sflphone-client-gnome/src/actions.c:926
+#: ../sflphone-client-gnome/src/actions.c:98
msgid "Using account"
msgstr "Account in uso:"
-#: ../sflphone-client-gnome/src/actions.c:89
+#: ../sflphone-client-gnome/src/actions.c:104
msgid "No registered accounts"
msgstr "Nessun account registrato"
-#: ../sflphone-client-gnome/src/actions.c:268
+#: ../sflphone-client-gnome/src/actions.c:285
msgid ""
"Unable to connect to the SFLphone server.\n"
"Make sure the daemon is running."
@@ -86,27 +76,23 @@ msgstr ""
"Impossibile connettersi al server SFLphone.\n"
"Accertarsi che il demone sia in esecuzione."
-#: ../sflphone-client-gnome/src/actions.c:913
-#, c-format
-msgid "IP call - %s"
-msgstr "Chiamata IP diretta - %s"
-
-#: ../sflphone-client-gnome/src/actions.c:922
-msgid "Codec"
-msgstr "Codec"
+#: ../sflphone-client-gnome/src/actions.c:589
+#: ../sflphone-client-gnome/src/actions.c:911
+msgid "Direct SIP call"
+msgstr ""
-#: ../sflphone-client-gnome/src/actions.c:1119
+#: ../sflphone-client-gnome/src/actions.c:1103
#, 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> )"
+"</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>Errore: Non è stato trovato alcun codec audio.</b>\n"
+"<b>Errore: Non è stato trovato alcun codec audio.</b>\n"
"\n"
-"I codec audio SFL devono trovarsi in <i>%s</i> o nella sottocartella "
-"<b>.sflphone</b> della cartella home dell'utente (</i>%s</i>)"
+"I codec audio SFL devono trovarsi in <i>%s</i> o nella sottocartella <b>."
+"sflphone</b> della cartella home dell'utente (</i>%s</i>)"
#: ../sflphone-client-gnome/src/errors.c:29
msgid ""
@@ -133,11 +119,11 @@ msgid ""
"Pulseaudio is not running"
msgstr ""
"Notifica PulseAudio\n"
-"PulseAudio non è in esecuzione"
+"PulseAudio non è in esecuzione"
#: ../sflphone-client-gnome/src/mainwindow.c:73
msgid "There is one call in progress."
-msgstr "C'è una chiamata in corso."
+msgstr "C'è una chiamata in corso."
#: ../sflphone-client-gnome/src/mainwindow.c:77
msgid "There are calls in progress."
@@ -147,57 +133,55 @@ msgstr "Ci sono chiamate in corso."
msgid "Do you still want to quit?"
msgstr "Vuoi veramente uscire?"
-#: ../sflphone-client-gnome/src/mainwindow.c:299
+#: ../sflphone-client-gnome/src/mainwindow.c:298
msgid "SFLphone Error"
msgstr "Errore SFLphone"
-#: ../sflphone-client-gnome/src/mainwindow.c:391
+#: ../sflphone-client-gnome/src/mainwindow.c:392
#, c-format
msgid "ZRTP is not supported by peer %s\n"
-msgstr "ZRPT non supportato dal nodo %s\n"
-
-#: ../sflphone-client-gnome/src/mainwindow.c:392
-msgid "Secure Communication Unavailable"
-msgstr "Comunicazione sicura non disponibile"
+msgstr ""
#: ../sflphone-client-gnome/src/mainwindow.c:393
-#: ../sflphone-client-gnome/src/mainwindow.c:415
-msgid "Continue"
-msgstr "Continua"
+msgid "Secure Communication Unavailable"
+msgstr ""
#: ../sflphone-client-gnome/src/mainwindow.c:394
#: ../sflphone-client-gnome/src/mainwindow.c:416
-#: ../sflphone-client-gnome/src/mainwindow.c:430
+msgid "Continue"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/mainwindow.c:395
+#: ../sflphone-client-gnome/src/mainwindow.c:417
+#: ../sflphone-client-gnome/src/mainwindow.c:431
msgid "Stop Call"
-msgstr "Chiudi la chiamata"
+msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:413
+#: ../sflphone-client-gnome/src/mainwindow.c:414
#, c-format
msgid ""
"A %s error forced the call with %s to fall under unencrypted mode.\n"
"Exact reason: %s\n"
-msgstr "Un errore %s ha provocato il passaggio della chiamata %s in modalità non sicura.\n"
-"Motivo esatto: %s\n"
+msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:414
+#: ../sflphone-client-gnome/src/mainwindow.c:415
msgid "ZRTP negotiation failed"
-msgstr "Negoziazione ZRTP fallita"
+msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:427
+#: ../sflphone-client-gnome/src/mainwindow.c:428
#, c-format
msgid ""
"%s wants to stop using secure communication. Confirm will resume "
"conversation without SRTP.\n"
-msgstr "%s vuole terminare l'uso della comunicazione sicura. Conferma ripristinerà "
-"la converazione senza SRTP.\n"
+msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:428
+#: ../sflphone-client-gnome/src/mainwindow.c:429
msgid "Confirm Go Clear"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:429
+#: ../sflphone-client-gnome/src/mainwindow.c:430
msgid "Confirm"
-msgstr "Conferma"
+msgstr ""
#: ../sflphone-client-gnome/src/sflnotify.c:71
#: ../sflphone-client-gnome/src/sflnotify.c:91
@@ -210,6 +194,13 @@ msgstr "Account %s: %s"
msgid "<i>From</i> %s"
msgstr "<i>Da</i> %s"
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+#, c-format
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] "%d messaggio vocale"
+msgstr[1] "%d messaggi vocali"
+
#: ../sflphone-client-gnome/src/sflnotify.c:111
#, c-format
msgid "Calling with %s account <i>%s</i>"
@@ -233,23 +224,21 @@ msgid ""
"<i>With:</i> %s \n"
"using %s"
msgstr ""
-"<i>con:</i> %s \n"
-"utilizzando $s"
#: ../sflphone-client-gnome/src/sflnotify.c:205
#, c-format
msgid "%s does not support ZRTP."
-msgstr "%s non supporta ZRTP."
+msgstr ""
#: ../sflphone-client-gnome/src/sflnotify.c:220
#, c-format
msgid "ZRTP negotiation failed with %s"
-msgstr "Negoziazione ZRTP con %s fallita"
+msgstr ""
#: ../sflphone-client-gnome/src/sflnotify.c:235
#, c-format
msgid "<i>With:</i> %s"
-msgstr "<i>Con:</i> %s"
+msgstr ""
#: ../sflphone-client-gnome/src/sliders.c:162
msgid "Speakers volume"
@@ -259,15 +248,15 @@ msgstr "Volume altoparlante"
msgid "Mic volume"
msgstr "Volume microfono"
-#: ../sflphone-client-gnome/src/statusicon.c:91
+#: ../sflphone-client-gnome/src/statusicon.c:96
msgid "_Show main window"
msgstr "Mostra la finestra principale"
-#: ../sflphone-client-gnome/src/statusicon.c:126
+#: ../sflphone-client-gnome/src/statusicon.c:131
msgid "SFLphone"
msgstr "SFLphone"
-#: ../sflphone-client-gnome/src/statusicon.c:127
+#: ../sflphone-client-gnome/src/statusicon.c:132
#, c-format
msgid "%i account configured"
msgid_plural "%i accounts configured"
@@ -275,203 +264,399 @@ msgstr[0] "%i account configurato"
msgstr[1] "%i account configurati"
#: ../sflphone-client-gnome/src/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:750
+#: ../sflphone-client-gnome/src/uimanager.c:693
+#: ../sflphone-client-gnome/src/uimanager.c:727
msgid "Voicemail"
msgstr "Segreteria telefonica"
-#: ../sflphone-client-gnome/src/uimanager.c:403
+#: ../sflphone-client-gnome/src/uimanager.c:117
+msgid "No address book selected"
+msgstr "Rubrica"
+
+#: ../sflphone-client-gnome/src/uimanager.c:137
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "Address book"
+msgstr "Rubrica"
+
+#: ../sflphone-client-gnome/src/uimanager.c:279
+msgid "Voicemail (%i)"
+msgstr "Segreteria telefonica (%i)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:342
msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
-msgstr "SFLphone è un client VoIP compatibile con i protocolli SIP e IAX2."
+msgstr "SFLphone è un client VoIP compatibile con i protocolli SIP e IAX2."
-#: ../sflphone-client-gnome/src/uimanager.c:406
+#: ../sflphone-client-gnome/src/uimanager.c:345
msgid "About SFLphone"
msgstr "Informazioni su SFLphone"
-#: ../sflphone-client-gnome/src/uimanager.c:1028
+#: ../sflphone-client-gnome/src/uimanager.c:719
+msgid "Call"
+msgstr "_Chiama"
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:1184
+msgid "_New call"
+msgstr "Chiama"
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+msgid "Place a new call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:979
msgid "_Pick up"
msgstr "Rispondi"
-#: ../sflphone-client-gnome/src/uimanager.c:1040
-#: ../sflphone-client-gnome/src/uimanager.c:1081
+#: ../sflphone-client-gnome/src/uimanager.c:721
+msgid "Answer the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:991
+#: ../sflphone-client-gnome/src/uimanager.c:1032
msgid "_Hang up"
msgstr "_Chiudi"
-#: ../sflphone-client-gnome/src/uimanager.c:1052
-#: ../sflphone-client-gnome/src/uimanager.c:1093
-msgid "On _Hold"
+#: ../sflphone-client-gnome/src/uimanager.c:722
+msgid "Finish the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "O_n hold"
msgstr "Attesa"
-#: ../sflphone-client-gnome/src/uimanager.c:1064
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "Place the call on hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "O_ff hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "Place the call off hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:725
+#: ../sflphone-client-gnome/src/uimanager.c:1015
msgid "_Record"
msgstr "_Registra"
-#: ../sflphone-client-gnome/src/uimanager.c:1154
-msgid "_Call back"
-msgstr "Richiama"
+#: ../sflphone-client-gnome/src/uimanager.c:725
+msgid "Record the current conversation"
+msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1226
-msgid "_New call"
-msgstr "Chiama"
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Configuration _Assistant"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Run the configuration assistant"
+msgstr "Errore di configurazione STUN"
+
+#: ../sflphone-client-gnome/src/uimanager.c:727
+msgid "Call your voicemail"
+msgstr "%d messaggio vocale"
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "_Close"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "Minimize to system tray"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "_Quit"
+msgstr "_Modifica"
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "Quit the program"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:732
+msgid "_Edit"
+msgstr "_Modifica"
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "_Copy"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "Copy the selection"
+msgstr "Elimina l'account selezionato"
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "_Paste"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "Paste the clipboard"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear _history"
+msgstr "Cancella la cronologia"
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear the call history"
+msgstr "Cancella la cronologia"
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "_Accounts"
+msgstr "_Account"
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "Edit your accounts"
+msgstr "Account attivo"
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "_Preferences"
+msgstr "Preferenze"
-#: ../sflphone-client-gnome/src/uimanager.c:1300
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "Change your preferences"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:740
+msgid "_View"
+msgstr "_Visualizza"
+
+#: ../sflphone-client-gnome/src/uimanager.c:743
+msgid "_Help"
+msgstr "_Aiuto"
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Contents"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Open the manual"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:745
+msgid "About this application"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "_Transfer"
+msgstr "Inoltra"
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "Transfer the call"
+msgstr "Inoltra a: "
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "_Show toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "Show the toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "_Dialpad"
+msgstr "Mostra tastiera"
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "Show the dialpad"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "_Volume controls"
+msgstr "Mostra i controlli del volume"
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "Show the volume controls"
+msgstr "Mostra i controlli del volume"
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "_History"
+msgstr "Cronologia"
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "Calls history"
+msgstr "Cronologia chiamate"
+
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "_Address book"
+msgstr "Rubrica"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1003
+#: ../sflphone-client-gnome/src/uimanager.c:1044
+msgid "On _Hold"
+msgstr "Attesa"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1107
+msgid "_Call back"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:1258
msgid "Edit phone number"
-msgstr "Modifica numero di telefono"
+msgstr ""
-#: ../sflphone-client-gnome/src/uimanager.c:1311
+#: ../sflphone-client-gnome/src/uimanager.c:1269
msgid "Edit the phone number before making a call"
-msgstr "Modifica il numero di telefono prima di chiamare"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:164
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
msgid "Account Parameters"
msgstr "Parametri account"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:173
-#: ../sflphone-client-gnome/src/config/assistant.c:294
-#: ../sflphone-client-gnome/src/config/assistant.c:402
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
+#: ../sflphone-client-gnome/src/config/assistant.c:314
+#: ../sflphone-client-gnome/src/config/assistant.c:427
msgid "_Alias"
msgstr "_Pseudonimo"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:181
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
msgid "_Protocol"
msgstr "_Protocollo"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:199
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
msgid "Unknown"
msgstr "Sconosciuto"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:209
-#: ../sflphone-client-gnome/src/config/assistant.c:302
-#: ../sflphone-client-gnome/src/config/assistant.c:410
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
+#: ../sflphone-client-gnome/src/config/assistant.c:322
+#: ../sflphone-client-gnome/src/config/assistant.c:435
msgid "_Host name"
msgstr "Nome _host"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:217
-#: ../sflphone-client-gnome/src/config/assistant.c:310
-#: ../sflphone-client-gnome/src/config/assistant.c:418
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
+#: ../sflphone-client-gnome/src/config/assistant.c:330
+#: ../sflphone-client-gnome/src/config/assistant.c:443
msgid "_User name"
msgstr "Nome _utente"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:234
-#: ../sflphone-client-gnome/src/config/assistant.c:326
-#: ../sflphone-client-gnome/src/config/assistant.c:433
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:346
+#: ../sflphone-client-gnome/src/config/assistant.c:458
msgid "_Password"
msgstr "_Password"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:254
-#: ../sflphone-client-gnome/src/config/assistant.c:344
-#: ../sflphone-client-gnome/src/config/assistant.c:449
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:363
+#: ../sflphone-client-gnome/src/config/assistant.c:473
+msgid "Show password"
+msgstr "Password"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:368
+#: ../sflphone-client-gnome/src/config/assistant.c:478
msgid "_Voicemail number"
msgstr "Numero segreteria telefonica"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:340
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
msgid "Authentication"
-msgstr "Autenticazione"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:341
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
msgid "Secret"
-msgstr "Segreto"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:466
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
msgid "Credential"
-msgstr "Credenziali"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:501
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
msgid "Authentication name"
-msgstr "Nome autenticazione"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:512
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
msgid "Password"
msgstr "Password"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:535
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:909
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:201
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
msgid "Security"
-msgstr "Sicurezza"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:547
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:213
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
msgid "Use TLS transport (sips)"
-msgstr "Utilizza il trasporto TLS (sips)"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:552
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:218
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
msgid "SRTP key exchange"
-msgstr "Scambio di chiavi SRTP"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:558
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
msgid "Disabled"
-msgstr "Disabilitato"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
msgid "Registration"
-msgstr "Registrazione"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:679
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
msgid "Registration expire"
msgstr "Scadenza registrazione"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
msgid "_Comply with RFC 3263"
-msgstr "Compatibile con RFC 3263"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
-msgid "Network"
-msgstr "Rete"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
+msgid "Network Interface"
+msgstr "Rete irraggiungibile"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:707
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
msgid "Local address"
-msgstr "Indirizzo locale"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:744
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
msgid "Local port"
-msgstr "Porta locale"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:752
-msgid "Set published address and port:"
-msgstr "Configura indirizzo pubblicato e porta:"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
+msgid "Published address"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:756
-msgid "Using STUN "
-msgstr "Utilizza STUN "
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+msgid "Using STUN"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:761
-msgid "Same as local parameters"
-msgstr "Come paramteri locali"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
+msgid "STUN server URL"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:764
-msgid "Manually"
-msgstr "Manuale"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
+msgid "Same as local parameters"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:769
-msgid "Published address"
-msgstr "Indirizzo pubblicato"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
+msgid "Set published address and port:"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:777
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
msgid "Published port"
-msgstr "Porta pubblicata"
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:785
-msgid "STUN server URL"
-msgstr "URL del server STUN"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
msgid "Account settings"
msgstr "Impostazioni dell'account"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
msgid "Basic"
msgstr "Generale"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:904
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
msgid "Advanced"
msgstr "Avanzate"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:169
-msgid "Server returned \""
-msgstr "Il server ha restituito \""
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:164
+#, c-format
+msgid "Server returned \"%s\" (%d)"
+msgstr ""
#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
msgid "Protocol"
@@ -483,40 +668,27 @@ msgstr "Stato"
#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:474
msgid "Accounts"
-msgstr "Accounts"
+msgstr "Account"
#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:484
msgid "Configured Accounts"
msgstr "Account configurati"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:505
-msgid "There "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "is "
-msgstr "è"
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "are "
-msgstr "sono"
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:508
-msgid " active account"
-msgstr " account attivo"
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:509
-msgid "s"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
+#, c-format
+msgid "There is %d active account"
+msgid_plural "There are %d active accounts"
+msgstr[0] ""
+msgstr[1] ""
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:514
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
msgid "You have no active account"
-msgstr "Non ci sono account attivi"
+msgstr ""
#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:443
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
msgid "General"
-msgstr "Generale"
+msgstr ""
#: ../sflphone-client-gnome/src/config/addressbook-config.c:312
msgid "_Use Evolution address books"
@@ -524,11 +696,11 @@ msgstr "_Usa la rubrica di Evolution"
#: ../sflphone-client-gnome/src/config/addressbook-config.c:319
msgid "Download limit :"
-msgstr "Limite per il download: "
+msgstr ""
#: ../sflphone-client-gnome/src/config/addressbook-config.c:327
msgid "cards"
-msgstr "schede"
+msgstr "tessere"
#: ../sflphone-client-gnome/src/config/addressbook-config.c:333
msgid "_Display contact photo if available"
@@ -559,244 +731,238 @@ msgid "Select which Evolution address books to use"
msgstr "Selezionare la rubrica di Evolution da usare"
#: ../sflphone-client-gnome/src/config/addressbook-config.c:404
-#: ../sflphone-client-gnome/src/config/audioconf.c:578
+#: ../sflphone-client-gnome/src/config/audioconf.c:577
msgid "Name"
msgstr "Nome"
-#: ../sflphone-client-gnome/src/config/assistant.c:69
+#: ../sflphone-client-gnome/src/config/assistant.c:75
#, c-format
msgid "This assistant is now finished."
msgstr "La procedura guidata è terminata."
-#: ../sflphone-client-gnome/src/config/assistant.c:71
+#: ../sflphone-client-gnome/src/config/assistant.c:77
msgid ""
"You can at any time check your registration state or modify your accounts "
"parameters in the Options/Accounts window."
-msgstr "In qualsiasi momento puoi controllare lo stato della tua registrazione o modificare i tuoi parametri"
-"di acccount nella finestra Opzioni/Accounts."
+msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:74
+#: ../sflphone-client-gnome/src/config/assistant.c:80
msgid "Alias"
-msgstr "Alias"
+msgstr "Pseudonimo"
-#: ../sflphone-client-gnome/src/config/assistant.c:78
+#: ../sflphone-client-gnome/src/config/assistant.c:84
msgid "Server"
msgstr "Server"
-#: ../sflphone-client-gnome/src/config/assistant.c:82
+#: ../sflphone-client-gnome/src/config/assistant.c:88
msgid "Username"
msgstr "Nome utente"
-#: ../sflphone-client-gnome/src/config/assistant.c:86
+#: ../sflphone-client-gnome/src/config/assistant.c:92
msgid "Security: "
-msgstr "Sicurezza: "
+msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:88
+#: ../sflphone-client-gnome/src/config/assistant.c:94
msgid "SRTP/ZRTP draft-zimmermann"
-msgstr "SRTP/ZRTP draft-zimmermann"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:90
-#: ../sflphone-client-gnome/src/config/assistant.c:182
+#: ../sflphone-client-gnome/src/config/assistant.c:96
msgid "None"
-msgstr "Nessuno"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:210
+#: ../sflphone-client-gnome/src/config/assistant.c:229
msgid "SFLphone account creation wizard"
-msgstr "Procedura guidata per la creazione dell'account SFLphone"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:236
+#: ../sflphone-client-gnome/src/config/assistant.c:255
msgid "Welcome to the Account creation wizard of SFLphone!"
msgstr ""
"Benvenuti alla procedura guidata per la creazione di un account SFLphone"
-#: ../sflphone-client-gnome/src/config/assistant.c:237
+#: ../sflphone-client-gnome/src/config/assistant.c:256
msgid "This installation wizard will help you configure an account."
-msgstr "Questa procedura di installazione permetterà di configurare un account."
+msgstr "Questa procedura permetterà di configurare un account."
-#: ../sflphone-client-gnome/src/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "VoIP Protocols"
msgstr "Protocolli VoIP"
-#: ../sflphone-client-gnome/src/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "Select an account type"
msgstr "Selezionare un tipo di account"
-#: ../sflphone-client-gnome/src/config/assistant.c:253
+#: ../sflphone-client-gnome/src/config/assistant.c:272
msgid "SIP (Session Initiation Protocol)"
msgstr "SIP (Session Initiation Protocol)"
-#: ../sflphone-client-gnome/src/config/assistant.c:255
+#: ../sflphone-client-gnome/src/config/assistant.c:274
msgid "IAX2 (InterAsterix Exchange)"
msgstr "IAX2 (InterAsterix Exchange)"
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Account"
msgstr "Account"
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Please select one of the following options"
msgstr "Scegliere una delle seguenti opzioni"
-#: ../sflphone-client-gnome/src/config/assistant.c:271
+#: ../sflphone-client-gnome/src/config/assistant.c:290
msgid "Create a free SIP/IAX2 account on sflphone.org"
msgstr "Creare un account SIP/IAX2 gratuito su sflphone.org"
-#: ../sflphone-client-gnome/src/config/assistant.c:273
+#: ../sflphone-client-gnome/src/config/assistant.c:292
msgid "Register an existing SIP or IAX2 account"
msgstr "Registrare un account SIP o IAX2 esistente"
-#: ../sflphone-client-gnome/src/config/assistant.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:306
msgid "SIP account settings"
msgstr "Impostazioni account SIP"
-#: ../sflphone-client-gnome/src/config/assistant.c:286
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "Please fill the following information"
-msgstr "Per favore compila le seguenti informazioni"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:352
-#: ../sflphone-client-gnome/src/config/assistant.c:381
+#: ../sflphone-client-gnome/src/config/assistant.c:376
+#: ../sflphone-client-gnome/src/config/assistant.c:405
msgid "Secure communications with _ZRTP"
-msgstr "Comunicazioni sicure con _ZRTP"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "Optional email address"
msgstr "Indirizzo email opzionale"
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "This email address will be used to send your voicemail messages."
msgstr ""
-"L'indirizzo email sarà usato per l'invio dei messaggi della segreteria "
+"L'indirizzo email sarà usato per l'invio dei messaggi della segreteria "
"telefonica."
-#: ../sflphone-client-gnome/src/config/assistant.c:373
+#: ../sflphone-client-gnome/src/config/assistant.c:397
msgid "_Email address"
msgstr "Indirizzo _email"
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "IAX2 account settings"
msgstr "Impostazioni account IAX2"
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "Network Address Translation (NAT)"
msgstr "Network Address Translation (NAT)"
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "You should probably enable this if you are behind a firewall."
msgstr "Dovrebbe essere abilitato se ci si trova dietro ad un firewall."
-#: ../sflphone-client-gnome/src/config/assistant.c:476
+#: ../sflphone-client-gnome/src/config/assistant.c:505
msgid "E_nable STUN"
msgstr "Abilita STUN"
-#: ../sflphone-client-gnome/src/config/assistant.c:483
+#: ../sflphone-client-gnome/src/config/assistant.c:512
msgid "_STUN server"
msgstr "Server STUN"
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Account Registration"
msgstr "Registrazione account"
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Congratulations!"
msgstr "Congratulazioni!"
-#: ../sflphone-client-gnome/src/config/audioconf.c:583
+#: ../sflphone-client-gnome/src/config/audioconf.c:582
msgid "Frequency"
msgstr "Frequenza"
-#: ../sflphone-client-gnome/src/config/audioconf.c:588
+#: ../sflphone-client-gnome/src/config/audioconf.c:587
msgid "Bitrate"
msgstr "Bitrate"
-#: ../sflphone-client-gnome/src/config/audioconf.c:593
+#: ../sflphone-client-gnome/src/config/audioconf.c:592
msgid "Bandwidth"
msgstr "Banda"
-#: ../sflphone-client-gnome/src/config/audioconf.c:673
+#: ../sflphone-client-gnome/src/config/audioconf.c:670
msgid "ALSA plugin"
msgstr "Plugin ALSA"
-#: ../sflphone-client-gnome/src/config/audioconf.c:695
+#: ../sflphone-client-gnome/src/config/audioconf.c:692
msgid "Output"
msgstr "Uscita"
-#: ../sflphone-client-gnome/src/config/audioconf.c:717
+#: ../sflphone-client-gnome/src/config/audioconf.c:714
msgid "Input"
msgstr "Ingresso"
-#: ../sflphone-client-gnome/src/config/audioconf.c:752
+#: ../sflphone-client-gnome/src/config/audioconf.c:749
msgid "_Voice Activity Detection"
-msgstr "Rilevazione dell'attività _Voce"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:762
+#: ../sflphone-client-gnome/src/config/audioconf.c:759
msgid "_Noise Reduction (Narrow-Band Companding)"
-msgstr "Riduzione del rumore (Narrow-Band Companding)"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:798
+#: ../sflphone-client-gnome/src/config/audioconf.c:800
msgid "Sound Manager"
-msgstr "Gestore del suono"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/audioconf.c:807
+#: ../sflphone-client-gnome/src/config/audioconf.c:809
msgid "_Pulseaudio"
msgstr "_Pulseaudio"
-#: ../sflphone-client-gnome/src/config/audioconf.c:811
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
msgid "_ALSA"
msgstr "_ALSA"
-#: ../sflphone-client-gnome/src/config/audioconf.c:816
-msgid "_Mute other applications during a call"
-msgstr "Spegni l'audio delle altre applicazioni durante una chiamata"
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:823
+#: ../sflphone-client-gnome/src/config/audioconf.c:819
msgid "ALSA settings"
msgstr "Impostazioni ALSA"
-#: ../sflphone-client-gnome/src/config/audioconf.c:840
+#: ../sflphone-client-gnome/src/config/audioconf.c:836
msgid "Codecs"
msgstr "Codec"
-#: ../sflphone-client-gnome/src/config/audioconf.c:869
+#: ../sflphone-client-gnome/src/config/audioconf.c:865
msgid "Recordings"
msgstr "Registrazioni"
-#: ../sflphone-client-gnome/src/config/audioconf.c:873
+#: ../sflphone-client-gnome/src/config/audioconf.c:869
msgid "Destination folder"
msgstr "Cartella di destinazione"
-#: ../sflphone-client-gnome/src/config/audioconf.c:877
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
msgid "Select a folder"
msgstr "Seleziona una cartella"
-#: ../sflphone-client-gnome/src/config/audioconf.c:883
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
msgid "Ringtones"
msgstr "Suonerie"
-#: ../sflphone-client-gnome/src/config/audioconf.c:889
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
msgid "_Enable ringtones"
msgstr "Abilita suonerie"
-#: ../sflphone-client-gnome/src/config/audioconf.c:895
+#: ../sflphone-client-gnome/src/config/audioconf.c:891
msgid "Choose a ringtone"
msgstr "Selezionare una suoneria"
-#: ../sflphone-client-gnome/src/config/audioconf.c:901
+#: ../sflphone-client-gnome/src/config/audioconf.c:897
msgid "Audio Files"
msgstr "File audio"
#: ../sflphone-client-gnome/src/config/hooks-config.c:130
msgid "URL Argument"
-msgstr "Stringa URL"
+msgstr ""
#: ../sflphone-client-gnome/src/config/hooks-config.c:135
msgid "Custom commands on incoming calls with URL"
-msgstr "Comandi custom sulle chiamate in ingresso con URL"
+msgstr ""
#: ../sflphone-client-gnome/src/config/hooks-config.c:138
#, c-format
msgid "%s will be replaced with the passed URL."
-msgstr "%s saranno rimpiazzati dall'URL fornito."
+msgstr ""
#: ../sflphone-client-gnome/src/config/hooks-config.c:141
msgid "Trigger on specific _SIP header"
@@ -818,101 +984,78 @@ msgstr "Riscrittura numero telefonico"
msgid "_Prefix dialed numbers with"
msgstr "Prefisso da aggiungere ai numeri da chiamare"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:195
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
msgid ""
"This profile is used when you want to reach a remote peer simply by typing a "
"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
"also be used if no account can be matched to an incoming or outgoing call."
msgstr ""
-"Questo profilo è utilizzato quando vuoi raggiungere un nodo remoto semplicemente digitando un "
-"URI sip tipo <b>sip:remotepeer</b>. Le configurazione che definisci qui saranno "
-"usate anche se nessun account corrisponde ad una chiamata in ingresso o in uscita."
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:274
-msgid "SIP Port"
-msgstr "SIP Port"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:281
-msgid "UDP Transport"
-msgstr "Trasporto UDP"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:319
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
msgid "Desktop Notifications"
msgstr "Notifiche"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:323
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
msgid "_Enable notifications"
msgstr "Abilita notifiche"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:329
-msgid "Enable voicemail _notifications"
-msgstr "Abilita notifiche messaggi vocali"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:341
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
msgid "System Tray Icon"
msgstr "Icona per area di notifica"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
msgid "_Popup main window on incoming call"
msgstr "Mostra la finestra principale all'arrivo delle chiamate"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:349
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
msgid "Ne_ver popup main window"
msgstr "Non mostrare mai la finestra principale"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:353
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
msgid "Hide SFLphone window on _startup"
msgstr "Nascondi la finestra di SFLphone all'avvio"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:359
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
msgid "Calls History"
msgstr "Cronologia chiamate"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:362
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
msgid "_Keep my history for at least"
msgstr "Mantieni la cronologia per almeno"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:373
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
msgid "days"
msgstr "giorni"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:377
-msgid "Configuration File"
-msgstr "File di configurazione"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:379
-msgid "Store SIP credentials as MD5 hash"
-msgstr "Memorizza le credenziali SIP in MD5"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:423
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
msgid "Preferences"
msgstr "Preferenze"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:448
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
msgid "Audio"
msgstr "Audio"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
msgid "Address Book"
msgstr "Rubrica"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:458
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
msgid "Hooks"
-msgstr "Agganci"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:468
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
msgid "Direct IP calls"
-msgstr "Chiamate IP dirette"
+msgstr ""
#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:38
msgid "Advanced options for TLS"
-msgstr "Opzioni avanzate per TLS"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:55
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:56
msgid "TLS transport"
-msgstr "Trasporto TLS"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:59
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:60
msgid ""
"TLS transport can be used along with UDP for those calls that would\n"
"require secure sip transactions (aka SIPS). You can configure a different\n"
@@ -920,117 +1063,125 @@ msgid ""
"dedicated\n"
"port, different one from each other\n"
msgstr ""
-"Il trasporto TLS può essere utilizzato con UDP per le chiamate che\n"
-"richiedono transazioni sip sicure (aka SIPS). Puoi configurare un trasporto\n"
-"TLS diverso per ognia account. Tuttavia, ognuino di essi girerà su una "
-"porta dedicata, differente dalle altre\n"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:100
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
msgid "Certificate of Authority list"
-msgstr "Lista delle Autorità di certificazione"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:104
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
msgid "Choose a CA list file (optional)"
-msgstr "Scelgi una lista di CA (opzionale)"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:115
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
msgid "Public endpoint certificate file"
-msgstr "File di certificato dell'endpoint pubblico"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:119
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
msgid "Choose a public endpoint certificate (optional)"
-msgstr "Scegli un certificato dell'endpoint pubblico (opzionale)"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:134
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
msgid "Choose a private key file (optional)"
-msgstr "Scegli un file con la chiave privata (opzionale)"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:145
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
msgid "Password for the private key"
-msgstr "Password per la chiave privata"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:168
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
msgid "TLS protocol method"
-msgstr "Metodo del protocollo TLS"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:202
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
msgid "TLS cipher list"
-msgstr "Cifratura TLS"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:211
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
msgid "Server name instance for outgoing TLS connection"
-msgstr "Nome dell'istanza serfer pre connessioni TLS in uscita"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:219
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
msgid "Negotiation timeout (sec:msec)"
-msgstr "Timeout di negoziazione (sec:msec)"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:236
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
msgid "Verify incoming certificates, as a server"
-msgstr "Verifica certificati in ingresso, come server"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:242
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
msgid "Verify certificates from answer, as a client"
-msgstr "Verifica certificati nella risposta, come client"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:248
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
msgid "Require certificate for incoming tls connections"
-msgstr "Richiede un certificato per le connessioni tls in ingresso"
+msgstr ""
#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:49
msgid "ZRTP Options"
-msgstr "Opziobi ZRTP"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:68
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:69
msgid "Send Hello Hash in S_DP"
-msgstr "Invia Hello Hash in S_DP"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:74
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:75
msgid "Ask User to Confirm SAS"
-msgstr "Chiedi all'utente di confermare SAS"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:80
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:81
msgid "_Warn if ZRTP not supported"
-msgstr "Notifica se ZRTP non è supportato"
+msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:86
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:87
msgid "Display SAS once for hold events"
msgstr ""
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:58
msgid "Search all"
msgstr "Cerca tra tutte le chiamate"
-#: ../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
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:59
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:72
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:84
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:96
msgid "Click here to change the search type"
msgstr "Fare clic qui per cambiare il tipo di ricerca"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:71
msgid "Search by missed call"
msgstr "Cerca tra le chiamate perse"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:83
msgid "Search by incoming call"
msgstr "Cerca tra le chiamate ricevute"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:95
msgid "Search by outgoing call"
msgstr "Cerca tra le chiamate effettuate"
-#~ msgid "(C) 2009 Savoir-faire Linux"
-#~ msgstr "(C) 2009 Savoir-faire Linux"
+#~ msgid "IP call - %s"
+#~ msgstr "Chiamata IP diretta - %s"
+
+#~ msgid "Codec"
+#~ msgstr "Codec"
-#~ msgid "Jérémy Quentin"
-#~ msgstr "Jérémy Quentin"
+#~ msgid "Network"
+#~ msgstr "Rete"
-#~ msgid "Address book"
-#~ msgstr "Rubrica"
+#~ msgid "_Mute other applications during a call"
+#~ msgstr "Spegni l'audio delle altre applicazioni durante una chiamata"
-#~ msgid "Call history"
-#~ msgstr "Cronologia chiamate"
+#~ msgid "SIP Port"
+#~ msgstr "SIP Port"
+
+#~ msgid "Enable voicemail _notifications"
+#~ msgstr "Abilita notifiche messaggi vocali"
+
+#~ msgid "(C) 2009 Savoir-faire Linux"
+#~ msgstr "(C) 2009 Savoir-faire Linux"
+
+#~ msgid "Jérémy Quentin"
+#~ msgstr "Jérémy Quentin"
#~ msgid "Hang up"
#~ msgstr "Chiudi"
@@ -1077,26 +1228,8 @@ msgstr "Cerca tra le chiamate effettuate"
#~ msgid "Enable notifications"
#~ msgstr "Attiva le notifiche"
-#~ msgid "History"
-#~ msgstr "Cronologia"
-
-#~ msgid "_Call"
-#~ msgstr "_Chiama"
-
-#~ msgid "_Help"
-#~ msgstr "_Aiuto"
-
-#~ msgid "_View"
-#~ msgstr "_Visualizza"
-
-#~ msgid "_Edit"
-#~ msgstr "_Modifica"
-
-#~ msgid "_Accounts"
-#~ msgstr "_Account"
-
#~ msgid "Port"
-#~ msgstr "Porta"
+#~ msgstr "Port"
#~ msgid "PulseAudio sound server"
#~ msgstr "Server audio PulseAudio"
@@ -1107,9 +1240,6 @@ msgstr "Cerca tra le chiamate effettuate"
#~ msgid "You have an incoming call from"
#~ msgstr "Chiamata in arrivo da"
-#~ msgid "Transfer"
-#~ msgstr "Inoltra"
-
#~ msgid "Hold on"
#~ msgstr "Attesa"
@@ -1122,15 +1252,6 @@ msgstr "Cerca tra le chiamate effettuate"
#~ msgid "Command to run"
#~ msgstr "Comando da eseguire"
-#~ msgid "Display volume controls"
-#~ msgstr "Mostra i controlli del volume"
-
-#~ msgid "Display dialpad"
-#~ msgstr "Mostra tastiera"
-
-#~ msgid "Clear _history"
-#~ msgstr "Cancella la cronologia"
-
#~ msgid "_Enable this account"
#~ msgstr "Abilita questo account"
@@ -1143,9 +1264,6 @@ msgstr "Cerca tra le chiamate effettuate"
#~ msgid "Stun Server"
#~ msgstr "Server STUN"
-#~ msgid "Transfer to : "
-#~ msgstr "Inoltra a: "
-
#~ msgid "Address book loading..."
#~ msgstr "Caricamento rubrica..."
@@ -1156,14 +1274,11 @@ msgstr "Cerca tra le chiamate effettuate"
#~ msgstr "Abilita STUN"
#~ msgid "Format : name.server:port"
-#~ msgstr "Formato: nome.server:porta"
+#~ msgstr "Formato: nome.del.server:porta"
#~ msgid "Incoming call"
#~ msgstr "Chiamata in arrivo"
-#~ msgid "Remove the selected account"
-#~ msgstr "Elimina l'account selezionato"
-
#~ msgid "Display photo if available"
#~ msgstr "Mostrare foto se disponibile"
@@ -1179,9 +1294,6 @@ msgstr "Cerca tra le chiamate effettuate"
#~ msgid "Show main window"
#~ msgstr "Mostra finestra principale"
-#~ msgid "Clear history"
-#~ msgstr "Cancella la cronologia"
-
#~ msgid "Prefix dialed numbers with"
#~ msgstr "Prefisso da aggiungere al numero da chiamare"
@@ -1192,27 +1304,27 @@ msgstr "Cerca tra le chiamate effettuate"
#~ msgstr "Scadenza registrazione"
#~ msgid ""
-#~ "Pressing \"apply\" will restart the network layer. Otherwise, SFLPhone would "
-#~ "have to be restarted."
+#~ "Pressing \"apply\" will restart the network layer. Otherwise, SFLPhone "
+#~ "would have to be restarted."
#~ msgstr ""
-#~ "Premendo il tasto \"Applica\" il modulo di rete verrà riavviato. In "
+#~ "Premendo il tasto \"Applica\" il modulo di rete verrà riavviato. In "
#~ "alternativa occorrerebbe riavviare SFLphone."
#~ msgid "Creation of account has failed for the reason"
-#~ msgstr "La creazione dell'account è fallita per il seguente motivo"
+#~ msgstr "La creazione dell'accound è fallita per il seguente motivo"
#~ msgid "Account creation wizard"
#~ msgstr "Procedura guidata creazione account"
#~ msgctxt "NAME OF TRANSLATORS"
#~ msgid "Your names"
-#~ msgstr "I tuoi nomi"
+#~ msgstr ""
#~ ",Launchpad Contributions:,Maurizio Porrato,Maxime Chambreuil, ,Launchpad "
#~ "Contributions:,Maurizio Porrato,Maxime Chambreuil, ,Launchpad "
#~ "Contributions:,Maurizio Porrato,Maxime Chambreuil"
#~ msgctxt "EMAIL OF TRANSLATORS"
#~ msgid "Your emails"
-#~ msgstr "I tuoi indirizzi email"
-#~ ",,,maxime.chambreuil@gmail.com,,,,maxime.chambreuil@gmail.com,,,,maxime.chamb"
-#~ "reuil@gmail.com"
+#~ msgstr ""
+#~ ",,,maxime.chambreuil@gmail.com,,,,maxime.chambreuil@gmail.com,,,,maxime."
+#~ "chambreuil@gmail.com"
diff --git a/sflphone-client-gnome/po/pt_BR/pt_BR.po b/sflphone-client-gnome/po/pt_BR/pt_BR.po
index 34f94f3dfd32e74edecc15ae1b5f3a56c15124f1..0a5429e6c0323561c75343ee5b5b977440bb1ae2 100644
--- a/sflphone-client-gnome/po/pt_BR/pt_BR.po
+++ b/sflphone-client-gnome/po/pt_BR/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: sflphone\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-14 11:18-0400\n"
-"PO-Revision-Date: 2009-10-15 18:00+0000\n"
+"POT-Creation-Date: 2009-12-03 10:22-0500\n"
+"PO-Revision-Date: 2009-10-26 20:46+0000\n"
"Last-Translator: kalib <kalibslack@gmail.com>\n"
"Language-Team: Brazilian Portuguese <pt_BR@li.org>\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"
-"X-Launchpad-Export-Date: 2009-10-26 15:48+0000\n"
+"X-Launchpad-Export-Date: 2009-12-03 15:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: ../sflphone-client-gnome/src/accountlist.c:175
@@ -60,25 +60,15 @@ msgstr "Servidor stun inválido"
msgid "Invalid"
msgstr "Inválido"
-#: ../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 mensagem de voz"
-msgstr[1] "%d mensagens de voz"
-
-#: ../sflphone-client-gnome/src/actions.c:83
-#: ../sflphone-client-gnome/src/actions.c:919
-#: ../sflphone-client-gnome/src/actions.c:926
+#: ../sflphone-client-gnome/src/actions.c:98
msgid "Using account"
msgstr "Utilizando conta"
-#: ../sflphone-client-gnome/src/actions.c:89
+#: ../sflphone-client-gnome/src/actions.c:104
msgid "No registered accounts"
msgstr "Sem contas registradas"
-#: ../sflphone-client-gnome/src/actions.c:268
+#: ../sflphone-client-gnome/src/actions.c:285
msgid ""
"Unable to connect to the SFLphone server.\n"
"Make sure the daemon is running."
@@ -86,22 +76,18 @@ msgstr ""
"Incapaz de conectar ao servidor SFLphone.\n"
"Tenha certeza de que o daemon está rodando."
-#: ../sflphone-client-gnome/src/actions.c:913
-#, c-format
-msgid "IP call - %s"
-msgstr "Ligação IP - %s"
-
-#: ../sflphone-client-gnome/src/actions.c:922
-msgid "Codec"
-msgstr "Codec"
+#: ../sflphone-client-gnome/src/actions.c:589
+#: ../sflphone-client-gnome/src/actions.c:911
+msgid "Direct SIP call"
+msgstr "Ligações IP diretas"
-#: ../sflphone-client-gnome/src/actions.c:1119
+#: ../sflphone-client-gnome/src/actions.c:1103
#, 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> )"
+"</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>Erro: Não foram encontrados codecs de áudio.\n"
"\n"
@@ -150,31 +136,31 @@ msgstr "Existem ligações em progresso"
msgid "Do you still want to quit?"
msgstr "Você ainda deseja sair?"
-#: ../sflphone-client-gnome/src/mainwindow.c:299
+#: ../sflphone-client-gnome/src/mainwindow.c:298
msgid "SFLphone Error"
msgstr "Erro no SFLphone"
-#: ../sflphone-client-gnome/src/mainwindow.c:391
+#: ../sflphone-client-gnome/src/mainwindow.c:392
#, c-format
msgid "ZRTP is not supported by peer %s\n"
msgstr "ZRTP não é suportado pelo peer %s\n"
-#: ../sflphone-client-gnome/src/mainwindow.c:392
+#: ../sflphone-client-gnome/src/mainwindow.c:393
msgid "Secure Communication Unavailable"
msgstr "Comunicação Segura Indisponível"
-#: ../sflphone-client-gnome/src/mainwindow.c:393
-#: ../sflphone-client-gnome/src/mainwindow.c:415
+#: ../sflphone-client-gnome/src/mainwindow.c:394
+#: ../sflphone-client-gnome/src/mainwindow.c:416
msgid "Continue"
msgstr "Continuar"
-#: ../sflphone-client-gnome/src/mainwindow.c:394
-#: ../sflphone-client-gnome/src/mainwindow.c:416
-#: ../sflphone-client-gnome/src/mainwindow.c:430
+#: ../sflphone-client-gnome/src/mainwindow.c:395
+#: ../sflphone-client-gnome/src/mainwindow.c:417
+#: ../sflphone-client-gnome/src/mainwindow.c:431
msgid "Stop Call"
msgstr "Finalizar Chamada"
-#: ../sflphone-client-gnome/src/mainwindow.c:413
+#: ../sflphone-client-gnome/src/mainwindow.c:414
#, c-format
msgid ""
"A %s error forced the call with %s to fall under unencrypted mode.\n"
@@ -183,11 +169,11 @@ msgstr ""
"Um erro %s forçou a ligação com %s a mudar para um modo não encriptado.\n"
"Motivo exato: %s\n"
-#: ../sflphone-client-gnome/src/mainwindow.c:414
+#: ../sflphone-client-gnome/src/mainwindow.c:415
msgid "ZRTP negotiation failed"
msgstr "Negociação ZRTP falhou"
-#: ../sflphone-client-gnome/src/mainwindow.c:427
+#: ../sflphone-client-gnome/src/mainwindow.c:428
#, c-format
msgid ""
"%s wants to stop using secure communication. Confirm will resume "
@@ -196,11 +182,11 @@ msgstr ""
"%s deseja finalizar a utilização de comunicação segura. A confirmação irá "
"retomar sem SRTP.\n"
-#: ../sflphone-client-gnome/src/mainwindow.c:428
+#: ../sflphone-client-gnome/src/mainwindow.c:429
msgid "Confirm Go Clear"
msgstr "Confirmar Vá Limpar"
-#: ../sflphone-client-gnome/src/mainwindow.c:429
+#: ../sflphone-client-gnome/src/mainwindow.c:430
msgid "Confirm"
msgstr "Confirmar"
@@ -215,6 +201,13 @@ msgstr "%s conta : %s"
msgid "<i>From</i> %s"
msgstr "<i>De</i> %s"
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+#, c-format
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] "%d mensagem de voz"
+msgstr[1] "%d mensagens de voz"
+
#: ../sflphone-client-gnome/src/sflnotify.c:111
#, c-format
msgid "Calling with %s account <i>%s</i>"
@@ -264,15 +257,15 @@ msgstr "Volume dos auto-falantes"
msgid "Mic volume"
msgstr "Volume do microfone"
-#: ../sflphone-client-gnome/src/statusicon.c:91
+#: ../sflphone-client-gnome/src/statusicon.c:96
msgid "_Show main window"
msgstr "_Apresentar janela principal"
-#: ../sflphone-client-gnome/src/statusicon.c:126
+#: ../sflphone-client-gnome/src/statusicon.c:131
msgid "SFLphone"
msgstr "SFLphone"
-#: ../sflphone-client-gnome/src/statusicon.c:127
+#: ../sflphone-client-gnome/src/statusicon.c:132
#, c-format
msgid "%i account configured"
msgid_plural "%i accounts configured"
@@ -280,202 +273,397 @@ msgstr[0] "%i conta configurada"
msgstr[1] "%i contas configuradas"
#: ../sflphone-client-gnome/src/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:750
+#: ../sflphone-client-gnome/src/uimanager.c:693
+#: ../sflphone-client-gnome/src/uimanager.c:727
msgid "Voicemail"
msgstr "Correio de voz"
-#: ../sflphone-client-gnome/src/uimanager.c:403
+#: ../sflphone-client-gnome/src/uimanager.c:117
+msgid "No address book selected"
+msgstr "Catálogo de endereços"
+
+#: ../sflphone-client-gnome/src/uimanager.c:137
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "Address book"
+msgstr "Catálogo de endereços"
+
+#: ../sflphone-client-gnome/src/uimanager.c:279
+msgid "Voicemail (%i)"
+msgstr "Correio de voz (%i)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:342
msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
msgstr "SFLphone é um cliente VoIP compatível com os protocolos SIP e IAX2."
-#: ../sflphone-client-gnome/src/uimanager.c:406
+#: ../sflphone-client-gnome/src/uimanager.c:345
msgid "About SFLphone"
msgstr "Sobre o SFLphone"
-#: ../sflphone-client-gnome/src/uimanager.c:1028
+#: ../sflphone-client-gnome/src/uimanager.c:719
+msgid "Call"
+msgstr "_Chamar"
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:1184
+msgid "_New call"
+msgstr "_Nova ligação"
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+msgid "Place a new call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:979
msgid "_Pick up"
msgstr "_Atender"
-#: ../sflphone-client-gnome/src/uimanager.c:1040
-#: ../sflphone-client-gnome/src/uimanager.c:1081
+#: ../sflphone-client-gnome/src/uimanager.c:721
+msgid "Answer the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:991
+#: ../sflphone-client-gnome/src/uimanager.c:1032
msgid "_Hang up"
msgstr "_Desligar"
-#: ../sflphone-client-gnome/src/uimanager.c:1052
-#: ../sflphone-client-gnome/src/uimanager.c:1093
-msgid "On _Hold"
+#: ../sflphone-client-gnome/src/uimanager.c:722
+msgid "Finish the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "O_n hold"
msgstr "Em _Espera"
-#: ../sflphone-client-gnome/src/uimanager.c:1064
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "Place the call on hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "O_ff hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "Place the call off hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:725
+#: ../sflphone-client-gnome/src/uimanager.c:1015
msgid "_Record"
msgstr "_Gravar"
-#: ../sflphone-client-gnome/src/uimanager.c:1154
+#: ../sflphone-client-gnome/src/uimanager.c:725
+msgid "Record the current conversation"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Configuration _Assistant"
+msgstr "Arquivo de Configuração"
+
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Run the configuration assistant"
+msgstr "Erro de configuração no stun"
+
+#: ../sflphone-client-gnome/src/uimanager.c:727
+msgid "Call your voicemail"
+msgstr "%d mensagem de voz"
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "_Close"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "Minimize to system tray"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "_Quit"
+msgstr "_Editar"
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "Quit the program"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:732
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "_Copy"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "Copy the selection"
+msgstr "Remover a conta selecionada"
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "_Paste"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "Paste the clipboard"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear _history"
+msgstr "Limpar _histórico"
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear the call history"
+msgstr "Limpar histórico"
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "_Accounts"
+msgstr "_Contas"
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "Edit your accounts"
+msgstr "Conta atual"
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "_Preferences"
+msgstr "Preferências"
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "Change your preferences"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:740
+msgid "_View"
+msgstr "_Exibir"
+
+#: ../sflphone-client-gnome/src/uimanager.c:743
+msgid "_Help"
+msgstr "_Ajuda"
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Contents"
+msgstr "Continuar"
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Open the manual"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:745
+msgid "About this application"
+msgstr "Autenticação"
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "_Transfer"
+msgstr "Transferir"
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "Transfer the call"
+msgstr "Transfirir para: "
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "_Show toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "Show the toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "_Dialpad"
+msgstr "Desabilitado"
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "Show the dialpad"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "_Volume controls"
+msgstr "_Controle de Volumes"
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "Show the volume controls"
+msgstr "Exibir controles de volume"
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "_History"
+msgstr "Histórico"
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "Calls history"
+msgstr "Histórico de chamadas"
+
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "_Address book"
+msgstr "Catálogo de endereços"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1003
+#: ../sflphone-client-gnome/src/uimanager.c:1044
+msgid "On _Hold"
+msgstr "Em _Espera"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1107
msgid "_Call back"
msgstr "_Ligar de volta"
-#: ../sflphone-client-gnome/src/uimanager.c:1226
-msgid "_New call"
-msgstr "_Nova ligação"
-
-#: ../sflphone-client-gnome/src/uimanager.c:1300
+#: ../sflphone-client-gnome/src/uimanager.c:1258
msgid "Edit phone number"
msgstr "Editar número de telefone"
-#: ../sflphone-client-gnome/src/uimanager.c:1311
+#: ../sflphone-client-gnome/src/uimanager.c:1269
msgid "Edit the phone number before making a call"
msgstr "Edite o número de telefone antes de fazer uma ligação"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:164
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
msgid "Account Parameters"
msgstr "Parâmetros de conta"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:173
-#: ../sflphone-client-gnome/src/config/assistant.c:294
-#: ../sflphone-client-gnome/src/config/assistant.c:402
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
+#: ../sflphone-client-gnome/src/config/assistant.c:314
+#: ../sflphone-client-gnome/src/config/assistant.c:427
msgid "_Alias"
msgstr "_Apelido"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:181
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
msgid "_Protocol"
msgstr "_Protocolo"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:199
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
msgid "Unknown"
msgstr "Desconhecido"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:209
-#: ../sflphone-client-gnome/src/config/assistant.c:302
-#: ../sflphone-client-gnome/src/config/assistant.c:410
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
+#: ../sflphone-client-gnome/src/config/assistant.c:322
+#: ../sflphone-client-gnome/src/config/assistant.c:435
msgid "_Host name"
msgstr "_Nome do host"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:217
-#: ../sflphone-client-gnome/src/config/assistant.c:310
-#: ../sflphone-client-gnome/src/config/assistant.c:418
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
+#: ../sflphone-client-gnome/src/config/assistant.c:330
+#: ../sflphone-client-gnome/src/config/assistant.c:443
msgid "_User name"
msgstr "_Nome do usuário"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:234
-#: ../sflphone-client-gnome/src/config/assistant.c:326
-#: ../sflphone-client-gnome/src/config/assistant.c:433
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:346
+#: ../sflphone-client-gnome/src/config/assistant.c:458
msgid "_Password"
msgstr "_Senha"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:254
-#: ../sflphone-client-gnome/src/config/assistant.c:344
-#: ../sflphone-client-gnome/src/config/assistant.c:449
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:363
+#: ../sflphone-client-gnome/src/config/assistant.c:473
+msgid "Show password"
+msgstr "Senha"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:368
+#: ../sflphone-client-gnome/src/config/assistant.c:478
msgid "_Voicemail number"
msgstr "_Senha da caixa postal de voz"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:340
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
msgid "Authentication"
msgstr "Autenticação"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:341
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
msgid "Secret"
msgstr "Segredo"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:466
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
msgid "Credential"
msgstr "Credencial"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:501
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
msgid "Authentication name"
msgstr "Nome de autenticação"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:512
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
msgid "Password"
msgstr "Senha"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:535
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:909
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:201
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
msgid "Security"
msgstr "Segurança"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:547
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:213
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
msgid "Use TLS transport (sips)"
msgstr "Use transporte TLS (sips)"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:552
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:218
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
msgid "SRTP key exchange"
msgstr "Troca de chave SRTP"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:558
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
msgid "Disabled"
msgstr "Desabilitado"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
msgid "Registration"
msgstr "Registro"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:679
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
msgid "Registration expire"
msgstr "Registro expira"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
msgid "_Comply with RFC 3263"
msgstr "_De acordo com RFC 3263"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
-msgid "Network"
-msgstr "Rede"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
+msgid "Network Interface"
+msgstr "A rede está inacessível"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:707
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
msgid "Local address"
msgstr "Endereço local"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:744
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
msgid "Local port"
msgstr "Porta local"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:752
-msgid "Set published address and port:"
-msgstr "Indique endereço e portas publicadas"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
+msgid "Published address"
+msgstr "Endereço publicado"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:756
-msgid "Using STUN "
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+msgid "Using STUN"
msgstr "Utilizando STUN "
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:761
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
+msgid "STUN server URL"
+msgstr "URL do servidor STUN"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
msgid "Same as local parameters"
msgstr "Igual aos parâmetros locais"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:764
-msgid "Manually"
-msgstr "Manualmente"
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:769
-msgid "Published address"
-msgstr "Endereço publicado"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
+msgid "Set published address and port:"
+msgstr "Indique endereço e portas publicadas"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:777
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
msgid "Published port"
msgstr "Porta publicada"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:785
-msgid "STUN server URL"
-msgstr "URL do servidor STUN"
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
msgid "Account settings"
msgstr "Configurações da conta"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
msgid "Basic"
msgstr "Básico"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:904
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
msgid "Advanced"
msgstr "Avançado"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:169
-msgid "Server returned \""
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:164
+msgid "Server returned \"%s\" (%d)"
msgstr "Servidor retornou \""
#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
@@ -494,32 +682,18 @@ msgstr "Contas"
msgid "Configured Accounts"
msgstr "Contas Configuradas"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:505
-msgid "There "
-msgstr "Ali "
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "is "
-msgstr "está "
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "are "
-msgstr "estão "
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
+msgid "There is %d active account"
+msgid_plural "There are %d active accounts"
+msgstr[0] " conta ativa"
+msgstr[1] " conta ativa"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:508
-msgid " active account"
-msgstr " conta ativa"
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:509
-msgid "s"
-msgstr "s"
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:514
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
msgid "You have no active account"
msgstr "Você não possui uma conta ativa"
#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:443
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
msgid "General"
msgstr "Geral"
@@ -564,16 +738,16 @@ msgid "Select which Evolution address books to use"
msgstr "Selecione qual catálogo de endereços do Evolution deseja utilizar"
#: ../sflphone-client-gnome/src/config/addressbook-config.c:404
-#: ../sflphone-client-gnome/src/config/audioconf.c:578
+#: ../sflphone-client-gnome/src/config/audioconf.c:577
msgid "Name"
msgstr "Nome"
-#: ../sflphone-client-gnome/src/config/assistant.c:69
+#: ../sflphone-client-gnome/src/config/assistant.c:75
#, c-format
msgid "This assistant is now finished."
msgstr "Este assistente está finalizado."
-#: ../sflphone-client-gnome/src/config/assistant.c:71
+#: ../sflphone-client-gnome/src/config/assistant.c:77
msgid ""
"You can at any time check your registration state or modify your accounts "
"parameters in the Options/Accounts window."
@@ -581,213 +755,208 @@ msgstr ""
"Você pode a qualquer momento checar seu estado de registro ou modificar seus "
"parâmetros de conta na janela Opções/Contas."
-#: ../sflphone-client-gnome/src/config/assistant.c:74
+#: ../sflphone-client-gnome/src/config/assistant.c:80
msgid "Alias"
msgstr "Apelido"
-#: ../sflphone-client-gnome/src/config/assistant.c:78
+#: ../sflphone-client-gnome/src/config/assistant.c:84
msgid "Server"
msgstr "Servidor"
-#: ../sflphone-client-gnome/src/config/assistant.c:82
+#: ../sflphone-client-gnome/src/config/assistant.c:88
msgid "Username"
msgstr "Nome de usuário"
-#: ../sflphone-client-gnome/src/config/assistant.c:86
+#: ../sflphone-client-gnome/src/config/assistant.c:92
msgid "Security: "
msgstr "Segurança: "
-#: ../sflphone-client-gnome/src/config/assistant.c:88
+#: ../sflphone-client-gnome/src/config/assistant.c:94
msgid "SRTP/ZRTP draft-zimmermann"
msgstr "SRTP/ZRTP rascunho-zimmermann"
-#: ../sflphone-client-gnome/src/config/assistant.c:90
-#: ../sflphone-client-gnome/src/config/assistant.c:182
+#: ../sflphone-client-gnome/src/config/assistant.c:96
msgid "None"
msgstr "Nenhum"
-#: ../sflphone-client-gnome/src/config/assistant.c:210
+#: ../sflphone-client-gnome/src/config/assistant.c:229
msgid "SFLphone account creation wizard"
msgstr "Assistente de criação de contas do SFLphone"
-#: ../sflphone-client-gnome/src/config/assistant.c:236
+#: ../sflphone-client-gnome/src/config/assistant.c:255
msgid "Welcome to the Account creation wizard of SFLphone!"
msgstr "Bem vindo ao assistente de criação de contas do SFLphone!"
-#: ../sflphone-client-gnome/src/config/assistant.c:237
+#: ../sflphone-client-gnome/src/config/assistant.c:256
msgid "This installation wizard will help you configure an account."
msgstr "Este assistente de instalação irá lhe ajudar a configurar uma conta."
-#: ../sflphone-client-gnome/src/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "VoIP Protocols"
msgstr "Protocolos VoIP"
-#: ../sflphone-client-gnome/src/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "Select an account type"
msgstr "Selecione um tipo de conta"
-#: ../sflphone-client-gnome/src/config/assistant.c:253
+#: ../sflphone-client-gnome/src/config/assistant.c:272
msgid "SIP (Session Initiation Protocol)"
msgstr "SIP (Session Initiation Protocol)"
-#: ../sflphone-client-gnome/src/config/assistant.c:255
+#: ../sflphone-client-gnome/src/config/assistant.c:274
msgid "IAX2 (InterAsterix Exchange)"
msgstr "IAX2 (InterAsterix Exchange)"
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Account"
msgstr "Conta"
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Please select one of the following options"
msgstr "Por favor, selecione uma das seguintes opções"
-#: ../sflphone-client-gnome/src/config/assistant.c:271
+#: ../sflphone-client-gnome/src/config/assistant.c:290
msgid "Create a free SIP/IAX2 account on sflphone.org"
msgstr "Criar uma conta gratuita SIP/IAX2 em sflphone.org"
-#: ../sflphone-client-gnome/src/config/assistant.c:273
+#: ../sflphone-client-gnome/src/config/assistant.c:292
msgid "Register an existing SIP or IAX2 account"
msgstr "Registrar uma conta SIP ou IAX2 existente"
-#: ../sflphone-client-gnome/src/config/assistant.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:306
msgid "SIP account settings"
msgstr "Configurações de conta SIP"
-#: ../sflphone-client-gnome/src/config/assistant.c:286
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "Please fill the following information"
msgstr "Por favor, preencha as informações a seguir"
-#: ../sflphone-client-gnome/src/config/assistant.c:352
-#: ../sflphone-client-gnome/src/config/assistant.c:381
+#: ../sflphone-client-gnome/src/config/assistant.c:376
+#: ../sflphone-client-gnome/src/config/assistant.c:405
msgid "Secure communications with _ZRTP"
msgstr "Comunicações seguras com _ZRTP"
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "Optional email address"
msgstr "Endereço de e-mail opcional"
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "This email address will be used to send your voicemail messages."
msgstr ""
"Este endereço de email será utilizado para enviar as mensagens de voz em sua "
"caixa postal."
-#: ../sflphone-client-gnome/src/config/assistant.c:373
+#: ../sflphone-client-gnome/src/config/assistant.c:397
msgid "_Email address"
msgstr "_endereço de email"
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "IAX2 account settings"
msgstr "Configurações de conta IAX2"
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "Network Address Translation (NAT)"
msgstr "Network Address Translation (NAT)"
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "You should probably enable this if you are behind a firewall."
msgstr ""
"Você provavelmente precise habilitar isto se estiver por trás de um firewall."
-#: ../sflphone-client-gnome/src/config/assistant.c:476
+#: ../sflphone-client-gnome/src/config/assistant.c:505
msgid "E_nable STUN"
msgstr "Ha_bilitar STUN"
-#: ../sflphone-client-gnome/src/config/assistant.c:483
+#: ../sflphone-client-gnome/src/config/assistant.c:512
msgid "_STUN server"
msgstr "_Servidor STUN"
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Account Registration"
msgstr "Registro de conta"
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Congratulations!"
msgstr "Parabéns!"
-#: ../sflphone-client-gnome/src/config/audioconf.c:583
+#: ../sflphone-client-gnome/src/config/audioconf.c:582
msgid "Frequency"
msgstr "Frequência"
-#: ../sflphone-client-gnome/src/config/audioconf.c:588
+#: ../sflphone-client-gnome/src/config/audioconf.c:587
msgid "Bitrate"
msgstr "Taxa de bits"
-#: ../sflphone-client-gnome/src/config/audioconf.c:593
+#: ../sflphone-client-gnome/src/config/audioconf.c:592
msgid "Bandwidth"
msgstr "Largura de banda"
-#: ../sflphone-client-gnome/src/config/audioconf.c:673
+#: ../sflphone-client-gnome/src/config/audioconf.c:670
msgid "ALSA plugin"
msgstr "Plugin ALSA"
-#: ../sflphone-client-gnome/src/config/audioconf.c:695
+#: ../sflphone-client-gnome/src/config/audioconf.c:692
msgid "Output"
msgstr "Saída"
-#: ../sflphone-client-gnome/src/config/audioconf.c:717
+#: ../sflphone-client-gnome/src/config/audioconf.c:714
msgid "Input"
msgstr "Entrada"
-#: ../sflphone-client-gnome/src/config/audioconf.c:752
+#: ../sflphone-client-gnome/src/config/audioconf.c:749
msgid "_Voice Activity Detection"
msgstr "_Detecção de atividade de voz"
-#: ../sflphone-client-gnome/src/config/audioconf.c:762
+#: ../sflphone-client-gnome/src/config/audioconf.c:759
msgid "_Noise Reduction (Narrow-Band Companding)"
msgstr "_Redução de ruído (Utilização de banda-estreita)"
-#: ../sflphone-client-gnome/src/config/audioconf.c:798
+#: ../sflphone-client-gnome/src/config/audioconf.c:800
msgid "Sound Manager"
msgstr "Gerenciador de Som"
-#: ../sflphone-client-gnome/src/config/audioconf.c:807
+#: ../sflphone-client-gnome/src/config/audioconf.c:809
msgid "_Pulseaudio"
msgstr "_Pulseaudio"
-#: ../sflphone-client-gnome/src/config/audioconf.c:811
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
msgid "_ALSA"
msgstr "_ALSA"
-#: ../sflphone-client-gnome/src/config/audioconf.c:816
-msgid "_Mute other applications during a call"
-msgstr "_Silenciar outras aplicações durante uma ligação"
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:823
+#: ../sflphone-client-gnome/src/config/audioconf.c:819
msgid "ALSA settings"
msgstr "Configurações do ALSA"
-#: ../sflphone-client-gnome/src/config/audioconf.c:840
+#: ../sflphone-client-gnome/src/config/audioconf.c:836
msgid "Codecs"
msgstr "Codecs"
-#: ../sflphone-client-gnome/src/config/audioconf.c:869
+#: ../sflphone-client-gnome/src/config/audioconf.c:865
msgid "Recordings"
msgstr "Gravações"
-#: ../sflphone-client-gnome/src/config/audioconf.c:873
+#: ../sflphone-client-gnome/src/config/audioconf.c:869
msgid "Destination folder"
msgstr "Pasta de destino"
-#: ../sflphone-client-gnome/src/config/audioconf.c:877
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
msgid "Select a folder"
msgstr "Selecione uma pasta"
-#: ../sflphone-client-gnome/src/config/audioconf.c:883
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
msgid "Ringtones"
msgstr "Ringtones"
-#: ../sflphone-client-gnome/src/config/audioconf.c:889
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
msgid "_Enable ringtones"
msgstr "_Habilitar ringtones"
-#: ../sflphone-client-gnome/src/config/audioconf.c:895
+#: ../sflphone-client-gnome/src/config/audioconf.c:891
msgid "Choose a ringtone"
msgstr "Escolha um ringtone"
-#: ../sflphone-client-gnome/src/config/audioconf.c:901
+#: ../sflphone-client-gnome/src/config/audioconf.c:897
msgid "Audio Files"
msgstr "Arquivos de Áudio"
@@ -824,7 +993,7 @@ msgstr "Reescrevendo número do telefone"
msgid "_Prefix dialed numbers with"
msgstr "_Prefixo de números discados com"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:195
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
msgid ""
"This profile is used when you want to reach a remote peer simply by typing a "
"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
@@ -835,79 +1004,59 @@ msgstr ""
"configurações que você definir aqui também serão utilizadas se nenhuma conta "
"puder ser combinada a uma chamada de entrada ou de saída."
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:274
-msgid "SIP Port"
-msgstr "Porta SIP"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:281
-msgid "UDP Transport"
-msgstr "Transporte UDP"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:319
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
msgid "Desktop Notifications"
msgstr "Notificações de Desktop"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:323
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
msgid "_Enable notifications"
msgstr "_Habilitar notificações"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:329
-msgid "Enable voicemail _notifications"
-msgstr "Habilitar _notificações de correio de voz"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:341
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
msgid "System Tray Icon"
msgstr "Ícone da bandeja do sistema"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
msgid "_Popup main window on incoming call"
msgstr "_Popup na janela principal ao receber ligação"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:349
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
msgid "Ne_ver popup main window"
msgstr "Nu_nca apresentar popup na janela principal"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:353
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
msgid "Hide SFLphone window on _startup"
msgstr "Esconder o SFLphone na _inicialização"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:359
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
msgid "Calls History"
msgstr "Histórico de Chamadas"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:362
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
msgid "_Keep my history for at least"
msgstr "_Manter meu histórico por pelo ao menos"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:373
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
msgid "days"
msgstr "dias"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:377
-msgid "Configuration File"
-msgstr "Arquivo de Configuração"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:379
-msgid "Store SIP credentials as MD5 hash"
-msgstr "Armazenar as credenciais SIP como hash MD5"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:423
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
msgid "Preferences"
msgstr "Preferências"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:448
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
msgid "Audio"
msgstr "Áudio"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
msgid "Address Book"
msgstr "Catálogo de endereços"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:458
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
msgid "Hooks"
msgstr "Ganchos"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:468
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
msgid "Direct IP calls"
msgstr "Ligações IP diretas"
@@ -915,11 +1064,11 @@ msgstr "Ligações IP diretas"
msgid "Advanced options for TLS"
msgstr "Opções avançadas para o TLS"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:55
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:56
msgid "TLS transport"
msgstr "Transporte TLS"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:59
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:60
msgid ""
"TLS transport can be used along with UDP for those calls that would\n"
"require secure sip transactions (aka SIPS). You can configure a different\n"
@@ -934,55 +1083,55 @@ msgstr ""
"funcionar em uma\n"
"porta dedicada, uma diferente da outra\n"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:100
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
msgid "Certificate of Authority list"
msgstr "Certificado da lista de Autoridades"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:104
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
msgid "Choose a CA list file (optional)"
msgstr "Escolha um arquivo de lista CA (opcional)"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:115
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
msgid "Public endpoint certificate file"
msgstr "Arquivo certificado endpoint público"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:119
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
msgid "Choose a public endpoint certificate (optional)"
msgstr "Escolha um certificado endpoint público (opcional)"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:134
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
msgid "Choose a private key file (optional)"
msgstr "Escolha um arquivo de chave privada (opcional)"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:145
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
msgid "Password for the private key"
msgstr "Senha para a chave privada"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:168
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
msgid "TLS protocol method"
msgstr "Método do protocolo TLS"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:202
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
msgid "TLS cipher list"
msgstr "Lista de cifras TLS"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:211
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
msgid "Server name instance for outgoing TLS connection"
msgstr "Instância de nome do servidor para saída da conexão TLS"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:219
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
msgid "Negotiation timeout (sec:msec)"
msgstr "Tempo de negociação expirado (seg:mseg)"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:236
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
msgid "Verify incoming certificates, as a server"
msgstr "Verificar os certificados de entrada, como um servidor"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:242
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
msgid "Verify certificates from answer, as a client"
msgstr "Verificar certificados de resposta, como um cliente"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:248
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
msgid "Require certificate for incoming tls connections"
msgstr "Requer certificado para conexões tls entrantes"
@@ -990,51 +1139,87 @@ msgstr "Requer certificado para conexões tls entrantes"
msgid "ZRTP Options"
msgstr "Opções ZRTP"
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:68
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:69
msgid "Send Hello Hash in S_DP"
msgstr "Enviar um Hash Olá no S_DP"
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:74
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:75
msgid "Ask User to Confirm SAS"
msgstr "Pergunta ao Usuário para Confirmar SAS"
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:80
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:81
msgid "_Warn if ZRTP not supported"
msgstr "_Alerta se o ZRTP não é suportado"
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:86
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:87
msgid "Display SAS once for hold events"
msgstr "Apresenta o SAS uma vez para realizar eventos"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:58
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
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:59
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:72
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:84
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:96
msgid "Click here to change the search type"
msgstr "Clique aqui para alterar o tipo de pesquisa"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:71
msgid "Search by missed call"
msgstr "Buscar por ligações perdidas"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:83
msgid "Search by incoming call"
msgstr "Buscar por ligações recebidas"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:95
msgid "Search by outgoing call"
msgstr "Buscar por ligações feitas"
+#~ msgid "IP call - %s"
+#~ msgstr "Ligação IP - %s"
+
+#~ msgid "Codec"
+#~ msgstr "Codec"
+
+#~ msgid "Network"
+#~ msgstr "Rede"
+
+#~ msgid "Manually"
+#~ msgstr "Manualmente"
+
+#~ msgid "There "
+#~ msgstr "Ali "
+
+#~ msgid "is "
+#~ msgstr "está "
+
+#~ msgid "are "
+#~ msgstr "estão "
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#~ msgid "_Mute other applications during a call"
+#~ msgstr "_Silenciar outras aplicações durante uma ligação"
+
+#~ msgid "SIP Port"
+#~ msgstr "Porta SIP"
+
+#~ msgid "UDP Transport"
+#~ msgstr "Transporte UDP"
+
+#~ msgid "Enable voicemail _notifications"
+#~ msgstr "Habilitar _notificações de correio de voz"
+
+#~ msgid "Store SIP credentials as MD5 hash"
+#~ msgstr "Armazenar as credenciais SIP como hash MD5"
+
#~ msgid "Stun Server"
#~ msgstr "Servidor STUN"
-#~ msgid "Call history"
-#~ msgstr "Histórico de chamadas"
-
#~ msgid "(C) 2009 Savoir-faire Linux"
#~ msgstr "(C) 2009 Savoir-faire Linux"
@@ -1050,15 +1235,9 @@ msgstr "Buscar por ligações feitas"
#~ msgid "Record"
#~ msgstr "Gravar"
-#~ msgid "Transfer"
-#~ msgstr "Transferir"
-
#~ msgid "Hang up"
#~ msgstr "Desligar"
-#~ msgid "Remove the selected account"
-#~ msgstr "Remover a conta selecionada"
-
#~ msgid "Display"
#~ msgstr "Exibir"
@@ -1095,18 +1274,6 @@ msgstr "Buscar por ligações feitas"
#~ msgid "Enable notifications"
#~ msgstr "Habilitar notificações"
-#~ msgid "History"
-#~ msgstr "Histórico"
-
-#~ msgid "_Help"
-#~ msgstr "_Ajuda"
-
-#~ msgid "_Call"
-#~ msgstr "_Chamar"
-
-#~ msgid "_Edit"
-#~ msgstr "_Editar"
-
#~ msgid "NAT Traversal"
#~ msgstr "NAT Traversal"
@@ -1126,15 +1293,12 @@ msgstr "Buscar por ligações feitas"
#~ "After checking the settings you chose, click \"Finish\" to create the "
#~ "account."
#~ msgstr ""
-#~ "Após checar as configurações que deseja, clique em \"Finalizar\" para criar "
-#~ "a conta."
+#~ "Após checar as configurações que deseja, clique em \"Finalizar\" para "
+#~ "criar a conta."
#~ msgid "Enable STUN"
#~ msgstr "Habilitar STUN"
-#~ msgid "Transfer to : "
-#~ msgstr "Transfirir para: "
-
#~ msgid "Default account"
#~ msgstr "Conta padrão"
@@ -1144,12 +1308,6 @@ msgstr "Buscar por ligações feitas"
#~ msgid "Main screen"
#~ msgstr "Tela principal"
-#~ msgid "Address book"
-#~ msgstr "Catálogo de endereços"
-
-#~ msgid "Display volume controls"
-#~ msgstr "Exibir controles de volume"
-
#~ msgid "Configure SFLphone"
#~ msgstr "Configurar SFLphone"
@@ -1186,32 +1344,32 @@ msgstr "Buscar por ligações feitas"
#~ 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."
+#~ "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 padrão, quando você realiza uma ligação, sflphone utilizará a prieira "
-#~ "conta desta lista que estiver \"registrada\". Modifique a ordem das contas "
-#~ "utilizando as setas de \"Cima\" e \"Baixo\". Habilite/desabilite as "
-#~ "marcando/desmarcando à esquerda de cada item. Adicione ou remova algumas com "
-#~ "os botões \"Adicionar\" e \"Remover\". Edite a conta selecionada com o "
-#~ "formulário à direita."
+#~ "conta desta lista que estiver \"registrada\". Modifique a ordem das "
+#~ "contas utilizando as setas de \"Cima\" e \"Baixo\". Habilite/desabilite "
+#~ "as marcando/desmarcando à esquerda de cada item. Adicione ou remova "
+#~ "algumas com os botões \"Adicionar\" e \"Remover\". Edite a conta "
+#~ "selecionada com o formulário à direita."
#~ 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."
+#~ "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ão irá remover a conta selecionada na lista apresentada. Tenha "
#~ "certeza de que você não precisa mais dela. Se você acha que você irá "
#~ "utilizar ela novamente, apenas desmarque a opção."
#~ msgid ""
-#~ "This button enables you to initialize a new account. You will then be able "
-#~ "to edit it using the form on the right."
+#~ "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ão lhe permite iniciar uma nova conta. Em seguida você poderá edita-"
-#~ "la utilizando o formulário à direita."
+#~ "Este botão lhe permite iniciar uma nova conta. Em seguida você poderá "
+#~ "edita-la utilizando o formulário à direita."
#~ msgid "Get this account down"
#~ msgstr "Desabilitar esta conta"
@@ -1222,8 +1380,8 @@ msgstr "Buscar por ligações feitas"
#~ "the \"Up\" and \"Down\" arrows."
#~ msgstr ""
#~ "Por padrão, quando você inicia uma ligação, o sflphone irá utilizar a "
-#~ "primeira conta desta lista que estiver \"registrada\". Modifique a ordem das "
-#~ "contas utilizando as setas para \"Cima\" e para \"Baixo\"."
+#~ "primeira conta desta lista que estiver \"registrada\". Modifique a ordem "
+#~ "das contas utilizando as setas para \"Cima\" e para \"Baixo\"."
#~ msgid "Get this account up"
#~ msgstr "Habilite esta conta"
@@ -1294,9 +1452,6 @@ msgstr "Buscar por ligações feitas"
#~ msgid "Trigger on specific SIP header"
#~ msgstr "Gancho no cabeçalho SIP específico"
-#~ msgid "Clear history"
-#~ msgstr "Limpar histórico"
-
#~ msgid "Attention:number of results exceeds max displayed."
#~ msgstr "Atencão:número de resultados excede o máximo de exibição"
@@ -1306,18 +1461,6 @@ msgstr "Buscar por ligações feitas"
#~ msgid "_Account creation wizard"
#~ msgstr "_Assistante de criação de conta"
-#~ msgid "_View"
-#~ msgstr "_Exibir"
-
-#~ msgid "_Accounts"
-#~ msgstr "_Contas"
-
-#~ msgid "Clear _history"
-#~ msgstr "Limpar _histórico"
-
-#~ msgid "_Volume Controls"
-#~ msgstr "_Controle de Volumes"
-
#~ msgid "_Enable this account"
#~ msgstr "_Habilitar esta conta"
@@ -1333,11 +1476,11 @@ msgstr "Buscar por ligações feitas"
#~ "sessões."
#~ msgid ""
-#~ "Pressing \"apply\" will restart the network layer. Otherwise, SFLPhone would "
-#~ "have to be restarted."
+#~ "Pressing \"apply\" will restart the network layer. Otherwise, SFLPhone "
+#~ "would have to be restarted."
#~ msgstr ""
-#~ "Pressionando \"aplicar\" a camada de rede será reiniciada. De outra forma o "
-#~ "SFKPhone teria que ser reiniciado."
+#~ "Pressionando \"aplicar\" a camada de rede será reiniciada. De outra forma "
+#~ "o SFKPhone teria que ser reiniciado."
#~ msgid "PulseAudio sound server"
#~ msgstr "Servidor de som PulseAudio"
@@ -1347,10 +1490,11 @@ msgstr "Buscar por ligações feitas"
#~ msgstr ""
#~ ",Launchpad Contributions:,Maxime Chambreuil,kalib, ,Launchpad "
#~ "Contributions:,Maxime Chambreuil,kalib, ,Launchpad Contributions:,Maxime "
-#~ "Chambreuil,kalib"
+#~ "Chambreuil,kalib, ,Launchpad Contributions:,Maxime Chambreuil,kalib"
#~ msgctxt "EMAIL OF TRANSLATORS"
#~ msgid "Your emails"
#~ msgstr ""
-#~ ",,maxime.chambreuil@gmail.com,kalibslack@gmail.com,,,maxime.chambreuil@gmail."
-#~ "com,kalibslack@gmail.com,,,maxime.chambreuil@gmail.com,kalibslack@gmail.com"
+#~ ",,maxime.chambreuil@gmail.com,kalibslack@gmail.com,,,maxime."
+#~ "chambreuil@gmail.com,kalibslack@gmail.com,,,maxime.chambreuil@gmail.com,"
+#~ "kalibslack@gmail.com,,,maxime.chambreuil@gmail.com,kalibslack@gmail.com"
diff --git a/sflphone-client-gnome/po/ru/ru.po b/sflphone-client-gnome/po/ru/ru.po
index 319dfce2c09bbbb437bf46ebf80afad98b164e99..14b3aa5dd8b52a0d5e0d4baafc1ee6278b5fe18f 100644
--- a/sflphone-client-gnome/po/ru/ru.po
+++ b/sflphone-client-gnome/po/ru/ru.po
@@ -7,17 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: SFLphone 0.9.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-14 11:18-0400\n"
-"PO-Revision-Date: 2009-10-21 22:26+0000\n"
-"Last-Translator: Hussein Abdallah <Unknown>\n"
+"POT-Creation-Date: 2009-12-03 10:22-0500\n"
+"PO-Revision-Date: 2009-12-08 20:46+0000\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"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2009-10-26 15:48+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: \n"
#: ../sflphone-client-gnome/src/accountlist.c:175
msgid "Registered"
@@ -29,7 +28,7 @@ msgstr "Не зарегистрирован"
#: ../sflphone-client-gnome/src/accountlist.c:181
msgid "Trying..."
-msgstr "Пытаюсь..."
+msgstr "Подключение..."
#: ../sflphone-client-gnome/src/accountlist.c:184
#: ../sflphone-client-gnome/src/sflnotify.c:131
@@ -59,28 +58,17 @@ msgstr "Неверный сервер Stun"
#: ../sflphone-client-gnome/src/accountlist.c:202
msgid "Invalid"
-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 голосовые письма"
-msgstr[2] "%d голосовые письма"
+msgstr "Ошибка"
-#: ../sflphone-client-gnome/src/actions.c:83
-#: ../sflphone-client-gnome/src/actions.c:919
-#: ../sflphone-client-gnome/src/actions.c:926
+#: ../sflphone-client-gnome/src/actions.c:98
msgid "Using account"
-msgstr "Используя учетную запись"
+msgstr "Используется учетная запись"
-#: ../sflphone-client-gnome/src/actions.c:89
+#: ../sflphone-client-gnome/src/actions.c:104
msgid "No registered accounts"
-msgstr "У вас нет зарегистрированных аккаунтов"
+msgstr "Нет зарегистрированных учëтных записей"
-#: ../sflphone-client-gnome/src/actions.c:268
+#: ../sflphone-client-gnome/src/actions.c:285
msgid ""
"Unable to connect to the SFLphone server.\n"
"Make sure the daemon is running."
@@ -88,27 +76,23 @@ msgstr ""
"Невозможно подключиться к SFLphone-серверу.\n"
"Проверьте если демон работает."
-#: ../sflphone-client-gnome/src/actions.c:913
-#, c-format
-msgid "IP call - %s"
-msgstr "IP звонок - %s"
-
-#: ../sflphone-client-gnome/src/actions.c:922
-msgid "Codec"
-msgstr "Codec"
+#: ../sflphone-client-gnome/src/actions.c:589
+#: ../sflphone-client-gnome/src/actions.c:911
+msgid "Direct SIP call"
+msgstr "Прямые IP-звонки"
-#: ../sflphone-client-gnome/src/actions.c:1119
+#: ../sflphone-client-gnome/src/actions.c:1103
#, 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> )"
+"</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> )"
+"</b> Звуковые кодеки SFL должны находиться в <i>%s</i> или в <b>.sflphone</"
+"b> каталоге в вашем домашнем каталоге( <i>%s</i> )"
#: ../sflphone-client-gnome/src/errors.c:29
msgid ""
@@ -142,41 +126,41 @@ msgstr ""
#: ../sflphone-client-gnome/src/mainwindow.c:73
msgid "There is one call in progress."
-msgstr "Звонок ещё не окончен."
+msgstr "Один текущий разговор."
#: ../sflphone-client-gnome/src/mainwindow.c:77
msgid "There are calls in progress."
-msgstr "Несколько звонков ещё не окончены."
+msgstr "Несколько текущих разговоров."
#: ../sflphone-client-gnome/src/mainwindow.c:86
msgid "Do you still want to quit?"
msgstr "Вы уверенны что хотите выйти?"
-#: ../sflphone-client-gnome/src/mainwindow.c:299
+#: ../sflphone-client-gnome/src/mainwindow.c:298
msgid "SFLphone Error"
msgstr "Ошибка SFLphone."
-#: ../sflphone-client-gnome/src/mainwindow.c:391
+#: ../sflphone-client-gnome/src/mainwindow.c:392
#, c-format
msgid "ZRTP is not supported by peer %s\n"
-msgstr "не поддерживается устройством %s\n"
+msgstr "ZRTP не поддерживается устройством %s\n"
-#: ../sflphone-client-gnome/src/mainwindow.c:392
+#: ../sflphone-client-gnome/src/mainwindow.c:393
msgid "Secure Communication Unavailable"
-msgstr "Зашифрованная связь недоступна."
+msgstr "Зашифрованная связь недоступна"
-#: ../sflphone-client-gnome/src/mainwindow.c:393
-#: ../sflphone-client-gnome/src/mainwindow.c:415
+#: ../sflphone-client-gnome/src/mainwindow.c:394
+#: ../sflphone-client-gnome/src/mainwindow.c:416
msgid "Continue"
msgstr "Продолжить"
-#: ../sflphone-client-gnome/src/mainwindow.c:394
-#: ../sflphone-client-gnome/src/mainwindow.c:416
-#: ../sflphone-client-gnome/src/mainwindow.c:430
+#: ../sflphone-client-gnome/src/mainwindow.c:395
+#: ../sflphone-client-gnome/src/mainwindow.c:417
+#: ../sflphone-client-gnome/src/mainwindow.c:431
msgid "Stop Call"
msgstr "Закончить звонок"
-#: ../sflphone-client-gnome/src/mainwindow.c:413
+#: ../sflphone-client-gnome/src/mainwindow.c:414
#, c-format
msgid ""
"A %s error forced the call with %s to fall under unencrypted mode.\n"
@@ -185,11 +169,11 @@ msgstr ""
"Из-за ошибки %s переговор с %s перейдëт в не зашифрованный режим.\n"
"Точная причина: %s\n"
-#: ../sflphone-client-gnome/src/mainwindow.c:414
+#: ../sflphone-client-gnome/src/mainwindow.c:415
msgid "ZRTP negotiation failed"
msgstr "Неудачный обмен информации ZRTP"
-#: ../sflphone-client-gnome/src/mainwindow.c:427
+#: ../sflphone-client-gnome/src/mainwindow.c:428
#, c-format
msgid ""
"%s wants to stop using secure communication. Confirm will resume "
@@ -198,11 +182,11 @@ msgstr ""
"%s хочет остановить зашифрованную связь. В случае подтверждения переговор "
"продолжится без SRTP.\n"
-#: ../sflphone-client-gnome/src/mainwindow.c:428
+#: ../sflphone-client-gnome/src/mainwindow.c:429
msgid "Confirm Go Clear"
msgstr "Подтвердить переход на незашифрованную связь"
-#: ../sflphone-client-gnome/src/mainwindow.c:429
+#: ../sflphone-client-gnome/src/mainwindow.c:430
msgid "Confirm"
msgstr "Подтвердить"
@@ -217,22 +201,30 @@ msgstr "%s аккаунт: %s"
msgid "<i>From</i> %s"
msgstr "<i>От:</i> %s"
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+#, c-format
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] "%d голосовое письмо"
+msgstr[1] "%d голосовые письма"
+msgstr[2] "%d голосовые письма"
+
#: ../sflphone-client-gnome/src/sflnotify.c:111
#, c-format
msgid "Calling with %s account <i>%s</i>"
-msgstr "Звонок с аккаунтом %s <i>%s</i>"
+msgstr "Звонок с учëтной записью %s <i>%s</i>"
#: ../sflphone-client-gnome/src/sflnotify.c:115
msgid "Current account"
-msgstr "Нынешний аккаунт"
+msgstr "Нынешняя учëтная запись"
#: ../sflphone-client-gnome/src/sflnotify.c:130
msgid "You have no accounts set up"
-msgstr "Вы не настроили ни одного аккаунта"
+msgstr "Вы не настроили ни одной учëтной записи"
#: ../sflphone-client-gnome/src/sflnotify.c:147
msgid "You have no registered accounts"
-msgstr "У вас нет зарегистрированных аккаунтов"
+msgstr "У вас нет зарегистрированных учëтных записей"
#: ../sflphone-client-gnome/src/sflnotify.c:190
#, c-format
@@ -266,219 +258,414 @@ msgstr "Громкость"
msgid "Mic volume"
msgstr "Громкость микрофона"
-#: ../sflphone-client-gnome/src/statusicon.c:91
+#: ../sflphone-client-gnome/src/statusicon.c:96
msgid "_Show main window"
msgstr "_Показать главное окно"
-#: ../sflphone-client-gnome/src/statusicon.c:126
+#: ../sflphone-client-gnome/src/statusicon.c:131
msgid "SFLphone"
msgstr "SFLphone"
-#: ../sflphone-client-gnome/src/statusicon.c:127
+#: ../sflphone-client-gnome/src/statusicon.c:132
#, c-format
msgid "%i account configured"
msgid_plural "%i accounts configured"
-msgstr[0] "%i аккаунт настроен."
-msgstr[1] "%i аккаунтов настроены"
-msgstr[2] "%i аккаунтов настроены"
+msgstr[0] "Настроена одна учëтная запись"
+msgstr[1] "Настроены %i учëтные записи"
+msgstr[2] "Настроены %i учëтные записи"
#: ../sflphone-client-gnome/src/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:750
+#: ../sflphone-client-gnome/src/uimanager.c:693
+#: ../sflphone-client-gnome/src/uimanager.c:727
msgid "Voicemail"
msgstr "Автоответчик"
-#: ../sflphone-client-gnome/src/uimanager.c:403
+#: ../sflphone-client-gnome/src/uimanager.c:117
+msgid "No address book selected"
+msgstr "Нет выбранных адресных книг"
+
+#: ../sflphone-client-gnome/src/uimanager.c:137
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "Address book"
+msgstr "Адресная книга"
+
+#: ../sflphone-client-gnome/src/uimanager.c:279
+msgid "Voicemail (%i)"
+msgstr "Автоответчик (%i)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:342
msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
msgstr "SFLphone - SIP и IAX2-совместимый VoIP-клиент"
-#: ../sflphone-client-gnome/src/uimanager.c:406
+#: ../sflphone-client-gnome/src/uimanager.c:345
msgid "About SFLphone"
msgstr "О SFLphone"
-#: ../sflphone-client-gnome/src/uimanager.c:1028
+#: ../sflphone-client-gnome/src/uimanager.c:719
+msgid "Call"
+msgstr "_Звонок"
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:1184
+msgid "_New call"
+msgstr "_Новый звонок"
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+msgid "Place a new call"
+msgstr "Позвонить"
+
+#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:979
msgid "_Pick up"
msgstr "_Взять трубку"
-#: ../sflphone-client-gnome/src/uimanager.c:1040
-#: ../sflphone-client-gnome/src/uimanager.c:1081
+#: ../sflphone-client-gnome/src/uimanager.c:721
+msgid "Answer the call"
+msgstr "Ответить"
+
+#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:991
+#: ../sflphone-client-gnome/src/uimanager.c:1032
msgid "_Hang up"
msgstr "_Положить трубку"
-#: ../sflphone-client-gnome/src/uimanager.c:1052
-#: ../sflphone-client-gnome/src/uimanager.c:1093
-msgid "On _Hold"
+#: ../sflphone-client-gnome/src/uimanager.c:722
+msgid "Finish the call"
+msgstr "Закончить звонок"
+
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "O_n hold"
msgstr "_Удержать звонок"
-#: ../sflphone-client-gnome/src/uimanager.c:1064
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "Place the call on hold"
+msgstr "Удержать звонок"
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "O_ff hold"
+msgstr "_Возобновить разговор"
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "Place the call off hold"
+msgstr "Возобновить разговор"
+
+#: ../sflphone-client-gnome/src/uimanager.c:725
+#: ../sflphone-client-gnome/src/uimanager.c:1015
msgid "_Record"
msgstr "Записать"
-#: ../sflphone-client-gnome/src/uimanager.c:1154
+#: ../sflphone-client-gnome/src/uimanager.c:725
+msgid "Record the current conversation"
+msgstr "Записать переговор"
+
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Configuration _Assistant"
+msgstr "Мастер настройки"
+
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Run the configuration assistant"
+msgstr "Запустить мастер настройки"
+
+#: ../sflphone-client-gnome/src/uimanager.c:727
+msgid "Call your voicemail"
+msgstr "%d голосовое письмо"
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "_Close"
+msgstr "_Закрыть"
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "Minimize to system tray"
+msgstr "Уменьшить в значок"
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "_Quit"
+msgstr "_Правка"
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "Quit the program"
+msgstr "Выйти из программы"
+
+#: ../sflphone-client-gnome/src/uimanager.c:732
+msgid "_Edit"
+msgstr "_Правка"
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "_Copy"
+msgstr "_Копировать"
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "Copy the selection"
+msgstr "Копировать видимое"
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "_Paste"
+msgstr "_Вставить"
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "Paste the clipboard"
+msgstr "Вставить из буфера обмена"
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear _history"
+msgstr "_Стереть журнал"
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear the call history"
+msgstr "Очистить историю"
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "_Accounts"
+msgstr "_Учëтные записи"
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "Edit your accounts"
+msgstr "Изменить ваши учëтные записи"
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "_Preferences"
+msgstr "_Предпочтения"
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "Change your preferences"
+msgstr "Изменить ваши предпочтении"
+
+#: ../sflphone-client-gnome/src/uimanager.c:740
+msgid "_View"
+msgstr "_Вид"
+
+#: ../sflphone-client-gnome/src/uimanager.c:743
+msgid "_Help"
+msgstr "_Помощь"
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Contents"
+msgstr "Продолжить"
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Open the manual"
+msgstr "Открыть справочник "
+
+#: ../sflphone-client-gnome/src/uimanager.c:745
+msgid "About this application"
+msgstr "Идентификация"
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "_Transfer"
+msgstr "Переслать звонок на другой номер"
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "Transfer the call"
+msgstr "Переслать звонок на другой номер"
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "_Show toolbar"
+msgstr "Показать панель инструментов"
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "Show the toolbar"
+msgstr "Показать панель инструментов"
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "_Dialpad"
+msgstr "Панель набора номера"
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "Show the dialpad"
+msgstr "Показать панель набора номера"
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "_Volume controls"
+msgstr "_Настройки громкости"
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "Show the volume controls"
+msgstr "_Настройки громкости"
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "_History"
+msgstr "Журнал"
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "Calls history"
+msgstr "Журнал звонков"
+
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "_Address book"
+msgstr "Адресная книга"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1003
+#: ../sflphone-client-gnome/src/uimanager.c:1044
+msgid "On _Hold"
+msgstr "_Удержать звонок"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1107
msgid "_Call back"
msgstr "_Перезвонить"
-#: ../sflphone-client-gnome/src/uimanager.c:1226
-msgid "_New call"
-msgstr "_Новый звонок"
-
-#: ../sflphone-client-gnome/src/uimanager.c:1300
+#: ../sflphone-client-gnome/src/uimanager.c:1258
msgid "Edit phone number"
msgstr "Мобильный телефон"
-#: ../sflphone-client-gnome/src/uimanager.c:1311
+#: ../sflphone-client-gnome/src/uimanager.c:1269
msgid "Edit the phone number before making a call"
msgstr "Изменить номер телефона перед звонком"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:164
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
msgid "Account Parameters"
msgstr "Параметры учетной записи"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:173
-#: ../sflphone-client-gnome/src/config/assistant.c:294
-#: ../sflphone-client-gnome/src/config/assistant.c:402
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
+#: ../sflphone-client-gnome/src/config/assistant.c:314
+#: ../sflphone-client-gnome/src/config/assistant.c:427
msgid "_Alias"
msgstr "_Псевдоним"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:181
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
msgid "_Protocol"
msgstr "Пр_отокол"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:199
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
msgid "Unknown"
msgstr "Неизвестный"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:209
-#: ../sflphone-client-gnome/src/config/assistant.c:302
-#: ../sflphone-client-gnome/src/config/assistant.c:410
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
+#: ../sflphone-client-gnome/src/config/assistant.c:322
+#: ../sflphone-client-gnome/src/config/assistant.c:435
msgid "_Host name"
msgstr "Имя или IP-адрес _сервера"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:217
-#: ../sflphone-client-gnome/src/config/assistant.c:310
-#: ../sflphone-client-gnome/src/config/assistant.c:418
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
+#: ../sflphone-client-gnome/src/config/assistant.c:330
+#: ../sflphone-client-gnome/src/config/assistant.c:443
msgid "_User name"
msgstr "Имя или _номер пользователя"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:234
-#: ../sflphone-client-gnome/src/config/assistant.c:326
-#: ../sflphone-client-gnome/src/config/assistant.c:433
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:346
+#: ../sflphone-client-gnome/src/config/assistant.c:458
msgid "_Password"
msgstr "Па_роль"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:254
-#: ../sflphone-client-gnome/src/config/assistant.c:344
-#: ../sflphone-client-gnome/src/config/assistant.c:449
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:363
+#: ../sflphone-client-gnome/src/config/assistant.c:473
+msgid "Show password"
+msgstr "Показать пароль"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:368
+#: ../sflphone-client-gnome/src/config/assistant.c:478
msgid "_Voicemail number"
msgstr "Номер _автоответчика #"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:340
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
msgid "Authentication"
msgstr "Идентификация"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:341
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
msgid "Secret"
msgstr "Секретный"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:466
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
msgid "Credential"
msgstr "Параметры доступа"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:501
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
msgid "Authentication name"
msgstr "Имя для аутентификации"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:512
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
msgid "Password"
msgstr "Пароль"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:535
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:909
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:201
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
msgid "Security"
msgstr "Безопасность"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:547
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:213
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
msgid "Use TLS transport (sips)"
-msgstr "Имя для аутентификации"
+msgstr "Использовать TLS-транспорт (sips)"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:552
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:218
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
msgid "SRTP key exchange"
msgstr "Обмена ключей SRTP"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:558
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
msgid "Disabled"
msgstr "Отключен"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
msgid "Registration"
msgstr "Регистрация"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:679
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
msgid "Registration expire"
-msgstr "Истек срок регистрации"
+msgstr "Срок истечения регистрации"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
msgid "_Comply with RFC 3263"
msgstr "_Соотвествует RFC 3263"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
-msgid "Network"
-msgstr "Сеть"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
+msgid "Network Interface"
+msgstr "Сетевые настройки"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:707
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
msgid "Local address"
msgstr "Локальный адрес"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:744
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
msgid "Local port"
msgstr "Локальный порт"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:752
-msgid "Set published address and port:"
-msgstr "Настроить видимый адрес и порт :"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
+msgid "Published address"
+msgstr "Сетевые настройки для Интернета"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:756
-msgid "Using STUN "
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+msgid "Using STUN"
msgstr "Использует STUN "
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:761
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
+msgid "STUN server URL"
+msgstr "URL STUN-сервера"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
msgid "Same as local parameters"
msgstr "Использовать локальный адрес и порт"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:764
-msgid "Manually"
-msgstr "Вручную"
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:769
-msgid "Published address"
-msgstr "издаваемый адрес"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
+msgid "Set published address and port:"
+msgstr "Настроить видимый адрес и порт :"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:777
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
msgid "Published port"
-msgstr "издаваемый порт"
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:785
-msgid "STUN server URL"
-msgstr "URL STUN-сервера"
+msgstr "Публичный порт"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
msgid "Account settings"
-msgstr "Настройки аккаунта"
+msgstr "Настройки учëтной записи"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
msgid "Basic"
msgstr "Основные"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:904
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
msgid "Advanced"
msgstr "Дополнительные"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:169
-msgid "Server returned \""
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:164
+msgid "Server returned \"%s\" (%d)"
msgstr "Сервер ответил \""
#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
@@ -495,34 +682,21 @@ msgstr "Учётные записи"
#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:484
msgid "Configured Accounts"
-msgstr "Нынешний аккаунт"
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:505
-msgid "There "
-msgstr "Здесь "
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "is "
-msgstr "Зарегестрирован "
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "are "
-msgstr "Зарегестрированны "
+msgstr "Настроенные учëтные записи"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:508
-msgid " active account"
-msgstr " действующий аккаунт"
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
+msgid "There is %d active account"
+msgid_plural "There are %d active accounts"
+msgstr[0] "Одна действующая учëтная запись"
+msgstr[1] "%d действующих учëтных записей"
+msgstr[2] "%d действующих учëтных записей"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:509
-msgid "s"
-msgstr "a"
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:514
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
msgid "You have no active account"
-msgstr "У вас нет активного аккаунта"
+msgstr "У вас нет активной учëтной записи"
#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:443
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
msgid "General"
msgstr "Общие настройки"
@@ -532,7 +706,7 @@ msgstr "_Использовать адресную книгу Evolution"
#: ../sflphone-client-gnome/src/config/addressbook-config.c:319
msgid "Download limit :"
-msgstr "Ограничение скорости скачивания:"
+msgstr "Показывать не более "
#: ../sflphone-client-gnome/src/config/addressbook-config.c:327
msgid "cards"
@@ -544,7 +718,7 @@ msgstr "_Показать фотографию контакта (если име
#: ../sflphone-client-gnome/src/config/addressbook-config.c:341
msgid "Fields from Evolution's address books"
-msgstr "Исполоьзовать следующие поля из адресной книги Evolution:"
+msgstr "Исполоьзовать следующие номера из адресной книги Evolution"
#: ../sflphone-client-gnome/src/config/addressbook-config.c:345
msgid "_Work"
@@ -567,228 +741,222 @@ 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:578
+#: ../sflphone-client-gnome/src/config/audioconf.c:577
msgid "Name"
msgstr "Имя"
-#: ../sflphone-client-gnome/src/config/assistant.c:69
+#: ../sflphone-client-gnome/src/config/assistant.c:75
#, c-format
msgid "This assistant is now finished."
msgstr "Мастер закончил настройку."
-#: ../sflphone-client-gnome/src/config/assistant.c:71
+#: ../sflphone-client-gnome/src/config/assistant.c:77
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/config/assistant.c:74
+#: ../sflphone-client-gnome/src/config/assistant.c:80
msgid "Alias"
msgstr "Псевдоним"
-#: ../sflphone-client-gnome/src/config/assistant.c:78
+#: ../sflphone-client-gnome/src/config/assistant.c:84
msgid "Server"
msgstr "Сервер"
-#: ../sflphone-client-gnome/src/config/assistant.c:82
+#: ../sflphone-client-gnome/src/config/assistant.c:88
msgid "Username"
msgstr "Пользователь"
-#: ../sflphone-client-gnome/src/config/assistant.c:86
+#: ../sflphone-client-gnome/src/config/assistant.c:92
msgid "Security: "
-msgstr "Безопасность "
+msgstr "Безопасность:"
-#: ../sflphone-client-gnome/src/config/assistant.c:88
+#: ../sflphone-client-gnome/src/config/assistant.c:94
msgid "SRTP/ZRTP draft-zimmermann"
msgstr "SRTP/ZRTP draft-zimmermann"
-#: ../sflphone-client-gnome/src/config/assistant.c:90
-#: ../sflphone-client-gnome/src/config/assistant.c:182
+#: ../sflphone-client-gnome/src/config/assistant.c:96
msgid "None"
msgstr "Нет"
-#: ../sflphone-client-gnome/src/config/assistant.c:210
+#: ../sflphone-client-gnome/src/config/assistant.c:229
msgid "SFLphone account creation wizard"
msgstr "Мастер настройки SFLphone"
-#: ../sflphone-client-gnome/src/config/assistant.c:236
+#: ../sflphone-client-gnome/src/config/assistant.c:255
msgid "Welcome to the Account creation wizard of SFLphone!"
msgstr "Добро пожаловать в SFLphone!"
-#: ../sflphone-client-gnome/src/config/assistant.c:237
+#: ../sflphone-client-gnome/src/config/assistant.c:256
msgid "This installation wizard will help you configure an account."
-msgstr "Этот мастер установки поможет вам настроить ваш аккаунт."
+msgstr "Этот мастер установки поможет вам настроить вашу учëтную запись"
-#: ../sflphone-client-gnome/src/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "VoIP Protocols"
msgstr "VoIP-протоколы"
-#: ../sflphone-client-gnome/src/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "Select an account type"
-msgstr "Выберите тип аккаунта"
+msgstr "Выберите тип учëтной записи"
-#: ../sflphone-client-gnome/src/config/assistant.c:253
+#: ../sflphone-client-gnome/src/config/assistant.c:272
msgid "SIP (Session Initiation Protocol)"
msgstr "SIP (Session Initiation Protocol)"
-#: ../sflphone-client-gnome/src/config/assistant.c:255
+#: ../sflphone-client-gnome/src/config/assistant.c:274
msgid "IAX2 (InterAsterix Exchange)"
msgstr "IAX2 (InterAsterix Exchange)"
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Account"
-msgstr "Аккаунты"
+msgstr "Учëтная запись"
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Please select one of the following options"
msgstr "Введите пожалуйста следующие данные"
-#: ../sflphone-client-gnome/src/config/assistant.c:271
+#: ../sflphone-client-gnome/src/config/assistant.c:290
msgid "Create a free SIP/IAX2 account on sflphone.org"
-msgstr "Создать бесплатный SIP/IAX2-аккаунт на sflphone.org"
+msgstr "Создать бесплатную SIP/IAX2-учëтную запись на sflphone.org"
-#: ../sflphone-client-gnome/src/config/assistant.c:273
+#: ../sflphone-client-gnome/src/config/assistant.c:292
msgid "Register an existing SIP or IAX2 account"
-msgstr "Зарегистрировать существующий SIP или IAX2 аккаунт"
+msgstr "Зарегистрировать существующею SIP или IAX2 учëтную запись"
-#: ../sflphone-client-gnome/src/config/assistant.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:306
msgid "SIP account settings"
-msgstr "Настройка SIP-аккаунта"
+msgstr "Настройка учëтной записи SIP"
-#: ../sflphone-client-gnome/src/config/assistant.c:286
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "Please fill the following information"
msgstr "Введите пожалуйста следующие данные"
-#: ../sflphone-client-gnome/src/config/assistant.c:352
-#: ../sflphone-client-gnome/src/config/assistant.c:381
+#: ../sflphone-client-gnome/src/config/assistant.c:376
+#: ../sflphone-client-gnome/src/config/assistant.c:405
msgid "Secure communications with _ZRTP"
msgstr "Защищëнная связь с _ZRTP"
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "Optional email address"
msgstr "Электронный адрес (необязательный)"
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "This email address will be used to send your voicemail messages."
msgstr "Этот электронный адрес будет использоваться для речевых сообщений"
-#: ../sflphone-client-gnome/src/config/assistant.c:373
+#: ../sflphone-client-gnome/src/config/assistant.c:397
msgid "_Email address"
msgstr "_Адрес эл. почты"
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "IAX2 account settings"
-msgstr "Настройка IAX2-аккаунта"
+msgstr "Настройка учëтной записи IAX2"
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "Network Address Translation (NAT)"
msgstr "Network Address Translation (NAT)"
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "You should probably enable this if you are behind a firewall."
-msgstr ""
-"Вы наверное должны это включить если вы находитесь за сетевым экраном."
+msgstr "Вы наверное должны это включить если вы находитесь за сетевым экраном."
-#: ../sflphone-client-gnome/src/config/assistant.c:476
+#: ../sflphone-client-gnome/src/config/assistant.c:505
msgid "E_nable STUN"
msgstr "Включить STUN"
-#: ../sflphone-client-gnome/src/config/assistant.c:483
+#: ../sflphone-client-gnome/src/config/assistant.c:512
msgid "_STUN server"
msgstr "_STUN-сервер"
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Account Registration"
-msgstr "Регистрация аккаунта"
+msgstr "Регистрация учëтной записи"
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Congratulations!"
msgstr "Поздравляем!"
-#: ../sflphone-client-gnome/src/config/audioconf.c:583
+#: ../sflphone-client-gnome/src/config/audioconf.c:582
msgid "Frequency"
msgstr "Частота"
-#: ../sflphone-client-gnome/src/config/audioconf.c:588
+#: ../sflphone-client-gnome/src/config/audioconf.c:587
msgid "Bitrate"
msgstr "Битрейт"
-#: ../sflphone-client-gnome/src/config/audioconf.c:593
+#: ../sflphone-client-gnome/src/config/audioconf.c:592
msgid "Bandwidth"
msgstr "Пропускная способность"
-#: ../sflphone-client-gnome/src/config/audioconf.c:673
+#: ../sflphone-client-gnome/src/config/audioconf.c:670
msgid "ALSA plugin"
msgstr "ALSA-плагин"
-#: ../sflphone-client-gnome/src/config/audioconf.c:695
+#: ../sflphone-client-gnome/src/config/audioconf.c:692
msgid "Output"
msgstr "Выход"
-#: ../sflphone-client-gnome/src/config/audioconf.c:717
+#: ../sflphone-client-gnome/src/config/audioconf.c:714
msgid "Input"
msgstr "Вход"
-#: ../sflphone-client-gnome/src/config/audioconf.c:752
+#: ../sflphone-client-gnome/src/config/audioconf.c:749
msgid "_Voice Activity Detection"
msgstr "Включить детектор тишины"
-#: ../sflphone-client-gnome/src/config/audioconf.c:762
+#: ../sflphone-client-gnome/src/config/audioconf.c:759
msgid "_Noise Reduction (Narrow-Band Companding)"
msgstr "Шумоподавление"
-#: ../sflphone-client-gnome/src/config/audioconf.c:798
+#: ../sflphone-client-gnome/src/config/audioconf.c:800
msgid "Sound Manager"
msgstr "Менеджер звука"
-#: ../sflphone-client-gnome/src/config/audioconf.c:807
+#: ../sflphone-client-gnome/src/config/audioconf.c:809
msgid "_Pulseaudio"
msgstr "_Pulseaudio"
-#: ../sflphone-client-gnome/src/config/audioconf.c:811
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
msgid "_ALSA"
msgstr "_ALSA"
-#: ../sflphone-client-gnome/src/config/audioconf.c:816
-msgid "_Mute other applications during a call"
-msgstr "Приглушать звук других програм во время звонка"
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:823
+#: ../sflphone-client-gnome/src/config/audioconf.c:819
msgid "ALSA settings"
msgstr "Настройка ALSA"
-#: ../sflphone-client-gnome/src/config/audioconf.c:840
+#: ../sflphone-client-gnome/src/config/audioconf.c:836
msgid "Codecs"
msgstr "Кодеки"
-#: ../sflphone-client-gnome/src/config/audioconf.c:869
+#: ../sflphone-client-gnome/src/config/audioconf.c:865
msgid "Recordings"
msgstr "Записи"
-#: ../sflphone-client-gnome/src/config/audioconf.c:873
+#: ../sflphone-client-gnome/src/config/audioconf.c:869
msgid "Destination folder"
msgstr "Папка назначения"
-#: ../sflphone-client-gnome/src/config/audioconf.c:877
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
msgid "Select a folder"
msgstr "Выберите папку"
-#: ../sflphone-client-gnome/src/config/audioconf.c:883
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
msgid "Ringtones"
msgstr "Звонки"
-#: ../sflphone-client-gnome/src/config/audioconf.c:889
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
msgid "_Enable ringtones"
msgstr "Включить звонок"
-#: ../sflphone-client-gnome/src/config/audioconf.c:895
+#: ../sflphone-client-gnome/src/config/audioconf.c:891
msgid "Choose a ringtone"
msgstr "Выберите звонок"
-#: ../sflphone-client-gnome/src/config/audioconf.c:901
+#: ../sflphone-client-gnome/src/config/audioconf.c:897
msgid "Audio Files"
msgstr "Звуковые файлы"
@@ -825,90 +993,70 @@ msgstr "Переписка номера телефона"
msgid "_Prefix dialed numbers with"
msgstr "Добавить перед на набранными номерами"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:195
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
msgid ""
"This profile is used when you want to reach a remote peer simply by typing a "
"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
"also be used if no account can be matched to an incoming or outgoing call."
msgstr ""
-"Этот профиль используется когда бы хотите достичь удалëнное устройство "
+"Этот профиль используется когда вы хотите достичь удалëнное устройство "
"просто набрав SIP URI (адрес) типа <b>sip:удалëнное устройство</b>. Эти "
"настройки так-же будут использованы если не будет подходящего аккаунта для "
"входящего или выходящего звонка."
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:274
-msgid "SIP Port"
-msgstr "SIP-порт"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:281
-msgid "UDP Transport"
-msgstr "Транспорт UDP"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:319
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
msgid "Desktop Notifications"
msgstr "Извещения на рабочем столе"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:323
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
msgid "_Enable notifications"
msgstr "Включить звонок"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:329
-msgid "Enable voicemail _notifications"
-msgstr "Включить предупреждения о речевых сообщениях"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:341
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
msgid "System Tray Icon"
-msgstr "System Tray Icon"
+msgstr "Поведение окна SFLPhone"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
msgid "_Popup main window on incoming call"
msgstr "_Показать главное окно при входящем звонке"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:349
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
msgid "Ne_ver popup main window"
msgstr "Никогда не показывать главное окно"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:353
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
msgid "Hide SFLphone window on _startup"
msgstr "Спрятать окно SFLphone при пуске"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:359
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
msgid "Calls History"
msgstr "Журнал звонков"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:362
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
msgid "_Keep my history for at least"
msgstr "Со_хранить мой журнал звонков как минимум в течении"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:373
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
msgid "days"
msgstr "дней"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:377
-msgid "Configuration File"
-msgstr "Файл конфигурации"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:379
-msgid "Store SIP credentials as MD5 hash"
-msgstr "Записать параметры доступа SIP с шифровкой MD5."
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:423
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
msgid "Preferences"
msgstr "Предпочтения"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:448
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
msgid "Audio"
msgstr "Звук"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
msgid "Address Book"
msgstr "Адресная книга"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:458
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
msgid "Hooks"
msgstr "Зацепки"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:468
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
msgid "Direct IP calls"
msgstr "Прямые IP-звонки"
@@ -916,11 +1064,11 @@ msgstr "Прямые IP-звонки"
msgid "Advanced options for TLS"
msgstr "Дополнительные опции для TLS"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:55
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:56
msgid "TLS transport"
msgstr "Транспорт TLS"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:59
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:60
msgid ""
"TLS transport can be used along with UDP for those calls that would\n"
"require secure sip transactions (aka SIPS). You can configure a different\n"
@@ -933,55 +1081,55 @@ msgstr ""
"каждого аккаунта (но каждый из них будет использовать свой выделенный "
"порт).\n"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:100
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
msgid "Certificate of Authority list"
msgstr "Список центра сертификации"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:104
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
msgid "Choose a CA list file (optional)"
msgstr "Выберите файл Центра сертификации (необязательный)"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:115
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
msgid "Public endpoint certificate file"
msgstr "Файл с публичным сертификатом"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:119
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
msgid "Choose a public endpoint certificate (optional)"
msgstr "Выберите публичный сертификат (необязательный)"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:134
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
msgid "Choose a private key file (optional)"
msgstr "Выберите файл с секретным ключом (необязательно)"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:145
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
msgid "Password for the private key"
msgstr "Пароль для секретного ключа"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:168
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
msgid "TLS protocol method"
msgstr "Метод протокола TLS"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:202
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
msgid "TLS cipher list"
msgstr "Список шифров TLS"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:211
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
msgid "Server name instance for outgoing TLS connection"
msgstr "Имя сервера для выходящих TLS-подключений."
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:219
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
msgid "Negotiation timeout (sec:msec)"
msgstr "Время ожидания соединения (сек:мсек)"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:236
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
msgid "Verify incoming certificates, as a server"
msgstr "Проверять входящие сертификаты (в качестве сервера)"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:242
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
msgid "Verify certificates from answer, as a client"
msgstr "Проверять входящие сертификаты (в качестве клиента)"
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:248
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
msgid "Require certificate for incoming tls connections"
msgstr "Требовать сертификат для входящих TLS-подключений"
@@ -989,54 +1137,90 @@ msgstr "Требовать сертификат для входящих TLS-по
msgid "ZRTP Options"
msgstr "Опции ZRTP"
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:68
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:69
msgid "Send Hello Hash in S_DP"
msgstr "Послать hello-хэш в S_DP"
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:74
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:75
msgid "Ask User to Confirm SAS"
msgstr "Попросить пользователя подтвердить пароль SAS"
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:80
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:81
msgid "_Warn if ZRTP not supported"
msgstr "_Предупредить если ZRTP не пддерживается"
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:86
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:87
msgid "Display SAS once for hold events"
msgstr "Показать SAS один раз"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:58
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
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:59
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:72
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:84
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:96
msgid "Click here to change the search type"
msgstr "Нажмите, чтобы изменить тип поиска"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:71
msgid "Search by missed call"
msgstr "Поиск по пропущенным вызовам"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:83
msgid "Search by incoming call"
msgstr "Поиск по входящим вызовам"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:95
msgid "Search by outgoing call"
msgstr "Поиск по исходящим вызовам"
+#~ msgid "IP call - %s"
+#~ msgstr "IP звонок - %s"
+
+#~ msgid "Codec"
+#~ msgstr "Codec"
+
+#~ msgid "Network"
+#~ msgstr "Сеть"
+
+#~ msgid "Manually"
+#~ msgstr "Вручную"
+
+#~ msgid "There "
+#~ msgstr "Здесь "
+
+#~ msgid "is "
+#~ msgstr "Зарегестрирован "
+
+#~ msgid "are "
+#~ msgstr "Зарегестрированны "
+
+#~ msgid "s"
+#~ msgstr "a"
+
+#~ msgid "_Mute other applications during a call"
+#~ msgstr "Приглушать звук других програм во время звонка"
+
+#~ msgid "SIP Port"
+#~ msgstr "SIP-порт"
+
+#~ msgid "UDP Transport"
+#~ msgstr "Транспорт UDP"
+
+#~ msgid "Enable voicemail _notifications"
+#~ msgstr "Включить предупреждения о речевых сообщениях"
+
+#~ msgid "Store SIP credentials as MD5 hash"
+#~ msgstr "Записать параметры доступа SIP с шифровкой MD5."
+
#~ msgid "Account creation wizard"
#~ msgstr "Мастер настройки SFLphone"
#~ msgid "Voicemail number"
#~ msgstr "Номер автоответчика #"
-#~ msgid "Address book"
-#~ msgstr "Адресная книга"
-
#~ msgid "Display volume controls"
#~ msgstr "_Настройки громкости"
@@ -1049,9 +1233,6 @@ msgstr "Поиск по исходящим вызовам"
#~ msgid "Hold on"
#~ msgstr "Удержать звонок"
-#~ msgid "Transfer"
-#~ msgstr "Переслать звонок на другой номер"
-
#~ msgid "Record"
#~ msgstr "Записать переговор"
@@ -1091,33 +1272,9 @@ msgstr "Поиск по исходящим вызовам"
#~ msgid "Prefix dialed numbers with"
#~ msgstr "Добавить перед на набранными номерами"
-#~ msgid "_Help"
-#~ msgstr "_Помощь"
-
#~ msgid "_Account creation wizard"
#~ msgstr "Мастер настройки SFLphone"
-#~ msgid "_Call"
-#~ msgstr "_Звонок"
-
-#~ msgid "Clear _history"
-#~ msgstr "_Стереть журнал"
-
-#~ msgid "_Accounts"
-#~ msgstr "_Аккаунты"
-
-#~ msgid "_Edit"
-#~ msgstr "_Правка"
-
-#~ msgid "_Volume controls"
-#~ msgstr "_Настройки громкости"
-
-#~ msgid "_View"
-#~ msgstr "_Вид"
-
-#~ msgid "History"
-#~ msgstr "Журнал"
-
#~ msgid "_Enable this account"
#~ msgstr "_Включить"
@@ -1185,9 +1342,6 @@ msgstr "Поиск по исходящим вызовам"
#~ msgid "Enable STUN"
#~ msgstr "Задействовать STUN"
-#~ msgid "Transfer to : "
-#~ msgstr "Передать : "
-
#~ msgid "Default account"
#~ msgstr "Учетная запись по умолчанию"
@@ -1218,12 +1372,9 @@ msgstr "Поиск по исходящим вызовам"
#~ msgid "Give up transfer"
#~ msgstr "Прекратить передачу"
-#~ msgid "Remove the selected account"
-#~ msgstr "Удалить выбранную учетную запись"
-
#~ msgid ""
-#~ "This button enables you to initialize a new account. You will then be able "
-#~ "to edit it using the form on the right."
+#~ "This button enables you to initialize a new account. You will then be "
+#~ "able to edit it using the form on the right."
#~ msgstr ""
#~ "Эта кнопка позволяет инициализировать новую учетную запись. Редактировать "
#~ "данные будет возможно в форме справа."
@@ -1275,18 +1426,9 @@ msgstr "Поиск по исходящим вызовам"
#~ msgid "Keep my history for at least"
#~ msgstr "По крайней мере хранить историю"
-#~ msgid "Clear history"
-#~ msgstr "Очистить историю"
-
-#~ msgid "Call history"
-#~ msgstr "История звонков"
-
#~ msgid "Incoming call"
#~ msgstr "Входящий звонок"
-#~ msgid "Call back"
-#~ msgstr "Обратный вызов"
-
#~ msgid "(C) 2009 Savoir-faire Linux"
#~ msgstr "(C) 2009 Savoir-faire Linux"
@@ -1317,13 +1459,16 @@ msgstr "Поиск по исходящим вызовам"
#~ msgctxt "NAME OF TRANSLATORS"
#~ msgid "Your names"
#~ msgstr ""
-#~ ",Launchpad Contributions:,Hussein Abdallah, ,Launchpad "
-#~ "Contributions:,Emmanuel Milou,Hussein Abdallah,Maxime Chambreuil,Pavlo "
-#~ "Kucheriavyi,Sergei Sedov, ,Launchpad Contributions:,Emmanuel Milou,Hussein "
-#~ "Abdallah,Hussein Abdallah,Maxime Chambreuil,Pavlo Kucheriavyi,Sergei Sedov"
+#~ ",Launchpad Contributions:,Hussein Abdallah, ,Launchpad Contributions:,"
+#~ "Emmanuel Milou,Hussein Abdallah,Maxime Chambreuil,Pavlo Kucheriavyi,"
+#~ "Sergei Sedov, ,Launchpad Contributions:,Emmanuel Milou,Hussein Abdallah,"
+#~ "Hussein Abdallah,Maxime Chambreuil,Pavlo Kucheriavyi,Sergei Sedov, ,"
+#~ "Launchpad Contributions:,Emmanuel Milou,Hussein Abdallah,Hussein Abdallah,"
+#~ "Maxime Chambreuil,Pavlo Kucheriavyi,Sergey Sedov"
#~ msgctxt "EMAIL OF TRANSLATORS"
#~ msgid "Your emails"
#~ msgstr ""
-#~ ",,,,,emmanuel.milou@savoirfairelinux.com,,maxime.chambreuil@gmail.com,,,,,emm"
-#~ "anuel.milou@savoirfairelinux.com,,,maxime.chambreuil@gmail.com,,"
+#~ ",,,,,emmanuel.milou@savoirfairelinux.com,,maxime.chambreuil@gmail.com,,,,,"
+#~ "emmanuel.milou@savoirfairelinux.com,,,maxime.chambreuil@gmail.com,,,,,"
+#~ "emmanuel.milou@savoirfairelinux.com,,,maxime.chambreuil@gmail.com,,"
diff --git a/sflphone-client-gnome/po/sflphone_es.po.patch b/sflphone-client-gnome/po/sflphone_es.po.patch
deleted file mode 100644
index 80b09273b2ce99e095bc24d5ee842c3e2461d865..0000000000000000000000000000000000000000
--- a/sflphone-client-gnome/po/sflphone_es.po.patch
+++ /dev/null
@@ -1,395 +0,0 @@
---- sflphone_es.po.orig 2008-05-21 23:16:55.000000000 +0200
-+++ sflphone_es.po 2008-08-13 11:53:32.000000000 +0200
-@@ -11,7 +11,7 @@ msgid ""
- msgstr ""
- "Project-Id-Version: SFLphone 0.8.2\n"
- "Report-Msgid-Bugs-To: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com >\n"
--"PO-Revision-Date: 2008-03-27 11:15\n"
-+"PO-Revision-Date: 2008-08-13 11:53+0200\n"
- "Last-Translator: Maxime Chambreuil <maxime.chambreuil@savoirfairelinux.com>\n"
- "Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n"
- "MIME-Version: 1.0\n"
-@@ -21,19 +21,19 @@ msgstr ""
-
- #: src/audio/audiolayer.cpp: 318
- msgid "Error while opening capture device "
--msgstr "Error abriendo el dispositivo de captura "
-+msgstr "Error al abrir el dispositivo de captura "
-
- #: src/audio/audiolayer.cpp: 349
- msgid "Error while opening playback device "
--msgstr "Error abriendo el dispositivo del aparato de lectura "
-+msgstr "Error al abrir el dispositivo de reproducción "
-
- #: sflphone-gtk/src/menus.c: 119
- msgid "About SFLphone"
--msgstr "Sobre SFLphone"
-+msgstr "Acerca de SFLphone"
-
- #: sflphone-gtk/src/menus.c: 124
- msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
--msgstr "SFLphone es un telefono por Internet compatible con los protocolos SIP y IAX2"
-+msgstr "SFLphone es un cliente de VoIP compatible con los protocolos SIP y IAX2."
-
- #: sflphone-gtk/src/menus.c: 150
- msgid "_Help"
-@@ -45,15 +45,15 @@ msgstr "_Nueva llamada"
-
- #: sflphone-gtk/src/menus.c: 217 menus.c: 605
- msgid "_Pick up"
--msgstr "_Colgar"
-+msgstr "_Descolgar"
-
- #: sflphone-gtk/src/menus.c: 225 menus.c: 617
- msgid "_Hang up"
--msgstr "_Descolgar"
-+msgstr "_Colgar"
-
- #: sflphone-gtk/src/menus.c: 233 menus.c: 629
- msgid "On _Hold"
--msgstr "_Sostener"
-+msgstr "En _Espera"
-
- #: sflphone-gtk/src/menus.c: 254
- msgid "_Call"
-@@ -69,11 +69,11 @@ msgstr "_Cuentas"
-
- #: sflphone-gtk/src/menus.c: 438
- msgid "_Edit"
--msgstr "_Edición"
-+msgstr "_Editar"
-
- #: sflphone-gtk/src/menus.c: 462
- msgid "_Dialpad"
--msgstr "_Pantalla de numero"
-+msgstr "_Teclado numérico"
-
- #: sflphone-gtk/src/menus.c: 471
- msgid "_Volume controls"
-@@ -93,11 +93,11 @@ msgstr "Llamar"
-
- #: sflphone-gtk/src/calltree.c: 343 sflphone-gtk/src/calltree.c: 344
- msgid "Pick up"
--msgstr "Colgar"
-+msgstr "Descolgar"
-
- #: sflphone-gtk/src/calltree.c: 351 sflphone-gtk/src/calltree.c: 352
- msgid "Hang up"
--msgstr "Descolgar"
-+msgstr "Colgar"
-
- #: sflphone-gtk/src/calltree.c: 359 sflphone-gtk/src/calltree.c: 360
- msgid "Off Hold"
-@@ -105,7 +105,7 @@ msgstr "Seguir"
-
- #: sflphone-gtk/src/calltree.c: 367 sflphone-gtk/src/calltree.c: 368
- msgid "On Hold"
--msgstr "Sostener"
-+msgstr "Retener"
-
- #: sflphone-gtk/src/calltree.c: 375 sflphone-gtk/src/calltree.c: 376
- msgid "Transfer"
-@@ -117,11 +117,11 @@ msgstr "Nombre"
-
- #: sflphone-gtk/src/configwindow.c: 804
- msgid "Frequency"
--msgstr "Frequencia"
-+msgstr "Frecuencia"
-
- #: sflphone-gtk/src/configwindow.c: 809
- msgid "Bitrate"
--msgstr "Bitrato"
-+msgstr "Tasa de transferencia"
-
- #: sflphone-gtk/src/configwindow.c: 814
- msgid "Bandwidth"
-@@ -137,11 +137,11 @@ msgstr "Estado"
-
- #: sflphone-gtk/src/configwindow.c: 934
- msgid "Default"
--msgstr "Defecto"
-+msgstr "Predeterminado"
-
- #: sflphone-gtk/src/configwindow.c: 935
- msgid "Set the selected account as the default one to make calls"
--msgstr "Fije la cuenta seleccionada como el defecto para llamar"
-+msgstr "Establecer la cuenta seleccionada como predeterminada para hacer llamadas"
-
- #: sflphone-gtk/src/configwindow.c: 976
- msgid "Devices"
-@@ -161,19 +161,19 @@ msgstr "Periférico de entrada"
-
- #: sflphone-gtk/src/configwindow.c: 1080
- msgid "Detect all"
--msgstr "Detecte todos"
-+msgstr "Detectar todos"
-
- #: sflphone-gtk/src/configwindow.c: 1107
- msgid "_Enable ringtones"
--msgstr "_Permitir los ringtones"
-+msgstr "_Habilitar tonos de llamada"
-
- #: sflphone-gtk/src/configwindow.c: 1112
- msgid "Choose a ringtone"
--msgstr "Elija un ringtones"
-+msgstr "Elija un tono de llamada"
-
- #: sflphone-gtk/src/configwindow.c: 1117
- msgid "Audio Files"
--msgstr "Archivos Audio"
-+msgstr "Archivos de Audio"
-
- #: sflphone-gtk/src/configwindow.c: 1142
- msgid "Preferences"
-@@ -181,7 +181,7 @@ msgstr "Preferencias"
-
- #: sflphone-gtk/src/configwindow.c: 1167
- msgid "Audio Settings"
--msgstr "Configuración Audio"
-+msgstr "Configuración de audio"
-
- #: sflphone-gtk/src/configwindow.c: 1191
- msgid "Accounts"
-@@ -193,7 +193,7 @@ msgstr "Cuentas existentes"
-
- #: sflphone-gtk/src/configwindow.c: 1254
- msgid "Desktop Notification"
--msgstr "Notificación de Escritorio"
-+msgstr "Notificación de escritorio"
-
- #: sflphone-gtk/src/configwindow.c: 1263
- msgid "_Enable"
-@@ -201,31 +201,31 @@ msgstr "_Activar"
-
- #: sflphone-gtk/src/configwindow.c: 1268
- msgid "_Notify Voice Mails"
--msgstr "_Notificar Mensajes Vocales"
-+msgstr "_Notificar mensajes de voz"
-
- #: sflphone-gtk/src/configwindow.c: 1274
- msgid "System Tray Icon"
--msgstr "Icono de Bandeja del Sistema"
-+msgstr "Icono de bandeja del sistema"
-
- #: sflphone-gtk/src/configwindow.c: 1283
- msgid "_Popup Main Window On Incoming Call"
--msgstr "_Popup Ventana Principal por las Llamadas Recibidas"
-+msgstr "_Mostrar ventana principal al recibir llamadas"
-
- #: sflphone-gtk/src/configwindow.c: 1288
- msgid "Ne_ver Popup Main Window"
--msgstr "_Jamas Popup Ventana Principal"
-+msgstr "_Nunca mostrar ventana principal"
-
- #: sflphone-gtk/src/configwindow.c: 1292
- msgid "_Start Hidden"
--msgstr "_Iniciar Escondido"
-+msgstr "_Iniciar oculto"
-
- #: sflphone-gtk/src/configwindow.c: 1297
- msgid "Calls History"
--msgstr "Historia de Llamada"
-+msgstr "Historial de llamadas"
-
- #: sflphone-gtk/src/configwindow.c: 1307
- msgid "_Maximum number of calls"
--msgstr "_Numero Maximo de Llamadas"
-+msgstr "_Número máximo de llamadas"
-
- #: sflphone-gtk/src/accountwindow.c: 139
- msgid "Account settings"
-@@ -233,7 +233,7 @@ msgstr "Configuración de cuentas"
-
- #: sflphone-gtk/src/accountwindow.c: 151
- msgid "Account parameters"
--msgstr "Paràmetros de Cuenta"
-+msgstr "Parámetros de cuenta"
-
- #: sflphone-gtk/src/accountwindow.c: 174
- msgid "_Enabled"
-@@ -253,7 +253,7 @@ msgstr "Desconocido"
-
- #: sflphone-gtk/src/accountwindow.c: 216 sflphone-gtk/src/assistant.c: 169 sflphone-gtk/src/assistant.c: 218
- msgid "_Host name"
--msgstr "_Parte del servidor"
-+msgstr "_Nombre de equipo"
-
- #: sflphone-gtk/src/accountwindow.c: 224 sflphone-gtk/src/assistant.c: 177 sflphone-gtk/src/assistant.c: 226
- msgid "_User name"
-@@ -265,11 +265,11 @@ msgstr "_Contraseña"
-
- #: sflphone-gtk/src/accountwindow.c: 241
- msgid "_Voicemail box #"
--msgstr "_Numero de Caja de Voz"
-+msgstr "_Número de buzón de voz"
-
- #: sflphone-gtk/src/accountwindow.c: 252 sflphone-gtk/src/assistant.c: 256
- msgid "Network Address Translation"
--msgstr "Conversión de Dirección de Red"
-+msgstr "Conversión de Dirección de Red (NAT)"
-
- #: sflphone-gtk/src/accountwindow.c: 264 sflphone-gtk/src/assistant.c: 265
- msgid "E_nable STUN"
-@@ -277,7 +277,7 @@ msgstr "A_ctivar STUN"
-
- #: sflphone-gtk/src/accountwindow.c: 267
- msgid "Enable it if you are behind a firewall, then restart SFLphone"
--msgstr "Activar si esta atras un cortafuego, despues reiniciar SFLphone"
-+msgstr "Actívelo si está detrás de un cortafuegos, después reinicie SFLphone"
-
- #: sflphone-gtk/src/accountwindow.c: 270 sflphone-gtk/src/assistant.c: 272
- msgid "_STUN Server"
-@@ -289,44 +289,44 @@ msgstr "Formato: nombre.servidor:puerto"
-
- #: sflphone-gtk/src/actions.c: 45
- msgid "%d voice mails"
--msgstr "%d mensajes"
-+msgstr "%d mensajes de voz"
-
- #: sflphone-gtk/src/actions.c: 47
- msgid "%d voice mail"
--msgstr "%d mensaje"
-+msgstr "%d mensaje de voz"
-
- #: sflphone-gtk/src/actions.c: 162
- msgid "Unable to connect to the SFLphone server.\n"
- " Make sure the daemon is running."
--msgstr "Incapaz e conectar con el servidor SFLphone.\n"
--" Checa que el demonio está funcionando."
-+msgstr "Incapaz de conectar con el servidor SFLphone.\n"
-+" Asegúrese de que el demonio esté funcionando."
-
- #: sflphone-gtk/src/actions.c: 544
- msgid "The account selected as default is not registered."
--msgstr "La cuenta seleccionada como defecto no es registrada."
-+msgstr "La cuenta seleccionada como predeterminada no está registrada."
-
- #: sflphone-gtk/src/actions.c: 557
- msgid "There is no registered account to make this call with."
--msgstr "No hay cuenta registrada para hacer esta llamada"
-+msgstr "No hay ninguna cuenta registrada para hacer esta llamada."
-
- #: sflphone-gtk/src/actions.c: 591
- msgid "<b>ALSA notification</b>\n\n"
- "Error while opening playback device"
- msgstr "<b>Notificación ALSA</b>\n\n"
--"Error abriendo el dispositivo del aparato de lectura"
-+"Error al abrir el dispositivo de reproducción"
-
- #: sflphone-gtk/src/actions.c: 594
- msgid "<b>ALSA notification</b>\n\n"
- "Error while opening capture device"
- msgstr "<b>Notificación ALSA</b>\n\n"
--"Error abriendo el dispositivo de captura"
-+"Error al abrir el dispositivo de captura"
-
- #r sflphone-gtk/src/actions.c: 632
- msgid "<b>Error: No audio codecs found.\n\n</b>"
- " SFL audio codecs have to be placed in <i>%s</i>"
- " or in the <b>.sflphone</b> directory in your home( <i>%s</i> )"
--msgstr "<b>Error: No codec audio encontrado.\n\n</b>"
--" Los codecs audio de SFLphone deben estar en <i>%s</i>"
-+msgstr "<b>Error: Codecs de audio no encontrados.\n\n</b>"
-+" Los codecs de audio de SFLphone deben estar en <i>%s</i>"
- " o en el directorio <b>.sflphone</b> de su home( <i>%s</i> )"
-
- #: sflphone-gtk/src/accountlist.c: 148
-@@ -339,7 +339,7 @@ msgstr "No registrado"
-
- #: sflphone-gtk/src/accountlist.c: 154
- msgid "Trying..."
--msgstr "Tratando..."
-+msgstr "Intentando..."
-
- #: sflphone-gtk/src/accountlist.c: 157
- msgid "Error"
-@@ -362,8 +362,8 @@ msgid "<b><big>Welcome to SFLphone!</big
- "There is no VoIP account configured.\n"
- " Would you like to create one now?"
- msgstr "<b><big>Bienvenido en SFLphone!</big></b>\n\n"
--"No hay cuenta VoIP configurada.\n"
--" Usted quiere crear una ?"
-+"No hay ninguna cuenta VoIP configurada.\n"
-+" ¿Quiere crear una?"
-
- #: sflphone-gtk/src/SFLnotify.c: 32
- msgid "%s account: %s"
-@@ -379,7 +379,7 @@ msgstr "Aceptar"
-
- #: sflphone-gtk/src/SFLnotify.c: 51
- msgid "Refuse"
--msgstr "Renunciar"
-+msgstr "Rechazar"
-
- #: sflphone-gtk/src/SFLnotify.c: 52
- msgid "Ignore"
-@@ -387,7 +387,7 @@ msgstr "Ignorar"
-
- #: sflphone-gtk/src/statusicon.c: 80
- msgid "Show main window"
--msgstr "Mostrar Ventana Principal"
-+msgstr "Mostrar ventana principal"
-
- #: sflphone-gtk/src/statusicon.c: 113
- msgid "SFLphone - %i account registered"
-@@ -397,15 +397,15 @@ msgstr[1] "SFLphone - %i cuentas registr
-
- #: sflphone-gtk/src/assistant.c: 91
- msgid "SFLphone account configuration wizard"
--msgstr "Asistante de Configuración de Cuenta SFLphone"
-+msgstr "Asistente de configuración de cuentas de SFLphone"
-
- #: sflphone-gtk/src/assistant.c: 122
- msgid "Welcome to SFLphone!"
--msgstr "Bienvenido en SFLphone!"
-+msgstr "¡Bienvenido a SFLphone!"
-
- #: sflphone-gtk/src/assistant.c: 119
- msgid "This installation wizard will help you configure an account."
--msgstr "Ese asistante de instalaciòn ayuda usted a configurar una cuenta."
-+msgstr "Este asistente de instalación le ayudará a configurar una cuenta."
-
- #: sflphone-gtk/src/assistant.c: 134
- msgid "VoIP Protocols"
-@@ -413,33 +413,33 @@ msgstr "Protocolos VoIP"
-
- #: sflphone-gtk/src/assistant.c: 134
- msgid "Select an account type:"
--msgstr "Escoje un tipo de cuenta:"
-+msgstr "Escoja un tipo de cuenta:"
-
- #: sflphone-gtk/src/assistant.c: 153
- msgid "SIP account configuration"
--msgstr "Configuraciòn de cuenta SIP"
-+msgstr "Configuración de cuenta SIP"
-
- #: sflphone-gtk/src/assistant.c: 153 sflphone-gtk/src/assistant.c: 202
- msgid "Please fill the following information:"
--msgstr "Por favor de llenar esas informaciones:"
-+msgstr "Por favor, rellene la siguiente información:"
-
- #: sflphone-gtk/src/assistant.c: 202
- msgid "IAX2 account configuration"
--msgstr "Configuraciòn de cuenta IAX2"
-+msgstr "Configuración de cuenta IAX2"
-
- #: sflphone-gtk/src/assistant.c: 256
- msgid "You should probably enable this if you are behind a firewall."
--msgstr "Probablemente, tiene que activar eso si usted esta atras de un cortafuego."
-+msgstr "Probablemente tiene que activar esto si está detrás de un cortafuegos."
-
- #: sflphone-gtk/src/assistant.c: 289
- msgid "Account Registration"
--msgstr "Registraciòn de Cuenta"
-+msgstr "Registro de cuenta"
-
- #: sflphone-gtk/src/assistant.c: 289
- msgid "Congratulations!"
--msgstr "Felicitaciones!"
-+msgstr "¡Enhorabuena!"
-
- #: sflphone-gtk/src/assistant.c: 291
- msgid "This assistant is now finished.\n\n You can at any time check your registration state or modify your accounts parameters in the Options/Accounts window."
--msgstr "Ese asistante esta terminado.\n\n Usted puede checar su estado de registraciòn o cambiar sus parametros de cuentas en cualquier momento en la ventana de Opciones/Cuentas."
-+msgstr "Este asistente ha finalizado.\n\n Puede comprobar en cualquier momento su estado de registro o modificar la configuración de sus cuentas en la ventana de Opciones/Cuentas."
-
diff --git a/sflphone-client-gnome/po/zh_CN/zh_CN.po b/sflphone-client-gnome/po/zh_CN/zh_CN.po
index 3defe8ab2e3f4676950981c5e88e04e7c0296797..bfc3429d51dec35ea9728985f2d0967e8ad86bd1 100644
--- a/sflphone-client-gnome/po/zh_CN/zh_CN.po
+++ b/sflphone-client-gnome/po/zh_CN/zh_CN.po
@@ -8,15 +8,15 @@ msgid ""
msgstr ""
"Project-Id-Version: SFLphone 0.9.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-14 11:18-0400\n"
-"PO-Revision-Date: 2009-10-15 13:46+0000\n"
-"Last-Translator: Yinghua Wang <Unknown>\n"
+"POT-Creation-Date: 2009-12-03 10:22-0500\n"
+"PO-Revision-Date: 2009-10-26 20:46+0000\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=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-10-26 15:48+0000\n"
+"X-Launchpad-Export-Date: 2009-12-03 15:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: ../sflphone-client-gnome/src/accountlist.c:175
@@ -61,24 +61,15 @@ msgstr "Stun服务器无效"
msgid "Invalid"
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 个语音信息"
-
-#: ../sflphone-client-gnome/src/actions.c:83
-#: ../sflphone-client-gnome/src/actions.c:919
-#: ../sflphone-client-gnome/src/actions.c:926
+#: ../sflphone-client-gnome/src/actions.c:98
msgid "Using account"
msgstr "使用账户"
-#: ../sflphone-client-gnome/src/actions.c:89
+#: ../sflphone-client-gnome/src/actions.c:104
msgid "No registered accounts"
msgstr "没有已注册帐户"
-#: ../sflphone-client-gnome/src/actions.c:268
+#: ../sflphone-client-gnome/src/actions.c:285
msgid ""
"Unable to connect to the SFLphone server.\n"
"Make sure the daemon is running."
@@ -86,26 +77,23 @@ msgstr ""
"连接SFLphone服务器失败.\n"
"请检查daemon是否还在运行."
-#: ../sflphone-client-gnome/src/actions.c:913
-#, c-format
-msgid "IP call - %s"
-msgstr "IP 电话 - %s"
-
-#: ../sflphone-client-gnome/src/actions.c:922
-msgid "Codec"
-msgstr "编码"
+#: ../sflphone-client-gnome/src/actions.c:589
+#: ../sflphone-client-gnome/src/actions.c:911
+msgid "Direct SIP call"
+msgstr ""
-#: ../sflphone-client-gnome/src/actions.c:1119
+#: ../sflphone-client-gnome/src/actions.c:1103
#, 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> )"
+"</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>目录下"
+"</b> SFL声音codecs文件应位于<i>%s</i> 或 位于主目录( <i>%s</i> )的<b>."
+"sflphone</b>目录下"
#: ../sflphone-client-gnome/src/errors.c:29
msgid ""
@@ -149,53 +137,53 @@ msgstr "有电话正在处理中"
msgid "Do you still want to quit?"
msgstr "确认要退出?"
-#: ../sflphone-client-gnome/src/mainwindow.c:299
+#: ../sflphone-client-gnome/src/mainwindow.c:298
msgid "SFLphone Error"
msgstr "SFLphone出错"
-#: ../sflphone-client-gnome/src/mainwindow.c:391
+#: ../sflphone-client-gnome/src/mainwindow.c:392
#, c-format
msgid "ZRTP is not supported by peer %s\n"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:392
+#: ../sflphone-client-gnome/src/mainwindow.c:393
msgid "Secure Communication Unavailable"
msgstr "安全通信不可用"
-#: ../sflphone-client-gnome/src/mainwindow.c:393
-#: ../sflphone-client-gnome/src/mainwindow.c:415
+#: ../sflphone-client-gnome/src/mainwindow.c:394
+#: ../sflphone-client-gnome/src/mainwindow.c:416
msgid "Continue"
msgstr "继续"
-#: ../sflphone-client-gnome/src/mainwindow.c:394
-#: ../sflphone-client-gnome/src/mainwindow.c:416
-#: ../sflphone-client-gnome/src/mainwindow.c:430
+#: ../sflphone-client-gnome/src/mainwindow.c:395
+#: ../sflphone-client-gnome/src/mainwindow.c:417
+#: ../sflphone-client-gnome/src/mainwindow.c:431
msgid "Stop Call"
msgstr "停止呼叫"
-#: ../sflphone-client-gnome/src/mainwindow.c:413
+#: ../sflphone-client-gnome/src/mainwindow.c:414
#, c-format
msgid ""
"A %s error forced the call with %s to fall under unencrypted mode.\n"
"Exact reason: %s\n"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:414
+#: ../sflphone-client-gnome/src/mainwindow.c:415
msgid "ZRTP negotiation failed"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:427
+#: ../sflphone-client-gnome/src/mainwindow.c:428
#, c-format
msgid ""
"%s wants to stop using secure communication. Confirm will resume "
"conversation without SRTP.\n"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:428
+#: ../sflphone-client-gnome/src/mainwindow.c:429
msgid "Confirm Go Clear"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:429
+#: ../sflphone-client-gnome/src/mainwindow.c:430
msgid "Confirm"
msgstr "确认"
@@ -210,6 +198,12 @@ msgstr "%s 帐户: %s"
msgid "<i>From</i> %s"
msgstr "<i>拨入方</i> %s"
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+#, c-format
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] "%d 个语音信息"
+
#: ../sflphone-client-gnome/src/sflnotify.c:111
#, c-format
msgid "Calling with %s account <i>%s</i>"
@@ -257,217 +251,413 @@ msgstr "扬声器音量"
msgid "Mic volume"
msgstr "话筒音量"
-#: ../sflphone-client-gnome/src/statusicon.c:91
+#: ../sflphone-client-gnome/src/statusicon.c:96
msgid "_Show main window"
msgstr "显示主窗口(S)"
-#: ../sflphone-client-gnome/src/statusicon.c:126
+#: ../sflphone-client-gnome/src/statusicon.c:131
msgid "SFLphone"
msgstr "SFLphone"
-#: ../sflphone-client-gnome/src/statusicon.c:127
+#: ../sflphone-client-gnome/src/statusicon.c:132
#, c-format
msgid "%i account configured"
msgid_plural "%i accounts configured"
msgstr[0] "已配置了%i个账户"
#: ../sflphone-client-gnome/src/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:750
+#: ../sflphone-client-gnome/src/uimanager.c:693
+#: ../sflphone-client-gnome/src/uimanager.c:727
msgid "Voicemail"
msgstr "语音信箱"
-#: ../sflphone-client-gnome/src/uimanager.c:403
+#: ../sflphone-client-gnome/src/uimanager.c:117
+msgid "No address book selected"
+msgstr "地址簿"
+
+#: ../sflphone-client-gnome/src/uimanager.c:137
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "Address book"
+msgstr "地址簿"
+
+#: ../sflphone-client-gnome/src/uimanager.c:279
+msgid "Voicemail (%i)"
+msgstr "语音信箱 (%i)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:342
msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
msgstr "SFLphone是一个VoIP客户端，它兼容SIP和IAX2协议."
-#: ../sflphone-client-gnome/src/uimanager.c:406
+#: ../sflphone-client-gnome/src/uimanager.c:345
msgid "About SFLphone"
msgstr "关于SFLphone"
-#: ../sflphone-client-gnome/src/uimanager.c:1028
+#: ../sflphone-client-gnome/src/uimanager.c:719
+msgid "Call"
+msgstr "电话(_C)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:1184
+msgid "_New call"
+msgstr "新电话(_N)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+msgid "Place a new call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:979
msgid "_Pick up"
msgstr "接听(_P)"
-#: ../sflphone-client-gnome/src/uimanager.c:1040
-#: ../sflphone-client-gnome/src/uimanager.c:1081
+#: ../sflphone-client-gnome/src/uimanager.c:721
+msgid "Answer the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:991
+#: ../sflphone-client-gnome/src/uimanager.c:1032
msgid "_Hang up"
msgstr "挂断(_H)"
-#: ../sflphone-client-gnome/src/uimanager.c:1052
-#: ../sflphone-client-gnome/src/uimanager.c:1093
-msgid "On _Hold"
+#: ../sflphone-client-gnome/src/uimanager.c:722
+msgid "Finish the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "O_n hold"
msgstr "保持(_H)"
-#: ../sflphone-client-gnome/src/uimanager.c:1064
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "Place the call on hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "O_ff hold"
+msgstr "恢复通话"
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "Place the call off hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:725
+#: ../sflphone-client-gnome/src/uimanager.c:1015
msgid "_Record"
msgstr "录音(_R)"
-#: ../sflphone-client-gnome/src/uimanager.c:1154
+#: ../sflphone-client-gnome/src/uimanager.c:725
+msgid "Record the current conversation"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Configuration _Assistant"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Run the configuration assistant"
+msgstr "Stun配置有误"
+
+#: ../sflphone-client-gnome/src/uimanager.c:727
+msgid "Call your voicemail"
+msgstr "%d 个语音信息"
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "_Close"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "Minimize to system tray"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "_Quit"
+msgstr "编辑(_E)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "Quit the program"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:732
+msgid "_Edit"
+msgstr "编辑(_E)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "_Copy"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "Copy the selection"
+msgstr "删除所选账户"
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "_Paste"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "Paste the clipboard"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear _history"
+msgstr "清空历史记录(_H)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear the call history"
+msgstr "清空历史记录"
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "_Accounts"
+msgstr "账户(_A)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "Edit your accounts"
+msgstr "当前帐户"
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "_Preferences"
+msgstr "首选项"
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "Change your preferences"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:740
+msgid "_View"
+msgstr "查看(_V)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:743
+msgid "_Help"
+msgstr "帮助(_H)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Contents"
+msgstr "继续"
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Open the manual"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:745
+msgid "About this application"
+msgstr "身份验证"
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "_Transfer"
+msgstr "转接"
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "Transfer the call"
+msgstr "转给: "
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "_Show toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "Show the toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "_Dialpad"
+msgstr "禁用"
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "Show the dialpad"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "_Volume controls"
+msgstr "音量控制(V)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "Show the volume controls"
+msgstr "音量控制(V)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "_History"
+msgstr "历史"
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "Calls history"
+msgstr "呼叫记录"
+
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "_Address book"
+msgstr "地址簿"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1003
+#: ../sflphone-client-gnome/src/uimanager.c:1044
+msgid "On _Hold"
+msgstr "保持(_H)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1107
msgid "_Call back"
msgstr "回叫(_C)"
-#: ../sflphone-client-gnome/src/uimanager.c:1226
-msgid "_New call"
-msgstr "新电话(_N)"
-
-#: ../sflphone-client-gnome/src/uimanager.c:1300
+#: ../sflphone-client-gnome/src/uimanager.c:1258
msgid "Edit phone number"
msgstr "编辑电话号码"
-#: ../sflphone-client-gnome/src/uimanager.c:1311
+#: ../sflphone-client-gnome/src/uimanager.c:1269
msgid "Edit the phone number before making a call"
msgstr "拨出电话前编辑电话号码"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:164
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
msgid "Account Parameters"
msgstr "帐户相关参数"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:173
-#: ../sflphone-client-gnome/src/config/assistant.c:294
-#: ../sflphone-client-gnome/src/config/assistant.c:402
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
+#: ../sflphone-client-gnome/src/config/assistant.c:314
+#: ../sflphone-client-gnome/src/config/assistant.c:427
msgid "_Alias"
msgstr "别名(A)"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:181
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
msgid "_Protocol"
msgstr "协议(P)"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:199
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
msgid "Unknown"
msgstr "未知"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:209
-#: ../sflphone-client-gnome/src/config/assistant.c:302
-#: ../sflphone-client-gnome/src/config/assistant.c:410
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
+#: ../sflphone-client-gnome/src/config/assistant.c:322
+#: ../sflphone-client-gnome/src/config/assistant.c:435
msgid "_Host name"
msgstr "主机名(H)"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:217
-#: ../sflphone-client-gnome/src/config/assistant.c:310
-#: ../sflphone-client-gnome/src/config/assistant.c:418
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
+#: ../sflphone-client-gnome/src/config/assistant.c:330
+#: ../sflphone-client-gnome/src/config/assistant.c:443
msgid "_User name"
msgstr "用户名(U)"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:234
-#: ../sflphone-client-gnome/src/config/assistant.c:326
-#: ../sflphone-client-gnome/src/config/assistant.c:433
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:346
+#: ../sflphone-client-gnome/src/config/assistant.c:458
msgid "_Password"
msgstr "密码(P)"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:254
-#: ../sflphone-client-gnome/src/config/assistant.c:344
-#: ../sflphone-client-gnome/src/config/assistant.c:449
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:363
+#: ../sflphone-client-gnome/src/config/assistant.c:473
+msgid "Show password"
+msgstr "密码"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:368
+#: ../sflphone-client-gnome/src/config/assistant.c:478
msgid "_Voicemail number"
msgstr "语音信箱号码(V)"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:340
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
msgid "Authentication"
msgstr "身份验证"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:341
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
msgid "Secret"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:466
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
msgid "Credential"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:501
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
msgid "Authentication name"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:512
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
msgid "Password"
msgstr "密码"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:535
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:909
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:201
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
msgid "Security"
msgstr "安全"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:547
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:213
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
msgid "Use TLS transport (sips)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:552
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:218
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
msgid "SRTP key exchange"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:558
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
msgid "Disabled"
msgstr "禁用"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
msgid "Registration"
msgstr "注册"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:679
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
msgid "Registration expire"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
msgid "_Comply with RFC 3263"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
-msgid "Network"
-msgstr "网络"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
+msgid "Network Interface"
+msgstr "网络连接失败"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:707
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
msgid "Local address"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:744
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
msgid "Local port"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:752
-msgid "Set published address and port:"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
+msgid "Published address"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:756
-msgid "Using STUN "
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+msgid "Using STUN"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:761
-msgid "Same as local parameters"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
+msgid "STUN server URL"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:764
-msgid "Manually"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
+msgid "Same as local parameters"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:769
-msgid "Published address"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
+msgid "Set published address and port:"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:777
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
msgid "Published port"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:785
-msgid "STUN server URL"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
msgid "Account settings"
msgstr "帐户设置"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
msgid "Basic"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:904
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
msgid "Advanced"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:169
-msgid "Server returned \""
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:164
+#, c-format
+msgid "Server returned \"%s\" (%d)"
msgstr ""
#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
@@ -486,32 +676,18 @@ msgstr "帐户"
msgid "Configured Accounts"
msgstr "已配置帐户"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:505
-msgid "There "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "is "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "are "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:508
-msgid " active account"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:509
-msgid "s"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
+#, c-format
+msgid "There is %d active account"
+msgid_plural "There are %d active accounts"
+msgstr[0] ""
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:514
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
msgid "You have no active account"
msgstr ""
#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:443
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
msgid "General"
msgstr "常用配置"
@@ -556,225 +732,220 @@ 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:578
+#: ../sflphone-client-gnome/src/config/audioconf.c:577
msgid "Name"
msgstr "名称"
-#: ../sflphone-client-gnome/src/config/assistant.c:69
+#: ../sflphone-client-gnome/src/config/assistant.c:75
#, c-format
msgid "This assistant is now finished."
msgstr "配置完成."
-#: ../sflphone-client-gnome/src/config/assistant.c:71
+#: ../sflphone-client-gnome/src/config/assistant.c:77
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/config/assistant.c:74
+#: ../sflphone-client-gnome/src/config/assistant.c:80
msgid "Alias"
msgstr "别名"
-#: ../sflphone-client-gnome/src/config/assistant.c:78
+#: ../sflphone-client-gnome/src/config/assistant.c:84
msgid "Server"
msgstr "服务器"
-#: ../sflphone-client-gnome/src/config/assistant.c:82
+#: ../sflphone-client-gnome/src/config/assistant.c:88
msgid "Username"
msgstr "用户名"
-#: ../sflphone-client-gnome/src/config/assistant.c:86
+#: ../sflphone-client-gnome/src/config/assistant.c:92
msgid "Security: "
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:88
+#: ../sflphone-client-gnome/src/config/assistant.c:94
msgid "SRTP/ZRTP draft-zimmermann"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:90
-#: ../sflphone-client-gnome/src/config/assistant.c:182
+#: ../sflphone-client-gnome/src/config/assistant.c:96
msgid "None"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:210
+#: ../sflphone-client-gnome/src/config/assistant.c:229
msgid "SFLphone account creation wizard"
msgstr "SFLphone账户创建向导"
-#: ../sflphone-client-gnome/src/config/assistant.c:236
+#: ../sflphone-client-gnome/src/config/assistant.c:255
msgid "Welcome to the Account creation wizard of SFLphone!"
msgstr "欢迎使用SFLphone帐户创建向导!"
-#: ../sflphone-client-gnome/src/config/assistant.c:237
+#: ../sflphone-client-gnome/src/config/assistant.c:256
msgid "This installation wizard will help you configure an account."
msgstr "安装向导将帮助您配置帐户"
-#: ../sflphone-client-gnome/src/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "VoIP Protocols"
msgstr "VoIP协议"
-#: ../sflphone-client-gnome/src/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "Select an account type"
msgstr "选择帐户类型"
-#: ../sflphone-client-gnome/src/config/assistant.c:253
+#: ../sflphone-client-gnome/src/config/assistant.c:272
msgid "SIP (Session Initiation Protocol)"
msgstr "SIP(会话初始化协议)"
-#: ../sflphone-client-gnome/src/config/assistant.c:255
+#: ../sflphone-client-gnome/src/config/assistant.c:274
msgid "IAX2 (InterAsterix Exchange)"
msgstr "IAX2(Asterisk内部交换协议)"
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Account"
msgstr "帐户"
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Please select one of the following options"
msgstr "请选择以下选项中的一个"
-#: ../sflphone-client-gnome/src/config/assistant.c:271
+#: ../sflphone-client-gnome/src/config/assistant.c:290
msgid "Create a free SIP/IAX2 account on sflphone.org"
msgstr "在sflphone.org上创建免费的SIP/IAX2帐户"
-#: ../sflphone-client-gnome/src/config/assistant.c:273
+#: ../sflphone-client-gnome/src/config/assistant.c:292
msgid "Register an existing SIP or IAX2 account"
msgstr "注册已存在的SIP或IAX2帐户"
-#: ../sflphone-client-gnome/src/config/assistant.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:306
msgid "SIP account settings"
msgstr "SIP帐户设置"
-#: ../sflphone-client-gnome/src/config/assistant.c:286
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "Please fill the following information"
msgstr "请填写以下信息"
-#: ../sflphone-client-gnome/src/config/assistant.c:352
-#: ../sflphone-client-gnome/src/config/assistant.c:381
+#: ../sflphone-client-gnome/src/config/assistant.c:376
+#: ../sflphone-client-gnome/src/config/assistant.c:405
msgid "Secure communications with _ZRTP"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "Optional email address"
msgstr "可选邮件地址"
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "This email address will be used to send your voicemail messages."
msgstr "这个邮件地址将被用来发送您的语音邮箱消息"
-#: ../sflphone-client-gnome/src/config/assistant.c:373
+#: ../sflphone-client-gnome/src/config/assistant.c:397
msgid "_Email address"
msgstr "邮件地址(E)"
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "IAX2 account settings"
msgstr "IAX2帐户设置"
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "Network Address Translation (NAT)"
msgstr "网络地址解析(NAT)"
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "You should probably enable this if you are behind a firewall."
msgstr "如果你使用网络使用防火墙，你很有可能需要设定此项."
-#: ../sflphone-client-gnome/src/config/assistant.c:476
+#: ../sflphone-client-gnome/src/config/assistant.c:505
msgid "E_nable STUN"
msgstr "使用STUN(n)"
-#: ../sflphone-client-gnome/src/config/assistant.c:483
+#: ../sflphone-client-gnome/src/config/assistant.c:512
msgid "_STUN server"
msgstr "STUN服务器(S)"
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Account Registration"
msgstr "帐户注册"
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Congratulations!"
msgstr "恭喜！"
-#: ../sflphone-client-gnome/src/config/audioconf.c:583
+#: ../sflphone-client-gnome/src/config/audioconf.c:582
msgid "Frequency"
msgstr "频率"
-#: ../sflphone-client-gnome/src/config/audioconf.c:588
+#: ../sflphone-client-gnome/src/config/audioconf.c:587
msgid "Bitrate"
msgstr "比率"
-#: ../sflphone-client-gnome/src/config/audioconf.c:593
+#: ../sflphone-client-gnome/src/config/audioconf.c:592
msgid "Bandwidth"
msgstr "带宽"
-#: ../sflphone-client-gnome/src/config/audioconf.c:673
+#: ../sflphone-client-gnome/src/config/audioconf.c:670
msgid "ALSA plugin"
msgstr "ALSA插件"
-#: ../sflphone-client-gnome/src/config/audioconf.c:695
+#: ../sflphone-client-gnome/src/config/audioconf.c:692
msgid "Output"
msgstr "输出"
-#: ../sflphone-client-gnome/src/config/audioconf.c:717
+#: ../sflphone-client-gnome/src/config/audioconf.c:714
msgid "Input"
msgstr "输入"
-#: ../sflphone-client-gnome/src/config/audioconf.c:752
+#: ../sflphone-client-gnome/src/config/audioconf.c:749
msgid "_Voice Activity Detection"
msgstr "声音状态检测(V)"
-#: ../sflphone-client-gnome/src/config/audioconf.c:762
+#: ../sflphone-client-gnome/src/config/audioconf.c:759
msgid "_Noise Reduction (Narrow-Band Companding)"
msgstr "降噪处理-窄频压缩(N)"
-#: ../sflphone-client-gnome/src/config/audioconf.c:798
+#: ../sflphone-client-gnome/src/config/audioconf.c:800
msgid "Sound Manager"
msgstr "音频管理器"
-#: ../sflphone-client-gnome/src/config/audioconf.c:807
+#: ../sflphone-client-gnome/src/config/audioconf.c:809
msgid "_Pulseaudio"
msgstr "Pulseaudio"
-#: ../sflphone-client-gnome/src/config/audioconf.c:811
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
msgid "_ALSA"
msgstr "ALSA"
-#: ../sflphone-client-gnome/src/config/audioconf.c:816
-msgid "_Mute other applications during a call"
-msgstr "当有来电时静音其它应用程序(c)"
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:823
+#: ../sflphone-client-gnome/src/config/audioconf.c:819
msgid "ALSA settings"
msgstr "ALSA设置"
-#: ../sflphone-client-gnome/src/config/audioconf.c:840
+#: ../sflphone-client-gnome/src/config/audioconf.c:836
msgid "Codecs"
msgstr "Codecs编码"
-#: ../sflphone-client-gnome/src/config/audioconf.c:869
+#: ../sflphone-client-gnome/src/config/audioconf.c:865
msgid "Recordings"
msgstr "记录"
-#: ../sflphone-client-gnome/src/config/audioconf.c:873
+#: ../sflphone-client-gnome/src/config/audioconf.c:869
msgid "Destination folder"
msgstr "目标文件夹"
-#: ../sflphone-client-gnome/src/config/audioconf.c:877
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
msgid "Select a folder"
msgstr "选择文件夹"
-#: ../sflphone-client-gnome/src/config/audioconf.c:883
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
msgid "Ringtones"
msgstr "铃声"
-#: ../sflphone-client-gnome/src/config/audioconf.c:889
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
msgid "_Enable ringtones"
msgstr "启用铃声(E)"
-#: ../sflphone-client-gnome/src/config/audioconf.c:895
+#: ../sflphone-client-gnome/src/config/audioconf.c:891
msgid "Choose a ringtone"
msgstr "选择铃声"
-#: ../sflphone-client-gnome/src/config/audioconf.c:901
+#: ../sflphone-client-gnome/src/config/audioconf.c:897
msgid "Audio Files"
msgstr "音频文件"
@@ -811,86 +982,66 @@ msgstr "重设电话号码"
msgid "_Prefix dialed numbers with"
msgstr "号码前缀(P)"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:195
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
msgid ""
"This profile is used when you want to reach a remote peer simply by typing a "
"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
"also be used if no account can be matched to an incoming or outgoing call."
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:274
-msgid "SIP Port"
-msgstr "SIP端口号"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:281
-msgid "UDP Transport"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:319
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
msgid "Desktop Notifications"
msgstr "桌面提示"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:323
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
msgid "_Enable notifications"
msgstr "启用提示(E)"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:329
-msgid "Enable voicemail _notifications"
-msgstr "启用语音邮箱提示(n)"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:341
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
msgid "System Tray Icon"
msgstr "系统托盘图标"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
msgid "_Popup main window on incoming call"
msgstr "来电时弹出主窗口(P)"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:349
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
msgid "Ne_ver popup main window"
msgstr "从不弹出主窗口(v)"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:353
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
msgid "Hide SFLphone window on _startup"
msgstr "在启动时隐藏SFLphone主窗口"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:359
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
msgid "Calls History"
msgstr "拨号历史"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:362
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
msgid "_Keep my history for at least"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:373
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
msgid "days"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:377
-msgid "Configuration File"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:379
-msgid "Store SIP credentials as MD5 hash"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:423
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
msgid "Preferences"
msgstr "首选项"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:448
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
msgid "Audio"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
msgid "Address Book"
msgstr "地址簿"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:458
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
msgid "Hooks"
msgstr "钩键"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:468
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
msgid "Direct IP calls"
msgstr ""
@@ -898,11 +1049,11 @@ msgstr ""
msgid "Advanced options for TLS"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:55
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:56
msgid "TLS transport"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:59
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:60
msgid ""
"TLS transport can be used along with UDP for those calls that would\n"
"require secure sip transactions (aka SIPS). You can configure a different\n"
@@ -911,55 +1062,55 @@ msgid ""
"port, different one from each other\n"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:100
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
msgid "Certificate of Authority list"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:104
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
msgid "Choose a CA list file (optional)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:115
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
msgid "Public endpoint certificate file"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:119
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
msgid "Choose a public endpoint certificate (optional)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:134
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
msgid "Choose a private key file (optional)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:145
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
msgid "Password for the private key"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:168
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
msgid "TLS protocol method"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:202
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
msgid "TLS cipher list"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:211
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
msgid "Server name instance for outgoing TLS connection"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:219
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
msgid "Negotiation timeout (sec:msec)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:236
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
msgid "Verify incoming certificates, as a server"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:242
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
msgid "Verify certificates from answer, as a client"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:248
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
msgid "Require certificate for incoming tls connections"
msgstr ""
@@ -967,45 +1118,63 @@ msgstr ""
msgid "ZRTP Options"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:68
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:69
msgid "Send Hello Hash in S_DP"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:74
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:75
msgid "Ask User to Confirm SAS"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:80
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:81
msgid "_Warn if ZRTP not supported"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:86
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:87
msgid "Display SAS once for hold events"
msgstr ""
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:58
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
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:59
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:72
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:84
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:96
msgid "Click here to change the search type"
msgstr "请点击此处改变查询方式"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:71
msgid "Search by missed call"
msgstr "从未接电话中查询"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:83
msgid "Search by incoming call"
msgstr "从来电中查询"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:95
msgid "Search by outgoing call"
msgstr "从拨出电话中查询"
+#~ msgid "IP call - %s"
+#~ msgstr "IP 电话 - %s"
+
+#~ msgid "Codec"
+#~ msgstr "编码"
+
+#~ msgid "Network"
+#~ msgstr "网络"
+
+#~ msgid "_Mute other applications during a call"
+#~ msgstr "当有来电时静音其它应用程序(c)"
+
+#~ msgid "SIP Port"
+#~ msgstr "SIP端口号"
+
+#~ msgid "Enable voicemail _notifications"
+#~ msgstr "启用语音邮箱提示(n)"
+
#~ msgid "Account creation wizard"
#~ msgstr "帐户创建向导"
@@ -1026,9 +1195,6 @@ msgstr "从拨出电话中查询"
#~ msgid "Default account"
#~ msgstr "默认帐户"
-#~ msgid "Transfer to : "
-#~ msgstr "转给: "
-
#~ msgid "SFLphone KDE Client"
#~ msgstr "SFLphone KDE客户端"
@@ -1041,12 +1207,6 @@ msgstr "从拨出电话中查询"
#~ msgid "Main screen"
#~ msgstr "主屏幕"
-#~ msgid "Call history"
-#~ msgstr "呼叫记录"
-
-#~ msgid "Address book"
-#~ msgstr "地址簿"
-
#~ msgid "Configure SFLphone"
#~ msgstr "配置SFLphone"
@@ -1080,9 +1240,6 @@ msgstr "从拨出电话中查询"
#~ msgid "Hold on"
#~ msgstr "呼叫保持"
-#~ msgid "Transfer"
-#~ msgstr "转接"
-
#~ msgid "Record"
#~ msgstr "记录"
@@ -1101,29 +1258,32 @@ msgstr "从拨出电话中查询"
#~ 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."
+#~ "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会使用列表当中第一个已注册的帐户。使用箭头\"上\"和\"下\"可以改变账户的顺序。选择账户名称左边的方框可以"
-#~ "启用帐户，取消选择则会禁用该账户。通过\"加\"\"减\"按钮可以添加或删除账户。点击\"编辑\"按钮可以改变账户的设置。"
-
-#~ msgid "Remove the selected account"
-#~ msgstr "删除所选账户"
+#~ "在默认情况下，当你打电话时，sflphone会使用列表当中第一个已注册的帐户。使用"
+#~ "箭头\"上\"和\"下\"可以改变账户的顺序。选择账户名称左边的方框可以启用帐户，"
+#~ "取消选择则会禁用该账户。通过\"加\"\"减\"按钮可以添加或删除账户。点击\"编辑"
+#~ "\"按钮可以改变账户的设置。"
#~ 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 "该按钮会删除列表中被选定的账户。请确认你的操作。如果你希望继续使用某个账户，请取消对该账户的选择"
+#~ "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 ""
+#~ "该按钮会删除列表中被选定的账户。请确认你的操作。如果你希望继续使用某个账"
+#~ "户，请取消对该账户的选择"
#~ msgid "Remove"
#~ msgstr "删除"
#~ 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 "通过该按钮可以创建一个新账户。添加该账户之后你还可以通过编辑按钮来修改设置。"
+#~ "This button enables you to initialize a new account. You will then be "
+#~ "able to edit it using the form on the right."
+#~ msgstr ""
+#~ "通过该按钮可以创建一个新账户。添加该账户之后你还可以通过编辑按钮来修改设"
+#~ "置。"
#~ msgid "Add"
#~ msgstr "添加"
@@ -1136,8 +1296,9 @@ msgstr "从拨出电话中查询"
#~ "this list which is \"registered\". Change the order of the accounts using "
#~ "the \"Up\" and \"Down\" arrows."
#~ msgstr ""
-#~ "在默认情况下，当你打电话时，sflphone会使用列表当中第一个已注册的帐户。使用箭头\"上\"和\"下\"可以改变账户的顺序。选择账户名称左边的方框可以"
-#~ "启用帐户，取消选择则会禁用该账户。通过\"加\"\"减\"按钮可以添加或删除账户。"
+#~ "在默认情况下，当你打电话时，sflphone会使用列表当中第一个已注册的帐户。使用"
+#~ "箭头\"上\"和\"下\"可以改变账户的顺序。选择账户名称左边的方框可以启用帐户，"
+#~ "取消选择则会禁用该账户。通过\"加\"\"减\"按钮可以添加或删除账户。"
#~ msgid "Down"
#~ msgstr "下"
@@ -1220,9 +1381,6 @@ msgstr "从拨出电话中查询"
#~ msgid "On start"
#~ msgstr "正在启动"
-#~ msgid "Clear history"
-#~ msgstr "清空历史记录"
-
#~ msgid "Trigger on specific SIP header"
#~ msgstr "激活指定的SIP头"
@@ -1238,12 +1396,6 @@ msgstr "从拨出电话中查询"
#~ msgid "Attention:number of results exceeds max displayed."
#~ msgstr "注意:结果超过可显示的最大值"
-#~ msgid "_Volume controls"
-#~ msgstr "音量控制(V)"
-
-#~ msgid "History"
-#~ msgstr "历史"
-
#~ msgid "_Enable this account"
#~ msgstr "启用该账户(E)"
@@ -1392,9 +1544,6 @@ msgstr "从拨出电话中查询"
#~ msgid "\"Voicemail\" <%s>"
#~ msgstr "\"语音邮件\" <%s>"
-#~ msgid "Off Hold"
-#~ msgstr "恢复通话"
-
#~ msgid "Record a call"
#~ msgstr "记录通话"
@@ -1544,36 +1693,21 @@ msgstr "从拨出电话中查询"
#~ msgid "_STUN Server"
#~ msgstr "STUN服务器(S)"
-#~ msgid "_Edit"
-#~ msgstr "编辑(_E)"
-
-#~ msgid "_View"
-#~ msgstr "查看(_V)"
-
-#~ msgid "_Help"
-#~ msgstr "帮助(_H)"
-
#~ msgid "_Account creation wizard"
#~ msgstr "帐户创建向导(_A)"
-#~ msgid "_Call"
-#~ msgstr "电话(_C)"
-
-#~ msgid "Clear _history"
-#~ msgstr "清空历史记录(_H)"
-
-#~ msgid "_Accounts"
-#~ msgstr "账户(_A)"
-
#~ msgctxt "NAME OF TRANSLATORS"
#~ msgid "Your names"
#~ msgstr ""
#~ "Yun Liu, ,Launchpad Contributions:,Aron Xu,Yun Liu, ,Launchpad "
#~ "Contributions:,Aron Xu,Yinghua Wang,Yun Liu,rainofchaos, ,Launchpad "
-#~ "Contributions:,Aron Xu,Yinghua Wang,Yun Liu,冯超"
+#~ "Contributions:,Aron Xu,Yinghua Wang,Yun Liu,冯超, ,Launchpad "
+#~ "Contributions:,Aron Xu,Emmanuel Milou,Yun Liu,冯超,王英华"
#~ msgctxt "EMAIL OF TRANSLATORS"
#~ msgid "Your emails"
#~ msgstr ""
-#~ "yunliu2000@gmail.com,,,happyaron.xu@gmail.com,,,,happyaron.xu@gmail.com,,,rai"
-#~ "nofchaos@gmail.com,,,happyaron.xu@gmail.com,,,rainofchaos@gmail.com"
+#~ "yunliu2000@gmail.com,,,happyaron.xu@gmail.com,,,,happyaron.xu@gmail.com,,,"
+#~ "rainofchaos@gmail.com,,,happyaron.xu@gmail.com,,,rainofchaos@gmail.com,,,,"
+#~ "emmanuel.milou@savoirfairelinux.com,,rainofchaos@gmail.com,"
+#~ "wantinghard@gmail.com"
diff --git a/sflphone-client-gnome/po/zh_HK/zh_HK.po b/sflphone-client-gnome/po/zh_HK/zh_HK.po
index 7a9dcac8aae89233370f5c6e7c9e233b005ded7c..0e4afca0c52ab6cb04c97d2e67f3c4fd39c9c273 100644
--- a/sflphone-client-gnome/po/zh_HK/zh_HK.po
+++ b/sflphone-client-gnome/po/zh_HK/zh_HK.po
@@ -8,15 +8,15 @@ msgid ""
msgstr ""
"Project-Id-Version: SFLphone 0.9.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-14 11:18-0400\n"
-"PO-Revision-Date: 2009-10-14 17:28+0000\n"
+"POT-Creation-Date: 2009-12-03 10:22-0500\n"
+"PO-Revision-Date: 2009-10-26 20:46+0000\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=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-10-26 15:48+0000\n"
+"X-Launchpad-Export-Date: 2009-12-03 15:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: ../sflphone-client-gnome/src/accountlist.c:175
@@ -61,24 +61,15 @@ msgstr "Stun伺服器無效"
msgid "Invalid"
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 個語音郵件"
-
-#: ../sflphone-client-gnome/src/actions.c:83
-#: ../sflphone-client-gnome/src/actions.c:919
-#: ../sflphone-client-gnome/src/actions.c:926
+#: ../sflphone-client-gnome/src/actions.c:98
msgid "Using account"
msgstr "使用賬戶"
-#: ../sflphone-client-gnome/src/actions.c:89
+#: ../sflphone-client-gnome/src/actions.c:104
msgid "No registered accounts"
msgstr "沒有已註冊帳戶"
-#: ../sflphone-client-gnome/src/actions.c:268
+#: ../sflphone-client-gnome/src/actions.c:285
msgid ""
"Unable to connect to the SFLphone server.\n"
"Make sure the daemon is running."
@@ -86,26 +77,23 @@ msgstr ""
"連接SFLphone伺服器失敗.\n"
"請核查daemon是否正在運行."
-#: ../sflphone-client-gnome/src/actions.c:913
-#, c-format
-msgid "IP call - %s"
-msgstr "IP電話- %s"
-
-#: ../sflphone-client-gnome/src/actions.c:922
-msgid "Codec"
-msgstr "編碼"
+#: ../sflphone-client-gnome/src/actions.c:589
+#: ../sflphone-client-gnome/src/actions.c:911
+msgid "Direct SIP call"
+msgstr ""
-#: ../sflphone-client-gnome/src/actions.c:1119
+#: ../sflphone-client-gnome/src/actions.c:1103
#, 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> )"
+"</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>目錄下"
+"</b> SFL聲音編碼檔案應該位于<i>%s</i> 或者位于主目錄( <i>%s</i> )的<b>."
+"sflphone</b>目錄下"
#: ../sflphone-client-gnome/src/errors.c:29
msgid ""
@@ -149,53 +137,53 @@ msgstr "有電話正在處理中."
msgid "Do you still want to quit?"
msgstr "確認要退出?"
-#: ../sflphone-client-gnome/src/mainwindow.c:299
+#: ../sflphone-client-gnome/src/mainwindow.c:298
msgid "SFLphone Error"
msgstr "SFLphone 出錯"
-#: ../sflphone-client-gnome/src/mainwindow.c:391
+#: ../sflphone-client-gnome/src/mainwindow.c:392
#, c-format
msgid "ZRTP is not supported by peer %s\n"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:392
+#: ../sflphone-client-gnome/src/mainwindow.c:393
msgid "Secure Communication Unavailable"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:393
-#: ../sflphone-client-gnome/src/mainwindow.c:415
+#: ../sflphone-client-gnome/src/mainwindow.c:394
+#: ../sflphone-client-gnome/src/mainwindow.c:416
msgid "Continue"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:394
-#: ../sflphone-client-gnome/src/mainwindow.c:416
-#: ../sflphone-client-gnome/src/mainwindow.c:430
+#: ../sflphone-client-gnome/src/mainwindow.c:395
+#: ../sflphone-client-gnome/src/mainwindow.c:417
+#: ../sflphone-client-gnome/src/mainwindow.c:431
msgid "Stop Call"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:413
+#: ../sflphone-client-gnome/src/mainwindow.c:414
#, c-format
msgid ""
"A %s error forced the call with %s to fall under unencrypted mode.\n"
"Exact reason: %s\n"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:414
+#: ../sflphone-client-gnome/src/mainwindow.c:415
msgid "ZRTP negotiation failed"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:427
+#: ../sflphone-client-gnome/src/mainwindow.c:428
#, c-format
msgid ""
"%s wants to stop using secure communication. Confirm will resume "
"conversation without SRTP.\n"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:428
+#: ../sflphone-client-gnome/src/mainwindow.c:429
msgid "Confirm Go Clear"
msgstr ""
-#: ../sflphone-client-gnome/src/mainwindow.c:429
+#: ../sflphone-client-gnome/src/mainwindow.c:430
msgid "Confirm"
msgstr ""
@@ -210,6 +198,12 @@ msgstr "%s 帳戶 : %s"
msgid "<i>From</i> %s"
msgstr "<i>撥入方</i> %s"
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+#, c-format
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] "%d 個語音郵件"
+
#: ../sflphone-client-gnome/src/sflnotify.c:111
#, c-format
msgid "Calling with %s account <i>%s</i>"
@@ -257,217 +251,413 @@ msgstr "揚聲器音量"
msgid "Mic volume"
msgstr "話筒音量"
-#: ../sflphone-client-gnome/src/statusicon.c:91
+#: ../sflphone-client-gnome/src/statusicon.c:96
msgid "_Show main window"
msgstr "顯示主窗口(S)"
-#: ../sflphone-client-gnome/src/statusicon.c:126
+#: ../sflphone-client-gnome/src/statusicon.c:131
msgid "SFLphone"
msgstr "SFLphone"
-#: ../sflphone-client-gnome/src/statusicon.c:127
+#: ../sflphone-client-gnome/src/statusicon.c:132
#, c-format
msgid "%i account configured"
msgid_plural "%i accounts configured"
msgstr[0] "已配置了%i個賬戶"
#: ../sflphone-client-gnome/src/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:750
+#: ../sflphone-client-gnome/src/uimanager.c:693
+#: ../sflphone-client-gnome/src/uimanager.c:727
msgid "Voicemail"
msgstr "語音郵件"
-#: ../sflphone-client-gnome/src/uimanager.c:403
+#: ../sflphone-client-gnome/src/uimanager.c:117
+msgid "No address book selected"
+msgstr "地址簿"
+
+#: ../sflphone-client-gnome/src/uimanager.c:137
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "Address book"
+msgstr "地址簿"
+
+#: ../sflphone-client-gnome/src/uimanager.c:279
+msgid "Voicemail (%i)"
+msgstr "語音郵件 (%i)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:342
msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
msgstr "SFLphone是一個VoIP客戶端，它兼容SIP和IAX2协议."
-#: ../sflphone-client-gnome/src/uimanager.c:406
+#: ../sflphone-client-gnome/src/uimanager.c:345
msgid "About SFLphone"
msgstr "有關SFLphone"
-#: ../sflphone-client-gnome/src/uimanager.c:1028
+#: ../sflphone-client-gnome/src/uimanager.c:719
+msgid "Call"
+msgstr "電話"
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:1184
+msgid "_New call"
+msgstr "新電話(N)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:720
+msgid "Place a new call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:979
msgid "_Pick up"
msgstr "撥出(P)"
-#: ../sflphone-client-gnome/src/uimanager.c:1040
-#: ../sflphone-client-gnome/src/uimanager.c:1081
+#: ../sflphone-client-gnome/src/uimanager.c:721
+msgid "Answer the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:991
+#: ../sflphone-client-gnome/src/uimanager.c:1032
msgid "_Hang up"
msgstr "放下(H)"
-#: ../sflphone-client-gnome/src/uimanager.c:1052
-#: ../sflphone-client-gnome/src/uimanager.c:1093
-msgid "On _Hold"
+#: ../sflphone-client-gnome/src/uimanager.c:722
+msgid "Finish the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "O_n hold"
msgstr "待机"
-#: ../sflphone-client-gnome/src/uimanager.c:1064
+#: ../sflphone-client-gnome/src/uimanager.c:723
+msgid "Place the call on hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "O_ff hold"
+msgstr "恢复通話"
+
+#: ../sflphone-client-gnome/src/uimanager.c:724
+msgid "Place the call off hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:725
+#: ../sflphone-client-gnome/src/uimanager.c:1015
msgid "_Record"
msgstr "記錄(R)"
-#: ../sflphone-client-gnome/src/uimanager.c:1154
+#: ../sflphone-client-gnome/src/uimanager.c:725
+msgid "Record the current conversation"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Configuration _Assistant"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:726
+msgid "Run the configuration assistant"
+msgstr "Stun配置有誤"
+
+#: ../sflphone-client-gnome/src/uimanager.c:727
+msgid "Call your voicemail"
+msgstr "%d 個語音郵件"
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "_Close"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:728
+msgid "Minimize to system tray"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "_Quit"
+msgstr "編輯(E)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:729
+msgid "Quit the program"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:732
+msgid "_Edit"
+msgstr "編輯(E)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "_Copy"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:733
+msgid "Copy the selection"
+msgstr "刪除所選賬戶"
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "_Paste"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:734
+msgid "Paste the clipboard"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear _history"
+msgstr "清空曆史記錄(C)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:735
+msgid "Clear the call history"
+msgstr "清空曆史記錄"
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "_Accounts"
+msgstr "帳戶(A)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:736
+msgid "Edit your accounts"
+msgstr "當前帳戶"
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "_Preferences"
+msgstr "屬性"
+
+#: ../sflphone-client-gnome/src/uimanager.c:737
+msgid "Change your preferences"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:740
+msgid "_View"
+msgstr "查看(V)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:743
+msgid "_Help"
+msgstr "幫助(H)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Contents"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:744
+msgid "Open the manual"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:745
+msgid "About this application"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "_Transfer"
+msgstr "轉接"
+
+#: ../sflphone-client-gnome/src/uimanager.c:751
+msgid "Transfer the call"
+msgstr "轉給: "
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "_Show toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:752
+msgid "Show the toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "_Dialpad"
+msgstr "顯示撥號鍵盤"
+
+#: ../sflphone-client-gnome/src/uimanager.c:753
+msgid "Show the dialpad"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "_Volume controls"
+msgstr "音量控制(V)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:754
+msgid "Show the volume controls"
+msgstr "音量控制(V)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "_History"
+msgstr "歷史"
+
+#: ../sflphone-client-gnome/src/uimanager.c:755
+msgid "Calls history"
+msgstr "呼叫記錄"
+
+#: ../sflphone-client-gnome/src/uimanager.c:756
+msgid "_Address book"
+msgstr "地址簿"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1003
+#: ../sflphone-client-gnome/src/uimanager.c:1044
+msgid "On _Hold"
+msgstr "待机"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1107
msgid "_Call back"
msgstr "回叫(C)"
-#: ../sflphone-client-gnome/src/uimanager.c:1226
-msgid "_New call"
-msgstr "新電話(N)"
-
-#: ../sflphone-client-gnome/src/uimanager.c:1300
+#: ../sflphone-client-gnome/src/uimanager.c:1258
msgid "Edit phone number"
msgstr "編輯電話號碼"
-#: ../sflphone-client-gnome/src/uimanager.c:1311
+#: ../sflphone-client-gnome/src/uimanager.c:1269
msgid "Edit the phone number before making a call"
msgstr "撥出電話前編輯電話號碼"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:164
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
msgid "Account Parameters"
msgstr "帳戶相關參數"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:173
-#: ../sflphone-client-gnome/src/config/assistant.c:294
-#: ../sflphone-client-gnome/src/config/assistant.c:402
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
+#: ../sflphone-client-gnome/src/config/assistant.c:314
+#: ../sflphone-client-gnome/src/config/assistant.c:427
msgid "_Alias"
msgstr "別稱(A)"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:181
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
msgid "_Protocol"
msgstr "協議(P)"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:199
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
msgid "Unknown"
msgstr "未知"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:209
-#: ../sflphone-client-gnome/src/config/assistant.c:302
-#: ../sflphone-client-gnome/src/config/assistant.c:410
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
+#: ../sflphone-client-gnome/src/config/assistant.c:322
+#: ../sflphone-client-gnome/src/config/assistant.c:435
msgid "_Host name"
msgstr "主机名稱(H)"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:217
-#: ../sflphone-client-gnome/src/config/assistant.c:310
-#: ../sflphone-client-gnome/src/config/assistant.c:418
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
+#: ../sflphone-client-gnome/src/config/assistant.c:330
+#: ../sflphone-client-gnome/src/config/assistant.c:443
msgid "_User name"
msgstr "使用者名稱(U)"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:234
-#: ../sflphone-client-gnome/src/config/assistant.c:326
-#: ../sflphone-client-gnome/src/config/assistant.c:433
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:346
+#: ../sflphone-client-gnome/src/config/assistant.c:458
msgid "_Password"
msgstr "密碼(P)"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:254
-#: ../sflphone-client-gnome/src/config/assistant.c:344
-#: ../sflphone-client-gnome/src/config/assistant.c:449
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:363
+#: ../sflphone-client-gnome/src/config/assistant.c:473
+msgid "Show password"
+msgstr "密碼"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:368
+#: ../sflphone-client-gnome/src/config/assistant.c:478
msgid "_Voicemail number"
msgstr "語音郵箱(V)"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:340
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
msgid "Authentication"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:341
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
msgid "Secret"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:466
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
msgid "Credential"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:501
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
msgid "Authentication name"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:512
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
msgid "Password"
msgstr "密碼"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:535
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:909
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:201
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
msgid "Security"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:547
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:213
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
msgid "Use TLS transport (sips)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:552
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:218
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
msgid "SRTP key exchange"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:558
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
msgid "Disabled"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
msgid "Registration"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:679
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
msgid "Registration expire"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
msgid "_Comply with RFC 3263"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
-msgid "Network"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
+msgid "Network Interface"
+msgstr "網路連線失敗"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:707
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
msgid "Local address"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:744
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
msgid "Local port"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:752
-msgid "Set published address and port:"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
+msgid "Published address"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:756
-msgid "Using STUN "
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+msgid "Using STUN"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:761
-msgid "Same as local parameters"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
+msgid "STUN server URL"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:764
-msgid "Manually"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
+msgid "Same as local parameters"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:769
-msgid "Published address"
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
+msgid "Set published address and port:"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:777
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
msgid "Published port"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:785
-msgid "STUN server URL"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
msgid "Account settings"
msgstr "帳戶設置"
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
msgid "Basic"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:904
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
msgid "Advanced"
msgstr ""
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:169
-msgid "Server returned \""
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:164
+#, c-format
+msgid "Server returned \"%s\" (%d)"
msgstr ""
#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
@@ -486,32 +676,18 @@ msgstr "帳戶"
msgid "Configured Accounts"
msgstr "已配置帳戶"
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:505
-msgid "There "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "is "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:506
-msgid "are "
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:508
-msgid " active account"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:509
-msgid "s"
-msgstr ""
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
+#, c-format
+msgid "There is %d active account"
+msgid_plural "There are %d active accounts"
+msgstr[0] ""
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:514
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
msgid "You have no active account"
msgstr ""
#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:443
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
msgid "General"
msgstr "常用配置"
@@ -556,225 +732,220 @@ 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:578
+#: ../sflphone-client-gnome/src/config/audioconf.c:577
msgid "Name"
msgstr "名稱"
-#: ../sflphone-client-gnome/src/config/assistant.c:69
+#: ../sflphone-client-gnome/src/config/assistant.c:75
#, c-format
msgid "This assistant is now finished."
msgstr "配置完成."
-#: ../sflphone-client-gnome/src/config/assistant.c:71
+#: ../sflphone-client-gnome/src/config/assistant.c:77
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/config/assistant.c:74
+#: ../sflphone-client-gnome/src/config/assistant.c:80
msgid "Alias"
msgstr "別稱"
-#: ../sflphone-client-gnome/src/config/assistant.c:78
+#: ../sflphone-client-gnome/src/config/assistant.c:84
msgid "Server"
msgstr "伺服器"
-#: ../sflphone-client-gnome/src/config/assistant.c:82
+#: ../sflphone-client-gnome/src/config/assistant.c:88
msgid "Username"
msgstr "使用者名稱"
-#: ../sflphone-client-gnome/src/config/assistant.c:86
+#: ../sflphone-client-gnome/src/config/assistant.c:92
msgid "Security: "
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:88
+#: ../sflphone-client-gnome/src/config/assistant.c:94
msgid "SRTP/ZRTP draft-zimmermann"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:90
-#: ../sflphone-client-gnome/src/config/assistant.c:182
+#: ../sflphone-client-gnome/src/config/assistant.c:96
msgid "None"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:210
+#: ../sflphone-client-gnome/src/config/assistant.c:229
msgid "SFLphone account creation wizard"
msgstr "SFLphone賬戶創建嚮導"
-#: ../sflphone-client-gnome/src/config/assistant.c:236
+#: ../sflphone-client-gnome/src/config/assistant.c:255
msgid "Welcome to the Account creation wizard of SFLphone!"
msgstr "歡迎使用SFLphone帳戶創建嚮導!"
-#: ../sflphone-client-gnome/src/config/assistant.c:237
+#: ../sflphone-client-gnome/src/config/assistant.c:256
msgid "This installation wizard will help you configure an account."
msgstr "安裝向導將幫助您配置帳戶"
-#: ../sflphone-client-gnome/src/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "VoIP Protocols"
msgstr "VoIP協議"
-#: ../sflphone-client-gnome/src/config/assistant.c:251
+#: ../sflphone-client-gnome/src/config/assistant.c:270
msgid "Select an account type"
msgstr "選擇帳戶類型"
-#: ../sflphone-client-gnome/src/config/assistant.c:253
+#: ../sflphone-client-gnome/src/config/assistant.c:272
msgid "SIP (Session Initiation Protocol)"
msgstr "SIP(會話初始化協議)"
-#: ../sflphone-client-gnome/src/config/assistant.c:255
+#: ../sflphone-client-gnome/src/config/assistant.c:274
msgid "IAX2 (InterAsterix Exchange)"
msgstr "IAX2(Asterisk內部交換協議)"
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Account"
msgstr "帳戶"
-#: ../sflphone-client-gnome/src/config/assistant.c:269
+#: ../sflphone-client-gnome/src/config/assistant.c:288
msgid "Please select one of the following options"
msgstr "請選擇以下選項中的一個"
-#: ../sflphone-client-gnome/src/config/assistant.c:271
+#: ../sflphone-client-gnome/src/config/assistant.c:290
msgid "Create a free SIP/IAX2 account on sflphone.org"
msgstr "在sflphone.org上創建免費的SIP/IAX2帳戶"
-#: ../sflphone-client-gnome/src/config/assistant.c:273
+#: ../sflphone-client-gnome/src/config/assistant.c:292
msgid "Register an existing SIP or IAX2 account"
msgstr "註冊已存在的SIP或IAX2帳戶"
-#: ../sflphone-client-gnome/src/config/assistant.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:306
msgid "SIP account settings"
msgstr "SIP帳戶配置"
-#: ../sflphone-client-gnome/src/config/assistant.c:286
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "Please fill the following information"
msgstr "請填寫如下信息"
-#: ../sflphone-client-gnome/src/config/assistant.c:352
-#: ../sflphone-client-gnome/src/config/assistant.c:381
+#: ../sflphone-client-gnome/src/config/assistant.c:376
+#: ../sflphone-client-gnome/src/config/assistant.c:405
msgid "Secure communications with _ZRTP"
msgstr ""
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "Optional email address"
msgstr "可選郵件地址"
-#: ../sflphone-client-gnome/src/config/assistant.c:365
+#: ../sflphone-client-gnome/src/config/assistant.c:389
msgid "This email address will be used to send your voicemail messages."
msgstr "這個郵件地址將被用來發送您的語音"
-#: ../sflphone-client-gnome/src/config/assistant.c:373
+#: ../sflphone-client-gnome/src/config/assistant.c:397
msgid "_Email address"
msgstr "郵件地址(E)"
-#: ../sflphone-client-gnome/src/config/assistant.c:394
+#: ../sflphone-client-gnome/src/config/assistant.c:419
msgid "IAX2 account settings"
msgstr "IAX2帳戶配置"
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "Network Address Translation (NAT)"
msgstr "网络地址解析(NAT)"
-#: ../sflphone-client-gnome/src/config/assistant.c:467
+#: ../sflphone-client-gnome/src/config/assistant.c:496
msgid "You should probably enable this if you are behind a firewall."
msgstr "如果你使用網路防火牆，你很有可能需要設定該項."
-#: ../sflphone-client-gnome/src/config/assistant.c:476
+#: ../sflphone-client-gnome/src/config/assistant.c:505
msgid "E_nable STUN"
msgstr "啟用STUN(n)"
-#: ../sflphone-client-gnome/src/config/assistant.c:483
+#: ../sflphone-client-gnome/src/config/assistant.c:512
msgid "_STUN server"
msgstr "STUN伺服器(S)"
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Account Registration"
msgstr "帳戶註冊"
-#: ../sflphone-client-gnome/src/config/assistant.c:497
+#: ../sflphone-client-gnome/src/config/assistant.c:526
msgid "Congratulations!"
msgstr "恭喜！"
-#: ../sflphone-client-gnome/src/config/audioconf.c:583
+#: ../sflphone-client-gnome/src/config/audioconf.c:582
msgid "Frequency"
msgstr "顰律"
-#: ../sflphone-client-gnome/src/config/audioconf.c:588
+#: ../sflphone-client-gnome/src/config/audioconf.c:587
msgid "Bitrate"
msgstr "比率"
-#: ../sflphone-client-gnome/src/config/audioconf.c:593
+#: ../sflphone-client-gnome/src/config/audioconf.c:592
msgid "Bandwidth"
msgstr "顰寬"
-#: ../sflphone-client-gnome/src/config/audioconf.c:673
+#: ../sflphone-client-gnome/src/config/audioconf.c:670
msgid "ALSA plugin"
msgstr "ALSA插件"
-#: ../sflphone-client-gnome/src/config/audioconf.c:695
+#: ../sflphone-client-gnome/src/config/audioconf.c:692
msgid "Output"
msgstr "輸出"
-#: ../sflphone-client-gnome/src/config/audioconf.c:717
+#: ../sflphone-client-gnome/src/config/audioconf.c:714
msgid "Input"
msgstr "輸入"
-#: ../sflphone-client-gnome/src/config/audioconf.c:752
+#: ../sflphone-client-gnome/src/config/audioconf.c:749
msgid "_Voice Activity Detection"
msgstr "聲音狀態檢測(V)"
-#: ../sflphone-client-gnome/src/config/audioconf.c:762
+#: ../sflphone-client-gnome/src/config/audioconf.c:759
msgid "_Noise Reduction (Narrow-Band Companding)"
msgstr "降噪處理-窄頻壓縮(N)"
-#: ../sflphone-client-gnome/src/config/audioconf.c:798
+#: ../sflphone-client-gnome/src/config/audioconf.c:800
msgid "Sound Manager"
msgstr "聲音管理器"
-#: ../sflphone-client-gnome/src/config/audioconf.c:807
+#: ../sflphone-client-gnome/src/config/audioconf.c:809
msgid "_Pulseaudio"
msgstr "Pulseaudio"
-#: ../sflphone-client-gnome/src/config/audioconf.c:811
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
msgid "_ALSA"
msgstr "ALSA"
-#: ../sflphone-client-gnome/src/config/audioconf.c:816
-msgid "_Mute other applications during a call"
-msgstr "當有來電時靜音其它應用程序(c)"
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:823
+#: ../sflphone-client-gnome/src/config/audioconf.c:819
msgid "ALSA settings"
msgstr "ALSA 配置"
-#: ../sflphone-client-gnome/src/config/audioconf.c:840
+#: ../sflphone-client-gnome/src/config/audioconf.c:836
msgid "Codecs"
msgstr "編碼"
-#: ../sflphone-client-gnome/src/config/audioconf.c:869
+#: ../sflphone-client-gnome/src/config/audioconf.c:865
msgid "Recordings"
msgstr "記錄"
-#: ../sflphone-client-gnome/src/config/audioconf.c:873
+#: ../sflphone-client-gnome/src/config/audioconf.c:869
msgid "Destination folder"
msgstr "目標文件夾"
-#: ../sflphone-client-gnome/src/config/audioconf.c:877
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
msgid "Select a folder"
msgstr "選擇文件夾"
-#: ../sflphone-client-gnome/src/config/audioconf.c:883
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
msgid "Ringtones"
msgstr "鈴聲"
-#: ../sflphone-client-gnome/src/config/audioconf.c:889
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
msgid "_Enable ringtones"
msgstr "啟動鈴聲(E)"
-#: ../sflphone-client-gnome/src/config/audioconf.c:895
+#: ../sflphone-client-gnome/src/config/audioconf.c:891
msgid "Choose a ringtone"
msgstr "鈴聲選擇"
-#: ../sflphone-client-gnome/src/config/audioconf.c:901
+#: ../sflphone-client-gnome/src/config/audioconf.c:897
msgid "Audio Files"
msgstr "音訊檔案"
@@ -811,86 +982,66 @@ msgstr "重設電話號碼"
msgid "_Prefix dialed numbers with"
msgstr "號碼前綴(P)"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:195
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
msgid ""
"This profile is used when you want to reach a remote peer simply by typing a "
"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
"also be used if no account can be matched to an incoming or outgoing call."
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:274
-msgid "SIP Port"
-msgstr "SIP端口"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:281
-msgid "UDP Transport"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:319
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
msgid "Desktop Notifications"
msgstr "桌面提示"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:323
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
msgid "_Enable notifications"
msgstr "啟動提示(E)"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:329
-msgid "Enable voicemail _notifications"
-msgstr "啟用語音郵箱提示(n)"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:341
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
msgid "System Tray Icon"
msgstr "系統托盤圖標"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
msgid "_Popup main window on incoming call"
msgstr "來電話時彈出主視窗(P)"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:349
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
msgid "Ne_ver popup main window"
msgstr "從不彈出主視窗(v)"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:353
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
msgid "Hide SFLphone window on _startup"
msgstr "在啟動時隱藏SFLphone主窗口"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:359
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
msgid "Calls History"
msgstr "打電話歷史"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:362
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
msgid "_Keep my history for at least"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:373
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
msgid "days"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:377
-msgid "Configuration File"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:379
-msgid "Store SIP credentials as MD5 hash"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:423
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
msgid "Preferences"
msgstr "屬性"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:448
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
msgid "Audio"
msgstr ""
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
msgid "Address Book"
msgstr "地址簿"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:458
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
msgid "Hooks"
msgstr "鉤鍵"
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:468
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
msgid "Direct IP calls"
msgstr ""
@@ -898,11 +1049,11 @@ msgstr ""
msgid "Advanced options for TLS"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:55
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:56
msgid "TLS transport"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:59
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:60
msgid ""
"TLS transport can be used along with UDP for those calls that would\n"
"require secure sip transactions (aka SIPS). You can configure a different\n"
@@ -911,55 +1062,55 @@ msgid ""
"port, different one from each other\n"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:100
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
msgid "Certificate of Authority list"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:104
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
msgid "Choose a CA list file (optional)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:115
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
msgid "Public endpoint certificate file"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:119
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
msgid "Choose a public endpoint certificate (optional)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:134
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
msgid "Choose a private key file (optional)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:145
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
msgid "Password for the private key"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:168
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
msgid "TLS protocol method"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:202
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
msgid "TLS cipher list"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:211
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
msgid "Server name instance for outgoing TLS connection"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:219
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
msgid "Negotiation timeout (sec:msec)"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:236
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
msgid "Verify incoming certificates, as a server"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:242
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
msgid "Verify certificates from answer, as a client"
msgstr ""
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:248
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
msgid "Require certificate for incoming tls connections"
msgstr ""
@@ -967,45 +1118,60 @@ msgstr ""
msgid "ZRTP Options"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:68
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:69
msgid "Send Hello Hash in S_DP"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:74
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:75
msgid "Ask User to Confirm SAS"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:80
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:81
msgid "_Warn if ZRTP not supported"
msgstr ""
-#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:86
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:87
msgid "Display SAS once for hold events"
msgstr ""
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:56
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:58
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
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:59
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:72
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:84
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:96
msgid "Click here to change the search type"
msgstr "請點擊此處改變查詢方式"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:69
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:71
msgid "Search by missed call"
msgstr "從未接電話中查詢"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:81
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:83
msgid "Search by incoming call"
msgstr "從來電中查詢"
-#: ../sflphone-client-gnome/src/contacts/searchbar.c:93
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:95
msgid "Search by outgoing call"
msgstr "從撥出電話中查詢"
+#~ msgid "IP call - %s"
+#~ msgstr "IP電話- %s"
+
+#~ msgid "Codec"
+#~ msgstr "編碼"
+
+#~ msgid "_Mute other applications during a call"
+#~ msgstr "當有來電時靜音其它應用程序(c)"
+
+#~ msgid "SIP Port"
+#~ msgstr "SIP端口"
+
+#~ msgid "Enable voicemail _notifications"
+#~ msgstr "啟用語音郵箱提示(n)"
+
#~ msgid "Account creation wizard"
#~ msgstr "帳戶創建向導"
@@ -1026,9 +1192,6 @@ msgstr "從撥出電話中查詢"
#~ msgid "Default account"
#~ msgstr "默認帳戶"
-#~ msgid "Transfer to : "
-#~ msgstr "轉給: "
-
#~ msgid "SFLphone KDE Client"
#~ msgstr "SFLphone KDE客戶端"
@@ -1041,21 +1204,12 @@ msgstr "從撥出電話中查詢"
#~ msgid "Main screen"
#~ msgstr "主屏幕"
-#~ msgid "Call history"
-#~ msgstr "呼叫記錄"
-
-#~ msgid "Address book"
-#~ msgstr "地址簿"
-
#~ msgid "Configure SFLphone"
#~ msgstr "配置SFLphone"
#~ msgid "Display volume controls"
#~ msgstr "顯示音量控制"
-#~ msgid "Display dialpad"
-#~ msgstr "顯示撥號鍵盤"
-
#~ msgid "Incoming call"
#~ msgstr "來電"
@@ -1080,9 +1234,6 @@ msgstr "從撥出電話中查詢"
#~ msgid "Hold on"
#~ msgstr "呼叫保持"
-#~ msgid "Transfer"
-#~ msgstr "轉接"
-
#~ msgid "Record"
#~ msgstr "記錄"
@@ -1101,29 +1252,32 @@ msgstr "從撥出電話中查詢"
#~ 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."
+#~ "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會使用列表當中第一個已註冊的帳戶。使用箭頭\"上\"和\"下\"可以改變賬戶的順序。選擇賬戶名稱左邊的方框可以"
-#~ "啟用帳戶，取消選擇則會禁用該賬戶。通過\"加\"\"減\"按鈕可以添加或刪除賬戶。點擊\"編輯\"按鈕可以改變賬戶的設置。"
-
-#~ msgid "Remove the selected account"
-#~ msgstr "刪除所選賬戶"
+#~ "在默認情況下，當你打電話時，sflphone會使用列表當中第一個已註冊的帳戶。使用"
+#~ "箭頭\"上\"和\"下\"可以改變賬戶的順序。選擇賬戶名稱左邊的方框可以啟用帳戶，"
+#~ "取消選擇則會禁用該賬戶。通過\"加\"\"減\"按鈕可以添加或刪除賬戶。點擊\"編輯"
+#~ "\"按鈕可以改變賬戶的設置。"
#~ 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 "該按鈕會刪除列表中被選定的賬戶。請確認你的操作。如果你希望繼續使用某個賬戶，請取消對該賬戶的選擇"
+#~ "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 ""
+#~ "該按鈕會刪除列表中被選定的賬戶。請確認你的操作。如果你希望繼續使用某個賬"
+#~ "戶，請取消對該賬戶的選擇"
#~ msgid "Remove"
#~ msgstr "刪除"
#~ 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 "通過該按鈕可以創建一個新賬戶。添加該賬戶之後你還可以通過編輯按鈕來修改設置。"
+#~ "This button enables you to initialize a new account. You will then be "
+#~ "able to edit it using the form on the right."
+#~ msgstr ""
+#~ "通過該按鈕可以創建一個新賬戶。添加該賬戶之後你還可以通過編輯按鈕來修改設"
+#~ "置。"
#~ msgid "Add"
#~ msgstr "添加"
@@ -1136,8 +1290,9 @@ msgstr "從撥出電話中查詢"
#~ "this list which is \"registered\". Change the order of the accounts using "
#~ "the \"Up\" and \"Down\" arrows."
#~ msgstr ""
-#~ "在默認情況下，當你打電話時，sflphone會使用列表當中第一個已註冊的帳戶。使用箭頭\"上\"和\"下\"可以改變賬戶的順序。選擇賬戶名稱左邊的方框可以"
-#~ "啟用帳戶，取消選擇則會禁用該賬戶。通過\"加\"\"減\"按鈕可以添加或刪除賬戶。"
+#~ "在默認情況下，當你打電話時，sflphone會使用列表當中第一個已註冊的帳戶。使用"
+#~ "箭頭\"上\"和\"下\"可以改變賬戶的順序。選擇賬戶名稱左邊的方框可以啟用帳戶，"
+#~ "取消選擇則會禁用該賬戶。通過\"加\"\"減\"按鈕可以添加或刪除賬戶。"
#~ msgid "Down"
#~ msgstr "下"
@@ -1220,9 +1375,6 @@ msgstr "從撥出電話中查詢"
#~ msgid "On start"
#~ msgstr "正在啟動"
-#~ msgid "Clear history"
-#~ msgstr "清空曆史記錄"
-
#~ msgid "Trigger on specific SIP header"
#~ msgstr "激活指定的SIP頭"
@@ -1238,33 +1390,9 @@ msgstr "從撥出電話中查詢"
#~ msgid "Attention:number of results exceeds max displayed."
#~ msgstr "注意:結果超過可顯示的最大值"
-#~ msgid "_Help"
-#~ msgstr "幫助(H)"
-
#~ msgid "_Account creation wizard"
#~ msgstr "帳戶創建向導(A)"
-#~ msgid "_Call"
-#~ msgstr "電話"
-
-#~ msgid "Clear _history"
-#~ msgstr "清空曆史記錄(C)"
-
-#~ msgid "_Accounts"
-#~ msgstr "帳戶(A)"
-
-#~ msgid "_Edit"
-#~ msgstr "編輯(E)"
-
-#~ msgid "_Volume controls"
-#~ msgstr "音量控制(V)"
-
-#~ msgid "_View"
-#~ msgstr "查看(V)"
-
-#~ msgid "History"
-#~ msgstr "歷史"
-
#~ msgid "_Enable this account"
#~ msgstr "啟用該賬戶(E)"
@@ -1412,9 +1540,6 @@ msgstr "從撥出電話中查詢"
#~ msgid "\"Voicemail\" <%s>"
#~ msgstr "\"語音郵件\" <%s>"
-#~ msgid "Off Hold"
-#~ msgstr "恢复通話"
-
#~ msgid "Record a call"
#~ msgstr "記錄通話"
@@ -1570,12 +1695,12 @@ msgstr "從撥出電話中查詢"
#~ msgctxt "NAME OF TRANSLATORS"
#~ msgid "Your names"
#~ msgstr ""
-#~ "Yun Liu, ,Launchpad Contributions:,Yun Liu, ,Launchpad "
-#~ "Contributions:,Emmanuel Milou,Yun Liu, ,Launchpad Contributions:,Emmanuel "
-#~ "Milou,Yun Liu"
+#~ "Yun Liu, ,Launchpad Contributions:,Yun Liu, ,Launchpad Contributions:,"
+#~ "Emmanuel Milou,Yun Liu, ,Launchpad Contributions:,Emmanuel Milou,Yun "
+#~ "Liu, ,Launchpad Contributions:,Emmanuel Milou,Yun Liu"
#~ msgctxt "EMAIL OF TRANSLATORS"
#~ msgid "Your emails"
#~ msgstr ""
-#~ "yunliu2000@gmail.com,,,,,,emmanuel.milou@savoirfairelinux.com,,,,emmanuel.mil"
-#~ "ou@savoirfairelinux.com,"
+#~ "yunliu2000@gmail.com,,,,,,emmanuel.milou@savoirfairelinux.com,,,,emmanuel."
+#~ "milou@savoirfairelinux.com,,,,emmanuel.milou@savoirfairelinux.com,"
diff --git a/sflphone-client-gnome/src/actions.c b/sflphone-client-gnome/src/actions.c
index a2506dc62924c99ef2be59b710755a26994caea2..fe433aace6d95232e475767fef3308462ccfc69d 100644
--- a/sflphone-client-gnome/src/actions.c
+++ b/sflphone-client-gnome/src/actions.c
@@ -94,6 +94,7 @@ status_bar_display_account ()
acc = account_list_get_current ();
if(acc){
+ status_tray_icon_online(TRUE);
msg = g_markup_printf_escaped("%s %s (%s)" ,
_("Using account"),
(gchar*)g_hash_table_lookup( acc->properties , ACCOUNT_ALIAS),
@@ -101,6 +102,7 @@ status_bar_display_account ()
}
else
{
+ status_tray_icon_online(FALSE);
msg = g_markup_printf_escaped(_("No registered accounts"));
}
statusbar_push_message( msg , __MSG_ACCOUNT_DEFAULT);
@@ -694,6 +696,8 @@ sflphone_new_call()
peer_name = g_strdup ("");
create_new_call (CALL, CALL_STATE_DIALING, "", "", peer_name, peer_number, &c);
+ c->_history_state = OUTGOING;
+
calllist_add (current_calls,c);
calltree_add_call (current_calls, c, NULL);
update_actions();
@@ -1083,7 +1087,7 @@ sflphone_fill_codec_list()
for(pl=codecs; *codecs; codecs++)
{
details = (gchar **)dbus_codec_details(atoi(*codecs));
- if(codec_list_get_by_payload((gconstpointer)atoi(*codecs))!=NULL){
+ if(codec_list_get_by_payload((gconstpointer)(size_t)atoi(*codecs))!=NULL){
// does nothing - the codec is already in the list, so is active.
}
else{
@@ -1100,7 +1104,7 @@ sflphone_fill_codec_list()
}
if( codec_list_get_size() == 0) {
- gchar* markup = g_markup_printf_escaped(_("<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> )") , CODECS_DIR , g_get_home_dir());
+ gchar* markup = g_markup_printf_escaped(_("<b>No audio codecs found.</b>\n\nSFL audio codecs have to be placed in <i>%s</i> or in the <b>.sflphone</b> directory in your home (<i>%s</i>)"), CODECS_DIR, g_get_home_dir());
main_window_error_message( markup );
dbus_unregister(getpid());
exit(0);
@@ -1178,23 +1182,59 @@ void sflphone_fill_history (void)
{
GHashTable *entries;
GHashTableIter iter;
- gpointer key, value;
+ gpointer key, key_to_min, value;
callable_obj_t *history_entry;
+ int timestamp, min_timestamp;
+
+ gboolean is_first;
+
DEBUG ("Loading history ...");
entries = dbus_get_history ();
- if (entries)
- {
- // Init the iterator
- g_hash_table_iter_init (&iter, entries);
- while (g_hash_table_iter_next (&iter, &key, &value))
- {
- /* do something with key and value */
- create_history_entry_from_serialized_form ((gchar*)key, (gchar*)value, &history_entry);
- // Add it and update the GUI
- calllist_add (history, history_entry);
- }
+ if (entries) {
+
+ while(g_hash_table_size (entries)) {
+
+ is_first = TRUE;
+
+ // find lowest timestamp in map
+ g_hash_table_iter_init (&iter, entries);
+ while (g_hash_table_iter_next (&iter, &key, &value)) {
+
+ timestamp = atoi((gchar*)key);
+
+ if(is_first) {
+
+ // first iteration of the loop, init search
+ min_timestamp = timestamp;
+ key_to_min = key;
+
+ is_first = FALSE;
+ }
+ else {
+
+ // if lower, replace
+ if(timestamp < min_timestamp) {
+
+ min_timestamp = timestamp;
+ key_to_min = key;
+ }
+ }
+ }
+
+ if(g_hash_table_lookup_extended(entries, key_to_min, &key, &value)) {
+
+ // do something with key and value
+ create_history_entry_from_serialized_form ((gchar*)key, (gchar*)value, &history_entry);
+ DEBUG("HISTORY ENTRY: %i\n", history_entry->_time_start);
+ // Add it and update the GUI
+ calllist_add (history, history_entry);
+
+ // remove entry from map
+ g_hash_table_remove(entries, key_to_min);
+ }
+ }
}
}
diff --git a/sflphone-client-gnome/src/config/accountconfigdialog.c b/sflphone-client-gnome/src/config/accountconfigdialog.c
index e6e5df0af8a987e649930b865c58fabe57869e61..0c16fea5c38b1536395d91d9a0f913ce3aed4123 100644
--- a/sflphone-client-gnome/src/config/accountconfigdialog.c
+++ b/sflphone-client-gnome/src/config/accountconfigdialog.c
@@ -134,7 +134,7 @@ static void update_credential_cb(GtkWidget *widget, gpointer data UNUSED)
GtkTreeIter iter;
gtk_tree_model_get_iter_from_string ((GtkTreeModel *) credentialStore, &iter, "0");
gint column = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "column"));
- g_print ("set password to %s\n", (gchar *) gtk_entry_get_text(GTK_ENTRY(widget)));
+ // g_print ("set password to %s\n", (gchar *) gtk_entry_get_text(GTK_ENTRY(widget)));
gtk_list_store_set (GTK_LIST_STORE (credentialStore), &iter, column, (gchar *) gtk_entry_get_text(GTK_ENTRY(widget)), -1);
}
@@ -389,7 +389,7 @@ static void cell_edited_cb(GtkCellRendererText *renderer, gchar *path_desc, gcha
gint column = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (renderer), "column"));
- g_print ("path desc in cell_edited_cb: %s\n", text);
+ DEBUG("path desc in cell_edited_cb: %s\n", text);
if(g_strcasecmp(path_desc, "0") == 0) {
if(g_strcasecmp(text, gtk_entry_get_text (GTK_ENTRY(entryUsername))) != 0) {
@@ -411,7 +411,7 @@ static void cell_edited_cb(GtkCellRendererText *renderer, gchar *path_desc, gcha
static void editing_started_cb (GtkCellRenderer *cell, GtkCellEditable * editable, const gchar * path, gpointer data)
{
DEBUG("Editing started");
- g_print ("path desc in editing_started_cb: %s\n", path);
+ DEBUG("path desc in editing_started_cb: %s\n", path);
// If we are dealing the first row
if (g_strcasecmp (path, "0") == 0)
@@ -489,6 +489,25 @@ static void use_sip_tls_cb(GtkWidget *widget, gpointer data)
}
}
+static local_interface_changed_cb(GtkWidget * widget, gpointer data UNUSED)
+{
+
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sameAsLocalRadioButton))) {
+
+ gchar * local_interface;
+ gchar * local_address;
+
+ local_interface = (gchar *) gtk_combo_box_get_active_text(GTK_COMBO_BOX(localAddressCombo));
+ local_address = dbus_get_address_from_interface_name(local_interface);
+
+ gtk_entry_set_text(GTK_ENTRY(publishedAddressEntry), local_address);
+
+ // gchar * local_port = (gchar *) gtk_entry_get_text(GTK_ENTRY(localPortSpinBox));
+ // gtk_spin_button_set_value(GTK_SPIN_BUTTON(publishedPortSpinBox), g_ascii_strtod(local_port, NULL));
+ }
+
+}
+
static set_published_addr_manually_cb(GtkWidget * widget, gpointer data UNUSED)
{
DEBUG("set_published_addr_manually_cb");
@@ -510,6 +529,9 @@ static set_published_addr_manually_cb(GtkWidget * widget, gpointer data UNUSED)
static use_stun_cb(GtkWidget * widget, gpointer data UNUSED)
{
+ gchar * local_interface;
+ gchar * local_address;
+
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) {
DEBUG("Showing stun options, hiding Local/Published info");
gtk_widget_show(stunServerLabel);
@@ -531,17 +553,31 @@ static use_stun_cb(GtkWidget * widget, gpointer data UNUSED)
gtk_widget_show(publishedPortLabel);
gtk_widget_show(publishedAddressEntry);
gtk_widget_show(publishedPortSpinBox);
+
+ // Since stun callback is called at initialization, we cannot reinit published address
+ // TODO: find a way so that if stun is unchecked, reinit published address entry
+ // in case local address changedd
+
+ // local_interface = (gchar *) gtk_combo_box_get_active_text(GTK_COMBO_BOX(localAddressCombo));
+ // local_address = dbus_get_address_from_interface_name(local_interface);
+ // gtk_entry_set_text(GTK_ENTRY(publishedAddressEntry), local_address);
}
}
}
+
static same_as_local_cb(GtkWidget * widget, gpointer data UNUSED)
{
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) {
DEBUG("Same as local");
- gchar * ip_address = (gchar *) gtk_combo_box_get_active_text(GTK_COMBO_BOX(localAddressCombo));
- gtk_entry_set_text(GTK_ENTRY(publishedAddressEntry), ip_address);
+ gchar * local_interface;
+ gchar * local_address;
+
+ local_interface = (gchar *) gtk_combo_box_get_active_text(GTK_COMBO_BOX(localAddressCombo));
+ local_address = dbus_get_address_from_interface_name(local_interface);
+
+ gtk_entry_set_text(GTK_ENTRY(publishedAddressEntry), local_address);
gchar * local_port = (gchar *) gtk_entry_get_text(GTK_ENTRY(localPortSpinBox));
gtk_spin_button_set_value(GTK_SPIN_BUTTON(publishedPortSpinBox), g_ascii_strtod(local_port, NULL));
@@ -549,7 +585,6 @@ static same_as_local_cb(GtkWidget * widget, gpointer data UNUSED)
}
-
GtkWidget * create_security_tab(account_t **a)
{
GtkWidget * frame;
@@ -695,7 +730,7 @@ GtkWidget * create_security_tab(account_t **a)
keyExchangeCombo = gtk_combo_box_new_text();
gtk_label_set_mnemonic_widget (GTK_LABEL (label), keyExchangeCombo);
gtk_combo_box_append_text(GTK_COMBO_BOX(keyExchangeCombo), "ZRTP");
- //gtk_combo_box_append_text(GTK_COMBO_BOX(keyExchangeCombo), "SDES");
+ gtk_combo_box_append_text(GTK_COMBO_BOX(keyExchangeCombo), "SDES");
gtk_combo_box_append_text(GTK_COMBO_BOX(keyExchangeCombo), _("Disabled"));
advancedZrtpButton = gtk_button_new_from_stock(GTK_STOCK_PREFERENCES);
@@ -703,13 +738,17 @@ GtkWidget * create_security_tab(account_t **a)
if (g_strcmp0(curSRTPEnabled, "false") == 0)
{
- gtk_combo_box_set_active(GTK_COMBO_BOX(keyExchangeCombo), 1);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(keyExchangeCombo), 2);
gtk_widget_set_sensitive(GTK_WIDGET(advancedZrtpButton), FALSE);
} else {
if (strcmp(curKeyExchange, ZRTP) == 0) {
gtk_combo_box_set_active(GTK_COMBO_BOX(keyExchangeCombo),0);
- } else {
- gtk_combo_box_set_active(GTK_COMBO_BOX(keyExchangeCombo), 1);
+ }
+ else if (strcmp(curKeyExchange, SDES) == 0) {
+ gtk_combo_box_set_active(GTK_COMBO_BOX(keyExchangeCombo),1);
+ }
+ else {
+ gtk_combo_box_set_active(GTK_COMBO_BOX(keyExchangeCombo), 2);
gtk_widget_set_sensitive(GTK_WIDGET(advancedZrtpButton), FALSE);
}
}
@@ -757,6 +796,7 @@ GtkWidget * create_advanced_tab(account_t **a)
gchar * use_tls;
gchar * published_address;
gchar * published_port;
+ gchar * local_interface;
gchar * local_address;
gchar * local_port;
gchar * stun_enable;
@@ -772,13 +812,15 @@ GtkWidget * create_advanced_tab(account_t **a)
published_sameas_local = g_hash_table_lookup(currentAccount->properties, PUBLISHED_SAMEAS_LOCAL);
+ local_interface = g_hash_table_lookup(currentAccount->properties, LOCAL_INTERFACE);
+
local_port = g_hash_table_lookup(currentAccount->properties, LOCAL_PORT);
- local_address = g_hash_table_lookup(currentAccount->properties, LOCAL_ADDRESS);
if (g_strcasecmp(published_sameas_local,"true") == 0) {
- published_address = g_hash_table_lookup(currentAccount->properties, LOCAL_ADDRESS);
+ published_address = dbus_get_address_from_interface_name(local_interface);
published_port = g_hash_table_lookup(currentAccount->properties, LOCAL_PORT);
+
}
else {
@@ -833,7 +875,8 @@ GtkWidget * create_advanced_tab(account_t **a)
GtkTreeIter current_local_address_iter = iter;
gchar ** iface_list = NULL;
- iface_list = (gchar**) dbus_get_all_ip_interface();
+ // iface_list = (gchar**) dbus_get_all_ip_interface();
+ iface_list = (gchar**) dbus_get_all_ip_interface_by_name();
gchar ** iface = NULL;
// flag to determine if local_address is found
@@ -848,7 +891,7 @@ GtkWidget * create_advanced_tab(account_t **a)
gtk_list_store_set(ipInterfaceListStore, &iter, 0, *iface, -1 );
// set the current local address
- if (!iface_found && (g_strcmp0(*iface, local_address) == 0)) {
+ if (!iface_found && (g_strcmp0(*iface, local_interface) == 0)) {
DEBUG("Setting active local address combo box");
current_local_address_iter = iter;
iface_found = TRUE;
@@ -930,6 +973,7 @@ GtkWidget * create_advanced_tab(account_t **a)
gtk_misc_set_alignment(GTK_MISC (publishedAddressLabel), 0, 0.5);
publishedAddressEntry = gtk_entry_new();
gtk_label_set_mnemonic_widget (GTK_LABEL (publishedAddressLabel), publishedAddressEntry);
+
gtk_entry_set_text(GTK_ENTRY(publishedAddressEntry), published_address);
gtk_table_attach_defaults( GTK_TABLE(table), publishedAddressEntry, 1, 2, 5, 6);
@@ -946,7 +990,10 @@ GtkWidget * create_advanced_tab(account_t **a)
// This will trigger a signal, and the above two
// widgets need to be instanciated before that.
- g_signal_connect(useStunCheckBox, "toggled", G_CALLBACK(use_stun_cb), useStunCheckBox);
+ g_signal_connect(localAddressCombo, "changed", G_CALLBACK(local_interface_changed_cb), localAddressCombo);
+
+ g_signal_connect(useStunCheckBox, "toggled", G_CALLBACK(use_stun_cb), useStunCheckBox);
+
g_signal_connect(sameAsLocalRadioButton, "toggled", G_CALLBACK(same_as_local_cb), sameAsLocalRadioButton);
g_signal_connect(publishedAddrRadioButton, "toggled", G_CALLBACK(set_published_addr_manually_cb), publishedAddrRadioButton);
@@ -1015,6 +1062,11 @@ show_account_window (account_t * a)
gint response;
account_t *currentAccount;
+ // In case the published address is same than local,
+ // we must resolve published address from interface name
+ gchar * local_interface;
+ gchar * published_address;
+
currentAccount = a;
if (currentAccount == NULL) {
@@ -1104,7 +1156,12 @@ show_account_window (account_t * a)
if (g_strcasecmp(keyExchange, "ZRTP") == 0) {
g_hash_table_replace(currentAccount->properties, g_strdup(ACCOUNT_SRTP_ENABLED), g_strdup("true"));
g_hash_table_replace(currentAccount->properties, g_strdup(ACCOUNT_KEY_EXCHANGE), g_strdup(ZRTP));
- } else {
+ }
+ else if(g_strcasecmp(keyExchange, "SDES") == 0) {
+ g_hash_table_replace(currentAccount->properties, g_strdup(ACCOUNT_SRTP_ENABLED), g_strdup("true"));
+ g_hash_table_replace(currentAccount->properties, g_strdup(ACCOUNT_KEY_EXCHANGE), g_strdup(SDES));
+ }
+ else {
g_hash_table_replace(currentAccount->properties, g_strdup(ACCOUNT_SRTP_ENABLED), g_strdup("false"));
}
@@ -1114,14 +1171,16 @@ show_account_window (account_t * a)
g_hash_table_replace(currentAccount->properties, g_strdup(PUBLISHED_SAMEAS_LOCAL), g_strdup(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sameAsLocalRadioButton)) ? "true":"false"));
g_hash_table_replace(currentAccount->properties,
- g_strdup(LOCAL_PORT),
- g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(localPortSpinBox))));
+ g_strdup(LOCAL_INTERFACE),
+ g_strdup((gchar *)gtk_combo_box_get_active_text(GTK_COMBO_BOX(localAddressCombo))));
g_hash_table_replace(currentAccount->properties,
- g_strdup(LOCAL_ADDRESS),
- g_strdup((gchar *)gtk_combo_box_get_active_text(GTK_COMBO_BOX(localAddressCombo))));
+ g_strdup(LOCAL_PORT),
+ g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(localPortSpinBox))));
+
if(!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sameAsLocalRadioButton)))
{
+
g_hash_table_replace(currentAccount->properties,
g_strdup(PUBLISHED_PORT),
g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(publishedPortSpinBox))));
@@ -1135,10 +1194,13 @@ show_account_window (account_t * a)
g_hash_table_replace(currentAccount->properties,
g_strdup(PUBLISHED_PORT),
g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(localPortSpinBox))));
+ local_interface = g_strdup((gchar *)gtk_combo_box_get_active_text(GTK_COMBO_BOX(localAddressCombo)));
+
+ published_address = dbus_get_address_from_interface_name(local_interface);
g_hash_table_replace(currentAccount->properties,
g_strdup(PUBLISHED_ADDRESS),
- g_strdup((gchar *)gtk_combo_box_get_active_text(GTK_COMBO_BOX(localAddressCombo))));
+ published_address);
}
}
diff --git a/sflphone-client-gnome/src/config/assistant.c b/sflphone-client-gnome/src/config/assistant.c
index c3be338bced5e9a7771b67165d8c240b44089019..0319d1bd5e0e7e0bbec6120192546366aa45b4e8 100644
--- a/sflphone-client-gnome/src/config/assistant.c
+++ b/sflphone-client-gnome/src/config/assistant.c
@@ -164,7 +164,8 @@ static void sip_apply_callback( void ) {
iface = iface_list;
DEBUG("Selected interface %s", *iface);
- g_hash_table_insert(current->properties, g_strdup(LOCAL_ADDRESS), g_strdup((gchar *)*iface));
+ g_hash_table_insert(current->properties, g_strdup(LOCAL_INTERFACE), g_strdup((gchar *)*iface));
+
g_hash_table_insert(current->properties, g_strdup(PUBLISHED_ADDRESS), g_strdup((gchar *)*iface));
dbus_add_account( current );
diff --git a/sflphone-client-gnome/src/config/preferencesdialog.c b/sflphone-client-gnome/src/config/preferencesdialog.c
index 93c1982f7ded3c705d178c1ec2d7c71444fbd40e..4b7d9af6f23db9bd6c520a073e37c0fd204f0c0b 100644
--- a/sflphone-client-gnome/src/config/preferencesdialog.c
+++ b/sflphone-client-gnome/src/config/preferencesdialog.c
@@ -58,22 +58,6 @@ static gboolean history_enabled = TRUE;
GHashTable * directIpCallsProperties = NULL;
-
-
-static void update_ip_address_port_cb ( GtkSpinButton *button UNUSED, void *ptr )
-{
- // dbus_set_sip_port(gtk_spin_button_get_value_as_int((GtkSpinButton *)(ptr)));
- gchar* local_address = g_strdup((gchar *)gtk_combo_box_get_active_text(GTK_COMBO_BOX(localAddressCombo)));
- gchar* local_port = g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(localPortSpinBox)));
-
- gchar* ip_interface = g_strconcat(local_address, ":", local_port, NULL);
-
- DEBUG("update_ip_address_port_cb %s\n", ip_interface);
-
- dbus_set_sip_address(ip_interface);
-}
-
-
static void
set_md5_hash_cb(GtkWidget *widget UNUSED, gpointer data UNUSED)
{
@@ -136,10 +120,16 @@ static void key_exchange_changed_cb(GtkWidget *widget, gpointer data)
{
DEBUG("Key exchange changed");
if (g_strcasecmp(gtk_combo_box_get_active_text(GTK_COMBO_BOX(widget)), (gchar *) "ZRTP") == 0) {
- gtk_widget_set_sensitive(GTK_WIDGET(data), TRUE);
- g_hash_table_replace(directIpCallsProperties, g_strdup(ACCOUNT_SRTP_ENABLED), g_strdup("true"));
- g_hash_table_replace(directIpCallsProperties, g_strdup(ACCOUNT_KEY_EXCHANGE), g_strdup(ZRTP));
- } else {
+ gtk_widget_set_sensitive(GTK_WIDGET(data), TRUE);
+ g_hash_table_replace(directIpCallsProperties, g_strdup(ACCOUNT_SRTP_ENABLED), g_strdup("true"));
+ g_hash_table_replace(directIpCallsProperties, g_strdup(ACCOUNT_KEY_EXCHANGE), g_strdup(ZRTP));
+ }
+ else if (g_strcasecmp(gtk_combo_box_get_active_text(GTK_COMBO_BOX(widget)), (gchar *) "SDES") == 0) {
+ gtk_widget_set_sensitive(GTK_WIDGET(data), FALSE);
+ g_hash_table_replace(directIpCallsProperties, g_strdup(ACCOUNT_SRTP_ENABLED), g_strdup("true"));
+ g_hash_table_replace(directIpCallsProperties, g_strdup(ACCOUNT_KEY_EXCHANGE), g_strdup(SDES));
+ }
+ else {
gtk_widget_set_sensitive(GTK_WIDGET(data), FALSE);
DEBUG("Setting key exchange %s to %s\n", ACCOUNT_KEY_EXCHANGE, KEY_EXCHANGE_NONE);
g_hash_table_replace(directIpCallsProperties, g_strdup(ACCOUNT_SRTP_ENABLED), g_strdup("false"));
@@ -165,7 +155,7 @@ static void use_sip_tls_cb(GtkWidget *widget, gpointer data)
static void ip2ip_local_address_changed_cb(GtkWidget *widget, gpointer data)
{
DEBUG("ip2ip_local_address_changed_cb\n");
- g_hash_table_replace(directIpCallsProperties, g_strdup(LOCAL_ADDRESS), g_strdup((gchar *)gtk_combo_box_get_active_text(GTK_COMBO_BOX(widget))));
+ g_hash_table_replace(directIpCallsProperties, g_strdup(LOCAL_INTERFACE), g_strdup((gchar *)gtk_combo_box_get_active_text(GTK_COMBO_BOX(widget))));
}
static void ip2ip_local_port_changed_cb(GtkWidget *widget, gpointer data)
@@ -199,6 +189,7 @@ GtkWidget* create_direct_ip_calls_tab()
gchar * curKeyExchange = "0";
gchar * description;
+ gchar * local_interface;
gchar * local_address;
gchar * local_port;
@@ -207,9 +198,9 @@ GtkWidget* create_direct_ip_calls_tab()
if(directIpCallsProperties != NULL) {
DEBUG("got a directIpCallsProperties");
- local_address = g_hash_table_lookup(directIpCallsProperties, LOCAL_ADDRESS);
+ local_interface = g_hash_table_lookup(directIpCallsProperties, LOCAL_INTERFACE);
local_port = g_hash_table_lookup(directIpCallsProperties, LOCAL_PORT);
- DEBUG(" local address = %s", local_address);
+ DEBUG(" local interface = %s", local_interface);
DEBUG(" local port = %s", local_port);
curSRTPEnabled = g_hash_table_lookup(directIpCallsProperties, ACCOUNT_SRTP_ENABLED);
DEBUG(" curSRTPEnabled = %s", curSRTPEnabled);
@@ -252,7 +243,8 @@ GtkWidget* create_direct_ip_calls_tab()
GtkTreeIter current_local_address_iter = iter;
gchar ** iface_list = NULL;
- iface_list = (gchar**) dbus_get_all_ip_interface();
+ // iface_list = (gchar**) dbus_get_all_ip_interface();
+ iface_list = (gchar**) dbus_get_all_ip_interface_by_name();
gchar ** iface;
gboolean iface_found = FALSE;
@@ -263,7 +255,7 @@ GtkWidget* create_direct_ip_calls_tab()
gtk_list_store_append(ipInterfaceListStore, &iter );
gtk_list_store_set(ipInterfaceListStore, &iter, 0, *iface, -1 );
- if (!iface_found && (g_strcmp0(*iface, local_address) == 0)) {
+ if (!iface_found && (g_strcmp0(*iface, local_interface) == 0)) {
DEBUG("Setting active local address combo box");
current_local_address_iter = iter;
iface_found = TRUE;
@@ -291,7 +283,7 @@ GtkWidget* create_direct_ip_calls_tab()
gtk_combo_box_set_active_iter(GTK_COMBO_BOX(localAddressCombo), ¤t_local_address_iter);
g_signal_connect (G_OBJECT(GTK_COMBO_BOX(localAddressCombo)), "changed", G_CALLBACK (ip2ip_local_address_changed_cb), localAddressCombo);
- g_hash_table_replace(directIpCallsProperties, g_strdup(LOCAL_ADDRESS), g_strdup((gchar *)gtk_combo_box_get_active_text(GTK_COMBO_BOX(localAddressCombo))));
+ g_hash_table_replace(directIpCallsProperties, g_strdup(LOCAL_INTERFACE), g_strdup((gchar *)gtk_combo_box_get_active_text(GTK_COMBO_BOX(localAddressCombo))));
/**
@@ -311,7 +303,7 @@ GtkWidget* create_direct_ip_calls_tab()
GtkWidget *applyModificationButton = gtk_button_new_from_stock(GTK_STOCK_APPLY);
- g_signal_connect( G_OBJECT(applyModificationButton) , "clicked" , G_CALLBACK( update_ip_address_port_cb ), localPortSpinBox);
+ // g_signal_connect( G_OBJECT(applyModificationButton) , "clicked" , G_CALLBACK( update_ip_address_port_cb ), localPortSpinBox);
gtk_table_attach( GTK_TABLE(table), applyModificationButton, 2, 3, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 5);
@@ -340,16 +332,20 @@ GtkWidget* create_direct_ip_calls_tab()
keyExchangeCombo = gtk_combo_box_new_text();
gtk_label_set_mnemonic_widget (GTK_LABEL (label), keyExchangeCombo);
gtk_combo_box_append_text(GTK_COMBO_BOX(keyExchangeCombo), "ZRTP");
- //gtk_combo_box_append_text(GTK_COMBO_BOX(keyExchangeCombo), "SDES");
+ gtk_combo_box_append_text(GTK_COMBO_BOX(keyExchangeCombo), "SDES");
gtk_combo_box_append_text(GTK_COMBO_BOX(keyExchangeCombo), _("Disabled"));
advancedZrtpButton = gtk_button_new_from_stock(GTK_STOCK_PREFERENCES);
g_signal_connect(G_OBJECT(advancedZrtpButton), "clicked", G_CALLBACK(show_advanced_zrtp_options_cb), directIpCallsProperties);
if (g_strcasecmp(curKeyExchange, ZRTP) == 0) {
- gtk_combo_box_set_active(GTK_COMBO_BOX(keyExchangeCombo),0);
- } else {
- gtk_combo_box_set_active(GTK_COMBO_BOX(keyExchangeCombo), 1);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(keyExchangeCombo),0);
+ }
+ else if(g_strcasecmp(curKeyExchange, SDES) == 0) {
+ gtk_combo_box_set_active(GTK_COMBO_BOX(keyExchangeCombo),1);
+ }
+ else {
+ gtk_combo_box_set_active(GTK_COMBO_BOX(keyExchangeCombo), 2);
gtk_widget_set_sensitive(GTK_WIDGET(advancedZrtpButton), FALSE);
}
diff --git a/sflphone-client-gnome/src/config/tlsadvanceddialog.c b/sflphone-client-gnome/src/config/tlsadvanceddialog.c
index 2d59a0aaa03cb8798ad2b30ed8a0cc6ca0a77efb..493053f0ee93b715706ce03a0bec1e4c5869bac6 100644
--- a/sflphone-client-gnome/src/config/tlsadvanceddialog.c
+++ b/sflphone-client-gnome/src/config/tlsadvanceddialog.c
@@ -43,6 +43,7 @@ void show_advanced_tls_options(GHashTable * properties)
GTK_STOCK_SAVE,
GTK_RESPONSE_ACCEPT,
NULL));
+
gtk_window_set_policy( GTK_WINDOW(tlsDialog), FALSE, FALSE, FALSE );
gtk_dialog_set_has_separator(tlsDialog, TRUE);
gtk_container_set_border_width (GTK_CONTAINER(tlsDialog), 0);
@@ -62,7 +63,9 @@ void show_advanced_tls_options(GHashTable * properties)
"port, different one from each other\n"));
GtkWidget * label;
label = gtk_label_new(NULL);
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+ gtk_widget_set_size_request(label, 600, 70);
+ gtk_label_set_line_wrap (GTK_LABEL(label), TRUE);
+ gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
gtk_label_set_markup(GTK_LABEL(label), description);
gtk_table_attach(GTK_TABLE(table), label, 0, 3, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
diff --git a/sflphone-client-gnome/src/config/tlsadvanceddialog.h b/sflphone-client-gnome/src/config/tlsadvanceddialog.h
index 853d0ddd95416fe648bb5ed7b69c30e5e853644d..4b7702a2324ad086dd81444ea3e1f166c579cd07 100644
--- a/sflphone-client-gnome/src/config/tlsadvanceddialog.h
+++ b/sflphone-client-gnome/src/config/tlsadvanceddialog.h
@@ -24,6 +24,7 @@
*/
#include <glib.h>
+#include <mainwindow.h>
/**
* Display the advanced options window for zrtp
diff --git a/sflphone-client-gnome/src/config/zrtpadvanceddialog.c b/sflphone-client-gnome/src/config/zrtpadvanceddialog.c
index b055e0de41ad37998c1e43739950e6f166e2db73..02b634d55915e91c8752448bfdbee95013e3400a 100644
--- a/sflphone-client-gnome/src/config/zrtpadvanceddialog.c
+++ b/sflphone-client-gnome/src/config/zrtpadvanceddialog.c
@@ -47,7 +47,7 @@ void show_advanced_zrtp_options(GHashTable * properties)
}
securityDialog = GTK_DIALOG (gtk_dialog_new_with_buttons ( _("ZRTP Options"),
- GTK_WINDOW (get_main_window()),
+ GTK_WINDOW (get_main_window()),
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL,
diff --git a/sflphone-client-gnome/src/config/zrtpadvanceddialog.h b/sflphone-client-gnome/src/config/zrtpadvanceddialog.h
index fb84c6e7b74a17218e640f18714b1fea23b32385..df92bfb09b5586627b02fb61600388bb0d6cbd1e 100644
--- a/sflphone-client-gnome/src/config/zrtpadvanceddialog.h
+++ b/sflphone-client-gnome/src/config/zrtpadvanceddialog.h
@@ -24,7 +24,7 @@
*/
#include <glib.h>
-
+#include <mainwindow.h>
/**
* Display the advanced options window for zrtp
*/
diff --git a/sflphone-client-gnome/src/contacts/addressbook.c b/sflphone-client-gnome/src/contacts/addressbook.c
index 60557d04f6533ac2b87e724d6570bb170c7251ae..d9b987c6340af544880f01ef9e74ded840bfd2b4 100644
--- a/sflphone-client-gnome/src/contacts/addressbook.c
+++ b/sflphone-client-gnome/src/contacts/addressbook.c
@@ -32,17 +32,21 @@ void
addressbook_search(GtkEntry* entry)
{
- AddressBook_Config *addressbook_config;
+ gchar* query = gtk_entry_get_text(GTK_ENTRY (entry));
+ if (strlen(query) >= 3) {
- // Activate waiting layer
- activateWaitingLayer();
+ AddressBook_Config *addressbook_config;
+
+ // Activate waiting layer
+ activateWaitingLayer();
- // Load the address book parameters
- addressbook_config_load_parameters(&addressbook_config);
+ // Load the address book parameters
+ addressbook_config_load_parameters(&addressbook_config);
+
+ // Start the asynchronous search as soon as we have an entry */
+ search_async(gtk_entry_get_text(GTK_ENTRY (entry)), addressbook_config->max_results, &handler_async_search, addressbook_config);
- // Start the asynchronous search as soon as we have an entry */
- search_async(gtk_entry_get_text(GTK_ENTRY (entry)), addressbook_config->max_results, &handler_async_search,
- addressbook_config);
+ }
}
/**
@@ -84,6 +88,7 @@ addressbook_is_active()
static void
addressbook_config_books()
{
+
gchar **config_book_uid;
book_data_t *book_data;
gchar **list;
@@ -91,21 +96,21 @@ addressbook_config_books()
// Retrieve list of books
list = (gchar **) dbus_get_addressbook_list();
- if (list)
- {
- for (config_book_uid = list; *config_book_uid; config_book_uid++)
- {
+ if (list) {
+
+ for (config_book_uid = list; *config_book_uid; config_book_uid++) {
+
// Get corresponding book data
book_data = books_get_book_data_by_uid(*config_book_uid);
// If book_data exists
- if (book_data != NULL)
- {
+ if (book_data != NULL) {
+
book_data->active = TRUE;
- }
- }
+ }
+ }
g_strfreev(list);
- }
+ }
// Update buttons
update_actions ();
diff --git a/sflphone-client-gnome/src/contacts/addressbook/eds.c b/sflphone-client-gnome/src/contacts/addressbook/eds.c
index 4303109b741c4c7c9ccff471f1570246aa983629..289e5aea7485b34346cee19bff43cc28d3dffcea 100644
--- a/sflphone-client-gnome/src/contacts/addressbook/eds.c
+++ b/sflphone-client-gnome/src/contacts/addressbook/eds.c
@@ -275,23 +275,25 @@ pixbuf_from_contact(EContact *contact)
static void
eds_async_open_callback(EBook *book, EBookStatus status, gpointer closure)
{
- Open_Handler_And_Data *had = (Open_Handler_And_Data *) closure;
+ Open_Handler_And_Data *had = (Open_Handler_And_Data *) closure;
- remaining_books_to_open--;
+ remaining_books_to_open--;
- if (status == E_BOOK_ERROR_OK)
- {
- book_data_t *book_data = g_new(book_data_t, 1);
- book_data->active = FALSE;
- book_data->name = g_strdup(e_source_peek_name(e_book_get_source(book)));
- book_data->uid = g_strdup(e_source_peek_uid(e_book_get_source(book)));
- book_data->ebook = book;
- books_data = g_slist_prepend(books_data, book_data);
- had->handler();
+ DEBUG("eds_async_open_callback remaining book to open: %i", remaining_books_to_open);
+
+ if (status == E_BOOK_ERROR_OK) {
+
+ book_data_t *book_data = g_new(book_data_t, 1);
+ book_data->active = FALSE;
+ book_data->name = g_strdup(e_source_peek_name(e_book_get_source(book)));
+ book_data->uid = g_strdup(e_source_peek_uid(e_book_get_source(book)));
+ book_data->ebook = book;
+ books_data = g_slist_prepend(books_data, book_data);
+ had->handler();
}
- else
- {
- WARN("Got error %d when opening book", status);
+ else {
+
+ WARN("Got error %d when opening book", status);
}
}
@@ -302,14 +304,15 @@ void
init(OpenAsyncHandler callback)
{
GSList *list, *l;
- ESourceList *source_list;
+ ESourceList *source_list = NULL;
remaining_books_to_open = 0;
books_data = NULL;
- source_list = e_source_list_new_for_gconf_default(
- "/apps/evolution/addressbook/sources");
+ source_list = e_source_list_new_for_gconf_default("/apps/evolution/addressbook/sources");
+
if (source_list == NULL)
{
+ DEBUG("Error could not initialize source list for addressbook");
return;
}
@@ -320,6 +323,7 @@ init(OpenAsyncHandler callback)
for (l = list; l != NULL; l = l->next)
{
+
ESourceGroup *group = l->data;
GSList *sources = NULL, *m;
sources = e_source_group_peek_sources(group);
@@ -330,10 +334,12 @@ init(OpenAsyncHandler callback)
if (book != NULL)
{
// Keep count of remaining books to open
- remaining_books_to_open++;
+ DEBUG("init addressbook %i", remaining_books_to_open);
+ remaining_books_to_open++;
+
// Asynchronous open
- e_book_async_open(book, TRUE, eds_async_open_callback, had);
+ e_book_async_open(book, FALSE, eds_async_open_callback, had);
}
}
}
diff --git a/sflphone-client-gnome/src/contacts/calltree.c b/sflphone-client-gnome/src/contacts/calltree.c
index 5505e21d971bb54ad1d76b7ef4756b991893947b..0838bacd8e50d2c25eb2b671ab9bb3ed4b857235 100644
--- a/sflphone-client-gnome/src/contacts/calltree.c
+++ b/sflphone-client-gnome/src/contacts/calltree.c
@@ -253,6 +253,7 @@ row_activated(GtkTreeView *tree_view UNUSED,
}
+
/* Catch cursor-activated signal. That is, when the entry is single clicked */
void
row_single_click(GtkTreeView *tree_view UNUSED, void * data UNUSED)
@@ -336,6 +337,193 @@ button_pressed(GtkWidget* widget, GdkEventButton *event, gpointer user_data UNUS
return FALSE;
}
+
+gchar*
+calltree_display_call_info(callable_obj_t * c, CallDisplayType display_type, gchar *audio_codec, gchar** display_info)
+{
+
+ gchar * description;
+ gchar * tmp_info;
+
+ gchar * peer_number = c->_peer_number;
+ gchar * hostname = NULL;
+ gchar * display_number = "";
+
+ DEBUG("Display call info");
+
+ // If call is outgoing, keep the hostname, strip it elsewhere
+ if(c->_type == CALL && c->_history_state == OUTGOING) {
+
+ display_number = peer_number;
+ }
+ else {
+
+ // Get the hostname for this call (NULL if not existent)
+ hostname = g_strrstr(peer_number, "@");
+
+ // Test if we are dialing a new number
+ if(g_strcmp0("", c->_peer_number) != 0) {
+
+ // Strip the hostname if existent
+ if(hostname) {
+ display_number = g_strndup(peer_number, hostname - peer_number);
+ }
+ else {
+ display_number = peer_number;
+ }
+ }
+ else {
+
+ display_number = peer_number;
+ }
+ }
+ // Different display depending on type
+ switch(display_type) {
+
+ case DISPLAY_TYPE_CALL:
+
+ DEBUG("display a normal call");
+ if(c->_state_code == 0) {
+
+ if(g_strcmp0("", c->_peer_name) == 0) {
+ description = g_markup_printf_escaped("<b>%s</b><i>%s</i>",
+ display_number,
+ c->_peer_name);
+ }
+ else {
+ description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>",
+ c->_peer_name,
+ display_number);
+ }
+
+ }
+ else {
+ if(g_strcmp0("", c->_peer_name) == 0) {
+ description = g_markup_printf_escaped("<b>%s</b><i>%s</i>\n<i>%s (%d)</i>",
+ display_number,
+ c->_peer_name,
+ c->_state_code_description,
+ c->_state_code);
+ }
+ else {
+ description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>\n<i>%s (%d)</i>",
+ c->_peer_name,
+ display_number,
+ c->_state_code_description,
+ c->_state_code);
+ }
+ }
+
+ break;
+
+
+ case DISPLAY_TYPE_CALL_TRANSFER:
+
+ DEBUG("display a call transfer")
+
+ if(g_strcmp0("",c->_peer_name) == 0){
+ description = g_markup_printf_escaped("<b>%s</b><i>%s</i>\n<i>Transfert to:%s</i> ",
+ display_number,
+ c->_peer_name,
+ c->_trsft_to);
+ }
+ else {
+ description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>\n<i>Transfert to:%s</i> ",
+ c->_peer_name,
+ display_number,
+ c->_trsft_to);
+ }
+
+ break;
+
+
+ case DISPLAY_TYPE_STATE_CODE :
+
+ DEBUG("display a state code");
+
+ if(g_strcmp0("",c->_peer_name) == 0){
+
+ if (c->_state_code) {
+
+ description = g_markup_printf_escaped("<b>%s</b><i>%s</i>\n<i>%s (%d)</i> <i>%s</i>",
+ display_number,
+ c->_peer_name,
+ c->_state_code_description,
+ c->_state_code,
+ audio_codec);
+ } else {
+ description = g_markup_printf_escaped("<b>%s</b><i>%s</i>\n<i>%s</i>",
+ display_number,
+ c->_peer_name,
+ audio_codec);
+ }
+ }
+ else {
+ if (c->_state_code) {
+ description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>\n<i>%s (%d)</i> <i>%s</i>",
+ c->_peer_name,
+ display_number,
+ c->_state_code_description,
+ c->_state_code,
+ audio_codec);
+ } else {
+ description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>\n<i>%s</i>",
+ c->_peer_name,
+ display_number,
+ audio_codec);
+ }
+ }
+ break;
+
+ case DISPLAY_TYPE_SAS:
+
+ DEBUG("display a call with sas");
+
+ if(g_strcmp0("",c->_peer_name) == 0){
+ description = g_markup_printf_escaped("<b>%s</b><i>%s</i>\n<i>Confirm SAS <b>%s</b> ?</i> ",
+ display_number,
+ c->_peer_name,
+ c->_sas);
+ }
+ else {
+
+ description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>\n<i>Confirm SAS <b>%s</b> ?</i> ",
+ c->_peer_name,
+ display_number,
+ c->_sas);
+ }
+
+ case DISPLAY_TYPE_HISTORY :
+
+ DEBUG("display history entry");
+
+ if(g_strcmp0("", c->_peer_name) == 0) {
+
+ description = g_markup_printf_escaped("<b>%s</b><i>%s</i>",
+ display_number,
+ c->_peer_name);
+ }
+ else {
+
+ description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>",
+ c->_peer_name,
+ display_number);
+ }
+ break;
+
+ default :
+ DEBUG("Not an allowable type of display");
+ break;
+
+ }
+
+ // return description;
+ tmp_info = g_strdup(description);
+ *display_info = tmp_info;
+}
+
+
+
/**
* Reset call tree
*/
@@ -521,212 +709,180 @@ calltree_remove_call (calltab_t* tab, callable_obj_t * c, GtkTreeIter *parent)
void
calltree_update_call (calltab_t* tab, callable_obj_t * c, GtkTreeIter *parent)
{
- GdkPixbuf *pixbuf=NULL;
- GdkPixbuf *pixbuf_security=NULL;
- GtkTreeIter iter;
- GValue val;
- callable_obj_t * iterCall;
- GtkTreeStore* store = tab->store;
+ GdkPixbuf *pixbuf=NULL;
+ GdkPixbuf *pixbuf_security=NULL;
+ GtkTreeIter iter;
+ GValue val;
+ callable_obj_t * iterCall;
+ GtkTreeStore* store = tab->store;
- gchar* srtp_enabled = "";
- gboolean display_sas = TRUE;
- account_t* account_details=NULL;
- gchar *audio_codec = "";
+ gchar* srtp_enabled = "";
+ gboolean display_sas = TRUE;
+ account_t* account_details=NULL;
+ gchar *audio_codec = "";
+
+ int nbChild = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), parent);
+ int i;
+
+ if(c != NULL) {
+ account_details = account_list_get_by_id(c->_accountID);
+ if(account_details != NULL) {
+ srtp_enabled = g_hash_table_lookup(account_details->properties, ACCOUNT_SRTP_ENABLED);
+ if(g_strcasecmp(g_hash_table_lookup(account_details->properties, ACCOUNT_ZRTP_DISPLAY_SAS),"false") == 0)
+ { display_sas = FALSE; }
+ } else {
+ GHashTable * properties = NULL;
+ sflphone_get_ip2ip_properties (&properties);
+ if(properties != NULL) {
+ if(g_strcasecmp(g_hash_table_lookup(properties, ACCOUNT_ZRTP_DISPLAY_SAS),"false") == 0)
+ { display_sas = FALSE; }
+ }
+ }
+ }
+ for( i = 0; i < nbChild; i++) {
- int nbChild = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), parent);
- int i;
+ if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, parent, i)) {
- if(c != NULL) {
- account_details = account_list_get_by_id(c->_accountID);
- if(account_details != NULL) {
- srtp_enabled = g_hash_table_lookup(account_details->properties, ACCOUNT_SRTP_ENABLED);
- if(g_strcasecmp(g_hash_table_lookup(account_details->properties, ACCOUNT_ZRTP_DISPLAY_SAS),"false") == 0)
- { display_sas = FALSE; }
- } else {
- GHashTable * properties = NULL;
- sflphone_get_ip2ip_properties (&properties);
- if(properties != NULL) {
- if(g_strcasecmp(g_hash_table_lookup(properties, ACCOUNT_ZRTP_DISPLAY_SAS),"false") == 0)
- { display_sas = FALSE; }
- }
- }
- }
+ if(gtk_tree_model_iter_has_child(GTK_TREE_MODEL(store), &iter)) {
+ calltree_update_call (tab, c, &iter);
+ }
- for( i = 0; i < nbChild; i++)
- {
+ val.g_type = 0;
+ gtk_tree_model_get_value (GTK_TREE_MODEL(store), &iter, COLUMN_ACCOUNT_PTR, &val);
- if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, parent, i))
- {
+
+ iterCall = (callable_obj_t*) g_value_get_pointer(&val);
+ g_value_unset(&val);
+
+ if(iterCall != c) {
+ continue;
+ }
- if(gtk_tree_model_iter_has_child(GTK_TREE_MODEL(store), &iter))
- {
- calltree_update_call (tab, c, &iter);
- }
+ /* Update text */
+ gchar * description;
+ gchar * date="";
+ gchar * duration="";
+ audio_codec = call_get_audio_codec (c);
+
+ if(c->_state == CALL_STATE_TRANSFERT) {
- val.g_type = 0;
- gtk_tree_model_get_value (GTK_TREE_MODEL(store), &iter, COLUMN_ACCOUNT_PTR, &val);
+ calltree_display_call_info(c, DISPLAY_TYPE_CALL_TRANSFER, NULL, &description);
+
+ }
+ else {
+ if((c->_sas != NULL) && (display_sas == TRUE) && (c->_srtp_state == SRTP_STATE_SAS_UNCONFIRMED) && (c->_zrtp_confirmed == FALSE)) {
- iterCall = (callable_obj_t*) g_value_get_pointer(&val);
- g_value_unset(&val);
+ calltree_display_call_info(c, DISPLAY_TYPE_SAS, NULL, &description);
+
+ } else {
- if(iterCall != c) {
- continue;
- }
+ calltree_display_call_info(c, DISPLAY_TYPE_STATE_CODE, audio_codec, &description);
+ }
+ }
- /* Update text */
- gchar * description;
- gchar * date="";
- gchar * duration="";
- audio_codec = call_get_audio_codec (c);
+ /* Update icons */
+ if( tab == current_calls ) {
+ DEBUG("Receiving in state %d", c->_state);
+ switch(c->_state) {
+ case CALL_STATE_HOLD:
+ pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/hold.svg", NULL);
+ break;
+ case CALL_STATE_INCOMING:
+ case CALL_STATE_RINGING:
+ pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/ring.svg", NULL);
+ break;
+ case CALL_STATE_CURRENT:
+ pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/current.svg", NULL);
+ break;
+ case CALL_STATE_DIALING:
+ pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/dial.svg", NULL);
+ break;
+ case CALL_STATE_FAILURE:
+ pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/fail.svg", NULL);
+ break;
+ case CALL_STATE_BUSY:
+ pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/busy.svg", NULL);
+ break;
+ case CALL_STATE_TRANSFERT:
+ pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/transfert.svg", NULL);
+ break;
+ case CALL_STATE_RECORD:
+ pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/icon_rec.svg", NULL);
+ break;
+ default:
+ WARN("Update calltree - Should not happen!");
+ }
+
+ switch(c->_srtp_state) {
+ case SRTP_STATE_SAS_UNCONFIRMED:
+ DEBUG("Secure is ON");
+ pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/lock_unconfirmed.svg", NULL);
+ if(c->_sas != NULL) { DEBUG("SAS is ready with value %s", c->_sas); }
+ break;
+ case SRTP_STATE_SAS_CONFIRMED:
+ DEBUG("SAS is confirmed");
+ pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/lock_confirmed.svg", NULL);
+ break;
+ case SRTP_STATE_SAS_SIGNED:
+ DEBUG("Secure is ON with SAS signed and verified");
+ pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/lock_certified.svg", NULL);
+ break;
+ case SRTP_STATE_UNLOCKED:
+ DEBUG("Secure is off calltree %d", c->_state);
+ if(g_strcasecmp(srtp_enabled,"true") == 0) {
+ pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/lock_off.svg", NULL);
+ }
+ break;
+ default:
+ WARN("Update calltree srtp state #%d- Should not happen!", c->_srtp_state);
+ if(g_strcasecmp(srtp_enabled,"true") == 0) {
+ pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/lock_off.svg", NULL);
+ }
- if(c->_state == CALL_STATE_TRANSFERT)
- {
- if(g_strcmp0("",c->_peer_name) == 0){
- description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>\n<i>Transfert to:%s</i> ",
- c->_peer_number,
- c->_peer_name,
- c->_trsft_to);
- }
- else {
- description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>\n<i>Transfert to:%s</i> ",
- c->_peer_name,
- c->_peer_number,
- c->_trsft_to);
- }
- }
- else
- {
- // c->_zrtp_confirmed == FALSE : Hack explained in callable_obj.h
- if((c->_sas != NULL) && (display_sas == TRUE) && (c->_srtp_state == SRTP_STATE_SAS_UNCONFIRMED) && (c->_zrtp_confirmed == FALSE)) {
-
- if(g_strcmp0("",c->_peer_name) == 0){
- description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>\n<i>Confirm SAS <b>%s</b> ?</i> ",
- c->_peer_number,
- c->_peer_name,
- c->_sas);
- }
- else {
-
- description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>\n<i>Confirm SAS <b>%s</b> ?</i> ",
- c->_peer_name,
- c->_peer_number,
- c->_sas);
- }
- } else {
- DEBUG("Updating state code %d %s", c->_state_code, c->_state_code_description);
- if(g_strcmp0("",c->_peer_name) == 0){
- if (c->_state_code) {
- description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>\n<i>%s (%d)</i> <i>%s</i>",
- c->_peer_number,
- c->_peer_name,
- c->_state_code_description,
- c->_state_code,
- audio_codec);
- } else {
- description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>\n<i>%s</i>",
- c->_peer_number,
- c->_peer_name,
- audio_codec);
- }
- }
- else {
- if (c->_state_code) {
- description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>\n<i>%s (%d)</i> <i>%s</i>",
- c->_peer_name,
- c->_peer_number,
- c->_state_code_description,
- c->_state_code,
- audio_codec);
- } else {
- description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>\n<i>%s</i>",
- c->_peer_name,
- c->_peer_number,
- audio_codec);
- }
- }
- }
- }
+ }
+
+ }
- /* Update icons */
- if( tab == current_calls )
- {
- DEBUG("Receiving in state %d", c->_state);
- switch(c->_state)
- {
- case CALL_STATE_HOLD:
- pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/hold.svg", NULL);
- break;
- case CALL_STATE_INCOMING:
- case CALL_STATE_RINGING:
- pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/ring.svg", NULL);
- break;
- case CALL_STATE_CURRENT:
- pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/current.svg", NULL);
- break;
- case CALL_STATE_DIALING:
- pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/dial.svg", NULL);
- break;
- case CALL_STATE_FAILURE:
- pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/fail.svg", NULL);
- break;
- case CALL_STATE_BUSY:
- pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/busy.svg", NULL);
- break;
- case CALL_STATE_TRANSFERT:
- pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/transfert.svg", NULL);
- break;
- case CALL_STATE_RECORD:
- pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/icon_rec.svg", NULL);
- break;
- default:
- WARN("Update calltree - Should not happen!");
- }
+ if(tab == history) {
- switch(c->_srtp_state)
- {
- case SRTP_STATE_SAS_UNCONFIRMED:
- DEBUG("Secure is ON");
- pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/lock_unconfirmed.svg", NULL);
- if(c->_sas != NULL) { DEBUG("SAS is ready with value %s", c->_sas); }
- break;
- case SRTP_STATE_SAS_CONFIRMED:
- DEBUG("SAS is confirmed");
- pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/lock_confirmed.svg", NULL);
- break;
- case SRTP_STATE_SAS_SIGNED:
- DEBUG("Secure is ON with SAS signed and verified");
- pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/lock_certified.svg", NULL);
- break;
- case SRTP_STATE_UNLOCKED:
- DEBUG("Secure is off calltree %d", c->_state);
- if(g_strcasecmp(srtp_enabled,"true") == 0) {
- pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/lock_off.svg", NULL);
- }
- break;
- default:
- WARN("Update calltree srtp state #%d- Should not happen!", c->_srtp_state);
- if(g_strcasecmp(srtp_enabled,"true") == 0) {
- pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/lock_off.svg", NULL);
- }
+ switch(c->_history_state) {
+ case INCOMING:
+ pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/incoming.svg", NULL);
+ break;
+ case OUTGOING:
+ pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/outgoing.svg", NULL);
+ break;
+ case MISSED:
+ pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/missed.svg", NULL);
+ break;
+ default:
+ WARN("History - Should not happen!");
+ }
- }
- gtk_tree_store_set(store, &iter,
- 0, pixbuf, // Icon
- 1, description, // Description
- 2, pixbuf_security,
- 3, c,
- -1);
+ calltree_display_call_info(c, DISPLAY_TYPE_HISTORY, NULL, &description);
- if (pixbuf != NULL)
- g_object_unref(G_OBJECT(pixbuf));
+ date = get_formatted_start_timestamp (c);
+ duration = get_call_duration (c);
+ duration = g_strconcat( date , duration , NULL);
+ description = g_strconcat( description , duration, NULL);
+ }
- }
- }
+ gtk_tree_store_set(store, &iter,
+ 0, pixbuf, // Icon
+ 1, description, // Description
+ 2, pixbuf_security,
+ 3, c,
+ -1);
+ if (pixbuf != NULL)
+ g_object_unref(G_OBJECT(pixbuf));
}
- update_actions();
+
+ }
+
+ update_actions();
}
@@ -754,36 +910,7 @@ void calltree_add_call (calltab_t* tab, callable_obj_t * c, GtkTreeIter *parent)
gchar * date="";
gchar *duration="";
- if(c->_state_code == 0) {
-
- if(g_strcmp0("", c->_peer_name) == 0) {
- description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>",
- c->_peer_name,
- c->_peer_number);
- }
- else {
- description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>",
- c->_peer_name,
- c->_peer_number);
- }
-
- }
- else {
- if(g_strcmp0("", c->_peer_name) == 0) {
- description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>\n<i>%s (%d)</i>",
- c->_peer_number,
- c->_peer_name,
- c->_state_code_description,
- c->_state_code);
- }
- else {
- description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>\n<i>%s (%d)</i>",
- c->_peer_name,
- c->_peer_number,
- c->_state_code_description,
- c->_state_code);
- }
- }
+ calltree_display_call_info(c, DISPLAY_TYPE_CALL, NULL, &description);
gtk_tree_store_prepend (tab->store, &iter, parent);
@@ -890,18 +1017,7 @@ void calltree_add_history_entry (callable_obj_t * c)
// New call in the list
gchar * description, *date="", *duration="";
- if(g_strcmp0("", c->_peer_name) == 0) {
-
- description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>",
- c->_peer_number,
- c->_peer_name);
- }
- else {
-
- description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>",
- c->_peer_name,
- c->_peer_number);
- }
+ calltree_display_call_info(c, DISPLAY_TYPE_HISTORY, NULL, &description);
gtk_tree_store_prepend (history->store, &iter, NULL);
@@ -1340,7 +1456,7 @@ static void drag_end_cb(GtkWidget * widget, GdkDragContext * context, gpointer d
DEBUG(" selected_path %s, selected_call_id %s, selected_path_depth %i\n", selected_path, selected_call_id, selected_path_depth);
DEBUG(" dragged path %s, dragged_call_id %s, dragged_path_depth %i\n", selected_path, selected_call_id, dragged_path_depth);
- GtkTreeModel* model = (GtkTreeModel*)current_calls->store;
+ GtkTreeModel *model = (GtkTreeModel*)current_calls->store;
GtkTreePath *path = gtk_tree_path_new_from_string(dragged_path);
GtkTreePath *dpath = gtk_tree_path_new_from_string(dragged_path);
GtkTreePath *spath = gtk_tree_path_new_from_string(selected_path);
@@ -1348,173 +1464,243 @@ static void drag_end_cb(GtkWidget * widget, GdkDragContext * context, gpointer d
GtkTreeIter iter;
GtkTreeIter iter_parent;
GtkTreeIter iter_children;
- GtkTreeIter parent_conference;
+ GtkTreeIter parent_conference; // conference for which this call is attached
GValue val;
+ callable_obj_t* call;
conference_obj_t* conf;
- if(selected_path_depth == 1)
- {
- if(dragged_path_depth == 1)
- {
+ // Make sure that drag n drop does not imply a dialing call
+ if(selected_type == A_CALL && selected_call->_state == CALL_STATE_DIALING) {
+
+ DEBUG("Dragged a call on a dialing call");
- if (selected_type == A_CALL && dragged_type == A_CALL)
- {
+ calltree_remove_call(current_calls, selected_call, NULL);
+ calltree_add_call(current_calls, selected_call, NULL);
+ return;
+ }
+
+ else if(selected_type == A_CALL) {
- if(gtk_tree_path_compare (dpath, spath) == 0)
- {
- // draged a call on itself
- }
- else
- {
- // dragged a single call on a single call
- if(selected_call != NULL && dragged_call != NULL)
- sflphone_join_participant(selected_call->_callID, dragged_call->_callID);
- }
- }
- else if(selected_type == A_CALL && dragged_type == A_CONFERENCE)
- {
- // dragged a single call on a conference
- selected_call->_confID = g_strdup(dragged_call_id);
- sflphone_add_participant(selected_call_id, dragged_call_id);
- }
- else if(selected_type == A_CONFERENCE && dragged_type == A_CALL)
- {
- // dragged a conference on a single call (make no sence)
- calltree_remove_conference(current_calls, selected_conf, NULL);
- calltree_add_conference(current_calls, selected_conf);
+ // user may have dragged it outside the conference
+ if(dragged_call && dragged_call->_state == CALL_STATE_DIALING) {
+
+ calltree_remove_call(current_calls, dragged_call, NULL);
+
+ DEBUG("Dragged a call on a dialing call");
+
+ // test if call participate to a conference
+ if(selected_call->_confID) {
+
+ gtk_tree_path_up(spath);
+ gtk_tree_model_get_iter(GTK_TREE_MODEL(model), &parent_conference, path);
+
+ calltree_add_call(current_calls, selected_call, &parent_conference);
+ }
+ else {
+ calltree_add_call(current_calls, selected_call, NULL);
+ }
+
+ calltree_add_call(current_calls, dragged_call, NULL);
+ return;
+
+ }
+
+ }
+ else if(selected_type == A_CONFERENCE) {
+
+ DEBUG("Dragged a conference on a dialing call");
+
+ if(dragged_call && dragged_call->_state == CALL_STATE_DIALING) {
+
+ conf = selected_conf;
+
+ calltree_remove_conference(current_calls, conf, NULL);
+ calltree_add_conference(current_calls, conf);
+ return;
+ }
+ }
+
+
+ if(selected_path_depth == 1) {
+
+ if(dragged_path_depth == 1) {
+
+ if (selected_type == A_CALL && dragged_type == A_CALL) {
+
+ if(gtk_tree_path_compare (dpath, spath) == 0) {
+ // draged a call on itself
+ }
+ else {
+ // dragged a single call on a single call
+ if(selected_call != NULL && dragged_call != NULL)
+ sflphone_join_participant(selected_call->_callID, dragged_call->_callID);
+ }
+ }
+ else if(selected_type == A_CALL && dragged_type == A_CONFERENCE) {
+ // dragged a single call on a conference
+ if(!selected_call) {
+ DEBUG("Error: call dragged on a conference is null");
+ return;
+ }
+
+ selected_call->_confID = g_strdup(dragged_call_id);
+ sflphone_add_participant(selected_call_id, dragged_call_id);
+ }
+ else if(selected_type == A_CONFERENCE && dragged_type == A_CALL) {
+
+ // dragged a conference on a single call
+ conf = selected_conf;
+
+ calltree_remove_conference(current_calls, conf, NULL);
+ calltree_add_conference(current_calls, conf);
+
+
+ }
+ else if(selected_type == A_CONFERENCE && dragged_type == A_CONFERENCE){
+
+ // dragged a conference on a conference
+ if(gtk_tree_path_compare (dpath, spath) == 0) {
+
+ if(!current_calls) {
+ DEBUG("Error while joining the same conference\n");
+ return;
+ }
+
+ DEBUG("Joined the same conference!\n");
+ gtk_tree_view_expand_row(GTK_TREE_VIEW(current_calls->view), path, FALSE);
+ }
+ else {
+ if(!selected_conf) {
+ DEBUG("Error: selected conference is null while joining 2 conference");
}
- else if(selected_type == A_CONFERENCE && dragged_type == A_CONFERENCE)
- {
- // dragged a conference on a conference
- if(gtk_tree_path_compare (dpath, spath) == 0)
- {
- DEBUG("Joined the same conference!\n");
- gtk_tree_view_expand_row(GTK_TREE_VIEW(current_calls->view), path, FALSE);
- }
- else
- {
- DEBUG("Joined two conference %s, %s!\n", dragged_path, selected_path);
- sflphone_join_conference(selected_conf->_confID, dragged_conf->_confID);
- }
+
+ if(!dragged_conf) {
+ DEBUG("Error: dragged conference is null while joining 2 conference");
}
+ DEBUG("Joined two conference %s, %s!\n", dragged_path, selected_path);
+ sflphone_join_conference(selected_conf->_confID, dragged_conf->_confID);
+ }
+ }
+
// TODO: dragged a single call on a NULL element (should do nothing)
// TODO: dragged a conference on a NULL element (should do nothing)
+ }
+ else {
+
+ // dragged_path_depth == 2
+ if (selected_type == A_CALL && dragged_type == A_CALL) {
+
+ // TODO: dragged a call on a conference call
+ calltree_remove_call(current_calls, selected_call, NULL);
+ calltree_add_call(current_calls, selected_call, NULL);
}
- else // dragged_path_depth == 2
- {
- if (selected_type == A_CALL && dragged_type == A_CALL)
- {
- // TODO: dragged a call on a conference call
- calltree_remove_call(current_calls, selected_call, NULL);
- calltree_add_call(current_calls, selected_call, NULL);
- }
- else if(selected_type == A_CONFERENCE && dragged_type == A_CALL)
- {
- // TODO: dragged a conference on a conference call
- calltree_remove_conference(current_calls, selected_conf, NULL);
- calltree_add_conference(current_calls, selected_conf);
- }
- // TODO: dragged a single call on a NULL element
- // TODO: dragged a conference on a NULL element
+ else if(selected_type == A_CONFERENCE && dragged_type == A_CALL) {
+
+ // TODO: dragged a conference on a conference call
+ calltree_remove_conference(current_calls, selected_conf, NULL);
+ calltree_add_conference(current_calls, selected_conf);
}
+
+ // TODO: dragged a single call on a NULL element
+ // TODO: dragged a conference on a NULL element
+ }
}
- else // selected_path_depth == 2
- {
+ else {
- if(dragged_path_depth == 1)
- {
+ // selected_path_depth == 2
- if(selected_type == A_CALL && dragged_type == A_CALL)
- {
+ if(dragged_path_depth == 1) {
- // dragged a conference call on a call
- sflphone_detach_participant(selected_call_id);
+ if(selected_type == A_CALL && dragged_type == A_CALL) {
- if(selected_call != NULL && dragged_call != NULL)
- sflphone_join_participant(selected_call->_callID, dragged_call->_callID);
+ // dragged a conference call on a call
+ sflphone_detach_participant(selected_call_id);
- }
- else if(selected_type == A_CALL && dragged_type == A_CONFERENCE)
- {
- // dragged a conference call on a conference
- sflphone_detach_participant(selected_call_id);
+ if(selected_call != NULL && dragged_call != NULL)
+ sflphone_join_participant(selected_call->_callID, dragged_call->_callID);
- if(selected_call != NULL && dragged_conf != NULL)
- {
- DEBUG("Adding a participant, since dragged call on a conference");
+ }
+ else if(selected_type == A_CALL && dragged_type == A_CONFERENCE) {
- sflphone_add_participant(selected_call_id, dragged_call_id);
- }
- }
- else
- {
- // dragged a conference call on a NULL element
- sflphone_detach_participant(selected_call_id);
- }
+ // dragged a conference call on a conference
+ sflphone_detach_participant(selected_call_id);
+
+ if(selected_call != NULL && dragged_conf != NULL) {
+ DEBUG("Adding a participant, since dragged call on a conference");
+
+ sflphone_add_participant(selected_call_id, dragged_call_id);
+ }
}
- else // dragged_path_depth == 2
- {
- // dragged a conference call on another conference call (same conference)
- // TODO: dragged a conference call on another conference call (different conference)
+ else {
- gtk_tree_path_up(path);
+ // dragged a conference call on a NULL element
+ sflphone_detach_participant(selected_call_id);
+ }
+
+ }
+ else {
- gtk_tree_model_get_iter(GTK_TREE_MODEL(model), &parent_conference, path);
+ // dragged_path_depth == 2
+ // dragged a conference call on another conference call (same conference)
+ // TODO: dragged a conference call on another conference call (different conference)
+
+ gtk_tree_path_up(path);
- gtk_tree_path_up(dpath);
- gtk_tree_path_up(spath);
+ gtk_tree_model_get_iter(GTK_TREE_MODEL(model), &parent_conference, path);
- if(gtk_tree_path_compare (dpath, spath) == 0)
- {
+ gtk_tree_path_up(dpath);
+ gtk_tree_path_up(spath);
- DEBUG("Dragged a call in the same conference");
- calltree_remove_call (current_calls, selected_call, NULL);
- calltree_add_call (current_calls, selected_call, &parent_conference);
- }
- else
- {
- DEBUG("Dragged a conference call onto another conference call %s, %s", gtk_tree_path_to_string(dpath), gtk_tree_path_to_string(spath));
+ if(gtk_tree_path_compare (dpath, spath) == 0) {
- conf = NULL;
+ DEBUG("Dragged a call in the same conference");
+ calltree_remove_call (current_calls, selected_call, NULL);
+ calltree_add_call (current_calls, selected_call, &parent_conference);
+ }
+ else {
- val.g_type = 0;
- if(gtk_tree_model_get_iter (model, &iter, dpath))
- {
- DEBUG("we got an iter!");
- gtk_tree_model_get_value (model, &iter, COLUMN_ACCOUNT_PTR, &val);
- conf = (conference_obj_t*)g_value_get_pointer(&val);
- }
- g_value_unset(&val);
+ DEBUG("Dragged a conference call onto another conference call %s, %s", gtk_tree_path_to_string(dpath), gtk_tree_path_to_string(spath));
- sflphone_detach_participant(selected_call_id);
+ conf = NULL;
- if(conf)
- {
- DEBUG("we got a conf!");
- sflphone_add_participant(selected_call_id, conf->_confID);
- }
- else
- {
- DEBUG("didn't find a conf!");
- }
- }
+ val.g_type = 0;
+ if(gtk_tree_model_get_iter (model, &iter, dpath)) {
+
+ DEBUG("we got an iter!");
+ gtk_tree_model_get_value (model, &iter, COLUMN_ACCOUNT_PTR, &val);
+
+ conf = (conference_obj_t*)g_value_get_pointer(&val);
+ }
+ g_value_unset(&val);
+ sflphone_detach_participant(selected_call_id);
- // TODO: dragged a conference call on another conference call (different conference)
- // TODO: dragged a conference call on a NULL element (same conference)
- // TODO: dragged a conference call on a NULL element (different conference)
+ if(conf) {
+
+ DEBUG("we got a conf!");
+ sflphone_add_participant(selected_call_id, conf->_confID);
+ }
+ else {
+
+ DEBUG("didn't find a conf!");
+ }
}
+ // TODO: dragged a conference call on another conference call (different conference)
+ // TODO: dragged a conference call on a NULL element (same conference)
+ // TODO: dragged a conference call on a NULL element (different conference)
+ }
+
}
}
@@ -1542,75 +1728,69 @@ void drag_data_received_cb(GtkWidget *widget, GdkDragContext *context, gint x, g
if(drop_path)
{
- gtk_tree_model_get_iter(tree_model, &iter, drop_path);
- gtk_tree_model_get_value(tree_model, &iter, COLUMN_ACCOUNT_PTR, &val);
+ gtk_tree_model_get_iter(tree_model, &iter, drop_path);
+ gtk_tree_model_get_value(tree_model, &iter, COLUMN_ACCOUNT_PTR, &val);
+
+ if(gtk_tree_model_iter_has_child(tree_model, &iter)) {
- if(gtk_tree_model_iter_has_child(tree_model, &iter))
- {
- DEBUG("DRAGGING ON A CONFERENCE");
- dragged_type = A_CONFERENCE;
- }
- else
- {
- DEBUG("DRAGGING ON A CALL");
- dragged_type = A_CALL;
- }
+ DEBUG("DRAGGING ON A CONFERENCE");
+ dragged_type = A_CONFERENCE;
+ }
+ else {
- switch (position)
- {
- case GTK_TREE_VIEW_DROP_AFTER:
- dragged_path = gtk_tree_path_to_string(drop_path);
- dragged_path_depth = gtk_tree_path_get_depth(drop_path);
- dragged_call_id = "NULL";
- dragged_call = NULL;
- dragged_conf = NULL;
- // DEBUG(" AFTER dragged_path %s, dragged_call_id %s, dragged_path_depth %i\n", dragged_path, dragged_call_id, dragged_path_depth);
- break;
+ DEBUG("DRAGGING ON A CALL");
+ dragged_type = A_CALL;
+ }
- case GTK_TREE_VIEW_DROP_INTO_OR_AFTER:
- dragged_path = gtk_tree_path_to_string(drop_path);
- dragged_path_depth = gtk_tree_path_get_depth(drop_path);
- if (dragged_type == A_CALL)
- {
- dragged_call_id = ((callable_obj_t*)g_value_get_pointer(&val))->_callID;
- dragged_call = (callable_obj_t*)g_value_get_pointer(&val);
- }
- else
- {
- dragged_call_id = ((conference_obj_t*)g_value_get_pointer(&val))->_confID;
- dragged_conf = (conference_obj_t*)g_value_get_pointer(&val);
- }
- // DEBUG(" INTO_OR_AFTER dragged_path %s, dragged_call_id %s, dragged_path_depth %i\n", dragged_path, dragged_call_id, dragged_path_depth);
- break;
+ switch (position) {
- case GTK_TREE_VIEW_DROP_BEFORE:
- dragged_path = gtk_tree_path_to_string(drop_path);
- dragged_path_depth = gtk_tree_path_get_depth(drop_path);
- dragged_call_id = "NULL";
- dragged_call = NULL;
- dragged_conf = NULL;
- // DEBUG(" BEFORE dragged_path %s, dragged_call_id %s, dragged_path_depth %i\n", dragged_path, dragged_call_id, dragged_path_depth);
- break;
+ case GTK_TREE_VIEW_DROP_AFTER:
+ dragged_path = gtk_tree_path_to_string(drop_path);
+ dragged_path_depth = gtk_tree_path_get_depth(drop_path);
+ dragged_call_id = "NULL";
+ dragged_call = NULL;
+ dragged_conf = NULL;
+ break;
- case GTK_TREE_VIEW_DROP_INTO_OR_BEFORE:
- dragged_path = gtk_tree_path_to_string(drop_path);
- dragged_path_depth = gtk_tree_path_get_depth(drop_path);
- if (dragged_type == A_CALL)
- {
- dragged_call_id = ((callable_obj_t*)g_value_get_pointer(&val))->_callID;
- dragged_call = (callable_obj_t*)g_value_get_pointer(&val);
- }
- else
- {
- dragged_call_id = ((conference_obj_t*)g_value_get_pointer(&val))->_confID;
- dragged_conf = (conference_obj_t*)g_value_get_pointer(&val);
- }
- // DEBUG(" INTO_OR_BEFORE dragged_path %s, dragged_call_id %s, dragged_path_depth %i\n", dragged_path, dragged_call_id, dragged_path_depth);
- break;
+ case GTK_TREE_VIEW_DROP_INTO_OR_AFTER:
+ dragged_path = gtk_tree_path_to_string(drop_path);
+ dragged_path_depth = gtk_tree_path_get_depth(drop_path);
+ if (dragged_type == A_CALL) {
+
+ dragged_call_id = ((callable_obj_t*)g_value_get_pointer(&val))->_callID;
+ dragged_call = (callable_obj_t*)g_value_get_pointer(&val);
+ }
+ else {
- default:
- return;
+ dragged_call_id = ((conference_obj_t*)g_value_get_pointer(&val))->_confID;
+ dragged_conf = (conference_obj_t*)g_value_get_pointer(&val);
}
+ break;
+
+ case GTK_TREE_VIEW_DROP_BEFORE:
+ dragged_path = gtk_tree_path_to_string(drop_path);
+ dragged_path_depth = gtk_tree_path_get_depth(drop_path);
+ dragged_call_id = "NULL";
+ dragged_call = NULL;
+ dragged_conf = NULL;
+ break;
+
+ case GTK_TREE_VIEW_DROP_INTO_OR_BEFORE:
+ dragged_path = gtk_tree_path_to_string(drop_path);
+ dragged_path_depth = gtk_tree_path_get_depth(drop_path);
+ if (dragged_type == A_CALL) {
+ dragged_call_id = ((callable_obj_t*)g_value_get_pointer(&val))->_callID;
+ dragged_call = (callable_obj_t*)g_value_get_pointer(&val);
+ }
+ else {
+ dragged_call_id = ((conference_obj_t*)g_value_get_pointer(&val))->_confID;
+ dragged_conf = (conference_obj_t*)g_value_get_pointer(&val);
+ }
+ break;
+
+ default:
+ return;
+ }
}
}
diff --git a/sflphone-client-gnome/src/contacts/calltree.h b/sflphone-client-gnome/src/contacts/calltree.h
index a01565bc4b29f245bf94c745d5780f9bfd4647ce..fd6c33f455f321656d0f1e4e388b916274ef139c 100644
--- a/sflphone-client-gnome/src/contacts/calltree.h
+++ b/sflphone-client-gnome/src/contacts/calltree.h
@@ -34,12 +34,23 @@
* @brief The GtkTreeView that list calls in the main window.
*/
-enum
-{
+enum {
A_CALL,
A_CONFERENCE
};
+
+/**
+ * Tags used to identify display type in calltree
+ */
+typedef enum {
+ DISPLAY_TYPE_CALL,
+ DISPLAY_TYPE_CALL_TRANSFER,
+ DISPLAY_TYPE_SAS,
+ DISPLAY_TYPE_STATE_CODE,
+ DISPLAY_TYPE_HISTORY
+} CallDisplayType;
+
/**
* Create a new widget calltree
* @return GtkWidget* A new widget
diff --git a/sflphone-client-gnome/src/contacts/searchbar.c b/sflphone-client-gnome/src/contacts/searchbar.c
index 2044b4badd022dd103b60e32bad63cbbaf3c1fef..d84c6efcc4e6c168371daa1cec5fc0bbe7a9aff5 100644
--- a/sflphone-client-gnome/src/contacts/searchbar.c
+++ b/sflphone-client-gnome/src/contacts/searchbar.c
@@ -36,6 +36,8 @@ GdkPixbuf *missed_pixbuf = NULL;
void searchbar_entry_changed (GtkEntry* entry, gchar* arg1 UNUSED, gpointer data UNUSED)
{
+ DEBUG("searchbar_entry_changed");
+
if (active_calltree == contacts) {
addressbook_search (entry);
}
diff --git a/sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml b/sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml
index 4a1e2c286f5ef24d4854c759a0f12149424249c8..018917eaa4db5f890284d00d99d93be1b6871747 100644
--- a/sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml
+++ b/sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml
@@ -290,13 +290,6 @@
<method name="switchPopupMode">
</method>
- <method name="setSipAddress">
- <arg type="s" name="address" direction="in"/>
- </method>
-
- <method name="getSipAddress">
- <arg type="i" name="address" direction="out"/>
- </method>
<!-- Addressbook configuration -->
<method name="getAddressbookSettings">
@@ -369,11 +362,21 @@
<arg type="s" name="accountID" direction="in"/>
<arg type="a{ss}" name="details" direction="in"/>
</method>
-
+
+ <method name="getAddrFromInterfaceName">
+ <arg type="s" name="interface" direction="in"/>
+ <arg type="s" name="address" direction="out"/>
+ </method>
+
<method name="getAllIpInterface">
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="list" direction="out"/>
</method>
+
+ <method name="getAllIpInterfaceByName">
+ <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+ <arg type="as" name="list" direction="out"/>
+ </method>
</interface>
</node>
diff --git a/sflphone-client-gnome/src/dbus/dbus.c b/sflphone-client-gnome/src/dbus/dbus.c
index 3a5798348a546e97f7b9a10c5ea83f6b42c87f1f..7d4fb6f4e767ef415441d039c2eefe4ffd16b5bb 100644
--- a/sflphone-client-gnome/src/dbus/dbus.c
+++ b/sflphone-client-gnome/src/dbus/dbus.c
@@ -1195,7 +1195,7 @@ dbus_codec_list()
{
GError *error = NULL;
- gchar** array;
+ gchar** array = NULL;
org_sflphone_SFLphone_ConfigurationManager_get_codec_list (
configurationManagerProxy,
&array,
@@ -2056,6 +2056,7 @@ dbus_get_audio_manager( void )
return api;
}
+/*
void
dbus_set_sip_address( const gchar* address )
{
@@ -2069,6 +2070,9 @@ dbus_set_sip_address( const gchar* address )
g_error_free(error);
}
}
+*/
+
+ /*
gint
dbus_get_sip_address( void )
@@ -2085,6 +2089,7 @@ dbus_get_sip_address( void )
}
return address;
}
+ */
GHashTable* dbus_get_addressbook_settings (void) {
@@ -2358,6 +2363,23 @@ GHashTable* dbus_get_tls_settings_default(void)
return results;
}
+
+gchar * dbus_get_address_from_interface_name(gchar* interface)
+{
+ GError *error = NULL;
+ gchar * address;
+
+ org_sflphone_SFLphone_ConfigurationManager_get_addr_from_interface_name ( configurationManagerProxy, interface, &address, &error);
+ if (error != NULL){
+ ERROR ("Error calling org_sflphone_SFLphone_ConfigurationManager_get_addr_from_interface_name\n");
+ g_error_free (error);
+ }
+
+ return address;
+
+}
+
+
gchar ** dbus_get_all_ip_interface(void)
{
GError *error = NULL;
@@ -2382,3 +2404,27 @@ gchar ** dbus_get_all_ip_interface(void)
}
}
+gchar ** dbus_get_all_ip_interface_by_name(void)
+{
+ GError *error = NULL;
+ gchar ** array;
+
+ if(!org_sflphone_SFLphone_ConfigurationManager_get_all_ip_interface_by_name ( configurationManagerProxy, &array, &error))
+ {
+ if(error->domain == DBUS_GERROR && error->code == DBUS_GERROR_REMOTE_EXCEPTION)
+ {
+ ERROR ("Caught remote method (get_all_ip_interface) exception %s: %s", dbus_g_error_get_name(error), error->message);
+ }
+ else
+ {
+ ERROR("Error while calling get_all_ip_interface: %s", error->message);
+ }
+ g_error_free (error);
+ return NULL;
+ }
+ else{
+ DEBUG ("DBus called get_all_ip_interface() on ConfigurationManager");
+ return array;
+ }
+}
+
diff --git a/sflphone-client-gnome/src/dbus/dbus.h b/sflphone-client-gnome/src/dbus/dbus.h
index bb6d57a3b67ed695e5e37310e4b5250f88f02a94..fb9662231fe2dc10f5706e2bf7ddcaa74d3ea115 100644
--- a/sflphone-client-gnome/src/dbus/dbus.h
+++ b/sflphone-client-gnome/src/dbus/dbus.h
@@ -514,12 +514,21 @@ gchar** dbus_get_addressbook_list (void);
void dbus_set_addressbook_list (const gchar** list);
+/**
+ * Resolve the local address given an interface name
+ */
+gchar * dbus_get_address_from_interface_name(gchar* interface);
/**
* Query the daemon to return a list of network interface (described as there IP address)
*/
gchar** dbus_get_all_ip_interface(void);
+/**
+ * Query the daemon to return a list of network interface (described as there name)
+ */
+gchar** dbus_get_all_ip_interface_by_name(void);
+
/**
* Encapsulate all the url hook-related configuration
* Get the configuration
diff --git a/sflphone-client-gnome/src/main.c b/sflphone-client-gnome/src/main.c
index 2a8b7ca5a9af5e5f43a1392be2a37def3dbfec23..fffd9a831b849f5b91b4c97625bd9ff1f2d7f156 100644
--- a/sflphone-client-gnome/src/main.c
+++ b/sflphone-client-gnome/src/main.c
@@ -84,7 +84,7 @@ There is NO WARRANTY, to the extent permitted by law.\n\n");
srand(time(NULL));
// Internationalization
- bindtextdomain("sflphone-client-gnome", "/usr/share/locale");
+ bindtextdomain("sflphone-client-gnome", LOCALEDIR);
textdomain("sflphone-client-gnome");
// Initialises the GNOME libraries
diff --git a/sflphone-client-gnome/src/mainwindow.c b/sflphone-client-gnome/src/mainwindow.c
index d8607eb30fe0345c35222ba6674e99eabb117177..8218938509eddeb310adac4d2670abdd0eaa3b67 100644
--- a/sflphone-client-gnome/src/mainwindow.c
+++ b/sflphone-client-gnome/src/mainwindow.c
@@ -114,6 +114,7 @@ on_key_released (GtkWidget *widget, GdkEventKey *event, gpointer user_data UNUSE
event->keyval == 60 || // <
event->keyval == 62 || // >
event->keyval == 34 || // "
+ event->keyval == 65289 || // tab
event->keyval == 65361 || // left arrow
event->keyval == 65363 || // right arrow
event->keyval >= 65470 || // F-keys
@@ -290,11 +291,10 @@ main_window_message(GtkMessageType type, gchar * markup){
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
type,
GTK_BUTTONS_CLOSE,
- "%s\n",
- markup);
-
+ NULL);
gtk_window_set_title(GTK_WINDOW(dialog), _("SFLphone Error"));
+ gtk_message_dialog_set_markup(GTK_MESSAGE_DIALOG(dialog), markup);
gtk_dialog_run (GTK_DIALOG(dialog));
gtk_widget_destroy (GTK_WIDGET(dialog));
diff --git a/sflphone-client-gnome/src/sflphone_const.h b/sflphone-client-gnome/src/sflphone_const.h
index d76373fd71bba4c63cd2d8b69fbcbe3d8df2e9b7..52e786ade3e73803fe23fcf3943435c3fe7b7851 100644
--- a/sflphone-client-gnome/src/sflphone_const.h
+++ b/sflphone-client-gnome/src/sflphone_const.h
@@ -29,7 +29,8 @@
*/
#define LOGO ICONS_DIR "/sflphone.svg"
-#define LOGO_NOTIF ICONS_DIR "/sflphone_notif.svg"
+#define LOGO_NOTIF ICONS_DIR "/sflphone_notif.svg"
+#define LOGO_OFFLINE ICONS_DIR "/sflphone_offline.svg"
#define LOGO_SMALL ICONS_DIR "/sflphone_small.svg"
#define CURRENT_CALLS "current_calls"
@@ -50,9 +51,9 @@
#define UNUSED __attribute__((__unused__))
#define ACCOUNT_TYPE "Account.type"
-#define ACCOUNT_ALIAS "Account.alias"
-#define ACCOUNT_ENABLED "Account.enable"
-#define ACCOUNT_MAILBOX "Account.mailbox"
+#define ACCOUNT_ALIAS "Account.alias"
+#define ACCOUNT_ENABLED "Account.enable"
+#define ACCOUNT_MAILBOX "Account.mailbox"
#define ACCOUNT_RESOLVE_ONCE "Account.resolveOnce"
#define ACCOUNT_REGISTRATION_EXPIRE "Account.expire"
#define ACCOUNT_SIP_STUN_SERVER "STUN.server"
@@ -70,7 +71,7 @@
#define ACCOUNT_DISPLAY_SAS_ONCE "ZRTP.displaySasOnce"
#define KEY_EXCHANGE_NONE "0"
#define ZRTP "1"
-#define SDES_TLS "2"
+#define SDES "2"
#define TLS_ENABLE "TLS.enable"
#define TLS_PORT "TLS.port"
@@ -87,9 +88,9 @@
#define TLS_NEGOTIATION_TIMEOUT_SEC "TLS.negotiationTimeoutSec"
#define TLS_NEGOTIATION_TIMEOUT_MSEC "TLS.negotiationTimemoutMsec"
+#define LOCAL_INTERFACE "Account.localInterface"
#define PUBLISHED_SAMEAS_LOCAL "Account.publishedSameAsLocal"
#define LOCAL_PORT "Account.localPort"
-#define LOCAL_ADDRESS "Account.localAddress"
#define PUBLISHED_PORT "Account.publishedPort"
#define PUBLISHED_ADDRESS "Account.publishedAddress"
diff --git a/sflphone-client-gnome/src/statusicon.c b/sflphone-client-gnome/src/statusicon.c
index 99b8dcc2c6ccec24d66d924fe44b11a4cea5adcd..47e9d4a855517764dc2380834bc76d20ff3f1489 100644
--- a/sflphone-client-gnome/src/statusicon.c
+++ b/sflphone-client-gnome/src/statusicon.c
@@ -138,9 +138,12 @@ void status_tray_icon_blink (gboolean active)
{
// Set a different icon to notify of an event
active ? gtk_status_icon_set_from_file (status, LOGO_NOTIF) : gtk_status_icon_set_from_file (status, LOGO);
- // Do not blink anymore ...
- // gtk_status_icon_set_blinking (status, active);
+}
+void status_tray_icon_online (gboolean online)
+{
+ // Set a different icon to notify of an event
+ online ? gtk_status_icon_set_from_file (status, LOGO) : gtk_status_icon_set_from_file (status, LOGO_OFFLINE);
}
GtkStatusIcon*
diff --git a/sflphone-common/configure.ac b/sflphone-common/configure.ac
index 8ea46baa20c58530f23655ea5e79219ee206178f..fe7cdfcc927b1878cab573e780f0984c19be50c1 100644
--- a/sflphone-common/configure.ac
+++ b/sflphone-common/configure.ac
@@ -1,5 +1,6 @@
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.7~beta],[sflphoneteam@savoirfairelinux.com],[sflphone])
@@ -8,14 +9,17 @@ AC_REVISION([$Revision$])
AC_CANONICAL_SYSTEM
- AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+ PACKAGE=SFLphone
+ VERSION=`cat VERSION`
+
+ AM_INIT_AUTOMAKE($NAME, $VERSION)
AM_CONFIG_HEADER([config.h])
# Silent build by default. Use make V=1 to increase verbosity
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
dnl Use this variable in the program
-AC_SUBST(PACKAGE_VERSION)
+ AC_SUBST(PACKAGE_VERSION)
AM_PROG_LIBTOOL
@@ -90,7 +94,6 @@ AC_SUBST(PKGADD_VENDOR)
dnl Check for programs
AC_PROG_CC
- SFL_CXX_WITH_DEBUG
AC_PROG_CXX
AC_PROG_CPP
AC_PROG_INSTALL
@@ -281,7 +284,7 @@ fi
xml_CFLAGS=
xml_LIBS=-lexpat
- AC_SUBST(xml_CFLAGS)
+AC_SUBST(xml_CFLAGS)
AC_SUBST(xml_LIBS)
AC_CHECK_LIB([pthread], pthread_create,
@@ -292,6 +295,22 @@ AC_CHECK_LIB([pthread], pthread_create,
AC_MSG_ERROR([You need the POSIX Thread library (pthreads)])
fi
+
+AC_CHECK_LIB([pcre], pcre_free,
+ [AC_CHECK_HEADERS(pcre.h, have_pcre=true, have_pcre=false)],
+ have_pcre=false)
+
+ if test "$have_pcre" = "false"; then
+AC_MSG_ERROR([You need the Perl-Compatible Regular Expressions library (pcre)])
+ fi
+
+PCRE_LIBS=-lpcre
+PCRE_CFLAGS=
+AC_SUBST(PCRE_LIBS)
+AC_SUBST(PCRE_CFLAGS)
+
+
+
# For the tools/, we need libdbus-c++ for the "build" architecture as well
AM_CONDITIONAL(CROSS_COMPILING, test "$cross_compiling" = "yes")
@@ -378,6 +397,15 @@ AC_ARG_WITH([iax2],
AC_DEFINE([HAVE_IAX], test "x$with_iax2" = "xyes", [Define if you have libiax2])
AM_CONDITIONAL(USE_IAX, test "x$with_iax2" = "xyes" )
+ dnl Check for network-manager
+AC_ARG_WITH([networkmanager],
+ [AS_HELP_STRING([--without-networkmanager],
+ [disable support for network-manager events])],
+ [],
+ [with_networkmanager=yes])
+
+AM_CONDITIONAL(USE_NETWORKMANAGER, test "x$with_networkmanager" = "xyes" )
+
# check for doxygen, mostly stolen from http://log4cpp.sourceforge.net/
# ----------------------------------------------------------------------------
AC_DEFUN([BB_ENABLE_DOXYGEN],
diff --git a/sflphone-common/globals.mak b/sflphone-common/globals.mak
index b1bc9a5c11b88bb2d152e862d90c89dba4e5a6d8..bcbb63eb257e6d4e7aaac61e40ba22f8639f5592 100644
--- a/sflphone-common/globals.mak
+++ b/sflphone-common/globals.mak
@@ -61,6 +61,5 @@ AM_CPPFLAGS = \
-DCODECS_DIR=\""$(sflcodecdir)"\" \
-DPLUGINS_DIR=\""$(sflplugindir)"\" \
-DENABLE_TRACE \
- -DSFLDEBUG \
$(SPEEXCODEC) \
$(GSMCODEC)
diff --git a/sflphone-common/src/Makefile.am b/sflphone-common/src/Makefile.am
index faf3560fa0ba95a74db3b27735edf5283ed8f5a3..10d240d25e40a2b237f61cb2dae6d7420bd2de44 100644
--- a/sflphone-common/src/Makefile.am
+++ b/sflphone-common/src/Makefile.am
@@ -11,11 +11,13 @@ sflphoned_SOURCES = \
voiplink.cpp \
main.cpp \
managerimpl.cpp \
+ managerimpl_registration.cpp \
observer.cpp \
eventthread.cpp \
accountcreator.cpp \
call.cpp \
account.cpp \
+ logger.cpp \
numbercleaner.cpp
# Redefine the USE_IAX variable here, so that it could be used in managerimpl
@@ -27,8 +29,15 @@ IAX_CXXFLAG=
IAX_LIB=
endif
+if USE_NETWORKMANAGER
+NETWORKMANAGER=-DUSE_NETWORKMANAGER
+else
+NETWORKMANAGER=
+endif
+
sflphoned_CXXFLAGS = \
- -DPREFIX=\"$(prefix)\" -DPROGSHAREDIR=\"${datadir}/sflphone\" $(IAX_CXXFLAG)\
+ -DPREFIX=\"$(prefix)\" -DPROGSHAREDIR=\"${datadir}/sflphone\" $(IAX_CXXFLAG) $(NETWORKMANAGER) \
+ -DVERSION=\"$(VERSION)\" \
@ZRTPCPP_CFLAGS@ \
@libssl_CFLAGS@
@@ -53,7 +62,7 @@ noinst_LTLIBRARIES = libsflphone.la
noinst_HEADERS = \
conference.h \
- voiplink.h \
+ voiplink.h \
managerimpl.h \
manager.h \
global.h \
@@ -63,6 +72,7 @@ noinst_HEADERS = \
account.h \
accountcreator.h \
call.h \
+ logger.h \
numbercleaner.h
libsflphone_la_LIBADD = \
diff --git a/sflphone-common/src/account.cpp b/sflphone-common/src/account.cpp
index f5b542f57f34a97b02a1133a674aaa2c1b94bac6..e916ac6875c8c3ce94d1b949fcbd91b4c277e900 100644
--- a/sflphone-common/src/account.cpp
+++ b/sflphone-common/src/account.cpp
@@ -56,7 +56,7 @@ void Account::setRegistrationState (RegistrationState state)
{
if (state != _registrationState) {
- _debug ("Account::setRegistrationState\n");
+ _debug ("Account::setRegistrationState");
_registrationState = state;
// Notify the client
diff --git a/sflphone-common/src/account.h b/sflphone-common/src/account.h
index 3d6c36b8b2275bac68a0dc4c0f2ef64417bcb588..2edddfe9bfeda5fc6599b624d5ecca8bcd2bbddc 100644
--- a/sflphone-common/src/account.h
+++ b/sflphone-common/src/account.h
@@ -70,9 +70,9 @@ typedef enum RegistrationState {
#define REALM "realm"
#define DEFAULT_REALM "*"
+#define LOCAL_INTERFACE "Account.localInterface"
#define PUBLISHED_SAMEAS_LOCAL "Account.publishedSameAsLocal"
#define LOCAL_PORT "Account.localPort"
-#define LOCAL_ADDRESS "Account.localAddress"
#define PUBLISHED_PORT "Account.publishedPort"
#define PUBLISHED_ADDRESS "Account.publishedAddress"
@@ -139,7 +139,7 @@ class Account{
*/
inline VoIPLink* getVoIPLink() { return _link; }
- inline void setVoIPLink (VoIPLink *link) { _link = link; }
+ virtual void setVoIPLink () = 0;
/**
* Register the underlying VoIPLink. Launch the event listener.
diff --git a/sflphone-common/src/audio/alsa/alsalayer.cpp b/sflphone-common/src/audio/alsa/alsalayer.cpp
index bdbc27ed2d8964c1522d7ca58820f0b5cda6065c..920ab666b3be0e2e0824f8130dc4943e722b0542 100644
--- a/sflphone-common/src/audio/alsa/alsalayer.cpp
+++ b/sflphone-common/src/audio/alsa/alsalayer.cpp
@@ -41,7 +41,7 @@ AlsaLayer::AlsaLayer (ManagerImpl* manager)
, _audioThread (NULL)
{
- _debug (" Constructor of AlsaLayer called\n");
+ _debug (" Constructor of AlsaLayer called");
/* Instanciate the audio thread */
// _audioThread = new AudioThread (this);
// _audioThread = NULL;
@@ -53,7 +53,7 @@ AlsaLayer::AlsaLayer (ManagerImpl* manager)
// Destructor
AlsaLayer::~AlsaLayer (void)
{
- _debug ("Destructor of AlsaLayer called\n");
+ _debug ("Destructor of AlsaLayer called");
closeLayer();
if (_converter) {
@@ -70,17 +70,17 @@ AlsaLayer::~AlsaLayer (void)
bool
AlsaLayer::closeLayer()
{
- _debugAlsa ("Close ALSA streams\n");
+ _debugAlsa ("Close ALSA streams");
try {
/* Stop the audio thread first */
if (_audioThread) {
- _debug ("Stop Audio Thread\n");
+ _debug ("Stop Audio Thread");
delete _audioThread;
_audioThread=NULL;
}
} catch (...) {
- _debugException ("! ARTP Exception: when stopping audiortp\n");
+ _debugException ("! ARTP Exception: when stopping audiortp");
throw;
}
@@ -119,13 +119,13 @@ AlsaLayer::openDevice (int indexIn, int indexOut, int sampleRate, int frameSize,
_audioPlugin = std::string (plugin);
- _debugAlsa (" Setting AlsaLayer: device in=%2d, out=%2d\n", _indexIn, _indexOut);
+ _debugAlsa (" Setting AlsaLayer: device in=%2d, out=%2d", _indexIn, _indexOut);
- _debugAlsa (" : alsa plugin=%s\n", _audioPlugin.c_str());
+ _debugAlsa (" : alsa plugin=%s", _audioPlugin.c_str());
- _debugAlsa (" : nb channel in=%2d, out=%2d\n", _inChannel, _outChannel);
+ _debugAlsa (" : nb channel in=%2d, out=%2d", _inChannel, _outChannel);
- _debugAlsa (" : sample rate=%5d, format=%s\n", _audioSampleRate, SFLDataFormatString);
+ _debugAlsa (" : sample rate=%5d, format=%s", _audioSampleRate, SFLDataFormatString);
_audioThread = NULL;
@@ -144,7 +144,7 @@ AlsaLayer::openDevice (int indexIn, int indexOut, int sampleRate, int frameSize,
void
AlsaLayer::startStream (void)
{
- _debug ("AlsaLayer:: startStream\n");
+ _debug ("AlsaLayer:: startStream");
std::string pcmp = buildDeviceTopo (_audioPlugin, _indexOut, 0);
std::string pcmc = buildDeviceTopo (_audioPlugin, _indexIn, 0);
@@ -171,11 +171,11 @@ AlsaLayer::startStream (void)
if (_audioThread == NULL) {
try {
- _debug ("Start Audio Thread\n");
+ _debug ("Start Audio Thread");
_audioThread = new AudioThread (this);
_audioThread->start();
} catch (...) {
- _debugException ("Fail to start audio thread\n");
+ _debugException ("Fail to start audio thread");
}
}
@@ -184,17 +184,17 @@ AlsaLayer::startStream (void)
void
AlsaLayer::stopStream (void)
{
- _debug ("AlsaLayer:: stopStream\n");
+ _debug ("AlsaLayer:: stopStream");
try {
/* Stop the audio thread first */
if (_audioThread) {
- _debug ("Stop Audio Thread\n");
+ _debug ("Stop Audio Thread");
delete _audioThread;
_audioThread=NULL;
}
} catch (...) {
- _debugException ("! ARTP Exception: when stopping audiortp\n");
+ _debugException ("! ARTP Exception: when stopping audiortp");
throw;
}
@@ -228,10 +228,10 @@ void AlsaLayer::stopCaptureStream (void)
int err;
if (_CaptureHandle) {
- _debug ("AlsaLayer:: stop Alsa capture\n");
+ _debug ("AlsaLayer:: stop Alsa capture");
if ( (err = snd_pcm_drop (_CaptureHandle)) < 0)
- _debug ("AlsaLayer:: Error stopping ALSA capture: %s\n", snd_strerror (err));
+ _debug ("AlsaLayer:: Error stopping ALSA capture: %s", snd_strerror (err));
else
stop_capture ();
@@ -246,10 +246,10 @@ void AlsaLayer::closeCaptureStream (void)
stopCaptureStream ();
if (is_capture_open()) {
- _debug ("AlsaLayer:: close ALSA capture\n");
+ _debug ("AlsaLayer:: close ALSA capture");
if ( (err = snd_pcm_close (_CaptureHandle)) < 0)
- _debug ("Error closing ALSA capture: %s\n", snd_strerror (err));
+ _debug ("Error closing ALSA capture: %s", snd_strerror (err));
else
close_capture ();
}
@@ -260,10 +260,10 @@ void AlsaLayer::startCaptureStream (void)
int err;
if (_CaptureHandle && !is_capture_running()) {
- _debug ("AlsaLayer:: start ALSA capture\n");
+ _debug ("AlsaLayer:: start ALSA capture");
if ( (err = snd_pcm_start (_CaptureHandle)) < 0)
- _debug ("Error starting ALSA capture: %s\n", snd_strerror (err));
+ _debug ("Error starting ALSA capture: %s", snd_strerror (err));
else
start_capture();
}
@@ -274,10 +274,10 @@ void AlsaLayer::prepareCaptureStream (void)
int err;
if (is_capture_open() && !is_capture_prepared()) {
- _debug ("AlsaLayer:: prepare ALSA capture\n");
+ _debug ("AlsaLayer:: prepare ALSA capture");
if ( (err = snd_pcm_prepare (_CaptureHandle)) < 0)
- _debug ("Error preparing ALSA capture: %s\n", snd_strerror (err));
+ _debug ("Error preparing ALSA capture: %s", snd_strerror (err));
else
prepare_capture ();
}
@@ -288,10 +288,10 @@ void AlsaLayer::stopPlaybackStream (void)
int err;
if (_PlaybackHandle && is_playback_running()) {
- _debug ("AlsaLayer:: stop ALSA playback\n");
+ _debug ("AlsaLayer:: stop ALSA playback");
if ( (err = snd_pcm_drop (_PlaybackHandle)) < 0)
- _debug ("Error stopping ALSA playback: %s\n", snd_strerror (err));
+ _debug ("Error stopping ALSA playback: %s", snd_strerror (err));
else
stop_playback ();
}
@@ -306,10 +306,10 @@ void AlsaLayer::closePlaybackStream (void)
stopPlaybackStream ();
if (is_playback_open()) {
- _debug ("AlsaLayer:: close ALSA playback\n");
+ _debug ("AlsaLayer:: close ALSA playback");
if ( (err = snd_pcm_close (_PlaybackHandle)) < 0)
- _debug ("Error closing ALSA playback: %s\n", snd_strerror (err));
+ _debug ("Error closing ALSA playback: %s", snd_strerror (err));
else
close_playback ();
}
@@ -320,10 +320,10 @@ void AlsaLayer::startPlaybackStream (void)
int err;
if (_PlaybackHandle && !is_playback_running()) {
- _debug ("AlsaLayer:: start ALSA playback\n");
+ _debug ("AlsaLayer:: start ALSA playback");
if ( (err = snd_pcm_start (_PlaybackHandle)) < 0)
- _debug ("Error starting ALSA playback: %s\n", snd_strerror (err));
+ _debug ("Error starting ALSA playback: %s", snd_strerror (err));
else
start_playback();
}
@@ -334,10 +334,10 @@ void AlsaLayer::preparePlaybackStream (void)
int err;
if (is_playback_open() && !is_playback_prepared()) {
- _debug ("AlsaLayer:: prepare playback stream\n");
+ _debug ("AlsaLayer:: prepare playback stream");
if ( (err = snd_pcm_prepare (_PlaybackHandle)) < 0)
- _debug ("Error preparing the device: %s\n", snd_strerror (err));
+ _debug ("Error preparing the device: %s", snd_strerror (err));
else
prepare_playback ();
}
@@ -350,9 +350,9 @@ void AlsaLayer::recoverPlaybackStream(int error)
int err;
if (is_playback_open() && is_playback_running()) {
- _debug("AlsaLayer:: recover playback stream\n");
+ _debug("AlsaLayer:: recover playback stream");
if((err = snd_pcm_recover(_PlaybackHandle, error, 0)) < 0 )
- _debug("Error recovering the device: %s\n", snd_strerror(err));
+ _debug("Error recovering the device: %s", snd_strerror(err));
}
}
*/
@@ -364,9 +364,9 @@ void AlsaLayer::recoverPlaybackStream(int error)
int err;
if (is_capture_open() && is_capture_running()) {
- _debug("AlsaLayer:: recover capture stream\n");
+ _debug("AlsaLayer:: recover capture stream");
if((err = snd_pcm_recover(_PlaybackHandle, error, 0)) < 0 )
- _debug("Error recovering the device: %s\n", snd_strerror(err));
+ _debug("Error recovering the device: %s", snd_strerror(err));
}
}
*/
@@ -392,12 +392,12 @@ bool AlsaLayer::alsa_set_params (snd_pcm_t *pcm_handle, int type, int rate)
/* Full configuration space */
if ( (err = snd_pcm_hw_params_any (pcm_handle, hwparams)) < 0) {
- _debugAlsa (" Cannot initialize hardware parameter structure (%s)\n", snd_strerror (err));
+ _debugAlsa (" Cannot initialize hardware parameter structure (%s)", snd_strerror (err));
return false;
}
if ( (err = snd_pcm_hw_params_set_access (pcm_handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0) {
- _debugAlsa (" Cannot set access type (%s)\n", snd_strerror (err));
+ _debugAlsa (" Cannot set access type (%s)", snd_strerror (err));
return false;
}
@@ -405,7 +405,7 @@ bool AlsaLayer::alsa_set_params (snd_pcm_t *pcm_handle, int type, int rate)
format = SND_PCM_FORMAT_S16_LE;
if ( (err = snd_pcm_hw_params_set_format (pcm_handle, hwparams, (snd_pcm_format_t) format)) < 0) {
- _debugAlsa (" Cannot set sample format (%s)\n", snd_strerror (err));
+ _debugAlsa (" Cannot set sample format (%s)", snd_strerror (err));
return false;
}
@@ -417,17 +417,17 @@ bool AlsaLayer::alsa_set_params (snd_pcm_t *pcm_handle, int type, int rate)
exact_ivalue = rate;
if ( (err = snd_pcm_hw_params_set_rate_near (pcm_handle, hwparams, &exact_ivalue, &dir) < 0)) {
- _debugAlsa (" Cannot set sample rate (%s)\n", snd_strerror (err));
+ _debugAlsa (" Cannot set sample rate (%s)", snd_strerror (err));
return false;
}
if (dir!= 0) {
- _debugAlsa (" (%i) The choosen rate %d Hz is not supported by your hardware.\nUsing %d Hz instead.\n ",type ,rate, exact_ivalue);
+ _debugAlsa (" (%i) The choosen rate %d Hz is not supported by your hardware.Using %d Hz instead. ",type ,rate, exact_ivalue);
}
/* Set the number of channels */
if ( (err = snd_pcm_hw_params_set_channels (pcm_handle, hwparams, 1)) < 0) {
- _debugAlsa (" Cannot set channel count (%s)\n", snd_strerror (err));
+ _debugAlsa (" Cannot set channel count (%s)", snd_strerror (err));
return false;
}
@@ -437,12 +437,12 @@ bool AlsaLayer::alsa_set_params (snd_pcm_t *pcm_handle, int type, int rate)
dir=0;
if ( (err = snd_pcm_hw_params_set_period_size_near (pcm_handle, hwparams, &exact_lvalue , &dir)) < 0) {
- _debugAlsa (" Cannot set period time (%s)\n", snd_strerror (err));
+ _debugAlsa (" Cannot set period time (%s)", snd_strerror (err));
return false;
}
if (dir!=0) {
- _debugAlsa ("(%i) The choosen period size %d bytes is not supported by your hardware.\nUsing %d instead.\n ", type, (int) periodsize, (int) exact_lvalue);
+ _debugAlsa ("(%i) The choosen period size %d bytes is not supported by your hardware.Using %d instead. ", type, (int) periodsize, (int) exact_lvalue);
}
periodsize = exact_lvalue;
@@ -453,12 +453,12 @@ bool AlsaLayer::alsa_set_params (snd_pcm_t *pcm_handle, int type, int rate)
dir=0;
if ( (err = snd_pcm_hw_params_set_periods_near (pcm_handle, hwparams, &exact_ivalue, &dir)) < 0) {
- _debugAlsa (" Cannot set periods number (%s)\n", snd_strerror (err));
+ _debugAlsa (" Cannot set periods number (%s)", snd_strerror (err));
return false;
}
if (dir!=0) {
- _debugAlsa (" The choosen period number %i bytes is not supported by your hardware.\nUsing %i instead.\n ", periods, exact_ivalue);
+ _debugAlsa (" The choosen period number %i bytes is not supported by your hardware.Using %i instead. ", periods, exact_ivalue);
}
periods=exact_ivalue;
@@ -466,7 +466,7 @@ bool AlsaLayer::alsa_set_params (snd_pcm_t *pcm_handle, int type, int rate)
/* Set the hw parameters */
if ( (err = snd_pcm_hw_params (pcm_handle, hwparams)) < 0) {
- _debugAlsa (" Cannot set hw parameters (%s)\n", snd_strerror (err));
+ _debugAlsa (" Cannot set hw parameters (%s)", snd_strerror (err));
return false;
}
@@ -479,12 +479,12 @@ bool AlsaLayer::alsa_set_params (snd_pcm_t *pcm_handle, int type, int rate)
/* Set the start threshold */
if ( (err = snd_pcm_sw_params_set_start_threshold (pcm_handle, swparams, 2700 /*periodsize*2*/)) < 0) {
- _debugAlsa (" Cannot set start threshold (%s)\n", snd_strerror (err));
+ _debugAlsa (" Cannot set start threshold (%s)", snd_strerror (err));
return false;
}
if ( (err = snd_pcm_sw_params (pcm_handle, swparams)) < 0) {
- _debugAlsa (" Cannot set sw parameters (%s)\n", snd_strerror (err));
+ _debugAlsa (" Cannot set sw parameters (%s)", snd_strerror (err));
return false;
}
@@ -503,18 +503,18 @@ AlsaLayer::open_device (std::string pcm_p, std::string pcm_c, int flag)
if (flag == SFL_PCM_BOTH || flag == SFL_PCM_PLAYBACK) {
- _debug ("AlsaLayer:: open playback device\n");
+ _debug ("AlsaLayer:: open playback device");
// if((err = snd_pcm_open(&_PlaybackHandle, pcm_p.c_str(), SND_PCM_STREAM_PLAYBACK, 0 )) < 0){
if ( (err = snd_pcm_open (&_PlaybackHandle, pcm_p.c_str(), SND_PCM_STREAM_PLAYBACK, 0)) < 0) {
- _debugAlsa ("Error while opening playback device %s\n", pcm_p.c_str());
+ _debugAlsa ("Error while opening playback device %s", pcm_p.c_str());
setErrorMessage (ALSA_PLAYBACK_DEVICE);
close_playback ();
return false;
}
if (!alsa_set_params (_PlaybackHandle, 1, getSampleRate())) {
- _debug ("playback failed\n");
+ _debug ("playback failed");
snd_pcm_close (_PlaybackHandle);
close_playback ();
return false;
@@ -525,17 +525,17 @@ AlsaLayer::open_device (std::string pcm_p, std::string pcm_c, int flag)
if (flag == SFL_PCM_BOTH || flag == SFL_PCM_CAPTURE) {
- _debug ("AlsaLayer:: open capture device\n");
+ _debug ("AlsaLayer:: open capture device");
if ( (err = snd_pcm_open (&_CaptureHandle, pcm_c.c_str(), SND_PCM_STREAM_CAPTURE, 0)) < 0) {
- _debugAlsa ("Error while opening capture device %s\n", pcm_c.c_str());
+ _debugAlsa ("Error while opening capture device %s", pcm_c.c_str());
setErrorMessage (ALSA_CAPTURE_DEVICE);
close_capture ();
return false;
}
if (!alsa_set_params (_CaptureHandle, 0, 8000)) {
- _debug ("capture failed\n");
+ _debug ("capture failed");
snd_pcm_close (_CaptureHandle);
close_capture ();
return false;
@@ -551,7 +551,7 @@ AlsaLayer::open_device (std::string pcm_p, std::string pcm_c, int flag)
try {
_audioThread->start();
} catch (...) {
- _debugException ("Fail to start audio thread\n");
+ _debugException ("Fail to start audio thread");
}
*/
@@ -579,18 +579,18 @@ AlsaLayer::write (void* buffer, int length)
case -ESTRPIPE:
case -EIO:
- //_debugAlsa(" XRUN playback ignored (%s)\n", snd_strerror(err));
+ //_debugAlsa(" XRUN playback ignored (%s)", snd_strerror(err));
handle_xrun_playback();
if (snd_pcm_writei (_PlaybackHandle , buffer , frames) <0)
- _debugAlsa ("XRUN handling failed\n");
+ _debugAlsa ("XRUN handling failed");
_trigger_request = true;
break;
default:
- _debugAlsa ("Write error unknown - dropping frames **********************************: %s\n", snd_strerror (err));
+ _debugAlsa ("Write error unknown - dropping frames **********************************: %s", snd_strerror (err));
stopPlaybackStream ();
@@ -623,20 +623,20 @@ AlsaLayer::read (void* buffer, int toCopy)
case -ESTRPIPE:
case -EIO:
- _debugAlsa (" XRUN capture ignored (%s)\n", snd_strerror (samples));
+ _debugAlsa (" XRUN capture ignored (%s)", snd_strerror (samples));
handle_xrun_capture();
//samples = snd_pcm_readi( _CaptureHandle, buffer, frames);
//if (samples<0) samples=0;
break;
case EPERM:
- _debugAlsa (" Capture EPERM (%s)\n", snd_strerror (samples));
+ _debugAlsa (" Capture EPERM (%s)", snd_strerror (samples));
prepareCaptureStream ();
startCaptureStream ();
break;
default:
- //_debugAlsa("%s\n", snd_strerror(samples));
+ //_debugAlsa("%s", snd_strerror(samples));
break;
}
@@ -650,7 +650,7 @@ AlsaLayer::read (void* buffer, int toCopy)
void
AlsaLayer::handle_xrun_capture (void)
{
- _debugAlsa ("handle_xrun_capture\n");
+ _debugAlsa ("handle_xrun_capture");
snd_pcm_status_t* status;
snd_pcm_status_alloca (&status);
@@ -664,19 +664,19 @@ AlsaLayer::handle_xrun_capture (void)
startCaptureStream ();
}
} else
- _debugAlsa (" Get status failed\n");
+ _debugAlsa (" Get status failed");
}
void
AlsaLayer::handle_xrun_playback (void)
{
- _debugAlsa ("AlsaLayer:: handle_xrun_playback\n");
+ _debugAlsa ("AlsaLayer:: handle_xrun_playback");
int state;
snd_pcm_status_t* status;
snd_pcm_status_alloca (&status);
- if ( (state = snd_pcm_status (_PlaybackHandle, status)) < 0) _debugAlsa (" Error: Cannot get playback handle status (%s)\n" , snd_strerror (state));
+ if ( (state = snd_pcm_status (_PlaybackHandle, status)) < 0) _debugAlsa (" Error: Cannot get playback handle status (%s)" , snd_strerror (state));
else {
state = snd_pcm_status_get_state (status);
@@ -743,9 +743,9 @@ AlsaLayer::getSoundCardsInfo (int stream)
snd_pcm_info_set_device (pcminfo , 0);
snd_pcm_info_set_stream (pcminfo, (stream == SFL_PCM_CAPTURE) ? SND_PCM_STREAM_CAPTURE : SND_PCM_STREAM_PLAYBACK);
- if (snd_ctl_pcm_info (handle ,pcminfo) < 0) _debugAlsa (" Cannot get info\n");
+ if (snd_ctl_pcm_info (handle ,pcminfo) < 0) _debugAlsa (" Cannot get info");
else {
- _debugAlsa ("card %i : %s [%s]\n",
+ _debugAlsa ("card %i : %s [%s]",
numCard,
snd_ctl_card_info_get_id (info),
snd_ctl_card_info_get_name (info));
@@ -825,7 +825,7 @@ void AlsaLayer::audioCallback (void)
/*
int writeableSize = snd_pcm_avail_update(_PlaybackHandle);
- _debug("writeableSize %i\n", writeableSize);
+ _debug("writeableSize %i", writeableSize);
*/
// AvailForGet tell the number of chars inside the buffer
@@ -970,7 +970,7 @@ void AlsaLayer::audioCallback (void)
if (is_capture_running()) {
micAvailBytes = snd_pcm_avail_update (_CaptureHandle);
- // _debug("micAvailBytes %i\n", micAvailBytes);
+ // _debug("micAvailBytes %i", micAvailBytes);
if (micAvailBytes > 0) {
micAvailPut = getMainBuffer()->availForPut();
@@ -990,7 +990,7 @@ void AlsaLayer::audioCallback (void)
int nbSample = toPut / sizeof (SFLDataFormat);
int nb_sample_up = nbSample;
- // _debug("nb_sample_up %i\n", nb_sample_up);
+ // _debug("nb_sample_up %i", nb_sample_up);
nbSample = _converter->downsampleData ( (SFLDataFormat*) in, rsmpl_out, _mainBufferSampleRate, _audioSampleRate, nb_sample_up);
dcblocker->filter_signal (rsmpl_out, nbSample);
@@ -1010,7 +1010,7 @@ void AlsaLayer::audioCallback (void)
in=0;
} else if (micAvailBytes < 0) {
- _debug ("AlsaLayer::audioCallback (mic): error: %s\n", snd_strerror (micAvailBytes));
+ _debug ("AlsaLayer::audioCallback (mic): error: %s", snd_strerror (micAvailBytes));
}
}
diff --git a/sflphone-common/src/audio/audiolayer.cpp b/sflphone-common/src/audio/audiolayer.cpp
index ceabb38f1d5337fda2a6a0f8af1925df8711c4f9..e0a84d48481a1514b163a5824840f442517ffdbc 100644
--- a/sflphone-common/src/audio/audiolayer.cpp
+++ b/sflphone-common/src/audio/audiolayer.cpp
@@ -40,7 +40,7 @@ void AudioLayer::flushUrgent (void)
int AudioLayer::putUrgent (void* buffer, int toCopy)
{
- // _debug ("------------------- AudioLayer::putUrgent --------------------\n");
+ _debug ("------------------- AudioLayer::putUrgent --------------------");
int a;
ost::MutexLock guard (_mutex);
@@ -65,7 +65,7 @@ int AudioLayer::putMain (void *buffer, int toCopy, CallID call_id)
if (a >= toCopy) {
return getMainBuffer()->putData (buffer, toCopy, _defaultVolume, call_id);
} else {
- _debug ("Chopping sound, Ouch! RingBuffer full ?\n");
+ _debug ("Chopping sound, Ouch! RingBuffer full ?");
return getMainBuffer()->putData (buffer, a, _defaultVolume, call_id);
}
diff --git a/sflphone-common/src/audio/audiolayer.h b/sflphone-common/src/audio/audiolayer.h
index ab70ddfd0701caadbb55cd6d15343403199cf0bf..580c064e510b337790ddf0c453e06b4b23c9d4ff 100644
--- a/sflphone-common/src/audio/audiolayer.h
+++ b/sflphone-common/src/audio/audiolayer.h
@@ -213,6 +213,11 @@ class AudioLayer {
*/
inline Recordable* getRecorderInstance (void) {return _recorder;}
+ /**
+ * Get the mutex lock for the entire audio layer
+ */
+ inline ost::Mutex* getMutexLock(void) { return &_mutex; }
+
protected:
@@ -285,6 +290,9 @@ class AudioLayer {
/** Contains the current error code */
int _errorMessage;
+ /**
+ * Lock for the entire audio layer
+ */
ost::Mutex _mutex;
};
diff --git a/sflphone-common/src/audio/audiortp.cpp b/sflphone-common/src/audio/audiortp.cpp
index 3887a21f63d18b7f8a5647526fa4efaadef3e942..26615888a789d5b863c2a3e9f284fca381e2b458 100644
--- a/sflphone-common/src/audio/audiortp.cpp
+++ b/sflphone-common/src/audio/audiortp.cpp
@@ -68,14 +68,14 @@ AudioRtp::createNewSession (SIPCall *ca)
ost::MutexLock m (_rtpMutex);
- _debug ("AudioRtp::Create new rtp session\n");
+ _debug ("AudioRtp::Create new rtp session");
// something should stop the thread before...
if (_RTXThread != 0) {
- _debug ("**********************************************************\n");
- _debug ("! ARTP Failure: Thread already exists..., stopping it\n");
- _debug ("**********************************************************\n");
+ _debug ("**********************************************************");
+ _debug ("! ARTP Failure: Thread already exists..., stopping it");
+ _debug ("**********************************************************");
delete _RTXThread;
_RTXThread = 0;
}
@@ -93,14 +93,14 @@ AudioRtp::start (void)
ost::MutexLock m (_rtpMutex);
if (_RTXThread == 0) {
- _debug ("! ARTP Failure: Cannot start audiortp thread since not yet created\n");
+ _debug ("! ARTP Failure: Cannot start audiortp thread since not yet created");
throw AudioRtpException();
}
try {
if (_RTXThread->start() != 0) {
- _debug ("! ARTP Failure: unable to start RTX Thread\n");
+ _debug ("! ARTP Failure: unable to start RTX Thread");
return -1;
}
} catch (...) {
@@ -118,7 +118,7 @@ AudioRtp::closeRtpSession ()
ost::MutexLock m (_rtpMutex);
// This will make RTP threads finish.
- _debug ("AudioRtp::Stopping rtp session\n");
+ _debug ("AudioRtp::Stopping rtp session");
try {
if (_RTXThread != 0) {
@@ -126,11 +126,11 @@ AudioRtp::closeRtpSession ()
_RTXThread = 0;
}
} catch (...) {
- _debugException ("! ARTP Exception: when stopping audiortp\n");
+ _debugException ("! ARTP Exception: when stopping audiortp");
throw;
}
- _debug ("AudioRtp::Audio rtp stopped\n");
+ _debug ("AudioRtp::Audio rtp stopped");
return true;
}
@@ -140,7 +140,7 @@ void
AudioRtp::setRecording()
{
- _debug ("AudioRtp::setRecording\n");
+ _debug ("AudioRtp::setRecording");
_RTXThread->_ca->setRecording();
}
@@ -161,7 +161,7 @@ AudioRtpRTX::AudioRtpRTX (SIPCall *sipcall, bool sym) : time (new ost::Time()),
std::string localipConfig = _ca->getLocalIp(); // _ca->getLocalIp();
ost::InetHostAddress local_ip (localipConfig.c_str());
- _debug ("%i\n", _ca->getLocalAudioPort());
+ _debug ("%i", _ca->getLocalAudioPort());
_session = new ost::SymmetricRTPSession (local_ip, _ca->getLocalAudioPort());
// _session = new ost::RTPSessionBase(local_ip, _ca->getLocalAudioPort());
_sessionRecv = NULL;
@@ -209,7 +209,7 @@ AudioRtpRTX::~AudioRtpRTX ()
ost::MutexLock m (_rtpRtxMutex);
- _debug ("Delete AudioRtpRTX instance in callid %s\n", _ca->getCallId().c_str());
+ _debug ("Delete AudioRtpRTX instance in callid %s", _ca->getCallId().c_str());
try {
this->terminate();
@@ -218,12 +218,12 @@ AudioRtpRTX::~AudioRtpRTX ()
throw;
}
- _debug ("Remove audio stream for call id %s\n", _ca->getCallId().c_str());
+ _debug ("Remove audio stream for call id %s", _ca->getCallId().c_str());
_audiolayer->getMainBuffer()->unBindAll (_ca->getCallId());
// Manager::instance().removeStream(_ca->getCallId());
- _debug ("DELETE print micData address %p\n", micData);
+ _debug ("DELETE print micData address %p", micData);
delete [] micData;
micData = NULL;
delete [] micDataConverted;
@@ -248,7 +248,7 @@ AudioRtpRTX::~AudioRtpRTX ()
delete _session;
_session = NULL;
- _debug ("AudioRtpRTX instance deleted\n");
+ _debug ("AudioRtpRTX instance deleted");
rtp_input_rec->close();
rtp_output_rec->close();
@@ -261,17 +261,17 @@ AudioRtpRTX::initBuffers()
{
ost::MutexLock m (_rtpRtxMutex);
- _debug ("AudioRtpRTX::initBuffers Init RTP buffers for %s\n", _ca->getCallId().c_str());
+ _debug ("AudioRtpRTX::initBuffers Init RTP buffers for %s", _ca->getCallId().c_str());
converter = new SamplerateConverter (_layerSampleRate , _layerFrameSize);
nbSamplesMax = (int) (_layerSampleRate * _layerFrameSize /1000);
- _debug ("AudioRtpRTX::initBuffers NBSAMPLEMAX %i\n", nbSamplesMax);
+ _debug ("AudioRtpRTX::initBuffers NBSAMPLEMAX %i", nbSamplesMax);
micData = new SFLDataFormat[nbSamplesMax];
- _debug ("CREATE print micData address %p\n", micData);
+ _debug ("CREATE print micData address %p", micData);
micDataConverted = new SFLDataFormat[nbSamplesMax];
micDataEncoded = new unsigned char[nbSamplesMax];
@@ -305,7 +305,7 @@ AudioRtpRTX::setRtpSessionMedia (void)
{
if (_ca == 0) {
- _debug (" !ARTP: No call, can't init RTP media\n");
+ _debug (" !ARTP: No call, can't init RTP media");
return;
}
@@ -314,11 +314,11 @@ AudioRtpRTX::setRtpSessionMedia (void)
_audiocodec = Manager::instance().getCodecDescriptorMap().instantiateCodec (pl);
if (_audiocodec == NULL) {
- _debug (" !ARTP: No audiocodec, can't init RTP media\n");
+ _debug (" !ARTP: No audiocodec, can't init RTP media");
return;
}
- _debug ("Init audio RTP session: codec payload %i\n", _audiocodec->getPayload());
+ _debug ("Init audio RTP session: codec payload %i", _audiocodec->getPayload());
// _audioCodecInstance = *_audiocodec;
@@ -344,34 +344,34 @@ AudioRtpRTX::setRtpSessionRemoteIp (void)
if (!_remoteIpIsSet) {
- _debug ("++++++++++++++++++++++++++ SET IP ADDRESS ++++++++++++++++++++++++++++\n");
+ _debug ("++++++++++++++++++++++++++ SET IP ADDRESS ++++++++++++++++++++++++++++");
if (_ca == 0) {
- _debug (" !ARTP: No call, can't init RTP media \n");
+ _debug (" !ARTP: No call, can't init RTP media ");
return;
}
ost::InetHostAddress remote_ip (_ca->getLocalSDP()->get_remote_ip().c_str());
- _debug ("Init audio RTP session: remote ip %s\n", _ca->getLocalSDP()->get_remote_ip().data());
+ _debug ("Init audio RTP session: remote ip %s", _ca->getLocalSDP()->get_remote_ip().data());
if (!remote_ip) {
- _debug (" !ARTP Thread Error: Target IP address [%s] is not correct!\n", _ca->getLocalSDP()->get_remote_ip().data());
+ _debug (" !ARTP Thread Error: Target IP address [%s] is not correct!", _ca->getLocalSDP()->get_remote_ip().data());
return;
}
- _debug ("++++Address: %s, audioport: %d\n", _ca->getLocalSDP()->get_remote_ip().c_str(), _ca->getLocalSDP()->get_remote_audio_port());
+ _debug ("++++Address: %s, audioport: %d", _ca->getLocalSDP()->get_remote_ip().c_str(), _ca->getLocalSDP()->get_remote_audio_port());
- _debug ("++++Audioport: %d\n", (int) _ca->getLocalSDP()->get_remote_audio_port());
+ _debug ("++++Audioport: %d", (int) _ca->getLocalSDP()->get_remote_audio_port());
if (!_session->addDestination (remote_ip, (unsigned short) _ca->getLocalSDP()->get_remote_audio_port())) {
- _debug (" !ARTP Thread Error: can't add destination to session!\n");
+ _debug (" !ARTP Thread Error: can't add destination to session!");
return;
}
_remoteIpIsSet = true;
} else {
- _debug ("+++++++++++++++++++++++ IP ADDRESS ALREADY SET ++++++++++++++++++++++++\n");
+ _debug ("+++++++++++++++++++++++ IP ADDRESS ALREADY SET ++++++++++++++++++++++++");
}
}
@@ -404,23 +404,23 @@ AudioRtpRTX::processDataEncode()
// available bytes inside ringbuffer
int availBytesFromMic = _audiolayer->getMainBuffer()->availForGet (_ca->getCallId());
- // _debug("AudioRtpRTX::processDataEncode() callid: %s availBytesFromMic %i\n", _ca->getCallId().c_str(), availBytesFromMic);
+ // _debug("AudioRtpRTX::processDataEncode() callid: %s availBytesFromMic %i", _ca->getCallId().c_str(), availBytesFromMic);
- // _debug("AudioRtpRTX::processDataEncode: availBytesFromMic: %i\n", availBytesFromMic);
+ // _debug("AudioRtpRTX::processDataEncode: availBytesFromMic: %i", availBytesFromMic);
// set available byte to maxByteToGet
int bytesAvail = (availBytesFromMic < maxBytesToGet) ? availBytesFromMic : maxBytesToGet;
- // _debug("bytesAvail %i\n", bytesAvail);
+ // _debug("bytesAvail %i", bytesAvail);
if (bytesAvail == 0)
return 0;
- // _debug("AudioRtpRTX::processDataEncode: bytesAvail: %i\n", bytesAvail);
+ // _debug("AudioRtpRTX::processDataEncode: bytesAvail: %i", bytesAvail);
// Get bytes from micRingBuffer to data_from_mic
int nbSample = _audiolayer->getMainBuffer()->getData (micData , bytesAvail, 100, _ca->getCallId()) / sizeof (SFLDataFormat);
rtp_output_rec->write ( (char*) micData, bytesAvail);
- // _debug("AudioRtpRTX::processDataEncode: nbSample: %i\n", nbSample);
+ // _debug("AudioRtpRTX::processDataEncode: nbSample: %i", nbSample);
// nb bytes to be sent over RTP
int compSize = 0;
@@ -429,7 +429,7 @@ AudioRtpRTX::processDataEncode()
if (_audiocodec->getClockRate() != _layerSampleRate) {
int nb_sample_up = nbSample;
- //_debug("_nbSample audiolayer->getMic(): %i \n", nbSample);
+ //_debug("_nbSample audiolayer->getMic(): %i ", nbSample);
// Store the length of the mic buffer in samples for recording
_nSamplesMic = nbSample;
@@ -514,18 +514,18 @@ AudioRtpRTX::sendSessionFromMic (int timestamp)
// no call, so we do nothing
if (_ca==0) {
- _debug (" !ARTP: No call associated (mic)\n");
+ _debug (" !ARTP: No call associated (mic)");
return;
}
// AudioLayer* audiolayer = Manager::instance().getAudioDriver();
if (!_audiolayer) {
- _debug (" !ARTP: No audiolayer available for MIC\n");
+ _debug (" !ARTP: No audiolayer available for MIC");
return;
}
if (!_audiocodec) {
- _debug (" !ARTP: No audiocodec available for MIC\n");
+ _debug (" !ARTP: No audiocodec available for MIC");
return;
}
@@ -534,7 +534,7 @@ AudioRtpRTX::sendSessionFromMic (int timestamp)
int compSize = processDataEncode();
// putData put the data on RTP queue, sendImmediate bypass this queue
- // _debug("AudioRtpRTX::sendSessionFromMic: timestamp: %i, compsize: %i\n", timestamp, compSize);
+ // _debug("AudioRtpRTX::sendSessionFromMic: timestamp: %i, compsize: %i", timestamp, compSize);
if ( (compSize != 0) && (micDataEncoded != NULL))
_session->putData (timestamp, micDataEncoded, compSize);
@@ -554,12 +554,12 @@ AudioRtpRTX::receiveSessionForSpkr (int& countTime)
}
if (!_audiolayer) {
- _debug (" !ARTP: No audiolayer available for SPEAKER\n");
+ _debug (" !ARTP: No audiolayer available for SPEAKER");
return;
}
if (!_audiocodec) {
- _debug (" !ARTP: No audiocodec available for SPEAKER\n");
+ _debug (" !ARTP: No audiocodec available for SPEAKER");
return;
}
@@ -638,12 +638,12 @@ AudioRtpRTX::run ()
int timestamp = _session->getCurrentTimestamp(); // for mic
- _debug ("- ARTP Action: Start call %s\n",_ca->getCallId().c_str());
+ _debug ("- ARTP Action: Start call %s",_ca->getCallId().c_str());
while (!testCancel()) {
- // _debug("Main while loop for call: %s\n", _ca->getCallId().c_str());
+ // _debug("Main while loop for call: %s", _ca->getCallId().c_str());
// Send session
sessionWaiting = _session->isWaiting();
@@ -676,7 +676,7 @@ AudioRtpRTX::run ()
}
// _audiolayer->stopStream();
- _debug ("- ARTP Action: Stop call %s\n",_ca->getCallId().c_str());
+ _debug ("- ARTP Action: Stop call %s",_ca->getCallId().c_str());
}
diff --git a/sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp b/sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp
index 6785f286e9710b79535442be38f9462dbd954203..3cf0fd3583a6b0eb62094842eb00d74e2f322589 100644
--- a/sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp
+++ b/sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp
@@ -20,11 +20,13 @@
#include "AudioRtpFactory.h"
#include "AudioZrtpSession.h"
+#include "AudioSrtpSession.h"
#include "AudioSymmetricRtpSession.h"
#include "manager.h"
#include "account.h"
#include "sip/sipcall.h"
+#include "sip/SdesNegotiator.h"
#include <assert.h>
@@ -52,67 +54,71 @@ AudioRtpFactory::~AudioRtpFactory()
stop();
}
-void AudioRtpFactory::initAudioRtpSession (SIPCall * ca)
+void AudioRtpFactory::initAudioRtpConfig(SIPCall *ca)
{
- ost::MutexLock m (_audioRtpThreadMutex);
-
assert (ca);
if (_rtpSession != NULL) {
_debugException ("An audio rtp thread was already created but not" \
- "destroyed. Forcing it before continuing.\n");
+ "destroyed. Forcing it before continuing.");
stop();
}
AccountID accountId = Manager::instance().getAccountFromCall (ca->getCallId());
- bool srtpEnabled = false;
- int keyExchangeProtocol = 1;
- bool helloHashEnabled = true;
-
// Check if it is an IP-to-IP call
-
if (accountId == AccountNULL) {
- srtpEnabled = Manager::instance().getConfigBool (IP2IP_PROFILE, SRTP_ENABLE);
- keyExchangeProtocol = Manager::instance().getConfigInt (IP2IP_PROFILE, SRTP_KEY_EXCHANGE);
- _debug ("Ip-to-ip profile selected with key exchange protocol number %d\n", keyExchangeProtocol);
- helloHashEnabled = Manager::instance().getConfigBool (IP2IP_PROFILE, ZRTP_HELLO_HASH);
+ _srtpEnabled = Manager::instance().getConfigBool (IP2IP_PROFILE, SRTP_ENABLE);
+ _keyExchangeProtocol = Manager::instance().getConfigInt (IP2IP_PROFILE, SRTP_KEY_EXCHANGE);
+ _debug ("Ip-to-ip profile selected with key exchange protocol number %d", _keyExchangeProtocol);
+ _helloHashEnabled = Manager::instance().getConfigBool (IP2IP_PROFILE, ZRTP_HELLO_HASH);
} else {
- srtpEnabled = Manager::instance().getConfigBool (accountId, SRTP_ENABLE);
- keyExchangeProtocol = Manager::instance().getConfigInt (accountId, SRTP_KEY_EXCHANGE);
- _debug ("Registered account %s profile selected with key exchange protocol number %d\n", accountId.c_str(), keyExchangeProtocol);
- helloHashEnabled = Manager::instance().getConfigBool (accountId, ZRTP_HELLO_HASH);
+ _srtpEnabled = Manager::instance().getConfigBool (accountId, SRTP_ENABLE);
+ _keyExchangeProtocol = Manager::instance().getConfigInt (accountId, SRTP_KEY_EXCHANGE);
+ _debug ("Registered account %s profile selected with key exchange protocol number %d", accountId.c_str(), _keyExchangeProtocol);
+ _helloHashEnabled = Manager::instance().getConfigBool (accountId, ZRTP_HELLO_HASH);
}
+}
- _debug ("Srtp enable: %d \n", srtpEnabled);
+void AudioRtpFactory::initAudioRtpSession (SIPCall * ca)
+{
+ ost::MutexLock m (_audioRtpThreadMutex);
- if (srtpEnabled) {
+ _debug ("Srtp enable: %d ", _srtpEnabled);
+ if (_srtpEnabled) {
std::string zidFilename (Manager::instance().getConfigString (SIGNALISATION, ZRTP_ZIDFILE));
- switch (keyExchangeProtocol) {
+ switch (_keyExchangeProtocol) {
case Zrtp:
_rtpSession = new AudioZrtpSession (&Manager::instance(), ca, zidFilename);
_rtpSessionType = Zrtp;
- if (helloHashEnabled) {
+ if (_helloHashEnabled) {
// TODO: be careful with that. The hello hash is computed asynchronously. Maybe it's
// not even available at that point.
ca->getLocalSDP()->set_zrtp_hash (static_cast<AudioZrtpSession *> (_rtpSession)->getHelloHash());
- _debug ("Zrtp hello hash fed to SDP\n");
+ _debug ("Zrtp hello hash fed to SDP");
}
break;
case Sdes:
+ _rtpSession = new AudioSrtpSession (&Manager::instance(), ca);
+ _rtpSessionType = Sdes;
+
+ ca->getLocalSDP()->set_srtp_crypto(static_cast<AudioSrtpSession *> (_rtpSession)->getLocalCryptoInfo());
+ break;
+
default:
+ _debug("Unsupported Rtp Session Exception Type!");
throw UnsupportedRtpSessionType();
}
} else {
_rtpSessionType = Symmetric;
_rtpSession = new AudioSymmetricRtpSession (&Manager::instance(), ca);
- _debug ("Starting a symmetric unencrypted rtp session\n");
+ _debug ("Starting a symmetric unencrypted rtp session");
}
}
@@ -125,9 +131,13 @@ void AudioRtpFactory::start (void)
switch (_rtpSessionType) {
case Sdes:
+ if (static_cast<AudioSrtpSession *> (_rtpSession)->startRtpThread() != 0) {
+ throw AudioRtpFactoryException ("Failed to start AudioSRtpSession thread");
+ }
+ break;
case Symmetric:
- _debug ("Starting symmetric rtp thread\n");
+ _debug ("Starting symmetric rtp thread");
if (static_cast<AudioSymmetricRtpSession *> (_rtpSession)->startRtpThread() != 0) {
throw AudioRtpFactoryException ("Failed to start AudioSymmetricRtpSession thread");
@@ -148,7 +158,7 @@ void AudioRtpFactory::start (void)
void AudioRtpFactory::stop (void)
{
ost::MutexLock mutex (_audioRtpThreadMutex);
- _debug ("Stopping audio rtp session\n");
+ _debug ("Stopping audio rtp session");
if (_rtpSession == NULL) {
_debugException ("_rtpSession is null when trying to stop. Returning.");
@@ -159,6 +169,8 @@ void AudioRtpFactory::stop (void)
switch (_rtpSessionType) {
case Sdes:
+ delete static_cast<AudioSrtpSession *> (_rtpSession);
+ break;
case Symmetric:
delete static_cast<AudioSymmetricRtpSession *> (_rtpSession);
@@ -171,8 +183,31 @@ void AudioRtpFactory::stop (void)
_rtpSession = NULL;
} catch (...) {
- _debugException ("Exception caught when stopping the audio rtp session\n");
- throw AudioRtpFactoryException();
+ _debugException ("Exception caught when stopping the audio rtp session");
+ throw AudioRtpFactoryException("caught exception in AudioRtpFactory::stop");
+ }
+}
+
+void AudioRtpFactory::updateDestinationIpAddress (void)
+{
+ _debug ("Updating IP address");
+ if (_rtpSession == NULL) {
+ throw AudioRtpFactoryException ("_rtpSession was null when trying to update IP address");
+ }
+
+ switch (_rtpSessionType) {
+
+ case Sdes:
+ static_cast<AudioSrtpSession *> (_rtpSession)->updateDestinationIpAddress();
+ break;
+
+ case Symmetric:
+ static_cast<AudioSymmetricRtpSession *> (_rtpSession)->updateDestinationIpAddress();
+ break;
+
+ case Zrtp:
+ static_cast<AudioZrtpSession *> (_rtpSession)->updateDestinationIpAddress();
+ break;
}
}
@@ -181,7 +216,19 @@ sfl::AudioZrtpSession * AudioRtpFactory::getAudioZrtpSession()
if ( (_rtpSessionType == Zrtp) && (_rtpSessionType != NULL)) {
return static_cast<AudioZrtpSession *> (_rtpSession);
} else {
- throw AudioRtpFactoryException();
+ throw AudioRtpFactoryException("_rtpSession is NULL in getAudioZrtpSession");
+ }
+}
+
+ void AudioRtpFactory::setRemoteCryptoInfo(sfl::SdesNegotiator& nego)
+{
+ if ( (_rtpSessionType != NULL) && (_rtpSessionType == Sdes)) {
+ static_cast<AudioSrtpSession *> (_rtpSession)->setRemoteCryptoInfo(nego);
+ }
+ else {
+ throw AudioRtpFactoryException("_rtpSession is NULL in setRemoteCryptoInfo");
}
}
}
+
+
diff --git a/sflphone-common/src/audio/audiortp/AudioRtpFactory.h b/sflphone-common/src/audio/audiortp/AudioRtpFactory.h
index 0eefcbfc8264339055a0cb98520fd95d1f7d9879..cfa14165f1cf0f85960eb775b4b09fd476df7062 100644
--- a/sflphone-common/src/audio/audiortp/AudioRtpFactory.h
+++ b/sflphone-common/src/audio/audiortp/AudioRtpFactory.h
@@ -22,14 +22,20 @@
#include <stdexcept>
#include <cc++/thread.h>
+#include "sip/SdesNegotiator.h"
+
+class SdesNegotiator;
class SIPCall;
+
namespace sfl {
class AudioZrtpSession;
+ class AudioSrtpSession;
}
namespace sfl {
class AudioZrtpSession;
+ class AudioSrtpSession;
// Possible kind of rtp session
typedef enum RtpMethod {
@@ -55,6 +61,8 @@ namespace sfl {
AudioRtpFactory(SIPCall * ca);
~AudioRtpFactory();
+ void initAudioRtpConfig(SIPCall *ca);
+
/**
* Lazy instantiation method. Create a new RTP session of a given
* type according to the content of the configuration file.
@@ -76,6 +84,12 @@ namespace sfl {
* @param None
*/
void stop();
+
+ /**
+ * Update current RTP destination address with one stored in call
+ * @param None
+ */
+ void updateDestinationIpAddress (void);
/**
* @param None
@@ -83,18 +97,65 @@ namespace sfl {
* file. initAudioRtpSession must have been called prior to that.
*/
inline void * getAudioRtpSession(void) { return _rtpSession; }
+
+ /**
+ * @param None
+ * @return The internal audio rtp session type
+ * Symmetric = 0
+ * Zrtp = 1
+ * Sdes = 2
+ */
+ inline RtpMethod getAudioRtpType(void) { return _rtpSessionType; }
+
+ /**
+ * @param Set internal audio rtp session type (Symmetric, Zrtp, Sdes)
+ */
+ inline void setAudioRtpType(RtpMethod type) { _rtpSessionType = type; }
+
+ /**
+ * Manually set the srtpEnable option (usefull for RTP fallback)
+ */
+ void setSrtpEnabled(bool enable){ _srtpEnabled = enable; }
+
+ /**
+ * Manually set the keyExchangeProtocol parameter (usefull for RTP fallback)
+ */
+ void setKeyExchangeProtocol(int proto){ _keyExchangeProtocol = proto; }
+
+ /**
+ * Manually set the setHelloHashEnabled parameter (usefull for RTP fallback)
+ */
+ void setHelloHashEnabled(bool enable){ _helloHashEnabled = enable; }
/**
* Get the current AudioZrtpSession. Throws an AudioRtpFactoryException
* if the current rtp thread is null, or if it's not of the correct type.
* @return The current AudioZrtpSession thread.
*/
- sfl::AudioZrtpSession * getAudioZrtpSession();
+ sfl::AudioZrtpSession * getAudioZrtpSession();
+
+ /**
+ * Set remote cryptographic info. Should be called after negotiation in SDP
+ * offer/answer session.
+ */
+ void setRemoteCryptoInfo(sfl::SdesNegotiator& nego);
private:
void * _rtpSession;
RtpMethod _rtpSessionType;
ost::Mutex _audioRtpThreadMutex;
+
+ // Field used when initializinga udio rtp session
+ // May be set manually or from config using initAudioRtpConfig
+ bool _srtpEnabled;
+
+ // Field used when initializinga udio rtp session
+ // May be set manually or from config using initAudioRtpConfig
+ int _keyExchangeProtocol;
+
+ // Field used when initializinga udio rtp session
+ // May be set manually or from config using initAudioRtpConfig
+ bool _helloHashEnabled;
};
}
#endif // __AUDIO_RTP_FACTORY_H__
diff --git a/sflphone-common/src/audio/audiortp/AudioRtpSession.h b/sflphone-common/src/audio/audiortp/AudioRtpSession.h
index 6cd4cf773cd177590d8a4fd0ceb3b5b12b86b554..d168cb8d750fef943960ef2e3b1c7999002a4bc3 100644
--- a/sflphone-common/src/audio/audiortp/AudioRtpSession.h
+++ b/sflphone-common/src/audio/audiortp/AudioRtpSession.h
@@ -66,7 +66,12 @@ namespace sfl {
virtual void run ();
int startRtpThread();
-
+
+ /**
+ * Used mostly when receiving a reinvite
+ */
+ void updateDestinationIpAddress(void);
+
private:
void initBuffers(void);
@@ -98,6 +103,16 @@ namespace sfl {
// it amounts to the same as doing
// start() with no semaphore at all.
ost::Semaphore * _mainloopSemaphore;
+
+ // Main destination address for this rtp session.
+ // Stored in case or reINVITE, which may require to forget
+ // this destination and update a new one.
+ ost::InetHostAddress _remote_ip;
+
+ // Main destination port for this rtp session.
+ // Stored in case reINVITE, which may require to forget
+ // this destination and update a new one
+ unsigned short _remote_port;
AudioCodec * _audiocodec;
@@ -202,7 +217,8 @@ namespace sfl {
}
_debug("Unbind audio RTP stream for call id %s\n", _ca->getCallId().c_str());
- _audiolayer->getMainBuffer()->unBindAll(_ca->getCallId());
+ // _audiolayer->getMainBuffer()->unBindAll(_ca->getCallId());
+ _manager->getAudioDriver()->getMainBuffer()->unBindAll(_ca->getCallId());
delete [] _micData;
delete [] _micDataConverted;
@@ -218,10 +234,12 @@ namespace sfl {
void AudioRtpSession<D>::initBuffers()
{
// Set sampling rate, main buffer choose the highest one
- _audiolayer->getMainBuffer()->setInternalSamplingRate(_codecSampleRate);
+ // _audiolayer->getMainBuffer()->setInternalSamplingRate(_codecSampleRate);
+ _manager->getAudioDriver()->getMainBuffer()->setInternalSamplingRate(_codecSampleRate);
// may be different than one already setted
- converterSamplingRate = _audiolayer->getMainBuffer()->getInternalSamplingRate();
+ // converterSamplingRate = _audiolayer->getMainBuffer()->getInternalSamplingRate();
+ converterSamplingRate = _manager->getAudioDriver()->getMainBuffer()->getInternalSamplingRate();
// initialize SampleRate converter using AudioLayer's sampling rate
// (internal buffers initialized with maximal sampling rate and frame size)
@@ -289,20 +307,36 @@ namespace sfl {
}
_debug ("Setting IP address for the RTP session\n");
-
- ost::InetHostAddress remote_ip (_ca->getLocalSDP()->get_remote_ip().c_str());
+
+ // Store remote ip in case we would need to forget current destination
+ _remote_ip = ost::InetHostAddress(_ca->getLocalSDP()->get_remote_ip().c_str());
_debug ("Init audio RTP session: remote ip %s\n", _ca->getLocalSDP()->get_remote_ip().data());
- if (!remote_ip) {
+ if (!_remote_ip) {
_debug ("Target IP address [%s] is not correct!\n", _ca->getLocalSDP()->get_remote_ip().data());
return;
}
- if (! static_cast<D*>(this)->addDestination (remote_ip, (unsigned short) _ca->getLocalSDP()->get_remote_audio_port())) {
+ // Store remote port in case we would need to forget current destination
+ _remote_port = (unsigned short) _ca->getLocalSDP()->get_remote_audio_port();
+
+ if (! static_cast<D*>(this)->addDestination (_remote_ip, _remote_port)) {
_debug ("Can't add destination to session!\n");
return;
}
}
+
+ template <typename D>
+ void AudioRtpSession<D>::updateDestinationIpAddress(void)
+ {
+ // Destination address are stored in a list in ccrtp
+ // This method clear off this entry
+ static_cast<D*>(this)->forgetDestination(_remote_ip, _remote_port);
+
+ // new destination is stored in call
+ // we just need to recall this method
+ setDestinationIpAddress();
+ }
template <typename D>
int AudioRtpSession<D>::processDataEncode(void)
@@ -310,7 +344,8 @@ namespace sfl {
assert(_audiocodec);
assert(_audiolayer);
- int _mainBufferSampleRate = _audiolayer->getMainBuffer()->getInternalSamplingRate();
+
+ int _mainBufferSampleRate = _manager->getAudioDriver()->getMainBuffer()->getInternalSamplingRate();
// compute codec framesize in ms
float fixed_codec_framesize = computeCodecFrameSize (_audiocodec->getFrameSize(), _audiocodec->getClockRate());
@@ -319,7 +354,7 @@ namespace sfl {
int maxBytesToGet = computeNbByteAudioLayer (fixed_codec_framesize);
// available bytes inside ringbuffer
- int availBytesFromMic = _audiolayer->getMainBuffer()->availForGet(_ca->getCallId());
+ int availBytesFromMic = _manager->getAudioDriver()->getMainBuffer()->availForGet(_ca->getCallId());
// set available byte to maxByteToGet
int bytesAvail = (availBytesFromMic < maxBytesToGet) ? availBytesFromMic : maxBytesToGet;
@@ -328,7 +363,7 @@ namespace sfl {
return 0;
// Get bytes from micRingBuffer to data_from_mic
- int nbSample = _audiolayer->getMainBuffer()->getData(_micData , bytesAvail, 100, _ca->getCallId()) / sizeof (SFLDataFormat);
+ int nbSample = _manager->getAudioDriver()->getMainBuffer()->getData(_micData , bytesAvail, 100, _ca->getCallId()) / sizeof (SFLDataFormat);
// nb bytes to be sent over RTP
int compSize = 0;
@@ -361,7 +396,7 @@ namespace sfl {
if (_audiocodec != NULL) {
- int _mainBufferSampleRate = _audiolayer->getMainBuffer()->getInternalSamplingRate();
+ int _mainBufferSampleRate = _manager->getAudioDriver()->getMainBuffer()->getInternalSamplingRate();
// Return the size of data in bytes
int expandedSize = _audiocodec->codecDecode (_spkrDataDecoded , spkrData , size);
@@ -381,7 +416,7 @@ namespace sfl {
_nSamplesSpkr = nbSample;
// put data in audio layer, size in byte
- _audiolayer->getMainBuffer()->putData (_spkrDataConverted, nbSample * sizeof (SFLDataFormat), 100, _ca->getCallId());
+ _manager->getAudioDriver()->getMainBuffer()->putData (_spkrDataConverted, nbSample * sizeof (SFLDataFormat), 100, _ca->getCallId());
} else {
@@ -390,7 +425,7 @@ namespace sfl {
// put data in audio layer, size in byte
- _audiolayer->getMainBuffer()->putData (_spkrDataDecoded, expandedSize, 100, _ca->getCallId());
+ _manager->getAudioDriver()->getMainBuffer()->putData (_spkrDataDecoded, expandedSize, 100, _ca->getCallId());
}
// Notify (with a beep) an incoming call when there is already a call
@@ -466,7 +501,12 @@ namespace sfl {
unsigned int size = adu->getSize(); // size in char
- processDataDecode (spkrData, size, countTime);
+ // _debug("RTP size: %i\n", size);
+
+ // Size of DTMF over RTP
+ if(size > 4) {
+ processDataDecode (spkrData, size, countTime);
+ }
}
template <typename D>
@@ -508,7 +548,7 @@ namespace sfl {
_ca->setRecordingSmplRate(_audiocodec->getClockRate());
// Start audio stream (if not started) AND flush all buffers (main and urgent)
- _audiolayer->startStream();
+ _manager->getAudioDriver()->startStream();
static_cast<D*>(this)->startRunning();
// Already called in _audiolayer->startStream()
@@ -519,7 +559,12 @@ namespace sfl {
while (!testCancel()) {
- converterSamplingRate = _audiolayer->getMainBuffer()->getInternalSamplingRate();
+ // ost::MutexLock lock(*(_manager->getAudioLayerMutex()));
+
+ _manager->getAudioLayerMutex()->enter();
+
+ // converterSamplingRate = _audiolayer->getMainBuffer()->getInternalSamplingRate();
+ _manager->getAudioDriver()->getMainBuffer()->getInternalSamplingRate();
// Send session
sessionWaiting = static_cast<D*>(this)->isWaiting();
@@ -539,6 +584,9 @@ namespace sfl {
_ca->recAudio.recData (_micData,_nSamplesMic);
}
+ // ost::MutexLock unlock(*(_manager->getAudioLayerMutex()));
+ _manager->getAudioLayerMutex()->leave();
+
// Let's wait for the next transmit cycle
Thread::sleep (TimerPort::getTimer());
diff --git a/sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp b/sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..7099b807bd6150f345a988c4c151945ca35f4fe3
--- /dev/null
+++ b/sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp
@@ -0,0 +1,302 @@
+/*
+ * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
+ * Author: Pierre-Luc Bacon <pierre-luc.bacon@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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#include "AudioSrtpSession.h"
+#include "user_cfg.h"
+
+#include "sip/sipcall.h"
+
+#include <openssl/sha.h>
+#include <openssl/hmac.h>
+#include <openssl/evp.h>
+#include <openssl/bio.h>
+#include <openssl/buffer.h>
+#include <openssl/rand.h>
+
+
+#include <cstdio>
+#include <cstring>
+#include <cerrno>
+
+static uint8 mk[] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f };
+
+static uint8 ms[] = { 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d };
+
+
+namespace sfl
+{
+
+AudioSrtpSession::AudioSrtpSession (ManagerImpl * manager, SIPCall * sipcall) :
+ ost::SymmetricRTPSession (ost::InetHostAddress (sipcall->getLocalIp().c_str()), sipcall->getLocalAudioPort()),
+ _localCryptoSuite(0),
+ _remoteCryptoSuite(0),
+ AudioRtpSession<AudioSrtpSession> (manager, sipcall)
+{
+
+ // Initialize local Crypto context
+ initializeLocalMasterKey();
+ initializeLocalMasterSalt();
+ initializeLocalCryptoContext();
+
+ // Set local crypto context in ccrtp
+ _localCryptoCtx->deriveSrtpKeys(0);
+
+ setOutQueueCryptoContext(_localCryptoCtx);
+}
+
+
+std::vector<std::string> AudioSrtpSession::getLocalCryptoInfo() {
+
+ _debug("Get Cryptographic info from this rtp session");
+
+ std::vector<std::string> crypto_vector;
+
+ // @TODO we should return a vector containing supported
+ // cryptographic context tagged 1, 2, 3...
+ std::string tag = "1";
+
+ std::string crypto_suite = sfl::CryptoSuites[_localCryptoSuite].name;
+
+ // srtp keys formated as the following as the following
+ // inline:NzB4d1BINUAvLEw6UzF3WSJ+PSdFcGdUJShpX1Zj|2^20|1:32
+ std::string srtp_keys = "inline:";
+ srtp_keys += getBase64ConcatenatedKeys();
+ srtp_keys.append("|2^20|1:32");
+
+ // generate crypto attribute
+ std::string crypto_attr = tag.append(" ");
+ crypto_attr += crypto_suite.append(" ");
+ crypto_attr += srtp_keys;
+
+ _debug("%s", crypto_attr.c_str());
+
+ crypto_vector.push_back(crypto_attr);
+
+ return crypto_vector;
+}
+
+
+void AudioSrtpSession::setRemoteCryptoInfo(sfl::SdesNegotiator& nego) {
+
+ _debug("Set remote Cryptographic info for Srtp session");
+
+ // decode keys
+ unBase64ConcatenatedKeys(nego.getKeyInfo());
+
+ // init crypto content int Srtp session
+ initializeRemoteCryptoContext();
+ setInQueueCryptoContext(_remoteCryptoCtx);
+}
+
+
+void AudioSrtpSession::initializeLocalMasterKey(void)
+{
+
+ // @TODO key may have different length depending on cipher suite
+ _localMasterKeyLength = sfl::CryptoSuites[_localCryptoSuite].masterKeyLength / 8;
+
+ // Allocate memory for key
+ unsigned char *random_key = new unsigned char[_localMasterKeyLength];
+
+ // Generate ryptographically strong pseudo-random bytes
+ int err;
+ if((err = RAND_bytes(random_key, _localMasterKeyLength)) != 1)
+ _debug("Error occured while generating cryptographically strong pseudo-random key");
+
+ memcpy(_localMasterKey, random_key, _localMasterKeyLength);
+
+ printf("Local Master: ");
+ for(int i = 0; i < _localMasterKeyLength; i++){
+ printf("%d", _localMasterKey[i]);
+ }
+ printf("\n");
+
+ return;
+}
+
+
+void AudioSrtpSession::initializeLocalMasterSalt(void)
+{
+
+ // @TODO key may have different length depending on cipher suite
+ _localMasterSaltLength = sfl::CryptoSuites[_localCryptoSuite].masterSaltLength / 8;
+
+ // Allocate memory for key
+ unsigned char *random_key = new unsigned char[_localMasterSaltLength];
+
+ // Generate ryptographically strong pseudo-random bytes
+ int err;
+ if((err = RAND_bytes(random_key, _localMasterSaltLength)) != 1)
+ _debug("Error occured while generating cryptographically strong pseudo-random key");
+
+ memcpy(_localMasterSalt, random_key, _localMasterSaltLength);
+
+ return;
+
+}
+
+
+std::string AudioSrtpSession::getBase64ConcatenatedKeys()
+{
+
+ // compute concatenated master and salt length
+ int concatLength = _localMasterKeyLength + _localMasterSaltLength;
+
+ uint8 concatKeys[concatLength];
+
+ // concatenate keys
+ memcpy((void*)concatKeys, (void*)_localMasterKey, _localMasterKeyLength);
+ memcpy((void*)(concatKeys + _localMasterKeyLength), (void*)_localMasterSalt, _localMasterSaltLength);
+
+ // encode concatenated keys in base64
+ char *output = encodeBase64((unsigned char*)concatKeys, concatLength);
+
+ // init string containing encoded data
+ std::string keys(output);
+
+ free(output);
+
+ return keys;
+}
+
+
+void AudioSrtpSession::unBase64ConcatenatedKeys(std::string base64keys)
+{
+
+
+ _remoteMasterKeyLength = sfl::CryptoSuites[1].masterKeyLength / 8;
+ _remoteMasterSaltLength = sfl::CryptoSuites[1].masterSaltLength / 8;
+
+ // length of decoded data data
+ int length;
+
+ // pointer to binary data
+ char *dataptr = (char*)base64keys.data();
+
+ // decode concatenated binary keys
+ char *output = decodeBase64((unsigned char*)dataptr, strlen(dataptr), &length);
+
+ // copy master and slt respectively
+ memcpy((void*)_remoteMasterKey, (void*)output, _remoteMasterKeyLength);
+ memcpy((void*)_remoteMasterSalt, (void*)(output + _remoteMasterKeyLength), _remoteMasterSaltLength);
+
+ free(output);
+}
+
+
+void AudioSrtpSession::initializeRemoteCryptoContext(void)
+{
+
+ _remoteCryptoCtx = new ost::CryptoContext(0x0,
+ 0, // roc,
+ 0L, // keydr,
+ SrtpEncryptionAESCM, // encryption algo
+ SrtpAuthenticationSha1Hmac, // authtication algo
+ _remoteMasterKey, // Master Key
+ _remoteMasterKeyLength, // Master Key length
+ _remoteMasterSalt, // Master Salt
+ _remoteMasterSaltLength, // Master Salt length
+ 128 / 8, // encryption keyl
+ 160 / 8, // authentication key len
+ 112 / 8, // session salt len
+ 80 / 8); // authentication tag len
+
+
+}
+
+void AudioSrtpSession::initializeLocalCryptoContext(void)
+{
+
+ _localCryptoCtx = new ost::CryptoContext(OutgoingDataQueue::getLocalSSRC(),
+ 0, // roc,
+ 0L, // keydr,
+ SrtpEncryptionAESCM, // encryption algo
+ SrtpAuthenticationSha1Hmac, // authtication algo
+ _localMasterKey, // Master Key
+ _localMasterKeyLength, // Master Key length
+ _localMasterSalt, // Master Salt
+ _localMasterSaltLength, // Master Salt length
+ 128 / 8, // encryption keyl
+ 160 / 8, // authentication key len
+ 112 / 8, // session salt len
+ 80 / 8); // authentication tag len
+
+
+}
+
+
+char* AudioSrtpSession::encodeBase64(unsigned char *input, int length)
+{
+ BIO *b64, *bmem;
+ BUF_MEM *bptr ;
+
+ char *buffer = (char *)malloc(2*length);
+ memset(buffer, 0, 2*length);
+
+ // init decoder
+ b64 = BIO_new(BIO_f_base64());
+ BIO_set_flags(b64, BIO_FLAGS_BASE64_NO_NL);
+
+ // init internal buffer
+ bmem = BIO_new(BIO_s_mem());
+
+ // create decoder chain
+ b64 = BIO_push(b64, bmem);
+
+ BIO_write(b64, input, length);
+ BIO_flush(b64);
+
+ // get pointer to data
+ BIO_get_mem_ptr(b64, &bptr);
+
+ // copy result in output buffer (-1 since we do not want the EOF character)
+ strncpy(buffer, (char*)(bptr->data), bptr->length);
+
+ BIO_free_all(bmem);
+
+ return buffer;
+}
+
+char* AudioSrtpSession::decodeBase64(unsigned char *input, int length, int *length_out)
+{
+ BIO *b64, *bmem;
+
+ char *buffer = (char *)malloc(length);
+ memset(buffer, 0, length);
+
+ // init decoder and read-only BIO buffer
+ b64 = BIO_new(BIO_f_base64());
+ BIO_set_flags(b64, BIO_FLAGS_BASE64_NO_NL);
+
+ // init internal buffer
+ bmem = BIO_new_mem_buf(input, length);
+
+ // create encoder chain
+ bmem = BIO_push(b64, bmem);
+
+ *length_out = BIO_read(bmem, buffer, length);
+
+ BIO_free_all(bmem);
+
+ return buffer;
+
+}
+
+}
diff --git a/sflphone-common/src/audio/audiortp/AudioSrtpSession.h b/sflphone-common/src/audio/audiortp/AudioSrtpSession.h
new file mode 100644
index 0000000000000000000000000000000000000000..d3b8c3dbfd07d0aa55f9a32883ca1d516eb673f3
--- /dev/null
+++ b/sflphone-common/src/audio/audiortp/AudioSrtpSession.h
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
+ * Author: Pierre-Luc Bacon <pierre-luc.bacon@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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#ifndef __SFL_AUDIO_SRTP_SESSION_H__
+#define __SFL_AUDIO_SRTP_SESSION_H__
+
+#include "AudioRtpSession.h"
+#include "sip/SdesNegotiator.h"
+
+#include <ccrtp/CryptoContext.h>
+#include <vector>
+
+class SdesNegotiator;
+class ManagerImpl;
+class SIPCall;
+
+/*
+ Table from RFC 4568 6.2. Crypto-Suites, which define key parameters for supported
+ cipher suite
+
+ +---------------------+-------------+--------------+---------------+
+ | |AES_CM_128_ | AES_CM_128_ | F8_128_ |
+ | |HMAC_SHA1_80 | HMAC_SHA1_32 | HMAC_SHA1_80 |
+ +---------------------+-------------+--------------+---------------+
+ | Master key length | 128 bits | 128 bits | 128 bits |
+ | Master salt length | 112 bits | 112 bits | 112 bits |
+ | SRTP lifetime | 2^48 packets| 2^48 packets | 2^48 packets |
+ | SRTCP lifetime | 2^31 packets| 2^31 packets | 2^31 packets |
+ | Cipher | AES Counter | AES Counter | AES F8 Mode |
+ | | Mode | Mode | |
+ | Encryption key | 128 bits | 128 bits | 128 bits |
+ | MAC | HMAC-SHA1 | HMAC-SHA1 | HMAC-SHA1 |
+ | SRTP auth. tag | 80 bits | 32 bits | 80 bits |
+ | SRTCP auth. tag | 80 bits | 80 bits | 80 bits |
+ | SRTP auth. key len. | 160 bits | 160 bits | 160 bits |
+ | SRTCP auth. key len.| 160 bits | 160 bits | 160 bits |
+ +---------------------+-------------+--------------+---------------+
+*/
+
+
+namespace sfl {
+
+ class SrtpException: public std::exception
+ {
+ virtual const char* what() const throw()
+ {
+ return "ZRTP ZID initialization failed.";
+ }
+ };
+
+ class AudioSrtpSession : public ost::SymmetricRTPSession, public AudioRtpSession<AudioSrtpSession>
+ {
+ public:
+
+ AudioSrtpSession(ManagerImpl * manager, SIPCall * sipcall);
+
+ std::vector<std::string> getLocalCryptoInfo(void);
+
+ void setRemoteCryptoInfo(sfl::SdesNegotiator& nego);
+
+ private:
+
+ void initializeLocalMasterKey(void);
+
+ void initializeLocalMasterSalt(void);
+
+ void initializeRemoteCryptoContext(void);
+
+ void initializeLocalCryptoContext(void);
+
+ std::string getBase64ConcatenatedKeys();
+
+ void unBase64ConcatenatedKeys(std::string base64keys);
+
+ char* encodeBase64(unsigned char *input, int length);
+
+ char* decodeBase64(unsigned char *input, int length, int *length_out);
+
+ /** Default local crypto suite is AES_CM_128_HMAC_SHA1_80*/
+ int _localCryptoSuite;
+
+ /** Remote crypto suite is initialized at AES_CM_128_HMAC_SHA1_80*/
+ int _remoteCryptoSuite;
+
+ uint8 _localMasterKey[16];
+
+ /** local master key length in byte */
+ int _localMasterKeyLength;
+
+ uint8 _localMasterSalt[14];
+
+ /** local master salt length in byte */
+ int _localMasterSaltLength;
+
+ uint8 _remoteMasterKey[16];
+
+ /** remote master key length in byte */
+ int _remoteMasterKeyLength;
+
+ uint8 _remoteMasterSalt[14];
+
+ /** remote master salt length in byte */
+ int _remoteMasterSaltLength;
+
+ ost::CryptoContext* _remoteCryptoCtx;
+
+ ost::CryptoContext* _localCryptoCtx;
+ };
+
+}
+
+#endif // __AUDIO_SRTP_SESSION_H__
diff --git a/sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp b/sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp
index cec4dd3ff75d4d06e74bb157b4b54a4e0a971c60..cdd2a118214f2d23c1409b6797a2226fac74101e 100644
--- a/sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp
+++ b/sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp
@@ -36,7 +36,7 @@ AudioZrtpSession::AudioZrtpSession (ManagerImpl * manager, SIPCall * sipcall, co
AudioRtpSession<AudioZrtpSession> (manager, sipcall),
_zidFilename (zidFilename)
{
- _debug ("AudioZrtpSession initialized\n");
+ _debug ("AudioZrtpSession initialized");
initializeZid();
startZrtp();
}
@@ -54,24 +54,24 @@ void AudioZrtpSession::initializeZid (void)
std::string xdg_config = std::string (HOMEDIR) + DIR_SEPARATOR_STR + ".cache" + DIR_SEPARATOR_STR + PROGDIR + "/" + _zidFilename;
- _debug (" xdg_config %s\n", xdg_config.c_str());
+ _debug (" xdg_config %s", xdg_config.c_str());
if (XDG_CACHE_HOME != NULL) {
std::string xdg_env = std::string (XDG_CACHE_HOME) + _zidFilename;
- _debug (" xdg_env %s\n", xdg_env.c_str());
+ _debug (" xdg_env %s", xdg_env.c_str());
(xdg_env.length() > 0) ? zidCompleteFilename = xdg_env : zidCompleteFilename = xdg_config;
} else
zidCompleteFilename = xdg_config;
if (initialize (zidCompleteFilename.c_str()) >= 0) {
- _debug ("Register callbacks\n");
+ _debug ("Register callbacks");
setEnableZrtp (true);
setUserCallback (new ZrtpSessionCallback (_ca));
return;
}
- _debug ("Initialization from ZID file failed. Trying to remove...\n");
+ _debug ("Initialization from ZID file failed. Trying to remove...");
if (remove (zidCompleteFilename.c_str()) !=0) {
_debug ("Failed to remove zid file because of: %s", strerror (errno));
@@ -79,7 +79,7 @@ void AudioZrtpSession::initializeZid (void)
}
if (initialize (zidCompleteFilename.c_str()) < 0) {
- _debug ("ZRTP initialization failed\n");
+ _debug ("ZRTP initialization failed");
throw ZrtpZidException();
}
diff --git a/sflphone-common/src/audio/audiortp/Makefile.am b/sflphone-common/src/audio/audiortp/Makefile.am
index 502a17b9002aa0e0799d5219962d46cb05741f0c..d2ab3aaec714d9065241752748284fe4ea59a0c2 100644
--- a/sflphone-common/src/audio/audiortp/Makefile.am
+++ b/sflphone-common/src/audio/audiortp/Makefile.am
@@ -5,12 +5,14 @@ noinst_LTLIBRARIES = libaudiortp.la
libaudiortp_la_SOURCES = \
AudioRtpFactory.cpp \
AudioZrtpSession.cpp \
- ZrtpSessionCallback.cpp
+ ZrtpSessionCallback.cpp \
+ AudioSrtpSession.cpp
noinst_HEADERS = \
AudioRtpFactory.h \
AudioRtpSession.h \
AudioSymmetricRtpSession.h \
AudioZrtpSession.h \
- ZrtpSessionCallback.h
+ ZrtpSessionCallback.h \
+ AudioSrtpSession.h
diff --git a/sflphone-common/src/audio/audiortp/ZrtpSessionCallback.cpp b/sflphone-common/src/audio/audiortp/ZrtpSessionCallback.cpp
index 1648112382c5a2ee5f5da5e847c2df0868143509..ebdcd8f95e277e0d8de0628045cb3bc6a03ee212 100644
--- a/sflphone-common/src/audio/audiortp/ZrtpSessionCallback.cpp
+++ b/sflphone-common/src/audio/audiortp/ZrtpSessionCallback.cpp
@@ -44,7 +44,7 @@ ZrtpSessionCallback::ZrtpSessionCallback (SIPCall *sipcall) :
return;
}
- _debug ("Initialize callbacks\n");
+ _debug ("Initialize callbacks");
/**
* Information Map
@@ -114,28 +114,28 @@ ZrtpSessionCallback::ZrtpSessionCallback (SIPCall *sipcall) :
void
ZrtpSessionCallback::secureOn (std::string cipher)
{
- _debug ("Secure mode is on with cipher %s\n", cipher.c_str());
+ _debug ("Secure mode is on with cipher %s", cipher.c_str());
DBusManager::instance().getCallManager()->secureOn (_sipcall->getCallId(), cipher);
}
void
ZrtpSessionCallback::secureOff (void)
{
- _debug ("Secure mode is off\n");
+ _debug ("Secure mode is off");
DBusManager::instance().getCallManager()->secureOff (_sipcall->getCallId());
}
void
ZrtpSessionCallback::showSAS (std::string sas, bool verified)
{
- _debug ("SAS is: %s\n", sas.c_str());
+ _debug ("SAS is: %s", sas.c_str());
DBusManager::instance().getCallManager()->showSAS (_sipcall->getCallId(), sas, verified);
}
void
ZrtpSessionCallback::zrtpNotSuppOther()
{
- _debug ("Callee does not support ZRTP\n");
+ _debug ("Callee does not support ZRTP");
DBusManager::instance().getCallManager()->zrtpNotSuppOther (_sipcall->getCallId());
}
@@ -148,7 +148,7 @@ ZrtpSessionCallback::showMessage (GnuZrtpCodes::MessageSeverity sev, int32_t sub
msg = _infoMap[subCode];
if (msg != NULL) {
- _debug ("ZRTP Debug:\n");
+ _debug ("ZRTP Debug:");
}
}
@@ -156,7 +156,7 @@ ZrtpSessionCallback::showMessage (GnuZrtpCodes::MessageSeverity sev, int32_t sub
msg = _warningMap[subCode];
if (msg != NULL) {
- _debug ("ZRTP Debug:\n");
+ _debug ("ZRTP Debug:");
}
}
@@ -164,22 +164,22 @@ ZrtpSessionCallback::showMessage (GnuZrtpCodes::MessageSeverity sev, int32_t sub
msg = _severeMap[subCode];
if (msg != NULL) {
- _debug ("ZRTP Debug:\n");
+ _debug ("ZRTP Debug:");
}
}
if (sev == ZrtpError) {
if (subCode < 0) { // received an error packet from peer
subCode *= -1;
- _debug ("Received an error packet from peer:\n");
+ _debug ("Received an error packet from peer:");
} else {
- _debug ("Sent error packet to peer:\n");
+ _debug ("Sent error packet to peer:");
}
msg = _zrtpMap[subCode];
if (msg != NULL) {
- _debug ("ZRTP Debug: %s\n", msg->c_str());
+ _debug ("ZRTP Debug: %s", msg->c_str());
}
}
}
@@ -192,20 +192,20 @@ ZrtpSessionCallback::zrtpNegotiationFailed (MessageSeverity severity, int subCod
if (severity == ZrtpError) {
if (subCode < 0) { // received an error packet from peer
subCode *= -1;
- _debug ("Received error packet: \n");
+ _debug ("Received error packet: ");
} else {
- _debug ("Sent error packet: \n");
+ _debug ("Sent error packet: ");
}
msg = _zrtpMap[subCode];
if (msg != NULL) {
- _debug ("%s\n", msg->c_str());
+ _debug ("%s", msg->c_str());
DBusManager::instance().getCallManager()->zrtpNegotiationFailed (_sipcall->getCallId(), *msg, "ZRTP");
}
} else {
msg = _severeMap[subCode];
- _debug ("%s\n", msg->c_str());
+ _debug ("%s", msg->c_str());
DBusManager::instance().getCallManager()->zrtpNegotiationFailed (_sipcall->getCallId(), *msg, "severe");
}
}
@@ -213,7 +213,7 @@ ZrtpSessionCallback::zrtpNegotiationFailed (MessageSeverity severity, int subCod
void
ZrtpSessionCallback::confirmGoClear()
{
- _debug ("Received go clear message. Until confirmation, ZRTP won't send any data\n");
+ _debug ("Received go clear message. Until confirmation, ZRTP won't send any data");
DBusManager::instance().getCallManager()->zrtpNotSuppOther (_sipcall->getCallId());
}
diff --git a/sflphone-common/src/audio/codecs/alaw.cpp b/sflphone-common/src/audio/codecs/alaw.cpp
index e8a3928a7283e620b2dc2341cc0ea5df429f3bb7..9ed3cd56dedfd19cab165897048012f2b49212ca 100644
--- a/sflphone-common/src/audio/codecs/alaw.cpp
+++ b/sflphone-common/src/audio/codecs/alaw.cpp
@@ -38,7 +38,7 @@ class Alaw : public AudioCodec
virtual ~Alaw() {}
virtual int codecDecode (short *dst, unsigned char *src, unsigned int size) {
- // _debug("Decoded by alaw \n");
+ // _debug("Decoded by alaw ");
int16* end = dst+size;
while (dst<end)
@@ -48,7 +48,7 @@ class Alaw : public AudioCodec
}
virtual int codecEncode (unsigned char *dst, short *src, unsigned int size) {
- // _debug("Encoded by alaw \n");
+ // _debug("Encoded by alaw ");
size >>= 1;
uint8* end = dst+size;
diff --git a/sflphone-common/src/audio/codecs/celtcodec.cpp b/sflphone-common/src/audio/codecs/celtcodec.cpp
index 93cf4470d4aac4bb97b56105395db0c5b5f66a3c..8787bd6b6b3f7c8bfeec6fbf31464de24e31816c 100644
--- a/sflphone-common/src/audio/codecs/celtcodec.cpp
+++ b/sflphone-common/src/audio/codecs/celtcodec.cpp
@@ -46,13 +46,13 @@ class Celt : public AudioCodec
// celt_mode_info(mode, CELT_GET_LOOKAHEAD, &skip);
if (mode == NULL) {
- printf ("failed to create a mode\n");
+ printf ("failed to create a mode");
}
// bytes_per_packet = 1024;
// if (bytes_per_packet < 0 || bytes_per_packet > MAX_PACKET)
// {
- // printf ("bytes per packet must be between 0 and %d\n");
+ // printf ("bytes per packet must be between 0 and %d");
// }
// celt_mode_info(mode, CELT_GET_FRAME_SIZE, &frame_size);
diff --git a/sflphone-common/src/audio/codecs/codecDescriptor.cpp b/sflphone-common/src/audio/codecs/codecDescriptor.cpp
index 8c9ca56006cc214451d3e26381521a933218a833..87a3c8c3d300791c0b89415ea8bf806c71f0e57e 100644
--- a/sflphone-common/src/audio/codecs/codecDescriptor.cpp
+++ b/sflphone-common/src/audio/codecs/codecDescriptor.cpp
@@ -51,14 +51,14 @@ CodecDescriptor::init()
_nbCodecs = CodecDynamicList.size();
if (_nbCodecs <= 0) {
- _debug (" Error - No codecs available in directory %s\n" , CODECS_DIR);
+ _debug (" Error - No codecs available in directory %s" , CODECS_DIR);
}
int i;
for (i = 0 ; i < _nbCodecs ; i++) {
_CodecsMap[ (AudioCodecType) CodecDynamicList[i]->getPayload() ] = CodecDynamicList[i];
- _debug ("%s\n" , CodecDynamicList[i]->getCodecName().c_str());
+ _debug ("%s" , CodecDynamicList[i]->getCodecName().c_str());
}
}
@@ -94,11 +94,11 @@ CodecDescriptor::getCodec (AudioCodecType payload)
CodecsMap::iterator iter = _CodecsMap.find (payload);
if (iter!=_CodecsMap.end()) {
- // _debug("Found codec %i _CodecsMap from codec descriptor\n", payload);
+ // _debug("Found codec %i _CodecsMap from codec descriptor", payload);
return (iter->second);
}
- _debug ("Error cannont found codec %i in _CodecsMap from codec descriptor\n", payload);
+ _debug ("Error cannont found codec %i in _CodecsMap from codec descriptor", payload);
return NULL;
}
@@ -207,7 +207,7 @@ CodecDescriptor::scanCodecDirectory (void)
for (i = 0 ; (unsigned int) i < dirToScan.size() ; i++) {
std::string dirStr = dirToScan[i];
- _debug ("Scanning %s to find audio codecs....\n", dirStr.c_str());
+ _debug ("Scanning %s to find audio codecs....", dirStr.c_str());
DIR *dir = opendir (dirStr.c_str());
AudioCodec* audioCodec;
@@ -218,7 +218,7 @@ CodecDescriptor::scanCodecDirectory (void)
tmp = dirStruct -> d_name ;
if (tmp == CURRENT_DIR || tmp == PARENT_DIR) {} else {
if (seemsValid (tmp) && !alreadyInCache (tmp)) {
- //_debug("Codec : %s\n", tmp.c_str());
+ //_debug("Codec : %s", tmp.c_str());
_Cache.push_back (tmp);
audioCodec = loadCodec (dirStr.append (tmp));
codecs.push_back (audioCodec);
@@ -237,7 +237,7 @@ CodecDescriptor::scanCodecDirectory (void)
AudioCodec*
CodecDescriptor::loadCodec (std::string path)
{
- //_debug("Load path %s\n", path.c_str());
+ //_debug("Load path %s", path.c_str());
CodecHandlePointer p;
using std::cerr;
void * codecHandle = dlopen (path.c_str() , RTLD_LAZY);
@@ -265,7 +265,7 @@ CodecDescriptor::loadCodec (std::string path)
void
CodecDescriptor::unloadCodec (CodecHandlePointer p)
{
- // _debug("Unload codec %s\n", p.first->getCodecName().c_str());
+ // _debug("Unload codec %s", p.first->getCodecName().c_str());
using std::cerr;
destroy_t* destroyCodec = (destroy_t*) dlsym (p.second , "destroy");
diff --git a/sflphone-common/src/audio/codecs/gsmcodec.cpp b/sflphone-common/src/audio/codecs/gsmcodec.cpp
index 8543dec2b59ed44e86766565444406fc2663de46..9116d76a94a713e8ac7be356902a358b5b6c9386 100644
--- a/sflphone-common/src/audio/codecs/gsmcodec.cpp
+++ b/sflphone-common/src/audio/codecs/gsmcodec.cpp
@@ -42,10 +42,10 @@ class Gsm : public AudioCodec
_bandwidth = 29.2;
if (! (_decode_gsmhandle = gsm_create()))
- printf ("ERROR: decode_gsm_create\n");
+ printf ("ERROR: decode_gsm_create");
if (! (_encode_gsmhandle = gsm_create()))
- printf ("AudioCodec: ERROR: encode_gsm_create\n");
+ printf ("AudioCodec: ERROR: encode_gsm_create");
}
Gsm (const Gsm&);
@@ -58,18 +58,18 @@ class Gsm : public AudioCodec
}
virtual int codecDecode (short * dst, unsigned char * src, unsigned int size) {
- // _debug("Decoded by gsm \n");
+ // _debug("Decoded by gsm ");
(void) size;
if (gsm_decode (_decode_gsmhandle, (gsm_byte*) src, (gsm_signal*) dst) < 0)
- printf ("ERROR: gsm_decode\n");
+ printf ("ERROR: gsm_decode");
return 320;
}
virtual int codecEncode (unsigned char * dst, short * src, unsigned int size) {
- // _debug("Encoded by gsm \n");
+ // _debug("Encoded by gsm ");
(void) size;
gsm_encode (_encode_gsmhandle, (gsm_signal*) src, (gsm_byte*) dst);
return 33;
diff --git a/sflphone-common/src/audio/mainbuffer.cpp b/sflphone-common/src/audio/mainbuffer.cpp
index 3f2751b6ba8b03eef708411b09ed0d24bd41a874..54be846cc2ef875a0df94d693bb62961022d2ebe 100644
--- a/sflphone-common/src/audio/mainbuffer.cpp
+++ b/sflphone-common/src/audio/mainbuffer.cpp
@@ -39,14 +39,12 @@ void MainBuffer::setInternalSamplingRate (int sr)
ost::MutexLock guard (_mutex);
if (sr != _internalSamplingRate) {
- // flushAllBuffers();
+
_internalSamplingRate = sr;
flushAllBuffers();
}
-
- // flushAllBuffers();
}
CallIDSet* MainBuffer::getCallIDSet (CallID call_id)
@@ -63,7 +61,6 @@ CallIDSet* MainBuffer::getCallIDSet (CallID call_id)
bool MainBuffer::createCallIDSet (CallID set_id)
{
- _debug ("---- MainBuffer::createCallIDSet %s\n", set_id.c_str());
CallIDSet* newCallIDSet = new CallIDSet;
@@ -77,21 +74,18 @@ bool MainBuffer::createCallIDSet (CallID set_id)
bool MainBuffer::removeCallIDSet (CallID set_id)
{
- _debug ("---- MainBuffer::removeCallIDSet %s\n", set_id.c_str());
-
CallIDSet* callid_set = getCallIDSet (set_id);
if (callid_set != NULL) {
if (_callIDMap.erase (set_id) != 0) {
- _debug (" callid set %s erased!\n", set_id.c_str());
return true;
} else {
- _debug (" error while removing callid set %s!\n", set_id.c_str());
+ _debug ("removeCallIDSet error while removing callid set %s!", set_id.c_str());
return false;
}
} else {
- _debug (" callid set %s does not exist!\n", set_id.c_str());
+ _debug ("removeCallIDSet error callid set %s does not exist!", set_id.c_str());
return false;
}
@@ -99,7 +93,6 @@ bool MainBuffer::removeCallIDSet (CallID set_id)
void MainBuffer::addCallIDtoSet (CallID set_id, CallID call_id)
{
- _debug ("---- MainBuffer::addCallIDtoSet %s in %s\n", set_id.c_str(), call_id.c_str());
CallIDSet* callid_set = getCallIDSet (set_id);
callid_set->insert (call_id);
@@ -108,18 +101,16 @@ void MainBuffer::addCallIDtoSet (CallID set_id, CallID call_id)
void MainBuffer::removeCallIDfromSet (CallID set_id, CallID call_id)
{
- _debug ("---- MainBuffer::removeCallIDfromSet element %s from %s\n", call_id.c_str(), set_id.c_str());
CallIDSet* callid_set = getCallIDSet (set_id);
if (callid_set != NULL) {
if (callid_set->erase (call_id) != 0) {
- _debug (" callid %s erased from set %s!\n", call_id.c_str(), set_id.c_str());
} else {
- _debug (" error while removing callid %s from set %s!\n", call_id.c_str(), set_id.c_str());
+ _debug ("removeCallIDfromSet error while removing callid %s from set %s!", call_id.c_str(), set_id.c_str());
}
} else {
- _debug (" callid set %s does not exist!\n", set_id.c_str());
+ _debug ("removeCallIDfromSet error callid set %s does not exist!", set_id.c_str());
}
}
@@ -130,7 +121,7 @@ RingBuffer* MainBuffer::getRingBuffer (CallID call_id)
RingBufferMap::iterator iter = _ringBufferMap.find (call_id);
if (iter == _ringBufferMap.end()) {
- // _debug("ringBuffer with ID: \"%s\" doesn't exist! \n", call_id.c_str());
+ // _debug("ringBuffer with ID: \"%s\" doesn't exist! ", call_id.c_str());
return NULL;
} else
return iter->second;
@@ -140,8 +131,6 @@ RingBuffer* MainBuffer::getRingBuffer (CallID call_id)
RingBuffer* MainBuffer::createRingBuffer (CallID call_id)
{
- _debug ("---- MainBuffer::createRingBuffer callid %s\n", call_id.c_str());
-
RingBuffer* newRingBuffer = new RingBuffer (SIZEBUF, call_id);
_ringBufferMap.insert (pair<CallID, RingBuffer*> (call_id, newRingBuffer));
@@ -153,20 +142,17 @@ RingBuffer* MainBuffer::createRingBuffer (CallID call_id)
bool MainBuffer::removeRingBuffer (CallID call_id)
{
- _debug ("---- MainBuffer::removeRingBuffer call_id %s\n", call_id.c_str());
-
RingBuffer* ring_buffer = getRingBuffer (call_id);
if (ring_buffer != NULL) {
if (_ringBufferMap.erase (call_id) != 0) {
- _debug (" ringbuffer %s removed!\n", call_id.c_str());
return true;
} else {
- _debug (" error while deleting ringbuffer %s!\n", call_id.c_str());
+ _debug ("removeRingBuffer error while deleting ringbuffer %s!", call_id.c_str());
return false;
}
} else {
- _debug (" error ringbuffer %s does not exist!\n", call_id.c_str());
+ _debug ("removeRingBuffer error ringbuffer %s does not exist!", call_id.c_str());
return true;
}
}
@@ -177,8 +163,6 @@ void MainBuffer::bindCallID (CallID call_id1, CallID call_id2)
ost::MutexLock guard (_mutex);
- _debug ("---- MainBuffer::bindCallID %s and callid %s\n", call_id1.c_str(), call_id2.c_str());
-
RingBuffer* ring_buffer;
CallIDSet* callid_set;
@@ -210,8 +194,6 @@ void MainBuffer::unBindCallID (CallID call_id1, CallID call_id2)
ost::MutexLock guard (_mutex);
- _debug ("---- MainBuffer::unBindCallID %s and callid %s\n", call_id1.c_str(), call_id2.c_str());
-
removeCallIDfromSet (call_id1, call_id2);
removeCallIDfromSet (call_id2, call_id1);
@@ -261,8 +243,6 @@ void MainBuffer::unBindAll (CallID call_id)
CallIDSet::iterator iter_set = temp_set.begin();
- _debug ("MainBuffer::unBindAll\n");
-
while (iter_set != temp_set.end()) {
CallID call_id_in_set = *iter_set;
unBindCallID (call_id, call_id_in_set);
@@ -369,12 +349,10 @@ int MainBuffer::getData (void *buffer, int toCopy, unsigned short volume, CallID
int MainBuffer::getDataByID (void *buffer, int toCopy, unsigned short volume, CallID call_id, CallID reader_id)
{
- // _debug("MainBuffer::getDataByID in buffer %s by %s \n", call_id.c_str(), reader_id.c_str());
-
RingBuffer* ring_buffer = getRingBuffer (call_id);
if (ring_buffer == NULL) {
- // _debug("Output RingBuffer ID: \"%s\" does not exist!\n", call_id.c_str());
+
return 0;
}
@@ -396,22 +374,21 @@ int MainBuffer::availForGet (CallID call_id)
return 0;
if (callid_set->empty()) {
- _debug ("CallIDSet with ID: \"%s\" is empty!\n", call_id.c_str());
+ _debug ("CallIDSet with ID: \"%s\" is empty!", call_id.c_str());
return 0;
}
if (callid_set->size() == 1) {
CallIDSet::iterator iter_id = callid_set->begin();
- // _debug("MainBuffer::availForGet availForGetByID(%s,%s)\n", (*iter_id).c_str(), call_id.c_str());
if ( (call_id != default_id) && (*iter_id == call_id)) {
- _debug ("This problem should not occur since we have %i element\n", (int) callid_set->size());
+ _debug ("This problem should not occur since we have %i element", (int) callid_set->size());
}
// else
return availForGetByID (*iter_id, call_id);
} else {
- // _debug("CallIDSet with ID: \"%s\" is a conference!\n", call_id.c_str());
+ // _debug("CallIDSet with ID: \"%s\" is a conference!", call_id.c_str());
int avail_bytes = 99999;
int nb_bytes;
CallIDSet::iterator iter_id = callid_set->begin();
@@ -433,14 +410,15 @@ int MainBuffer::availForGetByID (CallID call_id, CallID reader_id)
{
if ( (call_id != default_id) && (reader_id == call_id)) {
- _debug ("**********************************************************************\n");
- _debug ("Error an RTP session ring buffer is not supposed to have a readpointer on tiself\n");
+
+ _debug ("**********************************************************************");
+ _debug ("Error an RTP session ring buffer is not supposed to have a readpointer on tiself");
}
RingBuffer* ringbuffer = getRingBuffer (call_id);
if (ringbuffer == NULL) {
- _debug ("Error: ring buffer does not exist\n");
+ _debug ("Error: ring buffer does not exist");
return 0;
} else
return ringbuffer->AvailForGet (reader_id);
@@ -450,7 +428,7 @@ int MainBuffer::availForGetByID (CallID call_id, CallID reader_id)
int MainBuffer::discard (int toDiscard, CallID call_id)
{
- // _debug("MainBuffer::discard\n");
+ // _debug("MainBuffer::discard");
ost::MutexLock guard (_mutex);
@@ -460,17 +438,19 @@ int MainBuffer::discard (int toDiscard, CallID call_id)
return 0;
if (callid_set->empty()) {
- // _debug("CallIDSet with ID: \"%s\" is empty!\n", call_id.c_str());
+ // _debug("CallIDSet with ID: \"%s\" is empty!", call_id.c_str());
return 0;
}
if (callid_set->size() == 1) {
+
CallIDSet::iterator iter_id = callid_set->begin();
- // _debug("Discard Data in \"%s\" RingBuffer for \"%s\" ReaderPointer\n",(*iter_id).c_str(),call_id.c_str());
+
return discardByID (toDiscard, *iter_id, call_id);
} else {
- // _debug("CallIDSet with ID: \"%s\" is a conference!\n", call_id.c_str());
+
+
CallIDSet::iterator iter_id;
for (iter_id = callid_set->begin(); iter_id != callid_set->end(); iter_id++) {
@@ -501,22 +481,20 @@ void MainBuffer::flush (CallID call_id)
{
ost::MutexLock guard (_mutex);
- // _debug("MainBuffer::flush\n");
-
CallIDSet* callid_set = getCallIDSet (call_id);
if (callid_set == NULL)
return;
if (callid_set->empty()) {
- // _debug("CallIDSet with ID: \"%s\" is empty!\n", call_id.c_str());
+ // _debug("CallIDSet with ID: \"%s\" is empty!", call_id.c_str());
}
if (callid_set->size() == 1) {
CallIDSet::iterator iter_id = callid_set->begin();
flushByID (*iter_id, call_id);
} else {
- // _debug("CallIDSet with ID: \"%s\" is a conference!\n", call_id.c_str());
+
CallIDSet::iterator iter_id;
for (iter_id = callid_set->begin(); iter_id != callid_set->end(); iter_id++) {
@@ -548,12 +526,9 @@ void MainBuffer::flushByID (CallID call_id, CallID reader_id)
void MainBuffer::flushAllBuffers()
{
- // _debug("-------------------------- flushAllBuffers()\n");
-
RingBufferMap::iterator iter_buffer = _ringBufferMap.begin();
while (iter_buffer != _ringBufferMap.end()) {
- // _debug("-------------------------- flushing: %s\n",iter_buffer->second->getBufferId().c_str());
iter_buffer->second->flushAll();
@@ -564,29 +539,70 @@ void MainBuffer::flushAllBuffers()
void MainBuffer::stateInfo()
{
- _debug ("MainBuffer state info\n");
+ _debug ("MainBuffer state info");
+
+ CallIDMap::iterator iter_call = _callIDMap.begin();
+
+ // print each call and bound call ids
+
+ while (iter_call != _callIDMap.end()) {
+
+ std::string dbg_str (" Call: ");
+ dbg_str.append (std::string (iter_call->first.c_str()));
+ dbg_str.append (std::string (" is bound to: "));
- CallIDMap::iterator iter_map = _callIDMap.begin();
+ CallIDSet* call_id_set = (CallIDSet*) iter_call->second;
- while (iter_map != _callIDMap.end()) {
- CallIDSet* id_set = getCallIDSet (iter_map->first);
+ CallIDSet::iterator iter_call_id = call_id_set->begin();
+
+ while (iter_call_id != call_id_set->end()) {
+
+ dbg_str.append (std::string (*iter_call_id));
+ dbg_str.append (std::string (", "));
+
+ iter_call_id++;
+ }
+
+ _debug ("%s\n", dbg_str.c_str());
+
+ iter_call++;
+ }
+
+ // Print ringbuffers ids and readpointers
+ RingBufferMap::iterator iter_buffer = _ringBufferMap.begin();
+
+ while (iter_buffer != _ringBufferMap.end()) {
+
+ RingBuffer* rbuffer = (RingBuffer*) iter_buffer->second;
+ ReadPointer* rpointer = NULL;
std::string dbg_str (" Buffer: ");
- dbg_str.append (string (iter_map->first.c_str()));
- dbg_str.append (string (" bound to "));
+ dbg_str.append (std::string (iter_buffer->first.c_str()));
+ dbg_str.append (std::string (" as read pointer: "));
+
+ if (rbuffer)
+ rpointer = rbuffer->getReadPointerList();
- if (id_set != NULL) {
- CallIDSet::iterator iter_set = id_set->begin();
+ if (rpointer) {
- while (iter_set != id_set->end()) {
- dbg_str.append (string (iter_set->c_str()));
+ ReadPointer::iterator iter_pointer = rpointer->begin();
+
+ while (iter_pointer != rpointer->end()) {
+
+ dbg_str.append (string (iter_pointer->first.c_str()));
dbg_str.append (string (", "));
+
+ iter_pointer++;
}
}
_debug ("%s\n", dbg_str.c_str());
- iter_map++;
+ iter_buffer++;
}
+
+
+
+
}
diff --git a/sflphone-common/src/audio/pulseaudio/audiostream.cpp b/sflphone-common/src/audio/pulseaudio/audiostream.cpp
index f63390969bc6b6f421ab5c779f67f394b1cfd26e..dd11a28d57e2cb74c59284783eb15612b2cf9375 100644
--- a/sflphone-common/src/audio/pulseaudio/audiostream.cpp
+++ b/sflphone-common/src/audio/pulseaudio/audiostream.cpp
@@ -73,7 +73,7 @@ bool
AudioStream::drainStream (void)
{
if (_audiostream) {
- _debug ("Draining stream\n");
+ _debug ("Draining stream");
pa_operation * operation;
pa_threaded_mainloop_lock (_mainloop);
@@ -81,7 +81,7 @@ AudioStream::drainStream (void)
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");
+ _debug ("Connection died: %s", _context ? pa_strerror (pa_context_errno (_context)) : "NULL");
pa_operation_unref (operation);
break;
} else {
@@ -99,7 +99,7 @@ AudioStream::drainStream (void)
bool
AudioStream::disconnectStream (void)
{
- _debug ("Destroy audio streams\n");
+ _debug ("Destroy audio streams");
pa_threaded_mainloop_lock (_mainloop);
@@ -128,7 +128,7 @@ 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");
+ _debug ("AudioStream::stream_state_callback :: The state of the stream changed");
assert (s);
m = (pa_threaded_mainloop*) user_data;
@@ -137,26 +137,26 @@ AudioStream::stream_state_callback (pa_stream* s, void* user_data)
switch (pa_stream_get_state (s)) {
case PA_STREAM_CREATING:
- _debug ("Stream is creating...\n");
+ _debug ("Stream is creating...");
break;
case PA_STREAM_TERMINATED:
- _debug ("Stream is terminating...\n");
+ _debug ("Stream is terminating...");
break;
case PA_STREAM_READY:
- _debug ("Stream successfully created, connected to %s\n", pa_stream_get_device_name (s));
+ _debug ("Stream successfully created, connected to %s", pa_stream_get_device_name (s));
// pa_stream_cork( s, 0, NULL, NULL);
break;
case PA_STREAM_UNCONNECTED:
- _debug ("Stream unconnected\n");
+ _debug ("Stream unconnected");
break;
case PA_STREAM_FAILED:
default:
- _debug ("Stream error - Sink/Source doesn't exists: %s\n" , pa_strerror (pa_context_errno (pa_stream_get_context (s))));
+ _debug ("Stream error - Sink/Source doesn't exists: %s" , pa_strerror (pa_context_errno (pa_stream_get_context (s))));
exit (0);
break;
}
@@ -192,7 +192,7 @@ AudioStream::createStream (pa_context* c)
pa_buffer_attr* attributes = (pa_buffer_attr*) malloc (sizeof (pa_buffer_attr));
if (! (s = pa_stream_new (c, _streamDescription.c_str() , &sample_spec, &channel_map)))
- _debug ("%s: pa_stream_new() failed : %s\n" , _streamDescription.c_str(), pa_strerror (pa_context_errno (c)));
+ _debug ("%s: pa_stream_new() failed : %s" , _streamDescription.c_str(), pa_strerror (pa_context_errno (c)));
assert (s);
@@ -202,8 +202,8 @@ AudioStream::createStream (pa_context* c)
// 20 ms framesize TODO: take framesize value from config
attributes->maxlength = (uint32_t) -1;
- attributes->tlength = pa_usec_to_bytes (50 * PA_USEC_PER_MSEC, &sample_spec);
- attributes->prebuf = (uint32_t) -1;
+ attributes->tlength = pa_usec_to_bytes (100 * PA_USEC_PER_MSEC, &sample_spec);
+ attributes->prebuf = 0;
attributes->minreq = (uint32_t) -1;
attributes->fragsize = (uint32_t) -1;
@@ -223,7 +223,7 @@ AudioStream::createStream (pa_context* c)
} else if (_streamType == UPLOAD_STREAM) {
pa_stream_connect_upload (s , 1024);
} else {
- _debug ("Stream type unknown \n");
+ _debug ("Stream type unknown ");
}
pa_stream_set_state_callback (s , stream_state_callback, _mainloop);
diff --git a/sflphone-common/src/audio/pulseaudio/pulselayer.cpp b/sflphone-common/src/audio/pulseaudio/pulselayer.cpp
index 906ba0a541a8ee50575087c0679bea536ec0d177..773956df5b35328bf5b2683b59507aa1d7af3faf 100644
--- a/sflphone-common/src/audio/pulseaudio/pulselayer.cpp
+++ b/sflphone-common/src/audio/pulseaudio/pulselayer.cpp
@@ -25,7 +25,7 @@ int framesPerBuffer = 2048;
static void playback_callback (pa_stream* s, size_t bytes, void* userdata)
{
- // _debug("playback_callback\n");
+ // _debug("playback_callback");
assert (s && bytes);
assert (bytes > 0);
@@ -35,7 +35,7 @@ static void playback_callback (pa_stream* s, size_t bytes, void* userdata)
static void capture_callback (pa_stream* s, size_t bytes, void* userdata)
{
- // _debug("capture_callback\n");
+ // _debug("capture_callback");
assert (s && bytes);
assert (bytes > 0);
@@ -46,25 +46,25 @@ static void capture_callback (pa_stream* s, size_t bytes, void* userdata)
/*
static void stream_suspended_callback (pa_stream *s UNUSED, void *userdata UNUSED)
{
- _debug("PulseLayer::Stream Suspended\n");
+ _debug("PulseLayer::Stream Suspended");
}
*/
/*
static void stream_moved_callback(pa_stream *s UNUSED, void *userdata UNUSED)
{
- _debug("PulseLayer::Stream Moved\n");
+ _debug("PulseLayer::Stream Moved");
}
*/
static void playback_underflow_callback (pa_stream* s, void* userdata UNUSED)
{
- _debug ("PulseLayer::Buffer Underflow\n");
+ _debug ("PulseLayer::Buffer Underflow");
// const pa_timing_info* info = pa_stream_get_timing_info(s);
- // _debug(" pa write_index: %l\n", (long)(info->write_index));
- // _debug(" pa write_index_corupt (if not 0): %i\n", info->write_index_corrupt);
- // _debug(" pa read_index: %l\n", (long)(info->read_index));
- // _debug(" pa read_index_corrupt (if not 0): %i\n", info->read_index_corrupt);
+ // _debug(" pa write_index: %l", (long)(info->write_index));
+ // _debug(" pa write_index_corupt (if not 0): %i", info->write_index_corrupt);
+ // _debug(" pa read_index: %l", (long)(info->read_index));
+ // _debug(" pa read_index_corrupt (if not 0): %i", info->read_index_corrupt);
// fill in audio buffer twice the prebuffering value to restart playback
@@ -77,7 +77,7 @@ static void playback_underflow_callback (pa_stream* s, void* userdata UNUSED)
static void playback_overflow_callback (pa_stream* s UNUSED, void* userdata UNUSED)
{
- _debug ("PulseLayer::Buffer OverFlow\n");
+ _debug ("PulseLayer::Buffer OverFlow");
//PulseLayer* pulse = (PulseLayer*) userdata;
// pa_stream_drop (s);
// pa_stream_trigger (s, NULL, NULL);
@@ -91,7 +91,7 @@ PulseLayer::PulseLayer (ManagerImpl* manager)
, playback()
, record()
{
- _debug ("PulseLayer::Pulse audio constructor: Create context\n");
+ _debug ("PulseLayer::Pulse audio constructor: Create context");
_urgentRingBuffer.createReadPointer();
dcblocker = new DcBlocker();
@@ -116,7 +116,7 @@ PulseLayer::~PulseLayer (void)
bool
PulseLayer::closeLayer (void)
{
- _debug ("PulseLayer::closeLayer :: Destroy pulselayer\n");
+ _debug ("PulseLayer::closeLayer :: Destroy pulselayer");
// Commenting the line below will make the
// PulseLayer to close immediately, not
@@ -153,7 +153,7 @@ PulseLayer::closeLayer (void)
void
PulseLayer::connectPulseAudioServer (void)
{
- _debug ("PulseLayer::connectPulseAudioServer \n");
+ _debug ("PulseLayer::connectPulseAudioServer ");
setenv ("PULSE_PROP_media.role", "phone", 1);
@@ -161,7 +161,7 @@ PulseLayer::connectPulseAudioServer (void)
pa_threaded_mainloop_lock (m);
- _debug ("Connect the context to the server\n");
+ _debug ("Connect the context to the server");
pa_context_connect (context, NULL , flag , NULL);
pa_context_set_state_callback (context, context_state_callback, this);
@@ -170,7 +170,7 @@ PulseLayer::connectPulseAudioServer (void)
// Run the main loop
if (pa_context_get_state (context) != PA_CONTEXT_READY) {
- _debug ("Error connecting to pulse audio server\n");
+ _debug ("Error connecting to pulse audio server");
// pa_threaded_mainloop_unlock (m);
}
@@ -178,13 +178,13 @@ PulseLayer::connectPulseAudioServer (void)
//serverinfo();
//muteAudioApps(99);
- _debug ("Context creation done\n");
+ _debug ("Context creation done");
}
void PulseLayer::context_state_callback (pa_context* c, void* user_data)
{
- _debug ("PulseLayer::context_state_callback ::The state of the context changed\n");
+ _debug ("PulseLayer::context_state_callback ::The state of the context changed");
PulseLayer* pulse = (PulseLayer*) user_data;
assert (c && pulse->m);
@@ -195,22 +195,22 @@ void PulseLayer::context_state_callback (pa_context* c, void* user_data)
case PA_CONTEXT_AUTHORIZING:
case PA_CONTEXT_SETTING_NAME:
- _debug ("Waiting....\n");
+ _debug ("Waiting....");
break;
case PA_CONTEXT_READY:
pulse->createStreams (c);
- _debug ("Connection to PulseAudio server established\n");
+ _debug ("Connection to PulseAudio server established");
break;
case PA_CONTEXT_TERMINATED:
- _debug ("Context terminated\n");
+ _debug ("Context terminated");
break;
case PA_CONTEXT_FAILED:
default:
- _debug (" Error : %s\n" , pa_strerror (pa_context_errno (c)));
+ _debug (" Error : %s" , pa_strerror (pa_context_errno (c)));
pulse->disconnectAudioStream();
exit (0);
break;
@@ -219,7 +219,7 @@ void PulseLayer::context_state_callback (pa_context* c, void* user_data)
bool PulseLayer::disconnectAudioStream (void)
{
- _debug ("PulseLayer::disconnectAudioStream( void ) \n");
+ _debug (" PulseLayer::disconnectAudioStream( void ) ");
closePlaybackStream();
@@ -234,7 +234,7 @@ bool PulseLayer::disconnectAudioStream (void)
bool PulseLayer::createStreams (pa_context* c)
{
- _debug ("PulseLayer::createStreams\n");
+ _debug ("PulseLayer::createStreams");
PulseLayerType * playbackParam = new PulseLayerType();
playbackParam->context = c;
@@ -330,27 +330,27 @@ void PulseLayer::startStream (void)
if (!is_started) {
- _debug ("PulseLayer::Start Stream\n");
+ _debug ("PulseLayer::Start Stream");
if (!m) {
- _debug ("Creating PulseAudio MainLoop\n");
+ _debug ("Creating PulseAudio MainLoop");
m = pa_threaded_mainloop_new();
assert (m);
if (pa_threaded_mainloop_start (m) < 0) {
- _debug ("Failed starting the mainloop\n");
+ _debug ("Failed starting the mainloop");
}
}
if (!context) {
- _debug ("Creating new PulseAudio Context\n");
+ _debug ("Creating new PulseAudio Context");
pa_threaded_mainloop_lock (m);
// Instanciate a context
if (! (context = pa_context_new (pa_threaded_mainloop_get_api (m) , "SFLphone")))
- _debug ("Error while creating the context\n");
+ _debug ("Error while creating the context");
pa_threaded_mainloop_unlock (m);
@@ -377,7 +377,7 @@ PulseLayer::stopStream (void)
if (is_started) {
- _debug ("PulseLayer::Stop Audio Stream\n");
+ _debug ("PulseLayer::Stop Audio Stream");
pa_stream_flush (playback->pulseStream(), NULL, NULL);
pa_stream_flush (record->pulseStream(), NULL, NULL);
@@ -387,7 +387,7 @@ PulseLayer::stopStream (void)
disconnectAudioStream();
- _debug ("Disconnecting PulseAudio context\n");
+ _debug ("Disconnecting PulseAudio context");
if (context) {
@@ -398,7 +398,7 @@ PulseLayer::stopStream (void)
context = NULL;
}
- _debug ("Freeing Pulseaudio mainloop\n");
+ _debug ("Freeing Pulseaudio mainloop");
if (m) {
pa_threaded_mainloop_free (m);
@@ -416,7 +416,7 @@ PulseLayer::stopStream (void)
// void PulseLayer::underflow (pa_stream* s UNUSED, void* userdata UNUSED)
//{
-// _debug ("PulseLayer::Buffer Underflow\n");
+// _debug ("PulseLayer::Buffer Underflow");
//}
/*
@@ -434,7 +434,7 @@ void PulseLayer::processPlaybackData (void)
// Handle the data for the speakers
if (playback && (playback->pulseStream()) && (pa_stream_get_state (playback->pulseStream()) == PA_STREAM_READY)) {
- // _debug("PulseLayer::processPlaybackData()\n");
+ // _debug("PulseLayer::processPlaybackData()");
// If the playback buffer is full, we don't overflow it; wait for it to have free space
if (pa_stream_writable_size (playback->pulseStream()) == 0)
@@ -463,7 +463,7 @@ void PulseLayer::processData (void)
// Handle the data for the speakers
if (playback && (playback->pulseStream()) && (pa_stream_get_state (playback->pulseStream()) == PA_STREAM_READY)) {
- // _debug("PulseLayer::processPlaybackData()\n");
+ // _debug("PulseLayer::processPlaybackData()");
// If the playback buffer is full, we don't overflow it; wait for it to have free space
if (pa_stream_writable_size (playback->pulseStream()) == 0)
@@ -495,17 +495,17 @@ void PulseLayer::writeToSpeaker (void)
int writeableSize = pa_stream_writable_size (playback->pulseStream());
- // _debug("PulseLayer writablesize : %i\n", writeableSize);
+ // _debug("PulseLayer writablesize : %i", writeableSize);
if (writeableSize < 0)
- _debug ("PulseLayer playback error : %s\n", pa_strerror (writeableSize));
+ _debug ("PulseLayer playback error : %s", pa_strerror (writeableSize));
if (urgentAvailBytes > writeableSize) {
- // _debug("urgentAvailBytes: %i\n", urgentAvailBytes);
+ // _debug("urgentAvailBytes: %i", urgentAvailBytes);
- // _debug("Play Urgent!\n");
+ // _debug("Play Urgent!");
out = (SFLDataFormat*) pa_xmalloc (writeableSize);
_urgentRingBuffer.Get (out, writeableSize, 100);
@@ -529,11 +529,11 @@ void PulseLayer::writeToSpeaker (void)
if (tone != 0) {
- // _debug("PlayTone writeableSize: %i\n", writeableSize);
+ // _debug("PlayTone writeableSize: %i", writeableSize);
if (playback->getStreamState() == PA_STREAM_READY) {
- // _debug("Play Sine Tone!\n");
+ // _debug("Play Sine Tone!");
out = (SFLDataFormat*) pa_xmalloc (writeableSize);
int copied = tone->getNext (out, writeableSize / sizeof (SFLDataFormat), 100);
@@ -549,7 +549,7 @@ void PulseLayer::writeToSpeaker (void)
else if (file_tone != 0) {
if (playback->getStreamState() == PA_STREAM_READY) {
- // _debug("Play File Tone!\n");
+ // _debug("Play File Tone!");
out = (SFLDataFormat*) pa_xmalloc (writeableSize);
int copied = file_tone->getNext (out, writeableSize / sizeof (SFLDataFormat), 100);
@@ -587,6 +587,7 @@ void PulseLayer::writeToSpeaker (void)
normalAvailBytes = getMainBuffer()->availForGet();
byteToGet = (normalAvailBytes < (int) (maxNbBytesToGet)) ? normalAvailBytes : maxNbBytesToGet;
+ // _debug("byteToGet: %i", byteToGet);
if (byteToGet) {
@@ -610,7 +611,7 @@ void PulseLayer::writeToSpeaker (void)
int nbSample = _converter->upsampleData ( (SFLDataFormat*) out, rsmpl_out, _mainBufferSampleRate, _audioSampleRate, nb_sample_down);
if ( (nbSample*sizeof (SFLDataFormat)) > (unsigned int) writeableSize)
- _debug ("Error: nbsbyte exceed buffer length\n");
+ _debug ("Error: nbsbyte exceed buffer length");
// pa_threaded_mainloop_lock (m);
pa_stream_write (playback->pulseStream(), rsmpl_out, nbSample*sizeof (SFLDataFormat), NULL, 0, PA_SEEK_RELATIVE);
@@ -661,10 +662,10 @@ void PulseLayer::readFromMic (void)
int readableSize = pa_stream_readable_size (record->pulseStream());
- // _debug("readableSize: %i\n", readableSize);
+ // _debug("readableSize: %i", readableSize);
if (pa_stream_peek (record->pulseStream() , (const void**) &data , &r) < 0 || !data) {
- _debug ("pa_stream_peek() failed: %s\n" , pa_strerror (pa_context_errno (context)));
+ _debug ("pa_stream_peek() failed: %s" , pa_strerror (pa_context_errno (context)));
}
@@ -679,7 +680,7 @@ void PulseLayer::readFromMic (void)
SFLDataFormat* rsmpl_out = (SFLDataFormat*) pa_xmalloc (readableSize);
- // _debug("Byte read: %i\n", r);
+ // _debug("Byte read: %i", r);
int nbSample = r / sizeof (SFLDataFormat);
int nb_sample_up = nbSample;
@@ -705,7 +706,7 @@ void PulseLayer::readFromMic (void)
}
if (pa_stream_drop (record->pulseStream()) < 0) {
- //_debug("pa_stream_drop() failed: %s\n" , pa_strerror( pa_context_errno( context) ));
+ //_debug("pa_stream_drop() failed: %s" , pa_strerror( pa_context_errno( context) ));
}
// pa_threaded_mainloop_unlock (m);
@@ -713,10 +714,10 @@ void PulseLayer::readFromMic (void)
static void retrieve_server_info (pa_context *c UNUSED, const pa_server_info *i, void *userdata UNUSED)
{
- _debug ("Server Info: Process owner : %s\n" , i->user_name);
- _debug ("\t\tServer name : %s - Server version = %s\n" , i->server_name, i->server_version);
- _debug ("\t\tDefault sink name : %s\n" , i->default_sink_name);
- _debug ("\t\tDefault source name : %s\n" , i->default_source_name);
+ _debug ("Server Info: Process owner : %s" , i->user_name);
+ _debug ("\t\tServer name : %s - Server version = %s" , i->server_name, i->server_version);
+ _debug ("\t\tDefault sink name : %s" , i->default_sink_name);
+ _debug ("\t\tDefault source name : %s" , i->default_source_name);
}
static void reduce_sink_list_cb (pa_context *c UNUSED, const pa_sink_input_info *i, int eol, void *userdata)
@@ -724,10 +725,10 @@ static void reduce_sink_list_cb (pa_context *c UNUSED, const pa_sink_input_info
PulseLayer* pulse = (PulseLayer*) userdata;
if (!eol) {
- //_debug("Sink Info: index : %i\n" , i->index);
- //_debug("\t\tClient : %i\n" , i->client);
- //_debug("\t\tVolume : %i\n" , i->volume.values[0]);
- //_debug("\t\tChannels : %i\n" , i->volume.channels);
+ //_debug("Sink Info: index : %i" , i->index);
+ //_debug("\t\tClient : %i" , i->client);
+ //_debug("\t\tVolume : %i" , i->volume.values[0]);
+ //_debug("\t\tChannels : %i" , i->volume.channels);
if (strcmp (i->name , PLAYBACK_STREAM_NAME) != 0)
pulse->setSinkVolume (i->index , i->volume.channels, 10);
}
@@ -738,11 +739,11 @@ static void restore_sink_list_cb (pa_context *c UNUSED, const pa_sink_input_info
PulseLayer* pulse = (PulseLayer*) userdata;
if (!eol) {
- //_debug("Sink Info: index : %i\n" , i->index);
- //_debug("\t\tSink name : -%s-\n" , i->name);
- //_debug("\t\tClient : %i\n" , i->client);
- //_debug("\t\tVolume : %i\n" , i->volume.values[0]);
- //_debug("\t\tChannels : %i\n" , i->volume.channels);
+ //_debug("Sink Info: index : %i" , i->index);
+ //_debug("\t\tSink name : -%s-" , i->name);
+ //_debug("\t\tClient : %i" , i->client);
+ //_debug("\t\tVolume : %i" , i->volume.values[0]);
+ //_debug("\t\tChannels : %i" , i->volume.channels);
if (strcmp (i->name , PLAYBACK_STREAM_NAME) != 0)
pulse->setSinkVolume (i->index , i->volume.channels, 100);
}
@@ -802,7 +803,7 @@ void PulseLayer::setSinkVolume (int index, int channels, int volume)
pa_volume_t vol = PA_VOLUME_NORM * ( (double) volume / 100) ;
pa_cvolume_set (&cvolume , channels , vol);
- _debug ("Set sink volume of index %i\n" , index);
+ _debug ("Set sink volume of index %i" , index);
pa_context_set_sink_input_volume (context, index, &cvolume, NULL, NULL) ;
}
@@ -814,7 +815,7 @@ void PulseLayer::setSourceVolume (int index, int channels, int volume)
pa_volume_t vol = PA_VOLUME_NORM * ( (double) volume / 100) ;
pa_cvolume_set (&cvolume , channels , vol);
- _debug ("Set source volume of index %i\n" , index);
+ _debug ("Set source volume of index %i" , index);
pa_context_set_source_volume_by_index (context, index, &cvolume, NULL, NULL);
}
diff --git a/sflphone-common/src/audio/ringbuffer.cpp b/sflphone-common/src/audio/ringbuffer.cpp
index 0eb146f397cb03b7d377aa39b2122466ff18cb6c..905377a4f12dc32f679156e88c73e84bd8ab4cfe 100644
--- a/sflphone-common/src/audio/ringbuffer.cpp
+++ b/sflphone-common/src/audio/ringbuffer.cpp
@@ -1,391 +1,370 @@
-/*
- * Copyright (C) 2004, 2005, 2006, 2009Savoir-Faire Linux inc.
- * Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
- * Author: Yan Morin <yan.morin@savoirfairelinux.com>
- * Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
- *
- * Portions (c) Dominic Mazzoni (Audacity)
- *
- * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "ringbuffer.h"
-#include "global.h"
-
-#define MIN_BUFFER_SIZE 1280
-
-int RingBuffer::count_rb = 0;
-
-// Create a ring buffer with 'size' bytes
-RingBuffer::RingBuffer (int size, CallID call_id) : mEnd (0)
- , mBufferSize (size > MIN_BUFFER_SIZE ? size : MIN_BUFFER_SIZE)
- , mBuffer (NULL)
- , buffer_id (call_id)
-{
- mBuffer = new unsigned char[mBufferSize];
- assert (mBuffer != NULL);
-
- count_rb++;
-}
-
-// Free memory on object deletion
-RingBuffer::~RingBuffer()
-{
- delete[] mBuffer;
- mBuffer = NULL;
-}
-
-void
-RingBuffer::flush (CallID call_id)
-{
- _debug ("flush: reinit \"%s\" readpointer in \"%s\" ringbuffer\n", call_id.c_str(), buffer_id.c_str());
- storeReadPointer (mEnd, call_id);
-}
-
-
-void
-RingBuffer::flushAll ()
-{
- // _debug("flushall: reinit all readpointer in \"%s\" ringbuffer\n", buffer_id.c_str());
-
- // _debug("------------------------------ flushAll() in \"%s\" ringbuffer\n", buffer_id.c_str());
-
- ReadPointer::iterator iter_pointer = _readpointer.begin();
-
- while (iter_pointer != _readpointer.end()) {
- // _debug("------------------------------ reinit readpointer %s\n", iter_pointer->first.c_str());
- iter_pointer->second = mEnd;
-
- iter_pointer++;
- }
-}
-
-int
-RingBuffer::putLen()
-{
- int mStart;
-
- if (_readpointer.size() >= 1) {
- mStart = getSmallestReadPointer();
- } else {
- mStart = 0;
- }
-
- int length = (mEnd + mBufferSize - mStart) % mBufferSize;
-
- // _debug("RingBuffer::putLen length %i\n", length);
- // _debug(" *RingBuffer::putLen: buffer_id %s, mStart %i, mEnd %i, length %i, buffersie %i\n", buffer_id.c_str(), mStart, mEnd, length, mBufferSize);
- return length;
-}
-
-int
-RingBuffer::getLen (CallID call_id)
-{
-
- int mStart = getReadPointer (call_id);
-
- int length = (mEnd + mBufferSize - mStart) % mBufferSize;
- // _debug(" *RingBuffer::getLen: buffer_id %s, call_id %s, mStart %i, mEnd %i, length %i, buffersie %i\n", buffer_id.c_str(), call_id.c_str(), mStart, mEnd, length, mBufferSize);
- return length;
-
-}
-
-void
-RingBuffer::debug()
-{
- int mStart = getSmallestReadPointer();
-
- _debug ("Start=%d; End=%d; BufferSize=%d\n", mStart, mEnd, mBufferSize);
-}
-
-int
-RingBuffer::getReadPointer (CallID call_id)
-{
-
- if (getNbReadPointer() == 0)
- return 0;
-
- // _debug("RingBuffer::getReadPointer() id %s\n", call_id.c_str());
-
- ReadPointer::iterator iter = _readpointer.find (call_id);
-
- if (iter == _readpointer.end()) {
- // _debug(" RingBuffer::getReadPointer Error read pointer size: %i\n", _readpointer.size());
- // _debug(" RingBuffer::getReadPointer Error read pointer \"%s\" is null\n", call_id.c_str());
- ReadPointer::iterator iter2;
-
- for (iter2 = _readpointer.begin(); iter2 != _readpointer.end(); iter2++) {
- // x_debug(" RingBuffer::getReadPointer list avail pointer \"%s\"\n", iter2->first.c_str());
- }
-
- return 0;
- } else {
- return iter->second;
- }
-
-}
-
-int
-RingBuffer::getSmallestReadPointer()
-{
- if (getNbReadPointer() == 0)
- return 0;
-
- int smallest = mBufferSize;
-
- ReadPointer::iterator iter = _readpointer.begin();
-
- while (iter != _readpointer.end()) {
- if (iter->second < smallest)
- smallest = iter->second;
-
- iter++;
- }
-
- return smallest;
-}
-
-void
-RingBuffer::storeReadPointer (int pointer_value, CallID call_id)
-{
-
- ReadPointer::iterator iter = _readpointer.find (call_id);
-
- if (iter != _readpointer.end()) {
- iter->second = pointer_value;
- // _debug("store read pointer call_id %s, size: %i \n",call_id.c_str(), _readpointer.size());
- } else {
- _debug ("storeReadPointer: Cannot find \"%s\" readPointer in \"%s\" ringbuffer\n", call_id.c_str(), buffer_id.c_str());
- }
-
-}
-
-
-void
-RingBuffer::createReadPointer (CallID call_id)
-{
-
- _debug ("---- createReadPointer ringbuffer_id %s, call_id %s\n", buffer_id.c_str(), call_id.c_str());
-
- _readpointer.insert (pair<CallID, int> (call_id, mEnd));
- _debug ("---- createReadPointer ringbuffer_id %s, size %i\n", buffer_id.c_str(), (int) _readpointer.size());
-
-}
-
-
-void
-RingBuffer::removeReadPointer (CallID call_id)
-{
-
- _debug ("---- removeReadPointer ringbuffer_id %s, call_id %s\n", buffer_id.c_str(), call_id.c_str());
-
- _readpointer.erase (call_id);
- _debug ("---- removeReadPointer ringbuffer_id %s, size %i\n", buffer_id.c_str(), (int) _readpointer.size());
-
-}
-
-
-bool
-RingBuffer::hasThisReadPointer (CallID call_id)
-{
- ReadPointer::iterator iter = _readpointer.find (call_id);
-
- if (iter == _readpointer.end()) {
- return false;
- } else {
- return true;
- }
-}
-
-
-int
-RingBuffer::getNbReadPointer()
-{
- return _readpointer.size();
-}
-
-//
-// For the writer only:
-//
-int
-RingBuffer::AvailForPut()
-{
- // Always keep 4 bytes safe (?)
- // z_debug("RingBuffer::AvailForPut: putLen %i\n", putLen());
- // _debug("RingBuffer::AvailForPut %s --------------------\n", buffer_id.c_str());
- return (mBufferSize-4) - putLen();
-}
-
-// This one puts some data inside the ring buffer.
-// Change the volume if it's not 100
-int
-RingBuffer::Put (void* buffer, int toCopy, unsigned short volume)
-{
- samplePtr src;
- int block;
- int copied;
- int pos;
- // _debug("RingBuffer::Put buffer_id %s, call_id %s --------------------\n", buffer_id.c_str(), call_id.c_str());
- int len = putLen();
- // _debug(" RingBuffer::Put bufferid %s, putlen %i\n", buffer_id.c_str(), len);
-
- if (toCopy > (mBufferSize-4) - len)
- toCopy = (mBufferSize-4) - len;
-
- src = (samplePtr) buffer;
-
-
- copied = 0;
-
- pos = mEnd;
-
- while (toCopy) {
- block = toCopy;
-
- // Wrap block around ring ?
-
- if (block > (mBufferSize - pos)) {
- // Fill in to the end of the buffer
- block = mBufferSize - pos;
- }
-
- // Gain adjustment (when Mic vol. is changed)
- if (volume != 100) {
- SFLDataFormat* start = (SFLDataFormat*) src;
- int nbSample = block / sizeof (SFLDataFormat);
-
- for (int i=0; i<nbSample; i++) {
- start[i] = start[i] * volume / 100;
- }
- }
-
- // bcopy(src, dest, len)
- //fprintf(stderr, "has %d put %d\t", len, block);
- bcopy (src, mBuffer + pos, block);
-
- src += block;
-
- pos = (pos + block) % mBufferSize;
-
- toCopy -= block;
-
- copied += block;
- }
-
- mEnd = pos;
-
- // How many items copied.
- return copied;
-}
-
-//
-// For the reader only:
-//
-
-int
-RingBuffer::AvailForGet (CallID call_id)
-{
- // Used space
- // _debug("RingBuffer::AvailForGet buffer_id %s, call_id %s --------------------\n", buffer_id.c_str(), call_id.c_str());
- return getLen (call_id);
-}
-
-// Get will move 'toCopy' bytes from the internal FIFO to 'buffer'
-int
-RingBuffer::Get (void *buffer, int toCopy, unsigned short volume, CallID call_id)
-{
-
- if (getNbReadPointer() == 0)
- return 0;
-
- if (!hasThisReadPointer (call_id))
- return 0;
-
- samplePtr dest;
-
- int block;
-
- int copied;
-
- // _debug("RingBuffer::Get buffer_id %s, call_id %s --------------------\n", buffer_id.c_str(), call_id.c_str());
- int len = getLen (call_id);
-
- // _debug(" RingBuffer::Get bufferid %s, getlen %i\n", buffer_id.c_str(), len);
-
- if (toCopy > len)
- toCopy = len;
-
- dest = (samplePtr) buffer;
-
- copied = 0;
-
- int mStart = getReadPointer (call_id);
-
- //fprintf(stderr, "G");
- while (toCopy) {
- block = toCopy;
-
- if (block > (mBufferSize - mStart)) {
- block = mBufferSize - mStart;
- }
-
- if (volume!=100) {
- SFLDataFormat* start = (SFLDataFormat*) (mBuffer + mStart);
- int nbSample = block / sizeof (SFLDataFormat);
-
- for (int i=0; i<nbSample; i++) {
- start[i] = start[i] * volume / 100;
- }
- }
-
- // bcopy(src, dest, len)
- bcopy (mBuffer + mStart, dest, block);
-
- dest += block;
-
- mStart = (mStart + block) % mBufferSize;
-
- toCopy -= block;
-
- copied += block;
- }
-
- storeReadPointer (mStart, call_id);
-
- return copied;
-}
-
-// Used to discard some bytes.
-int
-RingBuffer::Discard (int toDiscard, CallID call_id)
-{
- // _debug("RingBuffer::Discard buffer_id %s, call_id %s --------------------\n", buffer_id.c_str(), call_id.c_str());
- int len = getLen (call_id);
-
- int mStart = getReadPointer (call_id);
-
- if (toDiscard > len)
- toDiscard = len;
-
- mStart = (mStart + toDiscard) % mBufferSize;
-
- storeReadPointer (mStart, call_id);
-
- return toDiscard;
-}
+/*
+ * Copyright (C) 2004, 2005, 2006, 2009Savoir-Faire Linux inc.
+ * Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
+ * Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
+ *
+ * Portions (c) Dominic Mazzoni (Audacity)
+ *
+ * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "ringbuffer.h"
+#include "global.h"
+
+#define MIN_BUFFER_SIZE 1280
+
+int RingBuffer::count_rb = 0;
+
+// Create a ring buffer with 'size' bytes
+RingBuffer::RingBuffer (int size, CallID call_id) : mEnd (0)
+ , mBufferSize (size > MIN_BUFFER_SIZE ? size : MIN_BUFFER_SIZE)
+ , mBuffer (NULL)
+ , buffer_id (call_id)
+{
+ mBuffer = new unsigned char[mBufferSize];
+ assert (mBuffer != NULL);
+
+ count_rb++;
+}
+
+// Free memory on object deletion
+RingBuffer::~RingBuffer()
+{
+ delete[] mBuffer;
+ mBuffer = NULL;
+}
+
+void
+RingBuffer::flush (CallID call_id)
+{
+
+ storeReadPointer (mEnd, call_id);
+}
+
+
+void
+RingBuffer::flushAll ()
+{
+
+
+ ReadPointer::iterator iter_pointer = _readpointer.begin();
+
+ while (iter_pointer != _readpointer.end()) {
+
+ iter_pointer->second = mEnd;
+
+ iter_pointer++;
+ }
+}
+
+int
+RingBuffer::putLen()
+{
+ int mStart;
+
+ if (_readpointer.size() >= 1) {
+ mStart = getSmallestReadPointer();
+ } else {
+ mStart = 0;
+ }
+
+ int length = (mEnd + mBufferSize - mStart) % mBufferSize;
+
+ return length;
+}
+
+int
+RingBuffer::getLen (CallID call_id)
+{
+
+ int mStart = getReadPointer (call_id);
+
+ int length = (mEnd + mBufferSize - mStart) % mBufferSize;
+ // _debug(" *RingBuffer::getLen: buffer_id %s, call_id %s, mStart %i, mEnd %i, length %i, buffersie %i", buffer_id.c_str(), call_id.c_str(), mStart, mEnd, length, mBufferSize);
+ return length;
+
+}
+
+void
+RingBuffer::debug()
+{
+ int mStart = getSmallestReadPointer();
+
+ _debug ("Start=%d; End=%d; BufferSize=%d", mStart, mEnd, mBufferSize);
+}
+
+int
+RingBuffer::getReadPointer (CallID call_id)
+{
+
+ if (getNbReadPointer() == 0)
+ return 0;
+
+ ReadPointer::iterator iter = _readpointer.find (call_id);
+
+ if (iter == _readpointer.end()) {
+ return 0;
+ } else {
+ return iter->second;
+ }
+
+}
+
+int
+RingBuffer::getSmallestReadPointer()
+{
+ if (getNbReadPointer() == 0)
+ return 0;
+
+ int smallest = mBufferSize;
+
+ ReadPointer::iterator iter = _readpointer.begin();
+
+ while (iter != _readpointer.end()) {
+ if (iter->second < smallest)
+ smallest = iter->second;
+
+ iter++;
+ }
+
+ return smallest;
+}
+
+void
+RingBuffer::storeReadPointer (int pointer_value, CallID call_id)
+{
+
+ ReadPointer::iterator iter = _readpointer.find (call_id);
+
+ if (iter != _readpointer.end()) {
+ iter->second = pointer_value;
+ } else {
+ _debug ("storeReadPointer: Cannot find \"%s\" readPointer in \"%s\" ringbuffer", call_id.c_str(), buffer_id.c_str());
+ }
+
+}
+
+
+void
+RingBuffer::createReadPointer (CallID call_id)
+{
+
+ _readpointer.insert (pair<CallID, int> (call_id, mEnd));
+
+}
+
+
+void
+RingBuffer::removeReadPointer (CallID call_id)
+{
+
+
+ _readpointer.erase (call_id);
+
+
+}
+
+
+bool
+RingBuffer::hasThisReadPointer (CallID call_id)
+{
+ ReadPointer::iterator iter = _readpointer.find (call_id);
+
+ if (iter == _readpointer.end()) {
+ return false;
+ } else {
+ return true;
+ }
+}
+
+
+int
+RingBuffer::getNbReadPointer()
+{
+ return _readpointer.size();
+}
+
+//
+// For the writer only:
+//
+int
+RingBuffer::AvailForPut()
+{
+ // Always keep 4 bytes safe (?)
+
+ return (mBufferSize-4) - putLen();
+}
+
+// This one puts some data inside the ring buffer.
+// Change the volume if it's not 100
+int
+RingBuffer::Put (void* buffer, int toCopy, unsigned short volume)
+{
+ samplePtr src;
+ int block;
+ int copied;
+ int pos;
+
+ int len = putLen();
+
+
+ if (toCopy > (mBufferSize-4) - len)
+ toCopy = (mBufferSize-4) - len;
+
+ src = (samplePtr) buffer;
+
+
+ copied = 0;
+
+ pos = mEnd;
+
+ while (toCopy) {
+ block = toCopy;
+
+ // Wrap block around ring ?
+
+ if (block > (mBufferSize - pos)) {
+ // Fill in to the end of the buffer
+ block = mBufferSize - pos;
+ }
+
+ // Gain adjustment (when Mic vol. is changed)
+ if (volume != 100) {
+ SFLDataFormat* start = (SFLDataFormat*) src;
+ int nbSample = block / sizeof (SFLDataFormat);
+
+ for (int i=0; i<nbSample; i++) {
+ start[i] = start[i] * volume / 100;
+ }
+ }
+
+ // bcopy(src, dest, len)
+ //fprintf(stderr, "has %d put %d\t", len, block);
+ bcopy (src, mBuffer + pos, block);
+
+ src += block;
+
+ pos = (pos + block) % mBufferSize;
+
+ toCopy -= block;
+
+ copied += block;
+ }
+
+ mEnd = pos;
+
+ // How many items copied.
+ return copied;
+}
+
+//
+// For the reader only:
+//
+
+int
+RingBuffer::AvailForGet (CallID call_id)
+{
+ // Used space
+
+ return getLen (call_id);
+}
+
+// Get will move 'toCopy' bytes from the internal FIFO to 'buffer'
+int
+RingBuffer::Get (void *buffer, int toCopy, unsigned short volume, CallID call_id)
+{
+
+ if (getNbReadPointer() == 0)
+ return 0;
+
+ if (!hasThisReadPointer (call_id))
+ return 0;
+
+ samplePtr dest;
+
+ int block;
+
+ int copied;
+
+
+ int len = getLen (call_id);
+
+
+ if (toCopy > len)
+ toCopy = len;
+
+ dest = (samplePtr) buffer;
+
+ copied = 0;
+
+ int mStart = getReadPointer (call_id);
+
+ //fprintf(stderr, "G");
+ while (toCopy) {
+ block = toCopy;
+
+ if (block > (mBufferSize - mStart)) {
+ block = mBufferSize - mStart;
+ }
+
+ if (volume!=100) {
+ SFLDataFormat* start = (SFLDataFormat*) (mBuffer + mStart);
+ int nbSample = block / sizeof (SFLDataFormat);
+
+ for (int i=0; i<nbSample; i++) {
+ start[i] = start[i] * volume / 100;
+ }
+ }
+
+ // bcopy(src, dest, len)
+ bcopy (mBuffer + mStart, dest, block);
+
+ dest += block;
+
+ mStart = (mStart + block) % mBufferSize;
+
+ toCopy -= block;
+
+ copied += block;
+ }
+
+ storeReadPointer (mStart, call_id);
+
+ return copied;
+}
+
+// Used to discard some bytes.
+int
+RingBuffer::Discard (int toDiscard, CallID call_id)
+{
+
+ int len = getLen (call_id);
+
+ int mStart = getReadPointer (call_id);
+
+ if (toDiscard > len)
+ toDiscard = len;
+
+ mStart = (mStart + toDiscard) % mBufferSize;
+
+ storeReadPointer (mStart, call_id);
+
+ return toDiscard;
+}
diff --git a/sflphone-common/src/audio/ringbuffer.h b/sflphone-common/src/audio/ringbuffer.h
index ac559e98c1db50c4571d33f8ea97e5c508e03125..96871f825db937f91a9cb1a3c6e1ed44f9d4a8cf 100644
--- a/sflphone-common/src/audio/ringbuffer.h
+++ b/sflphone-common/src/audio/ringbuffer.h
@@ -57,9 +57,10 @@ class RingBuffer {
void flushAll();
-
int getReadPointer(CallID call_id = default_id);
+ ReadPointer* getReadPointerList() { return &_readpointer; }
+
int getSmallestReadPointer();
void storeReadPointer(int pointer_value, CallID call_id = default_id);
diff --git a/sflphone-common/src/audio/samplerateconverter.cpp b/sflphone-common/src/audio/samplerateconverter.cpp
index 29a3cc286bb27a2da04c38b1087309fd00495fc1..8d115a25560149e1a0b73c54f91d7fea26ace8a3 100644
--- a/sflphone-common/src/audio/samplerateconverter.cpp
+++ b/sflphone-common/src/audio/samplerateconverter.cpp
@@ -104,7 +104,7 @@ int SamplerateConverter::upsampleData (SFLDataFormat* dataIn , SFLDataFormat* da
{
double upsampleFactor = (double) samplerate2 / samplerate1 ;
- //_debug("factor = %f\n" , upsampleFactor);
+ //_debug("factor = %f" , upsampleFactor);
int nbSamplesMax = (int) (samplerate2 * getFramesize() / 1000);
nbSamplesMax = nbSamplesMax*4;
@@ -116,16 +116,16 @@ int SamplerateConverter::upsampleData (SFLDataFormat* dataIn , SFLDataFormat* da
src_data.output_frames = (int) floor (upsampleFactor * nbSamples);
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);
+ // _debug(" upsample %d %d %f %d" , src_data.input_frames , src_data.output_frames, src_data.src_ratio , 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);
+ //_debug("upsample %d %f %d" , 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);
+ // _debug(" upsample %d %d %d" , samplerate1, samplerate2 , nbSamples);
nbSamples = (src_data.output_frames_gen > nbSamplesMax) ? nbSamplesMax : src_data.output_frames_gen;
src_float_to_short_array (_floatBufferUpSpkr, dataOut, nbSamples);
- //_debug("upsample %d %d %d\n" , samplerate1, samplerate2 , nbSamples);
+ //_debug("upsample %d %d %d" , samplerate1, samplerate2 , nbSamples);
}
return nbSamples;
@@ -136,7 +136,7 @@ int SamplerateConverter::downsampleData (SFLDataFormat* dataIn , SFLDataFormat*
{
double downsampleFactor = (double) samplerate1 / samplerate2;
- //_debug("factor = %f\n" , downsampleFactor);
+ //_debug("factor = %f" , downsampleFactor);
int nbSamplesMax = (int) (samplerate1 * getFramesize() / 1000);
nbSamplesMax = nbSamplesMax*4;
@@ -149,15 +149,15 @@ int SamplerateConverter::downsampleData (SFLDataFormat* dataIn , SFLDataFormat*
src_data.output_frames = (int) floor (downsampleFactor * nbSamples);
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);
+ //_debug("downsample %d %f %d" , src_data.output_frames, src_data.src_ratio , 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);
+ //_debug("downsample %d %f %d" , 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);
+ //_debug("downsample %d %f %d" , src_data.output_frames, src_data.src_ratio , nbSamples);
nbSamples = (src_data.output_frames_gen > nbSamplesMax) ? nbSamplesMax : src_data.output_frames_gen;
- //_debug("downsample %d %f %d\n" , src_data.output_frames, src_data.src_ratio , nbSamples);
+ //_debug("downsample %d %f %d" , src_data.output_frames, src_data.src_ratio , nbSamples);
src_float_to_short_array (_floatBufferDownMic , dataOut , nbSamples);
}
diff --git a/sflphone-common/src/audio/sound/audiofile.cpp b/sflphone-common/src/audio/sound/audiofile.cpp
index 136938a1a5644f3f56dde8d3933ed6c89feff393..f11b43cbe634026c17109769bd71f6fff15ad5f9 100644
--- a/sflphone-common/src/audio/sound/audiofile.cpp
+++ b/sflphone-common/src/audio/sound/audiofile.cpp
@@ -63,7 +63,7 @@ AudioFile::loadFile (const std::string& filename, AudioCodec* codec , unsigned i
// no filename to load
if (filename.empty()) {
- _debug ("Unable to open audio file: filename is empty\n");
+ _debug ("Unable to open audio file: filename is empty");
return false;
}
@@ -73,7 +73,7 @@ AudioFile::loadFile (const std::string& filename, AudioCodec* codec , unsigned i
if (!file.is_open()) {
// unable to load the file
- _debug ("Unable to open audio file %s\n", filename.c_str());
+ _debug ("Unable to open audio file %s", filename.c_str());
return false;
}
diff --git a/sflphone-common/src/conference.cpp b/sflphone-common/src/conference.cpp
index 6266a30323c8d47f695e03eccd57c774634290cd..b2e6c51c750b7d7cdd947763b0e0a29bf4ca721e 100644
--- a/sflphone-common/src/conference.cpp
+++ b/sflphone-common/src/conference.cpp
@@ -71,7 +71,7 @@ void Conference::setState (ConferenceState state)
void Conference::add (CallID participant_id)
{
- _debug ("---- Conference:: add participant %s\n", participant_id.c_str());
+ _debug ("Conference:: add participant %s", participant_id.c_str());
_participants.insert (participant_id);
@@ -82,7 +82,8 @@ void Conference::add (CallID participant_id)
void Conference::remove (CallID participant_id)
{
- _debug ("---- Conference::remove participant %s\n", participant_id.c_str());
+
+ _debug ("Conference::remove participant %s", participant_id.c_str());
_participants.erase (participant_id);
@@ -99,8 +100,6 @@ void Conference::bindParticipant (CallID participant_id)
while (iter != _participants.end()) {
if (participant_id != (*iter)) {
-
- _debug ("---- Conference:: bind callid %s with %s in conference add\n", participant_id.c_str(), (*iter).c_str());
Manager::instance().getAudioDriver()->getMainBuffer()->bindCallID (participant_id, *iter);
}
@@ -109,7 +108,6 @@ void Conference::bindParticipant (CallID participant_id)
}
- _debug ("---- Conference::bind callid %s with default_id in conference add\n", participant_id.c_str());
Manager::instance().getAudioDriver()->getMainBuffer()->bindCallID (participant_id);
diff --git a/sflphone-common/src/config/config.cpp b/sflphone-common/src/config/config.cpp
index ec3f7bab8d0aef52ccd09d720cf020b1c3ce558e..e1565119515e2f34d8c92664b4ed204439186295 100644
--- a/sflphone-common/src/config/config.cpp
+++ b/sflphone-common/src/config/config.cpp
@@ -26,6 +26,7 @@
#include <sys/stat.h>
#include <errno.h>
#include <iostream>
+#include <string.h>
namespace Conf
{
@@ -59,7 +60,6 @@ void ConfigTree::addDefaultValue (const std::pair<std::string, std::string>& tok
std::string ConfigTree::getDefaultValue (const std::string& key)
{
- _debug ("Getting default value for %s\n", key.c_str());
std::map<std::string, std::string>::iterator it;
it = _defaultValueMap.find (key);
@@ -147,8 +147,6 @@ ConfigTree::getConfigTreeItemValue (const std::string& section, const std::strin
return item->getValue();
}
- _debug ("Option doesn't exist: [%s] %s\n", section.c_str(), itemName.c_str());
-
return getDefaultValue (itemName);
}
@@ -292,7 +290,7 @@ 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));
+ _debug ("Failed to set permission on configuration file because: %s",strerror (errno));
}
return true;
@@ -373,7 +371,7 @@ 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));
+ _debug ("Failed to set permission on configuration file because: %s",strerror (errno));
}
return 1;
diff --git a/sflphone-common/src/dbus/Makefile.am b/sflphone-common/src/dbus/Makefile.am
index 5ca2e42eeb78da476df2e00f775a9dfae787cdeb..a3c5dbbf0c81d5e11e84f0ec676aaebc8f036be9 100644
--- a/sflphone-common/src/dbus/Makefile.am
+++ b/sflphone-common/src/dbus/Makefile.am
@@ -17,9 +17,16 @@ libdbus_la_SOURCES = \
callmanager.cpp \
configurationmanager.cpp \
instance.cpp \
- dbusmanagerimpl.cpp
+ dbusmanagerimpl.cpp \
+ networkmanager.cpp
-libdbus_la_CXXFLAGS = -DPREFIX=\"$(prefix)\" -DPROGSHAREDIR=\"${datadir}/sflphone\"
+if USE_NETWORKMANAGER
+NETWORKMANAGER=-DUSE_NETWORKMANAGER
+else
+NETWORKMANAGER=
+endif
+
+libdbus_la_CXXFLAGS = -DPREFIX=\"$(prefix)\" -DPROGSHAREDIR=\"${datadir}/sflphone\" $(NETWORKMANAGER)
libdbus_la_LIBADD = $(top_srcdir)/libs/dbus-c++/src/libdbus-c++-1.la
@@ -29,6 +36,8 @@ noinst_HEADERS = \
instance.h \
dbusmanager.h \
dbusmanagerimpl.h \
+ networkmanager_proxy.h \
+ networkmanager.h \
$(BUILT_SOURCES)
# Dbus service file
diff --git a/sflphone-common/src/dbus/callmanager.cpp b/sflphone-common/src/dbus/callmanager.cpp
index 7cb135ff384cfddcdd268426d4bd23aae1ab21bc..3c3306fda8106fe19caf2479ce509c0346e3591c 100644
--- a/sflphone-common/src/dbus/callmanager.cpp
+++ b/sflphone-common/src/dbus/callmanager.cpp
@@ -39,31 +39,31 @@ CallManager::placeCall (const std::string& accountID,
const std::string& callID,
const std::string& to)
{
- _debug ("CallManager::placeCall received\n");
+ _debug ("CallManager::placeCall received");
// Check if a destination number is available
- if (to == "") _debug ("No number entered - Call stopped\n");
+ if (to == "") _debug ("No number entered - Call stopped");
else Manager::instance().outgoingCall (accountID, callID, to);
}
void
CallManager::refuse (const std::string& callID)
{
- _debug ("CallManager::refuse received\n");
+ _debug ("CallManager::refuse received");
Manager::instance().refuseCall (callID);
}
void
CallManager::accept (const std::string& callID)
{
- _debug ("CallManager::accept received\n");
+ _debug ("CallManager::accept received");
Manager::instance().answerCall (callID);
}
void
CallManager::hangUp (const std::string& callID)
{
- _debug ("CallManager::hangUp received %s\n", callID.c_str());
+ _debug ("CallManager::hangUp received %s", callID.c_str());
Manager::instance().hangupCall (callID);
}
@@ -71,7 +71,7 @@ CallManager::hangUp (const std::string& callID)
void
CallManager::hangUpConference (const std::string& confID)
{
- _debug ("CallManager::hangUpConference received %s\n", confID.c_str());
+ _debug ("CallManager::hangUpConference received %s", confID.c_str());
Manager::instance().hangupConference (confID);
}
@@ -80,7 +80,7 @@ CallManager::hangUpConference (const std::string& confID)
void
CallManager::hold (const std::string& callID)
{
- _debug ("CallManager::hold received %s\n", callID.c_str());
+ _debug ("CallManager::hold received %s", callID.c_str());
Manager::instance().onHoldCall (callID);
}
@@ -88,14 +88,14 @@ CallManager::hold (const std::string& callID)
void
CallManager::unhold (const std::string& callID)
{
- _debug ("CallManager::unhold received %s\n", callID.c_str());
+ _debug ("CallManager::unhold received %s", callID.c_str());
Manager::instance().offHoldCall (callID);
}
void
CallManager::transfert (const std::string& callID, const std::string& to)
{
- _debug ("CallManager::transfert received\n");
+ _debug ("CallManager::transfert received");
Manager::instance().transferCall (callID, to);
}
@@ -104,7 +104,7 @@ CallManager::transfert (const std::string& callID, const std::string& to)
void
CallManager::setVolume (const std::string& device, const double& value)
{
- _debug ("CallManager::setVolume received\n");
+ _debug ("CallManager::setVolume received");
if (device == "speaker") {
Manager::instance().setSpkrVolume ( (int) (value*100.0));
@@ -118,13 +118,13 @@ CallManager::setVolume (const std::string& device, const double& value)
double
CallManager::getVolume (const std::string& device)
{
- _debug ("CallManager::getVolume received \n");
+ _debug ("CallManager::getVolume received ");
if (device == "speaker") {
- _debug ("Current speaker = %d\n", Manager::instance().getSpkrVolume());
+ _debug ("Current speaker = %d", Manager::instance().getSpkrVolume());
return Manager::instance().getSpkrVolume() /100.0;
} else if (device == "mic") {
- _debug ("Current mic = %d\n", Manager::instance().getMicVolume());
+ _debug ("Current mic = %d", Manager::instance().getMicVolume());
return Manager::instance().getMicVolume() /100.0;
}
@@ -134,63 +134,63 @@ CallManager::getVolume (const std::string& device)
void
CallManager::joinParticipant (const std::string& sel_callID, const std::string& drag_callID)
{
- _debug ("CallManager::joinParticipant received %s, %s\n", sel_callID.c_str(), drag_callID.c_str());
+ _debug ("CallManager::joinParticipant received %s, %s", sel_callID.c_str(), drag_callID.c_str());
Manager::instance().joinParticipant (sel_callID, drag_callID);
}
void
CallManager::addParticipant (const std::string& callID, const std::string& confID)
{
- _debug ("CallManager::addParticipant received %s, %s\n", callID.c_str(), confID.c_str());
+ _debug ("CallManager::addParticipant received %s, %s", callID.c_str(), confID.c_str());
Manager::instance().addParticipant (callID, confID);
}
void
CallManager::addMainParticipant (const std::string& confID)
{
- _debug ("CallManager::addMainParticipant received %s\n", confID.c_str());
+ _debug ("CallManager::addMainParticipant received %s", confID.c_str());
Manager::instance().addMainParticipant (confID);
}
void
CallManager::detachParticipant (const std::string& callID)
{
- _debug ("CallManager::detachParticipant received %s\n", callID.c_str());
+ _debug ("CallManager::detachParticipant received %s", callID.c_str());
Manager::instance().detachParticipant (callID, "");
}
void
CallManager::joinConference (const std::string& sel_confID, const std::string& drag_confID)
{
- _debug ("CallManager::joinConference received %s, %s\n", sel_confID.c_str(), drag_confID.c_str());
+ _debug ("CallManager::joinConference received %s, %s", sel_confID.c_str(), drag_confID.c_str());
Manager::instance().joinConference (sel_confID, drag_confID);
}
void
CallManager::holdConference (const std::string& confID)
{
- _debug ("CallManager::holdConference received %s\n", confID.c_str());
+ _debug ("CallManager::holdConference received %s", confID.c_str());
Manager::instance().holdConference (confID);
}
void
CallManager::unholdConference (const std::string& confID)
{
- _debug ("CallManager::unHoldConference received %s\n", confID.c_str());
+ _debug ("CallManager::unHoldConference received %s", confID.c_str());
Manager::instance().unHoldConference (confID);
}
std::map< std::string, std::string >
CallManager::getConferenceDetails (const std::string& callID)
{
- _debug ("CallManager::getCallDetails received\n");
+ _debug ("CallManager::getCallDetails received");
return Manager::instance().getConferenceDetails (callID);
}
std::vector< std::string >
CallManager::getConferenceList (void)
{
- _debug ("CallManager::getConferenceList\n");
+ _debug ("CallManager::getConferenceList");
return Manager::instance().getConferenceList();
}
@@ -203,14 +203,14 @@ CallManager::getParticipantList (const std::string& confID)
void
CallManager::setRecording (const std::string& callID)
{
- _debug ("CallManager::setRecording received\n");
+ _debug ("CallManager::setRecording received");
Manager::instance().setRecordingCall (callID);
}
bool
CallManager::getIsRecording (const std::string& callID)
{
- _debug ("CallManager::getIsRecording received \n");
+ _debug ("CallManager::getIsRecording received ");
return Manager::instance().isRecording (callID);
}
@@ -218,7 +218,7 @@ CallManager::getIsRecording (const std::string& callID)
std::string
CallManager::getCurrentCodecName (const std::string& callID)
{
- _debug ("CallManager::getCurrentCodecName received %s \n",Manager::instance().getCurrentCodecName (callID).c_str());
+ _debug ("CallManager::getCurrentCodecName received %s ",Manager::instance().getCurrentCodecName (callID).c_str());
return Manager::instance().getCurrentCodecName (callID).c_str();
}
@@ -226,7 +226,7 @@ CallManager::getCurrentCodecName (const std::string& callID)
std::map< std::string, std::string >
CallManager::getCallDetails (const std::string& callID)
{
- _debug ("CallManager::getCallDetails received\n");
+ _debug ("CallManager::getCallDetails received");
return Manager::instance().getCallDetails (callID);
}
@@ -239,7 +239,7 @@ CallManager::getCallList (void)
std::string
CallManager::getCurrentCallID()
{
- _debug ("CallManager::getCurrentCallID received\n");
+ _debug ("CallManager::getCurrentCallID received");
return Manager::instance().getCurrentCallId();
}
@@ -271,7 +271,7 @@ sfl::AudioZrtpSession * CallManager::getAudioZrtpSession (const std::string& cal
link = dynamic_cast<SIPVoIPLink *> (Manager::instance().getAccountLink (AccountNULL));
if (link == NULL) {
- _debug ("Failed to get sip link\n");
+ _debug ("Failed to get sip link");
throw CallManagerException();
}
@@ -281,7 +281,7 @@ sfl::AudioZrtpSession * CallManager::getAudioZrtpSession (const std::string& cal
audioRtp = call->getAudioRtp();
if (audioRtp == NULL) {
- _debug ("Failed to get AudioRtpFactory\n");
+ _debug ("Failed to get AudioRtpFactory");
throw CallManagerException();
}
@@ -290,7 +290,7 @@ sfl::AudioZrtpSession * CallManager::getAudioZrtpSession (const std::string& cal
zSession = audioRtp->getAudioZrtpSession();
if (zSession == NULL) {
- _debug ("Failed to get AudioZrtpSession\n");
+ _debug ("Failed to get AudioZrtpSession");
throw CallManagerException();
}
@@ -300,7 +300,7 @@ sfl::AudioZrtpSession * CallManager::getAudioZrtpSession (const std::string& cal
void
CallManager::setSASVerified (const std::string& callID)
{
- _debug ("CallManager::setSASVerified received for account %s\n", callID.c_str());
+ _debug ("CallManager::setSASVerified received for account %s", callID.c_str());
try {
sfl::AudioZrtpSession * zSession;
@@ -315,7 +315,7 @@ CallManager::setSASVerified (const std::string& callID)
void
CallManager::resetSASVerified (const std::string& callID)
{
- _debug ("CallManager::resetSASVerified received for account %s\n", callID.c_str());
+ _debug ("CallManager::resetSASVerified received for account %s", callID.c_str());
try {
sfl::AudioZrtpSession * zSession;
@@ -330,7 +330,7 @@ CallManager::resetSASVerified (const std::string& callID)
void
CallManager::setConfirmGoClear (const std::string& callID)
{
- _debug ("CallManager::setConfirmGoClear received for account %s\n", callID.c_str());
+ _debug ("CallManager::setConfirmGoClear received for account %s", callID.c_str());
try {
sfl::AudioZrtpSession * zSession;
@@ -345,7 +345,7 @@ CallManager::setConfirmGoClear (const std::string& callID)
void
CallManager::requestGoClear (const std::string& callID)
{
- _debug ("CallManager::requestGoClear received for account %s\n", callID.c_str());
+ _debug ("CallManager::requestGoClear received for account %s", callID.c_str());
try {
sfl::AudioZrtpSession * zSession;
@@ -361,7 +361,7 @@ void
CallManager::acceptEnrollment (const std::string& callID, const bool& accepted)
{
- _debug ("CallManager::acceptEnrollment received for account %s\n", callID.c_str());
+ _debug ("CallManager::acceptEnrollment received for account %s", callID.c_str());
try {
sfl::AudioZrtpSession * zSession;
@@ -377,7 +377,7 @@ void
CallManager::setPBXEnrollment (const std::string& callID, const bool& yesNo)
{
- _debug ("CallManager::setPBXEnrollment received for account %s\n", callID.c_str());
+ _debug ("CallManager::setPBXEnrollment received for account %s", callID.c_str());
try {
sfl::AudioZrtpSession * zSession;
diff --git a/sflphone-common/src/dbus/configurationmanager-introspec.xml b/sflphone-common/src/dbus/configurationmanager-introspec.xml
index 4a1e2c286f5ef24d4854c759a0f12149424249c8..018917eaa4db5f890284d00d99d93be1b6871747 100644
--- a/sflphone-common/src/dbus/configurationmanager-introspec.xml
+++ b/sflphone-common/src/dbus/configurationmanager-introspec.xml
@@ -290,13 +290,6 @@
<method name="switchPopupMode">
</method>
- <method name="setSipAddress">
- <arg type="s" name="address" direction="in"/>
- </method>
-
- <method name="getSipAddress">
- <arg type="i" name="address" direction="out"/>
- </method>
<!-- Addressbook configuration -->
<method name="getAddressbookSettings">
@@ -369,11 +362,21 @@
<arg type="s" name="accountID" direction="in"/>
<arg type="a{ss}" name="details" direction="in"/>
</method>
-
+
+ <method name="getAddrFromInterfaceName">
+ <arg type="s" name="interface" direction="in"/>
+ <arg type="s" name="address" direction="out"/>
+ </method>
+
<method name="getAllIpInterface">
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="list" direction="out"/>
</method>
+
+ <method name="getAllIpInterfaceByName">
+ <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+ <arg type="as" name="list" direction="out"/>
+ </method>
</interface>
</node>
diff --git a/sflphone-common/src/dbus/configurationmanager.cpp b/sflphone-common/src/dbus/configurationmanager.cpp
index 8b36efbca5fb58833aa10c7e6ad31aeb1f9b84d8..82f7b6dda2262969406a1ea1dd7b532f919842a1 100644
--- a/sflphone-common/src/dbus/configurationmanager.cpp
+++ b/sflphone-common/src/dbus/configurationmanager.cpp
@@ -38,14 +38,14 @@ ConfigurationManager::ConfigurationManager (DBus::Connection& connection)
std::map< std::string, std::string >
ConfigurationManager::getAccountDetails (const std::string& accountID)
{
- _debug ("ConfigurationManager::getAccountDetails\n");
+ _debug ("ConfigurationManager::getAccountDetails");
return Manager::instance().getAccountDetails (accountID);
}
std::map< std::string, std::string >
ConfigurationManager::getTlsSettingsDefault (void)
{
- _debug ("ConfigurationManager::getTlsDefaultSettings\n");
+ _debug ("ConfigurationManager::getTlsDefaultSettings");
std::map<std::string, std::string> tlsSettingsDefault;
tlsSettingsDefault.insert (std::pair<std::string, std::string> (TLS_CA_LIST_FILE, ""));
@@ -77,7 +77,7 @@ ConfigurationManager::getIp2IpDetails (void)
ip2ipAccountDetails.insert (std::pair<std::string, std::string> (ZRTP_NOT_SUPP_WARNING, Manager::instance().getConfigString (IP2IP_PROFILE, ZRTP_NOT_SUPP_WARNING)));
ip2ipAccountDetails.insert (std::pair<std::string, std::string> (ZRTP_DISPLAY_SAS_ONCE, Manager::instance().getConfigString (IP2IP_PROFILE, ZRTP_DISPLAY_SAS_ONCE)));
- ip2ipAccountDetails.insert (std::pair<std::string, std::string> (LOCAL_ADDRESS, Manager::instance().getConfigString (IP2IP_PROFILE, LOCAL_ADDRESS)));
+ ip2ipAccountDetails.insert (std::pair<std::string, std::string> (LOCAL_INTERFACE, Manager::instance().getConfigString(IP2IP_PROFILE, LOCAL_INTERFACE)));
ip2ipAccountDetails.insert (std::pair<std::string, std::string> (LOCAL_PORT, Manager::instance().getConfigString (IP2IP_PROFILE, LOCAL_PORT)));
std::map<std::string, std::string> tlsSettings;
@@ -94,10 +94,10 @@ ConfigurationManager::setIp2IpDetails (const std::map< std::string, std::string
std::map<std::string, std::string> map_cpy = details;
std::map<std::string, std::string>::iterator it;
- it = map_cpy.find (LOCAL_ADDRESS);
+ it = map_cpy.find (LOCAL_INTERFACE);
if (it != details.end()) {
- Manager::instance().setConfig (IP2IP_PROFILE, LOCAL_ADDRESS, it->second);
+ Manager::instance().setConfig (IP2IP_PROFILE, LOCAL_INTERFACE, it->second);
}
it = map_cpy.find (LOCAL_PORT);
@@ -272,7 +272,7 @@ ConfigurationManager::setTlsSettings (const std::string& section, const std::map
std::map< std::string, std::string >
ConfigurationManager::getCredential (const std::string& accountID, const int32_t& index)
{
- _debug ("ConfigurationManager::getCredential number %i for accountID %s\n", index, accountID.c_str());
+ _debug ("ConfigurationManager::getCredential number %i for accountID %s", index, accountID.c_str());
std::string credentialIndex;
std::stringstream streamOut;
@@ -296,7 +296,7 @@ ConfigurationManager::getCredential (const std::string& accountID, const int32_t
int32_t
ConfigurationManager::getNumberOfCredential (const std::string& accountID)
{
- _debug ("ConfigurationManager::getNumberOfCredential\n");
+ _debug ("ConfigurationManager::getNumberOfCredential");
return Manager::instance().getConfigInt (accountID, CONFIG_CREDENTIAL_NUMBER);
}
@@ -312,14 +312,14 @@ void
ConfigurationManager::setCredential (const std::string& accountID, const int32_t& index,
const std::map< std::string, std::string >& details)
{
- _debug ("ConfigurationManager::setCredential received\n");
+ _debug ("ConfigurationManager::setCredential received");
Manager::instance().setCredential (accountID, index, details);
}
void
ConfigurationManager::deleteAllCredential (const std::string& accountID)
{
- _debug ("ConfigurationManager::deleteAllCredential received\n");
+ _debug ("ConfigurationManager::deleteAllCredential received");
Manager::instance().deleteAllCredential (accountID);
}
@@ -327,21 +327,21 @@ void
ConfigurationManager::setAccountDetails (const std::string& accountID,
const std::map< std::string, std::string >& details)
{
- _debug ("ConfigurationManager::setAccountDetails received\n");
+ _debug ("ConfigurationManager::setAccountDetails received");
Manager::instance().setAccountDetails (accountID, details);
}
void
ConfigurationManager::sendRegister (const std::string& accountID, const int32_t& expire)
{
- _debug ("ConfigurationManager::sendRegister received\n");
+ _debug ("ConfigurationManager::sendRegister received");
Manager::instance().sendRegister (accountID, expire);
}
std::string
ConfigurationManager::addAccount (const std::map< std::string, std::string >& details)
{
- _debug ("ConfigurationManager::addAccount received\n");
+ _debug ("ConfigurationManager::addAccount received");
return Manager::instance().addAccount (details);
}
@@ -349,14 +349,14 @@ ConfigurationManager::addAccount (const std::map< std::string, std::string >& de
void
ConfigurationManager::removeAccount (const std::string& accoundID)
{
- _debug ("ConfigurationManager::removeAccount received\n");
+ _debug ("ConfigurationManager::removeAccount received");
return Manager::instance().removeAccount (accoundID);
}
std::vector< std::string >
ConfigurationManager::getAccountList()
{
- _debug ("ConfigurationManager::getAccountList received\n");
+ _debug ("ConfigurationManager::getAccountList received");
return Manager::instance().getAccountList();
}
@@ -365,7 +365,7 @@ std::vector< std::string >
ConfigurationManager::getToneLocaleList()
{
std::vector< std::string > ret;
- _debug ("ConfigurationManager::getToneLocaleList received\n");
+ _debug ("ConfigurationManager::getToneLocaleList received");
return ret;
}
@@ -374,7 +374,7 @@ std::string
ConfigurationManager::getVersion()
{
std::string ret ("");
- _debug ("ConfigurationManager::getVersion received\n");
+ _debug ("ConfigurationManager::getVersion received");
return ret;
}
@@ -383,7 +383,7 @@ std::vector< std::string >
ConfigurationManager::getRingtoneList()
{
std::vector< std::string > ret;
- _debug ("ConfigurationManager::getRingtoneList received\n");
+ _debug ("ConfigurationManager::getRingtoneList received");
return ret;
}
@@ -392,14 +392,14 @@ ConfigurationManager::getRingtoneList()
std::vector< std::string >
ConfigurationManager::getCodecList (void)
{
- _debug ("ConfigurationManager::getCodecList received\n");
+ _debug ("ConfigurationManager::getCodecList received");
return Manager::instance().getCodecList();
}
std::vector<std::string>
ConfigurationManager::getSupportedTlsMethod (void)
{
- _debug ("ConfigurationManager::getSupportedTlsMethod received\n");
+ _debug ("ConfigurationManager::getSupportedTlsMethod received");
std::vector<std::string> method;
method.push_back ("Default");
method.push_back ("TLSv1");
@@ -412,21 +412,21 @@ ConfigurationManager::getSupportedTlsMethod (void)
std::vector< std::string >
ConfigurationManager::getCodecDetails (const int32_t& payload)
{
- _debug ("ConfigurationManager::getCodecDetails received\n");
+ _debug ("ConfigurationManager::getCodecDetails received");
return Manager::instance().getCodecDetails (payload);
}
std::vector< std::string >
ConfigurationManager::getActiveCodecList()
{
- _debug ("ConfigurationManager::getActiveCodecList received\n");
+ _debug ("ConfigurationManager::getActiveCodecList received");
return Manager::instance().getActiveCodecList();
}
void
ConfigurationManager::setActiveCodecList (const std::vector< std::string >& list)
{
- _debug ("ConfigurationManager::setActiveCodecList received\n");
+ _debug ("ConfigurationManager::setActiveCodecList received");
Manager::instance().setActiveCodecList (list);
}
@@ -434,77 +434,77 @@ ConfigurationManager::setActiveCodecList (const std::vector< std::string >& list
std::vector< std::string >
ConfigurationManager::getInputAudioPluginList()
{
- _debug ("ConfigurationManager::getInputAudioPluginList received\n");
+ _debug ("ConfigurationManager::getInputAudioPluginList received");
return Manager::instance().getInputAudioPluginList();
}
std::vector< std::string >
ConfigurationManager::getOutputAudioPluginList()
{
- _debug ("ConfigurationManager::getOutputAudioPluginList received\n");
+ _debug ("ConfigurationManager::getOutputAudioPluginList received");
return Manager::instance().getOutputAudioPluginList();
}
void
ConfigurationManager::setInputAudioPlugin (const std::string& audioPlugin)
{
- _debug ("ConfigurationManager::setInputAudioPlugin received\n");
+ _debug ("ConfigurationManager::setInputAudioPlugin received");
return Manager::instance().setInputAudioPlugin (audioPlugin);
}
void
ConfigurationManager::setOutputAudioPlugin (const std::string& audioPlugin)
{
- _debug ("ConfigurationManager::setOutputAudioPlugin received\n");
+ _debug ("ConfigurationManager::setOutputAudioPlugin received");
return Manager::instance().setOutputAudioPlugin (audioPlugin);
}
std::vector< std::string >
ConfigurationManager::getAudioOutputDeviceList()
{
- _debug ("ConfigurationManager::getAudioOutputDeviceList received\n");
+ _debug ("ConfigurationManager::getAudioOutputDeviceList received");
return Manager::instance().getAudioOutputDeviceList();
}
void
ConfigurationManager::setAudioOutputDevice (const int32_t& index)
{
- _debug ("ConfigurationManager::setAudioOutputDevice received\n");
+ _debug ("ConfigurationManager::setAudioOutputDevice received");
return Manager::instance().setAudioOutputDevice (index);
}
std::vector< std::string >
ConfigurationManager::getAudioInputDeviceList()
{
- _debug ("ConfigurationManager::getAudioInputDeviceList received\n");
+ _debug ("ConfigurationManager::getAudioInputDeviceList received");
return Manager::instance().getAudioInputDeviceList();
}
void
ConfigurationManager::setAudioInputDevice (const int32_t& index)
{
- _debug ("ConfigurationManager::setAudioInputDevice received\n");
+ _debug ("ConfigurationManager::setAudioInputDevice received");
return Manager::instance().setAudioInputDevice (index);
}
std::vector< std::string >
ConfigurationManager::getCurrentAudioDevicesIndex()
{
- _debug ("ConfigurationManager::getCurrentAudioDeviceIndex received\n");
+ _debug ("ConfigurationManager::getCurrentAudioDeviceIndex received");
return Manager::instance().getCurrentAudioDevicesIndex();
}
int32_t
ConfigurationManager::getAudioDeviceIndex (const std::string& name)
{
- _debug ("ConfigurationManager::getAudioDeviceIndex received\n");
+ _debug ("ConfigurationManager::getAudioDeviceIndex received");
return Manager::instance().getAudioDeviceIndex (name);
}
std::string
ConfigurationManager::getCurrentAudioOutputPlugin (void)
{
- _debug ("ConfigurationManager::getCurrentAudioOutputPlugin received\n");
+ _debug ("ConfigurationManager::getCurrentAudioOutputPlugin received");
return Manager::instance().getCurrentAudioOutputPlugin();
}
@@ -513,7 +513,7 @@ std::vector< std::string >
ConfigurationManager::getPlaybackDeviceList()
{
std::vector< std::string > ret;
- _debug ("ConfigurationManager::getPlaybackDeviceList received\n");
+ _debug ("ConfigurationManager::getPlaybackDeviceList received");
return ret;
}
@@ -521,7 +521,7 @@ std::vector< std::string >
ConfigurationManager::getRecordDeviceList()
{
std::vector< std::string > ret;
- _debug ("ConfigurationManager::getRecordDeviceList received\n");
+ _debug ("ConfigurationManager::getRecordDeviceList received");
return ret;
}
@@ -647,87 +647,73 @@ std::string ConfigurationManager::getHistoryEnabled (void)
void
ConfigurationManager::startHidden (void)
{
- _debug ("Manager received startHidden\n");
+ _debug ("Manager received startHidden");
Manager::instance().startHidden();
}
int32_t
ConfigurationManager::isStartHidden (void)
{
- _debug ("Manager received isStartHidden\n");
+ _debug ("Manager received isStartHidden");
return Manager::instance().isStartHidden();
}
void
ConfigurationManager::switchPopupMode (void)
{
- _debug ("Manager received switchPopupMode\n");
+ _debug ("Manager received switchPopupMode");
Manager::instance().switchPopupMode();
}
int32_t
ConfigurationManager::popupMode (void)
{
- _debug ("Manager received popupMode\n");
+ _debug ("Manager received popupMode");
return Manager::instance().popupMode();
}
void
ConfigurationManager::setNotify (void)
{
- _debug ("Manager received setNotify\n");
+ _debug ("Manager received setNotify");
Manager::instance().setNotify();
}
int32_t
ConfigurationManager::getNotify (void)
{
- _debug ("Manager received getNotify\n");
+ _debug ("Manager received getNotify");
return Manager::instance().getNotify();
}
void
ConfigurationManager::setAudioManager (const int32_t& api)
{
- _debug ("Manager received setAudioManager\n");
+ _debug ("Manager received setAudioManager");
Manager::instance().setAudioManager (api);
}
int32_t
ConfigurationManager::getAudioManager (void)
{
- _debug ("Manager received getAudioManager\n");
+ _debug ("Manager received getAudioManager");
return Manager::instance().getAudioManager();
}
void
ConfigurationManager::setMailNotify (void)
{
- _debug ("Manager received setMailNotify\n");
+ _debug ("Manager received setMailNotify");
Manager::instance().setMailNotify();
}
int32_t
ConfigurationManager::getMailNotify (void)
{
- _debug ("Manager received getMailNotify\n");
+ _debug ("Manager received getMailNotify");
return Manager::instance().getMailNotify();
}
-int
-ConfigurationManager::getSipAddress (void)
-{
- return Manager::instance().getLocalIp2IpPort();
-
- // return "ok";
-}
-
-void
-ConfigurationManager::setSipAddress (const std::string& address)
-{
- _debug ("Manager received setSipAddress: %s\n", address.c_str());
- Manager::instance().setLocalIp2IpInfo (address);
-}
std::map<std::string, int32_t> ConfigurationManager::getAddressbookSettings (void)
{
@@ -746,7 +732,7 @@ std::vector< std::string > ConfigurationManager::getAddressbookList (void)
void ConfigurationManager::setAddressbookList (const std::vector< std::string >& list)
{
- _debug ("Manager received setAddressbookList\n") ;
+ _debug ("Manager received setAddressbookList") ;
Manager::instance().setAddressbookList (list);
}
@@ -775,9 +761,21 @@ void ConfigurationManager::setHistory (const std::map <std::string, std::string>
Manager::instance().receive_history_from_client (entries);
}
+std::string
+ConfigurationManager::getAddrFromInterfaceName(const std::string& interface)
+{
+ _debug ("ConfigurationManager::getAddrFromInterfaceName received");
+
+ std::string address = SIPVoIPLink::instance("")->getInterfaceAddrFromName(interface);
+
+ _debug("address: %s", address.c_str());
+
+ return address;
+}
+
std::vector<std::string> ConfigurationManager::getAllIpInterface (void)
{
- _debug ("ConfigurationManager::getAllIpInterface received\n");
+ _debug ("ConfigurationManager::getAllIpInterface received");
std::vector<std::string> vector;
SIPVoIPLink * sipLink = NULL;
@@ -789,3 +787,18 @@ std::vector<std::string> ConfigurationManager::getAllIpInterface (void)
return vector;
}
+
+std::vector<std::string> ConfigurationManager::getAllIpInterfaceByName(void)
+{
+ _debug ("ConfigurationManager::getAllIpInterface received\n");
+
+ std::vector<std::string> vector;
+ SIPVoIPLink * sipLink = NULL;
+ sipLink = SIPVoIPLink::instance ("");
+
+ if (sipLink != NULL) {
+ vector = sipLink->getAllIpInterfaceByName();
+ }
+
+ return vector;
+}
diff --git a/sflphone-common/src/dbus/configurationmanager.h b/sflphone-common/src/dbus/configurationmanager.h
index 98a7441c621b1e660e3eb2a8ee731772f1aac5ab..61072e16b5bb9153dce4761b143211b4733ac637 100644
--- a/sflphone-common/src/dbus/configurationmanager.h
+++ b/sflphone-common/src/dbus/configurationmanager.h
@@ -113,8 +113,6 @@ public:
void setNotify( void );
int32_t getMailNotify( void );
void setMailNotify( void );
- int getSipAddress( void );
- void setSipAddress( const std::string& address );
std::map<std::string, int32_t> getAddressbookSettings (void);
void setAddressbookSettings (const std::map<std::string, int32_t>& settings);
@@ -131,8 +129,11 @@ public:
std::map<std::string, std::string> getTlsSettings(const std::string& accountID);
void setTlsSettings(const std::string& accountID, const std::map< std::string, std::string >& details);
+
+ std::string getAddrFromInterfaceName(const std::string& interface);
std::vector<std::string> getAllIpInterface(void);
+ std::vector<std::string> getAllIpInterfaceByName(void);
};
diff --git a/sflphone-common/src/dbus/dbusmanagerimpl.cpp b/sflphone-common/src/dbus/dbusmanagerimpl.cpp
index e87c1001f0f7513b873061c1daecce2122eef7f4..bfcc237ca369d02225fefb68023f0a62bc2877cc 100644
--- a/sflphone-common/src/dbus/dbusmanagerimpl.cpp
+++ b/sflphone-common/src/dbus/dbusmanagerimpl.cpp
@@ -23,6 +23,7 @@
#include "callmanager.h"
#include "configurationmanager.h"
+#include "networkmanager.h"
const char* DBusManagerImpl::SERVER_NAME = "org.sflphone.SFLphone";
@@ -32,17 +33,22 @@ DBusManagerImpl::exec()
DBus::default_dispatcher = &_dispatcher;
- DBus::Connection conn = DBus::Connection::SessionBus();
- conn.request_name (SERVER_NAME);
+ DBus::Connection sessionConnection = DBus::Connection::SessionBus();
+ DBus::Connection systemConnection = DBus::Connection::SystemBus();
+ sessionConnection.request_name (SERVER_NAME);
- _callManager = new CallManager (conn);
- _configurationManager = new ConfigurationManager (conn);
- _instanceManager = new Instance (conn);
+ _callManager = new CallManager (sessionConnection);
+ _configurationManager = new ConfigurationManager (sessionConnection);
+ _instanceManager = new Instance (sessionConnection);
+
+#ifdef USE_NETWORKMANAGER
+ _networkManager = new NetworkManager(systemConnection, "/org/freedesktop/NetworkManager", "");
+#endif
// Register accounts
Manager::instance().initRegisterAccounts(); //getEvents();
- _debug ("Starting DBus event loop\n");
+ _debug ("Starting DBus event loop");
_dispatcher.enter();
return 1;
diff --git a/sflphone-common/src/dbus/dbusmanagerimpl.h b/sflphone-common/src/dbus/dbusmanagerimpl.h
index 157b8118cef5d5410d5a49594e785c6c836b1639..c68d440fa375f9951f877c8d44443bc7a24b451c 100644
--- a/sflphone-common/src/dbus/dbusmanagerimpl.h
+++ b/sflphone-common/src/dbus/dbusmanagerimpl.h
@@ -24,6 +24,7 @@
class ConfigurationManager;
class CallManager;
+class NetworkManager;
class DBusManagerImpl {
public:
@@ -38,6 +39,7 @@ class DBusManagerImpl {
ConfigurationManager* _configurationManager;
Instance* _instanceManager;
DBus::BusDispatcher _dispatcher;
+ NetworkManager* _networkManager;
};
#endif
diff --git a/sflphone-common/src/dbus/instance.cpp b/sflphone-common/src/dbus/instance.cpp
index 233978ae630d03f1425977a42a3ba1a1b309389c..e70322d6fc19c5426cd8037f4942a4c975a3a616 100644
--- a/sflphone-common/src/dbus/instance.cpp
+++ b/sflphone-common/src/dbus/instance.cpp
@@ -32,7 +32,7 @@ void
Instance::Register (const int32_t& pid UNUSED,
const std::string& name UNUSED)
{
- _debug ("Instance::register received\n");
+ _debug ("Instance::register received");
count++;
}
@@ -40,7 +40,7 @@ Instance::Register (const int32_t& pid UNUSED,
void
Instance::Unregister (const int32_t& pid UNUSED)
{
- _debug ("Instance::unregister received\n");
+ _debug ("Instance::unregister received");
count --;
if (count <= 0) {
diff --git a/sflphone-common/src/dbus/networkmanager.cpp b/sflphone-common/src/dbus/networkmanager.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..4b1f0b2a50c48e66beaccba0270e0175ae5f17a4
--- /dev/null
+++ b/sflphone-common/src/dbus/networkmanager.cpp
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2004-2009 Savoir-Faire Linux inc.
+ * Author: Julien Bonjean <julien.bonjean@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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifdef USE_NETWORKMANAGER
+
+#include <global.h>
+#include "networkmanager.h"
+#include <iostream>
+#include <instance.h>
+#include "../manager.h"
+
+using namespace std;
+
+const string NetworkManager::statesString[5] = {"unknown", "asleep", "connecting", "connected", "disconnected"};
+
+string NetworkManager::stateAsString(const uint32_t& state)
+{
+ return statesString[state];
+}
+
+void NetworkManager::StateChanged(const uint32_t& state)
+{
+ _warn("Network state changed: %s", stateAsString(state).c_str());
+}
+
+void NetworkManager::PropertiesChanged(const std::map< std::string, ::DBus::Variant >& argin0)
+{
+ const map< string, ::DBus::Variant >::const_iterator iter = argin0.begin();
+
+ string message = iter->first;
+
+ _warn("Properties changed: %s", iter->first.c_str());
+/*
+ DBus::Variant variant = iter->second;
+ DBus::MessageIter i = variant.reader();
+ cout << i.type() << endl;// 97
+ cout << (char )i.type() << endl;
+ cout << (char)i.array_type() << endl;
+
+ cout << i.is_array() << endl;// 1
+ cout << i.is_dict() << endl;// 0
+ cout << i.array_type() << endl;// 111
+
+ int size;
+ ::DBus::Path* value = new ::DBus::Path[10];
+ size = i.get_array(value);
+ cout << "length: " << size << endl;
+
+ while (!i.at_end())
+ {
+ char **array = new char*[2];
+ size_t length = i.get_array(&array);
+ cout << "length: " << length << endl;
+ i = i.recurse();
+ }
+*/
+ Manager::instance().registerAccounts();
+}
+
+NetworkManager::NetworkManager(DBus::Connection& connection, const DBus::Path& path, const char* destination): DBus::ObjectProxy (connection, path, destination)
+{
+}
+
+#endif
diff --git a/sflphone-common/src/dbus/networkmanager.h b/sflphone-common/src/dbus/networkmanager.h
new file mode 100644
index 0000000000000000000000000000000000000000..bf18e15c6319a5bd66d9bb271ee333749395393c
--- /dev/null
+++ b/sflphone-common/src/dbus/networkmanager.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2004-2009 Savoir-Faire Linux inc.
+ * Author: Julien Bonjean <julien.bonjean@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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef NETWORKMANAGER_H
+#define NETWORKMANAGER_H
+
+#include "networkmanager_proxy.h"
+
+using namespace std;
+
+class NetworkManager
+: public org::freedesktop::NetworkManager_proxy,
+ public DBus::IntrospectableProxy,
+ public DBus::ObjectProxy
+{
+public:
+
+ NetworkManager(DBus::Connection&, const DBus::Path&, const char*);
+ void StateChanged(const uint32_t& state);
+ void PropertiesChanged(const std::map< std::string, ::DBus::Variant >& argin0);
+ string stateAsString(const uint32_t& state);
+
+ enum NMState
+ {
+ NM_STATE_UNKNOWN = 0,
+ NM_STATE_ASLEEP,
+ NM_STATE_CONNECTING,
+ NM_STATE_CONNECTED,
+ NM_STATE_DISCONNECTED
+ };
+
+ static const string statesString[5];
+};
+#endif
+
diff --git a/sflphone-common/src/dbus/networkmanager_proxy.h b/sflphone-common/src/dbus/networkmanager_proxy.h
new file mode 100644
index 0000000000000000000000000000000000000000..078925ceff22c9e0ebd0e21cf90868ab4b2da370
--- /dev/null
+++ b/sflphone-common/src/dbus/networkmanager_proxy.h
@@ -0,0 +1,78 @@
+
+/*
+ * This file was automatically generated by dbusxx-xml2cpp; DO NOT EDIT!
+ */
+
+#ifndef __dbusxx__networkmanager_proxy_h__PROXY_MARSHAL_H
+#define __dbusxx__networkmanager_proxy_h__PROXY_MARSHAL_H
+
+#include <dbus-c++/dbus.h>
+#include <cassert>
+
+namespace org {
+namespace freedesktop {
+
+class NetworkManager_proxy
+: public ::DBus::InterfaceProxy
+{
+public:
+
+ NetworkManager_proxy()
+ : ::DBus::InterfaceProxy("org.freedesktop.NetworkManager")
+ {
+ connect_signal(NetworkManager_proxy, StateChanged, _StateChanged_stub);
+ connect_signal(NetworkManager_proxy, PropertiesChanged, _PropertiesChanged_stub);
+ }
+
+public:
+
+ /* properties exported by this interface */
+public:
+
+ /* methods exported by this interface,
+ * this functions will invoke the corresponding methods on the remote objects
+ */
+ std::vector< ::DBus::Path > GetDevices()
+ {
+ ::DBus::CallMessage call;
+ call.member("GetDevices");
+ ::DBus::Message ret = invoke_method (call);
+ ::DBus::MessageIter ri = ret.reader();
+
+ std::vector< ::DBus::Path > argout;
+ ri >> argout;
+ return argout;
+ }
+
+
+public:
+
+ /* signal handlers for this interface
+ */
+ virtual void StateChanged(const uint32_t& argin0) = 0;
+ virtual void PropertiesChanged(const std::map< std::string, ::DBus::Variant >& argin0) = 0;
+
+private:
+
+ /* unmarshalers (to unpack the DBus message before calling the actual signal handler)
+ */
+ void _StateChanged_stub(const ::DBus::SignalMessage &sig)
+ {
+ ::DBus::MessageIter ri = sig.reader();
+
+ uint32_t arg0;
+ ri >> arg0;
+ StateChanged(arg0);
+ }
+ void _PropertiesChanged_stub(const ::DBus::SignalMessage &sig)
+ {
+ ::DBus::MessageIter ri = sig.reader();
+
+ std::map< std::string, ::DBus::Variant > arg0;
+ ri >> arg0;
+ PropertiesChanged(arg0);
+ }
+};
+
+} }
+#endif //__dbusxx__networkmanager_proxy_h__PROXY_MARSHAL_H
diff --git a/sflphone-common/src/dbus/org.freedesktop.NetworkManager.xml b/sflphone-common/src/dbus/org.freedesktop.NetworkManager.xml
new file mode 100644
index 0000000000000000000000000000000000000000..591fb7b8edb61bbf3dd0ac5bdad85ae338fda3ee
--- /dev/null
+++ b/sflphone-common/src/dbus/org.freedesktop.NetworkManager.xml
@@ -0,0 +1,16 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+ <interface name="org.freedesktop.NetworkManager">
+ <method name="GetDevices">
+ <arg name="devices" type="ao" direction="out"/>
+ </method>
+ <signal name="StateChanged">
+ <arg type="u"/>
+ </signal>
+ <signal name="PropertiesChanged">
+ <arg type="a{sv}"/>
+ </signal>
+ </interface>
+</node>
+
diff --git a/sflphone-common/src/global.h b/sflphone-common/src/global.h
index 12529fe3ef86a7f11f055cee864452d9425e06b2..474d08b0f39087de2e815f95f1aeaecef47c7040 100644
--- a/sflphone-common/src/global.h
+++ b/sflphone-common/src/global.h
@@ -31,6 +31,7 @@
#include <sstream>
#include <map>
#include <vector>
+#include "logger.h"
#define SFLPHONED_VERSION "0.9.6" /** Version number */
@@ -72,18 +73,6 @@ static const SOUND_FORMAT INT32 = 0x8;
#define SFLDataAmplitude (32767 >> 4)
#endif
-#ifdef SFLDEBUG
- #define _debug(...) fprintf(stderr, "[sfl-debug] " __VA_ARGS__)
- #define _debugException(...) fprintf(stderr, "[sfl-excep] " __VA_ARGS__ "\n")
- #define _debugInit(...) fprintf(stderr, "[sfl-init] " __VA_ARGS__ "\n")
- #define _debugAlsa(...) fprintf(stderr, "[alsa-debug] " __VA_ARGS__ )
-#else
- #define _debug(...)
- #define _debugException(...)
- #define _debugInit(...)
- #define _debugAlsa(...)
-#endif
-
#define PROGNAME "sflphoned" /** Binary name */
#define PROGDIR "sflphone" /** Program directory */
#define RINGDIR "ringtones" /** Ringtones directory */
diff --git a/sflphone-common/src/history/historymanager.cpp b/sflphone-common/src/history/historymanager.cpp
index d56d3f67155aa3cd67a2b4bc380a3bf7c3f50170..1fb5b991547caf37acb6bafa18753e2789090cdb 100644
--- a/sflphone-common/src/history/historymanager.cpp
+++ b/sflphone-common/src/history/historymanager.cpp
@@ -107,9 +107,10 @@ int HistoryManager::load_history_items_map (Conf::ConfigTree *history_list, int
return nb_items;
}
+
bool HistoryManager::save_history_to_file (Conf::ConfigTree *history_list)
{
- _debug ("Saving history in XDG directory: %s\n", _history_path.data());
+ _debug ("Saving history in XDG directory: %s", _history_path.data());
return history_list->saveConfigTree (_history_path.data());
}
@@ -165,7 +166,7 @@ int HistoryManager::create_history_path (std::string path)
if (mkdir (userdata.data(), 0755) != 0) {
// If directory creation failed
if (errno != EEXIST) {
- _debug ("Cannot create directory: %s\n", strerror (errno));
+ _debug ("Cannot create directory: %s", strerror (errno));
return -1;
}
}
diff --git a/sflphone-common/src/hooks/urlhook.cpp b/sflphone-common/src/hooks/urlhook.cpp
index b50aa1febbf33ecaefc5d681f0d7330ffda035d8..3538602fb773a926d74162f49e9b8e6ff8942fe5 100644
--- a/sflphone-common/src/hooks/urlhook.cpp
+++ b/sflphone-common/src/hooks/urlhook.cpp
@@ -19,6 +19,7 @@
#include "urlhook.h"
#include <iostream>
+#include <vector>
UrlHook::UrlHook () { }
@@ -28,9 +29,33 @@ int UrlHook::addAction (std::string field_value, std::string command)
{
std::string command_bg;
+ std::string temp;
+ std::vector <std::string> args;
+ size_t pos;
+ unsigned int i;
+
+ /* Escape the '&' char to not discard $_GET parameters in the URL - #2659 */
+ while ( (pos = field_value.find ("&", 0)) != std::string::npos) {
+ temp = field_value.substr (0, pos);
+ field_value.erase (0, pos + 1);
+ args.push_back (temp);
+ std::cout << temp << " " << std::endl;
+ }
+
+ command_bg = command + " ";
+
+ pos = args.size ();
+ for (i=0; i<pos; i++) {
+ // Escape the "&"
+ command_bg += args[i] + "\\&";
+ }
+
+ // Retrieve the last argument
+ command_bg += field_value;
/* Execute the command in the background to not block the application */
- command_bg = command + " " + field_value + "&" ;
+ command_bg += "&";
+
/* Execute a system call */
return RUN_COMMAND (command_bg.c_str());
diff --git a/sflphone-common/src/iax/iaxaccount.cpp b/sflphone-common/src/iax/iaxaccount.cpp
index f68dfbef67be0865721cc22ebde992c9747663d9..de210fda00b12026e09d891035ff83e2ff8a9424 100644
--- a/sflphone-common/src/iax/iaxaccount.cpp
+++ b/sflphone-common/src/iax/iaxaccount.cpp
@@ -36,6 +36,11 @@ IAXAccount::~IAXAccount()
_link = NULL;
}
+void IAXAccount::setVoIPLink()
+{
+
+}
+
int IAXAccount::registerVoIPLink()
{
_link->init();
diff --git a/sflphone-common/src/iax/iaxaccount.h b/sflphone-common/src/iax/iaxaccount.h
index 9c40df1194a5625b3e4fc4e6495778ede20a2c4c..54e6094de703b9e50c693b11af77871877a9cd84 100644
--- a/sflphone-common/src/iax/iaxaccount.h
+++ b/sflphone-common/src/iax/iaxaccount.h
@@ -33,6 +33,8 @@ class IAXAccount : public Account
~IAXAccount();
+ void setVoIPLink ();
+
/**
* Actually unuseful, since config loading is done in init()
*/
diff --git a/sflphone-common/src/iax/iaxcall.cpp b/sflphone-common/src/iax/iaxcall.cpp
index 93ecdcdfdb26cc88876e73f06360ba0b817323b1..d276abee64103b7ebed163633033c2e456bf1d7b 100644
--- a/sflphone-common/src/iax/iaxcall.cpp
+++ b/sflphone-common/src/iax/iaxcall.cpp
@@ -35,42 +35,40 @@ IAXCall::setFormat (int format)
{
_format = format;
- _debug ("IAX set supported format: ");
+ _info ("IAX set supported format: ");
switch (format) {
case AST_FORMAT_ULAW:
- printf ("PCMU\n");
+ _info("PCMU");
setAudioCodec (PAYLOAD_CODEC_ULAW);
break;
case AST_FORMAT_GSM:
- printf ("GSM\n");
+ _info ("GSM");
setAudioCodec (PAYLOAD_CODEC_GSM);
break;
case AST_FORMAT_ALAW:
- printf ("ALAW\n");
+ _info ("ALAW");
setAudioCodec (PAYLOAD_CODEC_ALAW);
break;
case AST_FORMAT_ILBC:
- printf ("ILBC\n");
+ _info ("ILBC");
setAudioCodec (PAYLOAD_CODEC_ILBC_20);
break;
case AST_FORMAT_SPEEX:
- printf ("SPEEX\n");
+ _info ("SPEEX");
setAudioCodec (PAYLOAD_CODEC_SPEEX_8000);
break;
default:
- printf ("Error audio codec type %i not supported!\n", format);
+ _info ("Error audio codec type %i not supported!", format);
setAudioCodec ( (AudioCodecType) -1);
break;
}
-
- printf ("\n");
}
@@ -81,7 +79,7 @@ IAXCall::getSupportedFormat()
int format = 0;
unsigned int iter;
- _debug ("IAX get supported format: ");
+ _info ("IAX get supported format: ");
map = getCodecMap().getActiveCodecs();
@@ -89,27 +87,27 @@ IAXCall::getSupportedFormat()
switch (map[iter]) {
case PAYLOAD_CODEC_ULAW:
- printf ("PCMU ");
+ _info ("PCMU ");
format |= AST_FORMAT_ULAW;
break;
case PAYLOAD_CODEC_GSM:
- printf ("GSM ");
+ _info ("GSM ");
format |= AST_FORMAT_GSM;
break;
case PAYLOAD_CODEC_ALAW:
- printf ("PCMA ");
+ _info ("PCMA ");
format |= AST_FORMAT_ALAW;
break;
case PAYLOAD_CODEC_ILBC_20:
- printf ("ILBC ");
+ _info ("ILBC ");
format |= AST_FORMAT_ILBC;
break;
case PAYLOAD_CODEC_SPEEX_8000:
- printf ("SPEEX ");
+ _info ("SPEEX ");
format |= AST_FORMAT_SPEEX;
break;
@@ -118,8 +116,6 @@ IAXCall::getSupportedFormat()
}
}
- printf ("\n");
-
return format;
}
@@ -137,27 +133,27 @@ IAXCall::getFirstMatchingFormat (int needles)
switch (map[iter]) {
case PAYLOAD_CODEC_ULAW:
- printf ("PCMU\n");
+ _debug ("PCMU");
format = AST_FORMAT_ULAW;
break;
case PAYLOAD_CODEC_GSM:
- printf ("GSM\n");
+ _debug ("GSM");
format = AST_FORMAT_GSM;
break;
case PAYLOAD_CODEC_ALAW:
- printf ("PCMA\n");
+ _debug ("PCMA");
format = AST_FORMAT_ALAW;
break;
case PAYLOAD_CODEC_ILBC_20:
- printf ("ILBC\n");
+ _debug ("ILBC");
format = AST_FORMAT_ILBC;
break;
case PAYLOAD_CODEC_SPEEX_8000:
- printf ("SPEEX\n");
+ _debug ("SPEEX");
format = AST_FORMAT_SPEEX;
break;
@@ -171,8 +167,6 @@ IAXCall::getFirstMatchingFormat (int needles)
}
- printf ("\n");
-
return 0;
}
diff --git a/sflphone-common/src/iax/iaxvoiplink.cpp b/sflphone-common/src/iax/iaxvoiplink.cpp
index f48d9a2c4efadbc4b6a3c76e98929ea6c7f48922..3aedd89b8d8a85de8c9bd0c3239b1a09ff987c7b 100644
--- a/sflphone-common/src/iax/iaxvoiplink.cpp
+++ b/sflphone-common/src/iax/iaxvoiplink.cpp
@@ -37,13 +37,13 @@
#define MUSIC_ONHOLD true
-#define CHK_VALID_CALL if (call == NULL) { _debug("IAX: Call doesn't exists\n"); \
+#define CHK_VALID_CALL if (call == NULL) { _debug("IAX: Call doesn't exists"); \
return false; }
IAXVoIPLink::IAXVoIPLink (const AccountID& accountID)
: VoIPLink (accountID)
{
- // _debug("IAXVoIPLink::IAXVoIPLink : creating eventhread \n ");
+ // _debug("IAXVoIPLink::IAXVoIPLink : creating eventhread ");
_evThread = new EventThread (this);
_regSession = NULL;
_nextRefreshStamp = 0;
@@ -116,13 +116,13 @@ IAXVoIPLink::init()
port = iax_init (port);
if (port < 0) {
- _debug ("IAX Warning: already initialize on port %d\n", last_port);
+ _debug ("IAX Warning: already initialize on port %d", last_port);
port = RANDOM_IAX_PORT;
} else if (port == IAX_FAILURE) {
_debug ("IAX Fail to start on port %d", last_port);
port = RANDOM_IAX_PORT;
} else {
- _debug ("IAX Info: listening on port %d\n", last_port);
+ _debug ("IAX Info: listening on port %d", last_port);
_localPort = last_port;
returnValue = true;
_evThread->start();
@@ -141,7 +141,7 @@ IAXVoIPLink::init()
}
if (port == IAX_FAILURE || nbTry==0) {
- _debug ("Fail to initialize iax\n");
+ _debug ("Fail to initialize iax");
initDone (false);
}
@@ -195,7 +195,7 @@ void IAXVoIPLink::terminateOneCall (const CallID& id)
IAXCall* call = getIAXCall (id);
if (call) {
- _debug ("IAXVoIPLink::terminateOneCall()::the call is deleted, should close recording file \n");
+ _debug ("IAXVoIPLink::terminateOneCall()::the call is deleted, should close recording file ");
delete call;
call = 0;
}
@@ -218,7 +218,7 @@ IAXVoIPLink::getEvent()
continue;
}
- //_debug ("Receive IAX Event: %d (0x%x)\n", event->etype, event->etype);
+ //_debug ("Receive IAX Event: %d (0x%x)", event->etype, event->etype);
call = iaxFindCallBySession (event->session);
@@ -234,7 +234,7 @@ IAXVoIPLink::getEvent()
iaxHandlePrecallEvent (event);
}
- // _debug("IAXVoIPLink::getEvent() : timestamp %i \n",event->ts);
+ // _debug("IAXVoIPLink::getEvent() : timestamp %i ",event->ts);
iax_event_free (event);
}
@@ -263,8 +263,8 @@ IAXVoIPLink::getEvent()
if ( (Manager::instance().incomingCallWaiting() > 0) && Manager::instance().hasCurrentCall()) {
int countTime_modulo = countTime % 4000;
- // _debug("countTime: %i\n", countTime);
- // _debug("countTime_modulo: %i\n", countTime_modulo);
+ // _debug("countTime: %i", countTime);
+ // _debug("countTime_modulo: %i", countTime_modulo);
if ( (countTime_modulo - countTime) < 0) {
Manager::instance().notificationIncomingCall();
@@ -317,7 +317,7 @@ IAXVoIPLink::sendAudioFromMic (void)
if (ac && audiolayer) {
- // _debug("Send sound\n");
+ // _debug("Send sound");
// audiolayer->getMainBuffer()->flush(currentCall->getCallId());
audiolayer->getMainBuffer()->setInternalSamplingRate (ac->getClockRate());
@@ -364,9 +364,9 @@ IAXVoIPLink::sendAudioFromMic (void)
_mutexIAX.enterMutex();
// Make sure the session and the call still exists.
- if (currentCall->getSession() && micDataEncoded != NULL) {
+ if (currentCall->getSession() && (micDataEncoded != NULL) && (nbSample_ > 0)) {
if (iax_send_voice (currentCall->getSession(), currentCall->getFormat(), micDataEncoded, compSize, nbSample_) == -1) {
- _debug ("IAX: Error sending voice data.\n");
+ _debug ("IAX: Error sending voice data.");
}
}
@@ -426,9 +426,9 @@ IAXVoIPLink::sendRegister (AccountID id)
if (!_regSession) {
_debug ("Error when generating new session for register");
} else {
- _debug ("IAX Sending registration to %s with user %s\n", account->getHostname().c_str() , account->getUsername().c_str());
+ _debug ("IAX Sending registration to %s with user %s", account->getHostname().c_str() , account->getUsername().c_str());
int val = iax_register (_regSession, account->getHostname().data(), account->getUsername().data(), account->getPassword().data(), 120);
- _debug ("Return value: %d\n", val);
+ _debug ("Return value: %d", val);
// set the time-out to 15 seconds, after that, resend a registration request.
// until we unregister.
_nextRefreshStamp = time (NULL) + 10;
@@ -466,7 +466,7 @@ IAXVoIPLink::sendUnregister (AccountID id)
_nextRefreshStamp = 0;
- _debug ("IAX2 send unregister\n");
+ _debug ("IAX2 send unregister");
account->setRegistrationState (Unregistered);
return SUCCESS;
@@ -522,7 +522,7 @@ IAXVoIPLink::answer (const CallID& id)
bool
IAXVoIPLink::hangup (const CallID& id)
{
- _debug ("IAXVoIPLink::hangup() : function called once hangup \n");
+ _debug ("IAXVoIPLink::hangup() : function called once hangup ");
IAXCall* call = getIAXCall (id);
std::string reason = "Dumped Call";
CHK_VALID_CALL;
@@ -550,7 +550,7 @@ IAXVoIPLink::hangup (const CallID& id)
bool
IAXVoIPLink::peerHungup (const CallID& id)
{
- _debug ("IAXVoIPLink::peerHangup() : function called once hangup \n");
+ _debug ("IAXVoIPLink::peerHangup() : function called once hangup ");
IAXCall* call = getIAXCall (id);
std::string reason = "Dumped Call";
CHK_VALID_CALL;
@@ -584,7 +584,7 @@ IAXVoIPLink::onhold (const CallID& id)
audiolayer->getMainBuffer()->unBindAll (call->getCallId());
- //if (call->getState() == Call::Hold) { _debug("Call is already on hold\n"); return false; }
+ //if (call->getState() == Call::Hold) { _debug("Call is already on hold"); return false; }
_mutexIAX.enterMutex();
iax_quelch_moh (call->getSession() , MUSIC_ONHOLD);
@@ -603,7 +603,7 @@ IAXVoIPLink::offhold (const CallID& id)
Manager::instance().addStream (call->getCallId());
- //if (call->getState() == Call::Active) { _debug("Call is already active\n"); return false; }
+ //if (call->getState() == Call::Active) { _debug("Call is already active"); return false; }
_mutexIAX.enterMutex();
iax_unquelch (call->getSession());
_mutexIAX.leaveMutex();
@@ -700,7 +700,7 @@ IAXVoIPLink::iaxOutgoingInvite (IAXCall* call)
newsession = iax_session_new();
if (!newsession) {
- _debug ("IAX Error: Can't make new session for a new call\n");
+ _debug ("IAX Error: Can't make new session for a new call");
return false;
}
@@ -715,7 +715,7 @@ IAXVoIPLink::iaxOutgoingInvite (IAXCall* call)
audio_format_preferred = call->getFirstMatchingFormat (call->getSupportedFormat());
audio_format_capability = call->getSupportedFormat();
- _debug ("IAX New call: %s\n", strNum.c_str());
+ _debug ("IAX New call: %s", strNum.c_str());
iax_call (newsession, username.c_str(), username.c_str(), strNum.c_str(), lang, wait, audio_format_preferred, audio_format_capability);
return true;
@@ -798,10 +798,10 @@ IAXVoIPLink::iaxHandleCallEvent (iax_event* event, IAXCall* call)
_debug ("IAX_EVENT_ACCEPT: codec format: ");
if (event->ies.format) {
- printf ("%i\n", event->ies.format);
+ printf ("%i", event->ies.format);
call->setFormat (event->ies.format);
} else {
- printf ("no codec format\n");
+ printf ("no codec format");
}
break;
@@ -820,18 +820,18 @@ IAXVoIPLink::iaxHandleCallEvent (iax_event* event, IAXCall* call)
if (event->ies.format) {
// Should not get here, should have been set in EVENT_ACCEPT
- printf ("%i\n", event->ies.format);
+ printf ("%i", event->ies.format);
call->setFormat (event->ies.format);
}
{
- printf ("no codec format\n");
+ printf ("no codec format");
}
Manager::instance().peerAnsweredCall (id);
// start audio here?
- audiolayer->startStream();
+ audiolayer->startStream();
audiolayer->flushMain();
} else {
// deja connecté ?
@@ -850,7 +850,7 @@ IAXVoIPLink::iaxHandleCallEvent (iax_event* event, IAXCall* call)
case IAX_EVENT_VOICE:
//if (!audiolayer->isCaptureActive ())
// audiolayer->startStream ();
- // _debug("IAX_EVENT_VOICE: \n");
+ // _debug("IAX_EVENT_VOICE: ");
iaxHandleVoiceEvent (event, call);
break;
@@ -872,7 +872,7 @@ IAXVoIPLink::iaxHandleCallEvent (iax_event* event, IAXCall* call)
if (Manager::instance().getConfigString (HOOKS, URLHOOK_IAX2_ENABLED) == "1") {
if (strcmp ( (char*) event->data, "") != 0) {
- _debug ("> IAX_EVENT_URL received: %s\n", event->data);
+ _debug ("> IAX_EVENT_URL received: %s", event->data);
urlhook->addAction ( (char*) event->data, Manager::instance().getConfigString (HOOKS, URLHOOK_COMMAND));
}
}
@@ -886,7 +886,7 @@ IAXVoIPLink::iaxHandleCallEvent (iax_event* event, IAXCall* call)
break;
default:
- _debug ("iaxHandleCallEvent: Unknown event type (in call event): %d\n", event->etype);
+ _debug ("iaxHandleCallEvent: Unknown event type (in call event): %d", event->etype);
}
}
@@ -907,7 +907,7 @@ IAXVoIPLink::iaxHandleVoiceEvent (iax_event* event, IAXCall* call)
if (!event->datalen) {
// Skip this empty packet.
- //_debug("IAX: Skipping empty jitter-buffer interpolated packet\n");
+ //_debug("IAX: Skipping empty jitter-buffer interpolated packet");
return;
}
@@ -930,11 +930,11 @@ IAXVoIPLink::iaxHandleVoiceEvent (iax_event* event, IAXCall* call)
// - subclass holds the voiceformat property.
if (event->subclass && event->subclass != call->getFormat()) {
- _debug ("iaxHandleVoiceEvent: no format found in call setting it to %i\n", event->subclass);
+ _debug ("iaxHandleVoiceEvent: no format found in call setting it to %i", event->subclass);
call->setFormat (event->subclass);
}
- //_debug("Receive: len=%d, format=%d, _receiveDataDecoded=%p\n", event->datalen, call->getFormat(), _receiveDataDecoded);
+ //_debug("Receive: len=%d, format=%d, _receiveDataDecoded=%p", event->datalen, call->getFormat(), _receiveDataDecoded);
// ac = call->getCodecMap().getCodec (call -> getAudioCodec());
data = (unsigned char*) event->data;
@@ -945,7 +945,7 @@ IAXVoIPLink::iaxHandleVoiceEvent (iax_event* event, IAXCall* call)
max = (int) (ac->getClockRate() * audiolayer->getFrameSize() / 1000);
if (size > max) {
- _debug ("The size %d is bigger than expected %d. Packet cropped. Ouch!\n", size, max);
+ _debug ("The size %d is bigger than expected %d. Packet cropped. Ouch!", size, max);
size = max;
}
@@ -954,7 +954,7 @@ IAXVoIPLink::iaxHandleVoiceEvent (iax_event* event, IAXCall* call)
nbInt16 = expandedSize/sizeof (int16);
if (nbInt16 > max) {
- _debug ("We have decoded an IAX VOICE packet larger than expected: %i VS %i. Cropping.\n", nbInt16, max);
+ _debug ("We have decoded an IAX VOICE packet larger than expected: %i VS %i. Cropping.", nbInt16, max);
nbInt16 = max;
}
@@ -1013,7 +1013,7 @@ IAXVoIPLink::iaxHandleRegReply (iax_event* event)
// Looking for the voicemail information
//if( event->ies != 0 )
//new_voicemails = processIAXMsgCount(event->ies.msgcount);
- //_debug("iax voicemail number notification: %i\n", new_voicemails);
+ //_debug("iax voicemail number notification: %i", new_voicemails);
// Notify the client if new voicemail waiting for the current account
//account_id = getAccountID();
//Manager::instance().startVoiceMessageNotification(account_id.c_str(), new_voicemails);
@@ -1063,18 +1063,18 @@ IAXVoIPLink::iaxHandlePrecallEvent (iax_event* event)
case IAX_EVENT_REGACK:
case IAX_EVENT_REGREJ:
- _debug ("IAX Registration Event in a pre-call setup\n");
+ _debug ("IAX Registration Event in a pre-call setup");
break;
case IAX_EVENT_REGREQ:
// Received when someone wants to register to us!?!
// Asterisk receives and answers to that, not us, we're a phone.
- _debug ("Registration by a peer, don't allow it\n");
+ _debug ("Registration by a peer, don't allow it");
break;
case IAX_EVENT_CONNECT:
// We've got an incoming call! Yikes!
- _debug ("> IAX_EVENT_CONNECT (receive)\n");
+ _debug ("> IAX_EVENT_CONNECT (receive)");
id = Manager::instance().getNewCallID();
@@ -1153,11 +1153,11 @@ IAXVoIPLink::iaxHandlePrecallEvent (iax_event* event)
break;
case IAX_IE_MSGCOUNT:
- //_debug("messssssssssssssssssssssssssssssssssssssssssssssssages\n");
+ //_debug("messssssssssssssssssssssssssssssssssssssssssssssssages");
break;
default:
- _debug ("IAXVoIPLink::iaxHandlePrecallEvent: Unknown event type (in precall): %d\n", event->etype);
+ _debug ("IAXVoIPLink::iaxHandlePrecallEvent: Unknown event type (in precall): %d", event->etype);
}
}
diff --git a/sflphone-common/src/logger.cpp b/sflphone-common/src/logger.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..08ab98f208b30acbb131f751aa9b8e2080615d3c
--- /dev/null
+++ b/sflphone-common/src/logger.cpp
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2004-2009 Savoir-Faire Linux inc.
+ * Author: Julien Bonjean <julien.bonjean@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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "logger.h"
+#include <stdarg.h>
+#include <string>
+#include <stdio.h>
+
+using namespace std;
+
+namespace Logger
+{
+
+bool consoleLog = false;
+bool debugMode = false;
+
+void log(const int level, const char* format, ...)
+{
+ if(!debugMode && level == LOG_DEBUG)
+ return;
+
+ va_list ap;
+ string prefix = "<> ";
+ char buffer[4096];
+ string message = "";
+ string color_prefix = "";
+
+ switch(level)
+ {
+ case LOG_ERR:
+ {
+ prefix = "<error> ";
+ color_prefix = RED;
+ break;
+ }
+ case LOG_WARNING:
+ {
+ prefix = "<warning> ";
+ color_prefix = LIGHT_RED;
+ break;
+ }
+ case LOG_INFO:
+ {
+ prefix = "<info> ";
+ color_prefix = "";
+ break;
+ }
+ case LOG_DEBUG:
+ {
+ prefix = "<debug> ";
+ color_prefix = "";
+ break;
+ }
+ }
+
+ va_start(ap, format);
+ vsprintf(buffer, format, ap);
+ va_end(ap);
+
+ message = buffer;
+ message = prefix + message;
+
+ syslog(level, message.c_str());
+
+ if(consoleLog)
+ {
+ message = color_prefix + message + END_COLOR + "\n";
+ fprintf(stderr, message.c_str());
+ }
+}
+
+void setConsoleLog(bool c)
+{
+ Logger::consoleLog = c;
+}
+
+void setDebugMode(bool d)
+{
+ Logger::debugMode = d;
+}
+
+}
+
diff --git a/sflphone-common/src/logger.h b/sflphone-common/src/logger.h
new file mode 100644
index 0000000000000000000000000000000000000000..b8a3b77b4cb27b426208aef5afd61e9b4c7aa312
--- /dev/null
+++ b/sflphone-common/src/logger.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2004-2009 Savoir-Faire Linux inc.
+ * Author: Julien Bonjean <julien.bonjean@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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef __LOGGER_H__
+#define __LOGGER_H__
+
+#include <syslog.h>
+
+namespace Logger
+{
+ void log(const int, const char*, ...);
+
+ void setConsoleLog(bool);
+ void setDebugMode(bool);
+};
+
+#define _error(...) Logger::log(LOG_ERROR, __VA_ARGS__)
+#define _warn(...) Logger::log(LOG_WARNING, __VA_ARGS__)
+#define _info(...) Logger::log(LOG_INFO, __VA_ARGS__)
+#define _debug(...) Logger::log(LOG_DEBUG, __VA_ARGS__)
+
+#define _debugException(...) Logger::log(LOG_DEBUG, __VA_ARGS__)
+#define _debugInit(...) Logger::log(LOG_DEBUG, __VA_ARGS__)
+#define _debugAlsa(...) Logger::log(LOG_DEBUG, __VA_ARGS__)
+
+#define BLACK "\033[22;30m"
+#define RED "\033[22;31m"
+#define GREEN "\033[22;32m"
+#define BROWN "\033[22;33m"
+#define BLUE "\033[22;34m"
+#define MAGENTA "\033[22;35m"
+#define CYAN "\033[22;36m"
+#define GREY "\033[22;37m"
+#define DARK_GREY "\033[01;30m"
+#define LIGHT_RED "\033[01;31m"
+#define LIGHT_SCREEN "\033[01;32m"
+#define YELLOW "\033[01;33m"
+#define LIGHT_BLUE "\033[01;34m"
+#define LIGHT_MAGENTA "\033[01;35m"
+#define LIGHT_CYAN "\033[01;36m"
+#define WHITE "\033[01;37m"
+#define END_COLOR "\033[0m"
+
+#endif
+
diff --git a/sflphone-common/src/main.cpp b/sflphone-common/src/main.cpp
index d023997021f9fc7d892ce88346a161ce1b940622..6f2d05cfe73e9dcc393235620bff131986218ed8 100644
--- a/sflphone-common/src/main.cpp
+++ b/sflphone-common/src/main.cpp
@@ -25,7 +25,7 @@
#include <string>
#include <dirent.h>
#include <sys/stat.h>
-//#include "config.h"
+#include <cc++/common.h>
#include "global.h"
#include "user_cfg.h"
@@ -34,25 +34,63 @@
#include "audio/audiolayer.h"
+using namespace std;
+using namespace ost;
+
+CommandOptionArg level(
+ "log-level", "l", "Log level (not yet implemented)"
+);
+
+CommandOptionNoArg console(
+ "console", "c", "Log in console (instead of syslog)"
+);
+
+CommandOptionNoArg debug(
+ "debug", "d", "Debug mode (more verbose)"
+);
+
+CommandOptionNoArg help(
+ "help", "h", "Print help"
+);
+
int
main (int argc, char **argv)
{
- int exit_code = 0;
+ int exit_code = 0;
+
+ Logger::setConsoleLog(false);
+ Logger::setDebugMode(false);
- //setlocale (LC_ALL, "");
- //bindtextdomain (PACKAGE, LOCALEDIR);
- //textdomain (PACKAGE);
+ CommandOptionParse * args = makeCommandOptionParse(argc, argv, "");
+
+ printf ("SFLphone Daemon %s, by Savoir-Faire Linux 2004-2009\n", VERSION);
+ printf ("http://www.sflphone.org/\n");
+
+ if ( help.numSet ) {
+ cerr << args->printUsage();
+ ::exit(0);
+ }
+
+ if ( args->argsHaveError() ) {
+ cerr << args->printErrors();
+ cerr << args->printUsage();
+ ::exit(1);
+ }
- if (argc == 2 && strcmp (argv[1], "--help") == 0) {
+ if( console.numSet )
+ {
+ _info("Console logging activated");
+ Logger::setConsoleLog(true);
+ }
+ if( debug.numSet )
+ {
+ _info("Debug mode activated");
+ Logger::setDebugMode(true);
+ }
- printf ("%1$s Daemon %2$s, by Savoir-Faire Linux 2004-2009\n\n",
- PROGNAME,
- SFLPHONED_VERSION);
- printf ("USAGE: sflphoned [--help]\nParameters: \n --help\tfor this message\n\n --port=3999\tchange the session port\n\n");
- printf ("See http://www.sflphone.org/ for more information\n");
+ delete args;
- } else {
FILE *fp;
char homepid[128];
char sfldir[128];
@@ -84,7 +122,7 @@ main (int argc, char **argv)
if ( (dir = opendir (sfldir)) == NULL) {
//Create it
if (mkdir (sfldir, 0755) != 0) {
- fprintf (stderr, "Creating directory %s failed. Exited.\n", sfldir);
+ fprintf (stderr, "Creating directory %s failed. Exited.", sfldir);
exit (-1);
}
}
@@ -95,14 +133,14 @@ main (int argc, char **argv)
if ( (dir = opendir (sfldir)) == NULL) {
//Create it
if (mkdir (sfldir, 0755) != 0) {
- fprintf (stderr, "Creating directory %s failed. Exited.\n", sfldir);
+ fprintf (stderr, "Creating directory %s failed. Exited.", sfldir);
exit (-1);
}
}
// PID file doesn't exists, create and write pid in it
if ( (fp = fopen (homepid,"w")) == NULL) {
- fprintf (stderr, "Creating PID file %s failed. Exited.\n", homepid);
+ fprintf (stderr, "Creating PID file %s failed. Exited.", homepid);
exit (-1);
} else {
fputs (cPid , fp);
@@ -119,11 +157,11 @@ main (int argc, char **argv)
fclose (fp);
if (kill (atoi (cOldPid), 0) == SUCCESS) {
- fprintf (stderr, "There is already a sflphoned daemon running in the system. Starting Failed.\n");
+ fprintf (stderr, "There is already a sflphoned daemon running in the system. Starting Failed.");
exit (-1);
} else {
if ( (fp = fopen (homepid,"w")) == NULL) {
- fprintf (stderr, "Writing to PID file %s failed. Exited.\n", homepid);
+ fprintf (stderr, "Writing to PID file %s failed. Exited.", homepid);
exit (-1);
} else {
fputs (cPid , fp);
@@ -155,7 +193,7 @@ main (int argc, char **argv)
std::cerr << e.what() << std::endl;
exit_code = -1;
} catch (...) {
- fprintf (stderr, "An exception occured when initializing the system.\n");
+ fprintf (stderr, "An exception occured when initializing the system.");
exit_code = -1;
}
@@ -163,7 +201,6 @@ main (int argc, char **argv)
Manager::instance().setDBusManager (&DBusManager::instance());
exit_code = DBusManager::instance().exec(); // UI Loop
}
- }
return exit_code;
}
diff --git a/sflphone-common/src/managerimpl.cpp b/sflphone-common/src/managerimpl.cpp
index 464c079ba679ef0cbb61d1a17be5ceecf38a424d..ca8ed41903e580d63fa4401e42e545d5ae38b541 100644
--- a/sflphone-common/src/managerimpl.cpp
+++ b/sflphone-common/src/managerimpl.cpp
@@ -114,19 +114,20 @@ ManagerImpl::~ManagerImpl (void)
// terminate();
delete _cleaner;
_cleaner=0;
- _debug ("%s stop correctly.\n", PROGNAME);
+ _debug ("%s stop correctly.", PROGNAME);
}
void
ManagerImpl::init()
{
+
// Load accounts, init map
loadAccountMap();
initVolume();
if (_exist == 0) {
- _debug ("Cannot create config file in your home directory\n");
+ _debug ("Cannot create config file in your home directory");
}
initAudioDriver();
@@ -159,23 +160,23 @@ ManagerImpl::init()
void ManagerImpl::terminate()
{
- _debug ("ManagerImpl::terminate \n");
+ _debug ("ManagerImpl::terminate ");
saveConfig();
unloadAccountMap();
- _debug ("Unload DTMF Key \n");
+ _debug ("Unload DTMF Key ");
delete _dtmfKey;
- _debug ("Unload Audio Driver \n");
+ _debug ("Unload Audio Driver ");
delete _audiodriver;
_audiodriver = NULL;
- _debug ("Unload Telephone Tone \n");
+ _debug ("Unload Telephone Tone ");
delete _telephoneTone;
_telephoneTone = NULL;
- _debug ("Unload Audio Codecs \n");
+ _debug ("Unload Audio Codecs ");
_codecDescriptorMap.deleteHandlePointer();
}
@@ -189,7 +190,7 @@ ManagerImpl::isCurrentCall (const CallID& callId)
bool
ManagerImpl::hasCurrentCall()
{
- // _debug ("ManagerImpl::hasCurrentCall current call ID = %s\n", _currentCallId2.c_str());
+ // _debug ("ManagerImpl::hasCurrentCall current call ID = %s", _currentCallId2.c_str());
if (_currentCallId2 != "") {
return true;
@@ -208,7 +209,7 @@ void
ManagerImpl::switchCall (const CallID& id)
{
ost::MutexLock m (_currentCallMutex);
- _debug ("----- Switch current call id to %s -----\n", id.c_str());
+ _debug ("----- Switch current call id to %s -----", id.c_str());
_currentCallId2 = id;
/*
@@ -223,7 +224,7 @@ ManagerImpl::switchCall (const CallID& id)
ConferenceMap::iterator iter = _conferencemap.find(id);
if(iter != _conferencemap.end())
{
- _debug(" set call recordable in audio layer\n");
+ _debug(" set call recordable in audio layer");
conf = iter->second;
al->setRecorderInstance((Recordable*)conf);
}
@@ -237,7 +238,7 @@ ManagerImpl::switchCall (const CallID& id)
Call *call = NULL;
call = getAccountLink (account_id)->getCall(id);
- _debug(" set call recordable in audio layer\n");
+ _debug(" set call recordable in audio layer");
al->setRecorderInstance((Recordable*)call);
}
}
@@ -257,7 +258,7 @@ ManagerImpl::outgoingCall (const std::string& account_id, const CallID& call_id,
Call::CallConfiguration callConfig;
SIPVoIPLink *siplink;
- _debug ("ManagerImpl::outgoingCall(%s)\n", call_id.c_str());
+ _debug ("ManagerImpl::outgoingCall(%s)", call_id.c_str());
CallID current_call_id = getCurrentCallId();
@@ -274,21 +275,21 @@ ManagerImpl::outgoingCall (const std::string& account_id, const CallID& call_id,
// in any cases we have to detach from current communication
if (hasCurrentCall()) {
- _debug (" outgoingCall: Has current call (%s) put it onhold\n", current_call_id.c_str());
+ _debug (" outgoingCall: Has current call (%s) put it onhold", current_call_id.c_str());
// if this is not a conferenceand this and is not a conference participant
if (!isConference (current_call_id) && !participToConference (current_call_id)) {
- _debug (" outgoingCall: Put the current call (%s) on hold\n", current_call_id.c_str());
+ _debug (" outgoingCall: Put the current call (%s) on hold", current_call_id.c_str());
onHoldCall (current_call_id);
} else if (isConference (current_call_id) && !participToConference (call_id)) {
- _debug (" outgoingCall: detach main participant from conference\n");
+ _debug (" outgoingCall: detach main participant from conference");
detachParticipant (default_id, current_call_id);
}
}
if (callConfig == Call::IPtoIP) {
- _debug (" outgoingCall: Start IP to IP call\n");
+ _debug (" outgoingCall: Start IP to IP call");
/* We need to retrieve the sip voiplink instance */
siplink = SIPVoIPLink::instance ("");
@@ -303,17 +304,17 @@ ManagerImpl::outgoingCall (const std::string& account_id, const CallID& call_id,
}
if (!accountExists (account_id)) {
- _debug ("! Manager Error: Outgoing Call: account doesn't exist\n");
+ _debug ("! Manager Error: Outgoing Call: account doesn't exist");
return false;
}
if (getAccountFromCall (call_id) != AccountNULL) {
- _debug ("! Manager Error: Outgoing Call: call id already exists\n");
+ _debug ("! Manager Error: Outgoing Call: call id already exists");
return false;
}
- _debug ("- Manager Action: Adding Outgoing Call %s on account %s\n", call_id.data(), account_id.data());
+ _debug ("- Manager Action: Adding Outgoing Call %s on account %s", call_id.data(), account_id.data());
associateCallToAccount (call_id, account_id);
@@ -322,7 +323,7 @@ ManagerImpl::outgoingCall (const std::string& account_id, const CallID& call_id,
return true;
} else {
callFailure (call_id);
- _debug ("! Manager Error: An error occur, the call was not created\n");
+ _debug ("! Manager Error: An error occur, the call was not created");
}
return false;
@@ -333,7 +334,7 @@ bool
ManagerImpl::answerCall (const CallID& call_id)
{
- _debug ("ManagerImpl::answerCall(%s)\n", call_id.c_str());
+ _debug ("ManagerImpl::answerCall(%s)", call_id.c_str());
stopTone ();
@@ -343,7 +344,7 @@ ManagerImpl::answerCall (const CallID& call_id)
AccountID account_id = getAccountFromCall (call_id);
if (account_id == AccountNULL) {
- _debug (" answerCall: AccountId is null\n");
+ _debug (" answerCall: AccountId is null");
}
Call* call = NULL;
@@ -351,23 +352,23 @@ ManagerImpl::answerCall (const CallID& call_id)
call = getAccountLink (account_id)->getCall (call_id);
if (call == NULL) {
- _debug (" answerCall: Call is null\n");
+ _debug (" answerCall: Call is null");
}
// in any cases we have to detach from current communication
if (hasCurrentCall()) {
- _debug (" answerCall: Currently conversing with %s\n", current_call_id.c_str());
+ _debug (" answerCall: Currently conversing with %s", current_call_id.c_str());
// if it is not a conference and is not a conference participant
if (!isConference (current_call_id) && !participToConference (current_call_id)) {
- _debug (" answerCall: Put the current call (%s) on hold\n", current_call_id.c_str());
+ _debug (" answerCall: Put the current call (%s) on hold", current_call_id.c_str());
onHoldCall (current_call_id);
}
// if we are talking to a conference and we are answering an incoming call
else if (isConference (current_call_id) && !participToConference (call_id)) {
- _debug (" answerCall: Detach main participant from conference\n");
+ _debug (" answerCall: Detach main participant from conference");
detachParticipant (default_id, current_call_id);
}
@@ -409,11 +410,10 @@ ManagerImpl::answerCall (const CallID& call_id)
bool
ManagerImpl::hangupCall (const CallID& call_id)
{
- _debug ("ManagerImpl::hangupCall(%s)\n", call_id.c_str());
+ _debug ("ManagerImpl::hangupCall(%s)", call_id.c_str());
PulseLayer *pulselayer;
AccountID account_id;
- bool returnValue;
- AudioLayer *audiolayer;
+ bool returnValue = true;
// store the current call id
CallID current_call_id = getCurrentCallId();
@@ -421,21 +421,10 @@ ManagerImpl::hangupCall (const CallID& call_id)
stopTone ();
/* Broadcast a signal over DBus */
- _debug (" hangupCall: Send DBUS call state change (HUNGUP) for id %s\n", call_id.c_str());
+ _debug (" hangupCall: Send DBUS call state change (HUNGUP) for id %s", call_id.c_str());
if (_dbus) _dbus->getCallManager()->callStateChanged (call_id, "HUNGUP");
- int nbCalls = getCallList().size();
-
- audiolayer = getAudioDriver();
-
- // stop streams
- if (audiolayer && (nbCalls <= 1)) {
- _debug (" hangupCall: stop audio stream, ther is only %i call(s) remaining\n", nbCalls);
- audiolayer->stopStream();
- }
-
-
if (participToConference (call_id)) {
Conference *conf = getConferenceFromCallID (call_id);
@@ -457,19 +446,30 @@ ManagerImpl::hangupCall (const CallID& call_id)
if (getConfigFromCall (call_id) == Call::IPtoIP) {
returnValue = SIPVoIPLink::instance (AccountNULL)->hangup (call_id);
}
-
/* Classic call, attached to an account */
else {
account_id = getAccountFromCall (call_id);
if (account_id == AccountNULL) {
- _debug ("! Manager Hangup Call: Call doesn't exists\n");
- return false;
+
+ _debug ("! Manager Hangup Call: Call doesn't exists");
+ returnValue = false;
}
+ else {
- returnValue = getAccountLink (account_id)->hangup (call_id);
+ returnValue = getAccountLink (account_id)->hangup (call_id);
+ removeCallAccount (call_id);
+ }
+ }
- removeCallAccount (call_id);
+ int nbCalls = getCallList().size();
+
+ AudioLayer *audiolayer = getAudioDriver();
+
+ // stop streams
+ if (audiolayer && (nbCalls <= 0)) {
+ _debug (" hangupCall: stop audio stream, ther is only %i call(s) remaining", nbCalls);
+ audiolayer->stopStream();
}
if (_audiodriver->getLayerType() == PULSEAUDIO) {
@@ -483,7 +483,7 @@ ManagerImpl::hangupCall (const CallID& call_id)
bool
ManagerImpl::hangupConference (const ConfID& id)
{
- _debug ("ManagerImpl::hangupConference()\n");
+ _debug ("ManagerImpl::hangupConference()");
Conference *conf;
ConferenceMap::iterator iter_conf = _conferencemap.find (id);
@@ -500,7 +500,7 @@ ManagerImpl::hangupConference (const ConfID& id)
ParticipantSet::iterator iter_participant = participants.begin();
while (iter_participant != participants.end()) {
- _debug ("ManagerImpl::hangupConference participant %s\n", (*iter_participant).c_str());
+ _debug ("ManagerImpl::hangupConference participant %s", (*iter_participant).c_str());
hangupCall (*iter_participant);
@@ -536,7 +536,7 @@ ManagerImpl::cancelCall (const CallID& id)
accountid = getAccountFromCall (id);
if (accountid == AccountNULL) {
- _debug ("! Manager Cancel Call: Call doesn't exists\n");
+ _debug ("! Manager Cancel Call: Call doesn't exists");
return false;
}
@@ -560,13 +560,13 @@ ManagerImpl::onHoldCall (const CallID& call_id)
AccountID account_id;
bool returnValue;
- _debug ("ManagerImpl::onHoldCall(%s)\n", call_id.c_str());
+ _debug ("ManagerImpl::onHoldCall(%s)", call_id.c_str());
stopTone ();
CallID current_call_id = getCurrentCallId();
- _debug (" onHoldCall: try to put call %s on hold\n", call_id.c_str());
+ _debug (" onHoldCall: try to put call %s on hold", call_id.c_str());
/* Direct IP to IP call */
@@ -579,7 +579,7 @@ ManagerImpl::onHoldCall (const CallID& call_id)
account_id = getAccountFromCall (call_id);
if (account_id == AccountNULL) {
- _debug (" onHoldCall: Account ID %s or callid %s doesn't exists\n", account_id.c_str(), call_id.c_str());
+ _debug (" onHoldCall: Account ID %s or callid %s doesn't exists", account_id.c_str(), call_id.c_str());
return false;
}
@@ -611,7 +611,7 @@ ManagerImpl::offHoldCall (const CallID& call_id)
is_rec = false;
- _debug ("ManagerImpl::offHoldCall(%s)\n", call_id.c_str());
+ _debug ("ManagerImpl::offHoldCall(%s)", call_id.c_str());
stopTone ();
@@ -622,10 +622,10 @@ ManagerImpl::offHoldCall (const CallID& call_id)
if (hasCurrentCall()) {
// if this is not a conferenceand this and is not a conference participant
if (!isConference (current_call_id) && !participToConference (current_call_id)) {
- _debug (" offHoldCall: put current call (%s) on hold\n", current_call_id.c_str());
+ _debug (" offHoldCall: put current call (%s) on hold", current_call_id.c_str());
onHoldCall (current_call_id);
} else if (isConference (current_call_id) && !participToConference (call_id)) {
- _debug (" offHoldCall Put current conference (%s) on hold\n", current_call_id.c_str());
+ _debug (" offHoldCall Put current conference (%s) on hold", current_call_id.c_str());
detachParticipant (default_id, current_call_id);
}
}
@@ -644,11 +644,11 @@ ManagerImpl::offHoldCall (const CallID& call_id)
account_id = getAccountFromCall (call_id);
if (account_id == AccountNULL) {
- _debug ("Manager OffHold Call: Call doesn't exists\n");
+ _debug ("Manager OffHold Call: Call doesn't exists");
return false;
}
- _debug ("Setting OFFHOLD, Account %s, callid %s\n", account_id.c_str(), call_id.c_str());
+ _debug ("Setting OFFHOLD, Account %s, callid %s", account_id.c_str(), call_id.c_str());
is_rec = getAccountLink (account_id)->getCall (call_id)->isRecording();
returnValue = getAccountLink (account_id)->offhold (call_id);
@@ -680,7 +680,7 @@ ManagerImpl::offHoldCall (const CallID& call_id)
// codecName = getCurrentCodecName (call_id);
- // _debug("ManagerImpl::hangupCall(): broadcast codec name %s \n",codecName.c_str());
+ // _debug("ManagerImpl::hangupCall(): broadcast codec name %s ",codecName.c_str());
// if (_dbus) _dbus->getCallManager()->currentSelectedCodec (call_id,codecName.c_str());
@@ -699,18 +699,37 @@ ManagerImpl::transferCall (const CallID& call_id, const std::string& to)
CallID current_call_id = getCurrentCallId();
- /* Direct IP to IP call */
+ if (participToConference (call_id)) {
+
+ _debug("Particip to a conference\n");
+
+ Conference *conf = getConferenceFromCallID (call_id);
+
+ if (conf != NULL) {
+ // remove this participant
+ removeParticipant (call_id);
+
+ processRemainingParticipant (current_call_id, conf);
+ }
+ } else {
+
+ _debug("Do not Particip to a conference\n");
+ // we are not participating to a conference, current call switched to ""
+ if (!isConference (current_call_id))
+ switchCall ("");
+ }
+
+ /* Direct IP to IP call */
if (getConfigFromCall (call_id) == Call::IPtoIP) {
returnValue = SIPVoIPLink::instance (AccountNULL)-> transfer (call_id, to);
}
-
/* Classic call, attached to an account */
else {
accountid = getAccountFromCall (call_id);
if (accountid == AccountNULL) {
- _debug ("! Manager Transfer Call: Call doesn't exists\n");
+ _debug ("! Manager Transfer Call: Call doesn't exists");
return false;
}
@@ -721,22 +740,6 @@ ManagerImpl::transferCall (const CallID& call_id, const std::string& to)
removeWaitingCall (call_id);
- if (participToConference (call_id)) {
-
- Conference *conf = getConferenceFromCallID (call_id);
-
- if (conf != NULL) {
- // remove this participant
- removeParticipant (call_id);
-
- processRemainingParticipant (current_call_id, conf);
- }
- } else {
- // we are not participating to a conference, current call switched to ""
- if (!isConference (current_call_id))
- switchCall ("");
- }
-
if (_dbus) _dbus->getCallManager()->callStateChanged (call_id, "HUNGUP");
return returnValue;
@@ -771,7 +774,7 @@ ManagerImpl::refuseCall (const CallID& id)
// AudioLayer* audiolayer = getAudioDriver();
if (nbCalls <= 1) {
- _debug (" hangupCall: stop audio stream, ther is only %i call(s) remaining\n", nbCalls);
+ _debug (" hangupCall: stop audio stream, ther is only %i call(s) remaining", nbCalls);
AudioLayer* audiolayer = getAudioDriver();
audiolayer->stopStream();
@@ -788,7 +791,7 @@ ManagerImpl::refuseCall (const CallID& id)
accountid = getAccountFromCall (id);
if (accountid == AccountNULL) {
- _debug ("! Manager OffHold Call: Call doesn't exists\n");
+ _debug ("! Manager OffHold Call: Call doesn't exists");
return false;
}
@@ -817,7 +820,7 @@ ManagerImpl::refuseCall (const CallID& id)
Conference*
ManagerImpl::createConference (const CallID& id1, const CallID& id2)
{
- _debug ("ManagerImpl::createConference()\n");
+ _debug ("ManagerImpl::createConference()");
Conference* conf = new Conference();
@@ -838,21 +841,21 @@ void
ManagerImpl::removeConference (const ConfID& conference_id)
{
- _debug ("ManagerImpl::removeConference(%s)\n", conference_id.c_str());
+ _debug ("ManagerImpl::removeConference(%s)", conference_id.c_str());
Conference* conf = NULL;
- _debug (" removeConference: _conferencemap.size: %i\n", (int) _conferencemap.size());
+ _debug (" removeConference: _conferencemap.size: %i", (int) _conferencemap.size());
ConferenceMap::iterator iter = _conferencemap.find (conference_id);
if (iter != _conferencemap.end()) {
- _debug (" removeConference: Found conference id %s in conferencemap\n", conference_id.c_str());
+ _debug (" removeConference: Found conference id %s in conferencemap", conference_id.c_str());
conf = iter->second;
}
if (conf == NULL) {
- _debug (" removeConference: Error conference not found\n");
+ _debug (" removeConference: Error conference not found");
return;
}
@@ -875,15 +878,15 @@ ManagerImpl::removeConference (const ConfID& conference_id)
}
// Then remove the conference from the conference map
- _debug ("ManagerImpl:: remove conference %s\n", conference_id.c_str());
+ _debug ("ManagerImpl:: remove conference %s", conference_id.c_str());
if (_conferencemap.erase (conference_id) == 1)
- _debug ("ManagerImpl:: conference %s removed succesfully\n", conference_id.c_str());
+ _debug ("ManagerImpl:: conference %s removed succesfully", conference_id.c_str());
else
- _debug ("ManagerImpl:: error cannot remove conference id: %s\n", conference_id.c_str());
+ _debug ("ManagerImpl:: error cannot remove conference id: %s", conference_id.c_str());
// broadcast a signal over dbus
- _debug ("ManagerImpl::removeConference broadcast call removed on dbus: %s\n", conference_id.c_str());
+ _debug ("ManagerImpl::removeConference broadcast call removed on dbus: %s", conference_id.c_str());
_dbus->getCallManager()->conferenceRemoved (conference_id);
@@ -911,7 +914,7 @@ ManagerImpl::getConferenceFromCallID (const CallID& call_id)
void
ManagerImpl::holdConference (const CallID& id)
{
- _debug ("ManagerImpl::holdConference()\n");
+ _debug ("ManagerImpl::holdConference()");
Conference *conf;
ConferenceMap::iterator iter_conf = _conferencemap.find (id);
@@ -927,7 +930,7 @@ ManagerImpl::holdConference (const CallID& id)
ParticipantSet::iterator iter_participant = participants.begin();
while (iter_participant != participants.end()) {
- _debug (" holdConference: participant %s\n", (*iter_participant).c_str());
+ _debug (" holdConference: participant %s", (*iter_participant).c_str());
currentAccountId = getAccountFromCall (*iter_participant);
call = getAccountLink (currentAccountId)->getCall (*iter_participant);
@@ -954,7 +957,7 @@ void
ManagerImpl::unHoldConference (const CallID& id)
{
- _debug ("ManagerImpl::unHoldConference()\n");
+ _debug ("ManagerImpl::unHoldConference()");
Conference *conf;
ConferenceMap::iterator iter_conf = _conferencemap.find (id);
@@ -970,7 +973,7 @@ ManagerImpl::unHoldConference (const CallID& id)
ParticipantSet::iterator iter_participant = participants.begin();
while (iter_participant != participants.end()) {
- _debug (" unholdConference: participant %s\n", (*iter_participant).c_str());
+ _debug (" unholdConference: participant %s", (*iter_participant).c_str());
currentAccountId = getAccountFromCall (*iter_participant);
call = getAccountLink (currentAccountId)->getCall (*iter_participant);
@@ -1011,12 +1014,15 @@ ManagerImpl::participToConference (const CallID& call_id)
accountId = getAccountFromCall (call_id);
call = getAccountLink (accountId)->getCall (call_id);
- if (call == NULL)
+ if (call == NULL) {
return false;
+ }
+
if (call->getConfId() == "") {
return false;
} else {
+
return true;
}
}
@@ -1025,7 +1031,7 @@ ManagerImpl::participToConference (const CallID& call_id)
void
ManagerImpl::addParticipant (const CallID& call_id, const CallID& conference_id)
{
- _debug ("ManagerImpl::addParticipant(%s, %s)\n", call_id.c_str(), conference_id.c_str());
+ _debug ("ManagerImpl::addParticipant(%s, %s)", call_id.c_str(), conference_id.c_str());
std::map<std::string, std::string> call_details = getCallDetails (call_id);
@@ -1051,7 +1057,7 @@ ManagerImpl::addParticipant (const CallID& call_id, const CallID& conference_id)
addMainParticipant (conference_id);
- _debug (" addParticipant: enter main process\n");
+ _debug (" addParticipant: enter main process");
if (iter != _conferencemap.end()) {
@@ -1069,15 +1075,15 @@ ManagerImpl::addParticipant (const CallID& call_id, const CallID& conference_id)
iter_details = call_details.find ("CALL_STATE");
- _debug (" addParticipant: call state: %s\n", iter_details->second.c_str());
+ _debug (" addParticipant: call state: %s", iter_details->second.c_str());
if (iter_details->second == "HOLD") {
- _debug (" OFFHOLD %s\n", call_id.c_str());
+ _debug (" OFFHOLD %s", call_id.c_str());
// offHoldCall create a new rtp session which use addStream to bind participant
offHoldCall (call_id);
} else if (iter_details->second == "INCOMING") {
- _debug (" ANSWER %s\n", call_id.c_str());
+ _debug (" ANSWER %s", call_id.c_str());
// answerCall create a new rtp session which use addStream to bind participant
answerCall (call_id);
} else if (iter_details->second == "CURRENT") {
@@ -1103,7 +1109,7 @@ ManagerImpl::addParticipant (const CallID& call_id, const CallID& conference_id)
_audiodriver->getMainBuffer()->flush (default_id);
} else {
- _debug (" addParticipant: Error, conference %s conference_id not found!\n", conference_id.c_str());
+ _debug (" addParticipant: Error, conference %s conference_id not found!", conference_id.c_str());
}
}
@@ -1162,8 +1168,8 @@ ManagerImpl::addMainParticipant (const CallID& conference_id)
void
ManagerImpl::joinParticipant (const CallID& call_id1, const CallID& call_id2)
{
- _debug ("ManagerImpl::joinParticipant(%s, %s)\n", call_id1.c_str(), call_id2.c_str());
- // _debug(" Current call ID %s\n", getCurrentCallId().c_str());
+ _debug ("ManagerImpl::joinParticipant(%s, %s)", call_id1.c_str(), call_id2.c_str());
+ // _debug(" Current call ID %s", getCurrentCallId().c_str());
std::map<std::string, std::string> call1_details = getCallDetails (call_id1);
std::map<std::string, std::string> call2_details = getCallDetails (call_id2);
@@ -1174,7 +1180,7 @@ ManagerImpl::joinParticipant (const CallID& call_id1, const CallID& call_id2)
Call* call = NULL;
CallID current_call_id = getCurrentCallId();
- _debug (" joinParticipant: current_call_id %s\n", current_call_id.c_str());
+ _debug (" joinParticipant: current_call_id %s", current_call_id.c_str());
// detach from the conference and switch to this conference
@@ -1186,7 +1192,7 @@ ManagerImpl::joinParticipant (const CallID& call_id1, const CallID& call_id2)
onHoldCall (current_call_id);
}
- _debug (" joinParticipant: create a conference\n");
+ _debug (" joinParticipant: create a conference");
Conference *conf = createConference (call_id1, call_id2);
switchCall (conf->getConfID());
@@ -1196,23 +1202,23 @@ ManagerImpl::joinParticipant (const CallID& call_id1, const CallID& call_id2)
call->setConfId (conf->getConfID());
iter_details = call1_details.find ("CALL_STATE");
- _debug (" joinParticipant: call1 %s state: %s\n", call_id1.c_str(), iter_details->second.c_str());
+ _debug (" joinParticipant: call1 %s state: %s", call_id1.c_str(), iter_details->second.c_str());
if (iter_details->second == "HOLD") {
- _debug (" OFFHOLD %s\n", call_id1.c_str());
+ _debug (" OFFHOLD %s", call_id1.c_str());
offHoldCall (call_id1);
} else if (iter_details->second == "INCOMING") {
- _debug (" ANSWER %s\n", call_id1.c_str());
+ _debug (" ANSWER %s", call_id1.c_str());
answerCall (call_id1);
} else if (iter_details->second == "CURRENT") {
- _debug (" CURRENT %s\n", call_id1.c_str());
+ _debug (" CURRENT %s", call_id1.c_str());
_audiodriver->getMainBuffer()->unBindAll (call_id1);
conf->bindParticipant (call_id1);
} else if (iter_details->second == "INACTIVE") {
- _debug (" INACTIVE %s\n", call_id1.c_str());
+ _debug (" INACTIVE %s", call_id1.c_str());
answerCall (call_id1);
} else {
- _debug (" CAll State not recognized\n");
+ _debug (" CAll State not recognized");
}
currentAccountId = getAccountFromCall (call_id2);
@@ -1221,23 +1227,23 @@ ManagerImpl::joinParticipant (const CallID& call_id1, const CallID& call_id2)
call->setConfId (conf->getConfID());
iter_details = call2_details.find ("CALL_STATE");
- _debug (" joinParticipant: call2 %s state: %s\n", call_id2.c_str(), iter_details->second.c_str());
+ _debug (" joinParticipant: call2 %s state: %s", call_id2.c_str(), iter_details->second.c_str());
if (iter_details->second == "HOLD") {
- _debug (" OFFHOLD %s\n", call_id2.c_str());
+ _debug (" OFFHOLD %s", call_id2.c_str());
offHoldCall (call_id2);
} else if (iter_details->second == "INCOMING") {
- _debug (" ANSWER %s\n", call_id2.c_str());
+ _debug (" ANSWER %s", call_id2.c_str());
answerCall (call_id2);
} else if (iter_details->second == "CURRENT") {
- _debug (" CURRENT %s\n", call_id2.c_str());
+ _debug (" CURRENT %s", call_id2.c_str());
_audiodriver->getMainBuffer()->unBindAll (call_id2);
conf->bindParticipant (call_id2);
} else if (iter_details->second == "INACTIVE") {
- _debug (" INACTIVE %s\n", call_id2.c_str());
+ _debug (" INACTIVE %s", call_id2.c_str());
answerCall (call_id2);
} else {
- _debug (" CAll State not recognized\n");
+ _debug (" CAll State not recognized");
}
// finally bind main participant to conference
@@ -1246,13 +1252,16 @@ ManagerImpl::joinParticipant (const CallID& call_id1, const CallID& call_id2)
// switchCall(conf->getConfID());
+ if (_audiodriver)
+ _audiodriver->getMainBuffer()->stateInfo();
+
}
void
ManagerImpl::detachParticipant (const CallID& call_id, const CallID& current_id)
{
- _debug ("ManagerImpl::detachParticipant(%s)\n", call_id.c_str());
+ _debug ("ManagerImpl::detachParticipant(%s)", call_id.c_str());
CallID current_call_id = current_id;
@@ -1272,7 +1281,7 @@ ManagerImpl::detachParticipant (const CallID& call_id, const CallID& current_id)
if (conf != NULL) {
- _debug (" detachParticipant: detaching participant %s\n", call_id.c_str());
+ _debug (" detachParticipant: detaching participant %s", call_id.c_str());
std::map<std::string, std::string> call_details = getCallDetails (call_id);
std::map<std::string, std::string>::iterator iter_details;
@@ -1282,7 +1291,7 @@ ManagerImpl::detachParticipant (const CallID& call_id, const CallID& current_id)
if (iter_details->second == "RINGING") {
removeParticipant (call_id);
} else {
- _debug (" ONHOLD %s\n", call_id.c_str());
+ _debug (" ONHOLD %s", call_id.c_str());
onHoldCall (call_id);
removeParticipant (call_id);
@@ -1292,11 +1301,11 @@ ManagerImpl::detachParticipant (const CallID& call_id, const CallID& current_id)
} else {
- _debug (" detachParticipant: call is not conferencing, cannot detach\n");
+ _debug (" detachParticipant: call is not conferencing, cannot detach");
}
} else {
- _debug (" detachParticipant: unbind main participant from all\n");
+ _debug (" detachParticipant: unbind main participant from all");
_audiodriver->getMainBuffer()->unBindAll (default_id);
if (isConference (current_call_id)) {
@@ -1319,7 +1328,7 @@ ManagerImpl::detachParticipant (const CallID& call_id, const CallID& current_id)
void
ManagerImpl::removeParticipant (const CallID& call_id)
{
- _debug ("ManagerImpl::removeParticipant(%s)\n", call_id.c_str());
+ _debug ("ManagerImpl::removeParticipant(%s)", call_id.c_str());
// TODO: add conference_id as a second parameter
Conference* conf;
@@ -1335,17 +1344,20 @@ ManagerImpl::removeParticipant (const CallID& call_id)
ConferenceMap::iterator iter = conf_map.find (call->getConfId());
if (iter == conf_map.end()) {
- _debug (" no conference created, cannot remove participant \n");
+ _debug (" no conference created, cannot remove participant ");
} else {
conf = iter->second;
- _debug (" removeParticipant %s\n", call_id.c_str());
+ _debug (" removeParticipant %s", call_id.c_str());
conf->remove (call_id);
call->setConfId ("");
}
+ if (_audiodriver)
+ _audiodriver->getMainBuffer()->stateInfo();
+
}
@@ -1353,7 +1365,7 @@ void
ManagerImpl::processRemainingParticipant (CallID current_call_id, Conference *conf)
{
- _debug ("ManagerImpl::processRemainingParticipant()\n");
+ _debug ("ManagerImpl::processRemainingParticipant()");
if (conf->getNbParticipants() > 1) {
@@ -1408,7 +1420,7 @@ ManagerImpl::processRemainingParticipant (CallID current_call_id, Conference *co
void
ManagerImpl::joinConference (const CallID& conf_id1, const CallID& conf_id2)
{
- _debug ("ManagerImpl::joinConference(%s, %s)\n", conf_id1.c_str(), conf_id2.c_str());
+ _debug ("ManagerImpl::joinConference(%s, %s)", conf_id1.c_str(), conf_id2.c_str());
ConferenceMap::iterator iter;
@@ -1443,7 +1455,7 @@ ManagerImpl::joinConference (const CallID& conf_id1, const CallID& conf_id2)
void
ManagerImpl::addStream (const CallID& call_id)
{
- _debug ("ManagerImpl::addStream %s\n", call_id.c_str());
+ _debug ("ManagerImpl::addStream %s", call_id.c_str());
AccountID currentAccountId;
Call* call = NULL;
@@ -1459,7 +1471,6 @@ ManagerImpl::addStream (const CallID& call_id)
if (iter != _conferencemap.end()) {
Conference* conf = iter->second;
- _debug (" addStream: bind call %s to conference %s\n", call_id.c_str(), conf->getConfID().c_str());
conf->bindParticipant (call_id);
@@ -1481,7 +1492,6 @@ ManagerImpl::addStream (const CallID& call_id)
} else {
- _debug (" addStream: bind call %s to main\n", call_id.c_str());
// bind to main
getAudioDriver()->getMainBuffer()->bindCallID (call_id);
@@ -1491,12 +1501,15 @@ ManagerImpl::addStream (const CallID& call_id)
_audiodriver->flushMain();
}
+
+ if (_audiodriver)
+ _audiodriver->getMainBuffer()->stateInfo();
}
void
ManagerImpl::removeStream (const CallID& call_id)
{
- _debug ("ManagerImpl::removeStream %s\n", call_id.c_str());
+ _debug ("ManagerImpl::removeStream %s", call_id.c_str());
getAudioDriver()->getMainBuffer()->unBindAll (call_id);
@@ -1504,13 +1517,15 @@ ManagerImpl::removeStream (const CallID& call_id)
removeParticipant (call_id);
}
+ if (_audiodriver)
+ _audiodriver->getMainBuffer()->stateInfo();
}
//THREAD=Main
bool
ManagerImpl::saveConfig (void)
{
- _debug ("Saving Configuration to XDG directory %s ... \n", _path.c_str());
+ _debug ("Saving Configuration to XDG directory %s ... ", _path.c_str());
setConfig (AUDIO, VOLUME_SPKR, getSpkrVolume());
setConfig (AUDIO, VOLUME_MICRO, getMicVolume());
@@ -1518,44 +1533,6 @@ ManagerImpl::saveConfig (void)
return _setupLoaded;
}
-//THREAD=Main
-int
-ManagerImpl::initRegisterAccounts()
-{
- int status;
- bool flag = true;
- AccountMap::iterator iter;
-
- _debugInit ("Initiate VoIP Links Registration");
- iter = _accountMap.begin();
-
- /* Loop on the account map previously loaded */
-
- while (iter != _accountMap.end()) {
- if (iter->second) {
- iter->second->loadConfig();
- /* If the account is set as enabled, try to register */
-
- if (iter->second->isEnabled()) {
- status = iter->second->registerVoIPLink();
-
- if (status != SUCCESS) {
- flag = false;
- }
- }
- }
-
- iter++;
- }
-
- // calls the client notification here in case of errors at startup...
- if (_audiodriver -> getErrorMessage() != -1)
- notifyErrClient (_audiodriver -> getErrorMessage());
-
- ASSERT (flag, true);
-
- return SUCCESS;
-}
//THREAD=Main
bool
@@ -1601,14 +1578,14 @@ ManagerImpl::playDtmf (char code)
AudioLayer *audiolayer;
SFLDataFormat *buf;
- _debug ("ManagerImpl::playDtmf\n");
+ _debug ("ManagerImpl::playDtmf");
stopTone ();
bool hasToPlayTone = getConfigBool (SIGNALISATION, PLAY_DTMF);
if (!hasToPlayTone) {
- _debug (" playDtmf: Do not have to play a tone...\n");
+ _debug (" playDtmf: Do not have to play a tone...");
return false;
}
@@ -1616,7 +1593,7 @@ ManagerImpl::playDtmf (char code)
pulselen = getConfigInt (SIGNALISATION, PULSE_LENGTH);
if (!pulselen) {
- _debug (" playDtmf: Pulse length is not set...\n");
+ _debug (" playDtmf: Pulse length is not set...");
return false;
}
@@ -1628,7 +1605,7 @@ ManagerImpl::playDtmf (char code)
// fast return, no sound, so no dtmf
if (audiolayer==0 || _dtmfKey == 0) {
- _debug (" playDtmf: Error no audio layer...\n");
+ _debug (" playDtmf: Error no audio layer...");
return false;
}
@@ -1638,9 +1615,9 @@ ManagerImpl::playDtmf (char code)
// ms/s
size = (int) ( (pulselen * (float) audiolayer->getSampleRate()) / 1000);
- _debug ("DTMF pulselen: %i\n", pulselen);
+ _debug ("DTMF pulselen: %i", pulselen);
- _debug ("DTMF size: %i\n", size);
+ _debug ("DTMF size: %i", size);
// this buffer is for mono
// TODO <-- this should be global and hide if same size
@@ -1658,7 +1635,7 @@ ManagerImpl::playDtmf (char code)
audiolayer->startStream();
audiolayer->putUrgent (buf, size * sizeof (SFLDataFormat));
} else {
- _debug (" playDtmf: Error cannot play dtmf\n");
+ _debug (" playDtmf: Error cannot play dtmf");
}
ret = true;
@@ -1721,7 +1698,7 @@ ManagerImpl::incomingCall (Call* call, const AccountID& accountId)
stopTone ();
- _debug ("Incoming call %s for account %s\n", call->getCallId().data(), accountId.c_str());
+ _debug ("Incoming call %s for account %s", call->getCallId().data(), accountId.c_str());
associateCallToAccount (call->getCallId(), accountId);
@@ -1746,7 +1723,7 @@ ManagerImpl::incomingCall (Call* call, const AccountID& accountId)
}
- _debug ("ManagerImpl::incomingCall :: hasCurrentCall() %i \n", hasCurrentCall());
+ _debug ("ManagerImpl::incomingCall :: hasCurrentCall() %i ", hasCurrentCall());
if (!hasCurrentCall()) {
@@ -1770,7 +1747,7 @@ ManagerImpl::incomingCall (Call* call, const AccountID& accountId)
display_name = call->getDisplayName();
- // _debug( "incomingCall from: %s, number: %s, display_name: %s\n", from.c_str(), number.c_str(), display_name.c_str());
+ // _debug( "incomingCall from: %s, number: %s, display_name: %s", from.c_str(), number.c_str(), display_name.c_str());
if (from != "" && number != "") {
from.append (" <");
@@ -1786,13 +1763,13 @@ ManagerImpl::incomingCall (Call* call, const AccountID& accountId)
CallIDSet::iterator iter = _waitingCall.begin();
while (iter != _waitingCall.end()) {
CallID ident = *iter;
- _debug("ManagerImpl::incomingCall :: CALL iteration: %s \n",ident.c_str());
+ _debug("ManagerImpl::incomingCall :: CALL iteration: %s ",ident.c_str());
++iter;
}
*/
/* Broadcast a signal over DBus */
- _debug ("From: %s, Number: %s, DisplayName: %s\n", from.c_str(), number.c_str(), display_name.c_str());
+ _debug ("From: %s, Number: %s, DisplayName: %s", from.c_str(), number.c_str(), display_name.c_str());
display = display_name;
@@ -1834,7 +1811,7 @@ ManagerImpl::peerAnsweredCall (const CallID& id)
// std::string codecName = getCurrentCodecName (id);
- // _debug("ManagerImpl::hangupCall(): broadcast codec name %s \n",codecName.c_str());
+ // _debug("ManagerImpl::hangupCall(): broadcast codec name %s ",codecName.c_str());
// if (_dbus) _dbus->getCallManager()->currentSelectedCodec (id,codecName.c_str());
// Required if there have been no sip reinvite, in this case we must reinit buffers since the
@@ -1862,7 +1839,7 @@ ManagerImpl::peerHungupCall (const CallID& call_id)
AccountID account_id;
bool returnValue;
- _debug ("ManagerImpl::peerHungupCall(%s)\n", call_id.c_str());
+ _debug ("ManagerImpl::peerHungupCall(%s)", call_id.c_str());
// store the current call id
CallID current_call_id = getCurrentCallId();
@@ -1886,18 +1863,7 @@ ManagerImpl::peerHungupCall (const CallID& call_id)
}
}
- int nbCalls = getCallList().size();
-
- // stop streams
-
- if (nbCalls <= 1) {
- _debug (" hangupCall: stop audio stream, ther is only %i call(s) remaining\n", nbCalls);
-
- AudioLayer* audiolayer = getAudioDriver();
- audiolayer->stopStream();
- }
-
- /* Direct IP to IP call */
+ /* Direct IP to IP call */
if (getConfigFromCall (call_id) == Call::IPtoIP) {
SIPVoIPLink::instance (AccountNULL)->hangup (call_id);
}
@@ -1907,7 +1873,7 @@ ManagerImpl::peerHungupCall (const CallID& call_id)
account_id = getAccountFromCall (call_id);
if (account_id == AccountNULL) {
- _debug ("peerHungupCall: Call doesn't exists\n");
+ _debug ("peerHungupCall: Call doesn't exists");
return;
}
@@ -1921,6 +1887,18 @@ ManagerImpl::peerHungupCall (const CallID& call_id)
removeCallAccount (call_id);
+ int nbCalls = getCallList().size();
+
+ // stop streams
+
+ if (nbCalls <= 0) {
+ _debug (" hangupCall: stop audio stream, ther is only %i call(s) remaining", nbCalls);
+
+ AudioLayer* audiolayer = getAudioDriver();
+ audiolayer->stopStream();
+ }
+
+
if (_audiodriver->getLayerType() == PULSEAUDIO) {
pulselayer = dynamic_cast<PulseLayer *> (getAudioDriver());
}
@@ -1930,7 +1908,7 @@ ManagerImpl::peerHungupCall (const CallID& call_id)
void
ManagerImpl::callBusy (const CallID& id)
{
- _debug ("Call busy\n");
+ _debug ("Call busy");
if (_dbus) _dbus->getCallManager()->callStateChanged (id, "BUSY");
@@ -2002,7 +1980,7 @@ bool ManagerImpl::playATone (Tone::TONEID toneId)
AudioLayer *audiolayer;
// unsigned int nbSamples;
- _debug ("ManagerImpl::playATone\n");
+ _debug ("ManagerImpl::playATone");
hasToPlayTone = getConfigBool (SIGNALISATION, PLAY_TONES);
@@ -2045,7 +2023,7 @@ void ManagerImpl::stopTone ()
{
bool hasToPlayTone;
- _debug ("ManagerImpl::stopTone\n");
+ _debug ("ManagerImpl::stopTone");
hasToPlayTone = getConfigBool (SIGNALISATION, PLAY_TONES);
@@ -2101,7 +2079,7 @@ ManagerImpl::congestion ()
void
ManagerImpl::ringback ()
{
- _debug ("ManagerImpl::ringback\n");
+ _debug ("ManagerImpl::ringback");
playATone (Tone::TONE_RINGTONE);
}
@@ -2112,7 +2090,7 @@ ManagerImpl::ringback ()
void
ManagerImpl::ringtone()
{
- _debug ("ManagerImpl::ringtone\n");
+ _debug ("ManagerImpl::ringtone");
std::string ringchoice;
AudioLayer *audiolayer;
AudioCodec *codecForTone;
@@ -2121,7 +2099,7 @@ ManagerImpl::ringtone()
if (isRingtoneEnabled()) {
- _debug (" Tone is enabled\n");
+ _debug (" Tone is enabled");
//TODO Comment this because it makes the daemon crashes since the main thread
//synchronizes the ringtone thread.
@@ -2172,7 +2150,7 @@ ManagerImpl::ringtone()
AudioLoop*
ManagerImpl::getTelephoneTone()
{
- // _debug("ManagerImpl::getTelephoneTone()\n");
+ // _debug("ManagerImpl::getTelephoneTone()");
if (_telephoneTone != 0) {
ost::MutexLock m (_toneMutex);
return _telephoneTone->getCurrentTone();
@@ -2184,7 +2162,7 @@ ManagerImpl::getTelephoneTone()
AudioLoop*
ManagerImpl::getTelephoneFile()
{
- // _debug("ManagerImpl::getTelephoneFile()\n");
+ // _debug("ManagerImpl::getTelephoneFile()");
ost::MutexLock m (_toneMutex);
if (_audiofile.isStarted()) {
@@ -2202,7 +2180,7 @@ void ManagerImpl::notificationIncomingCall (void)
audiolayer = getAudioDriver();
- _debug ("ManagerImpl::notificationIncomingCall\n");
+ _debug ("ManagerImpl::notificationIncomingCall");
if (audiolayer != 0) {
samplerate = audiolayer->getSampleRate();
@@ -2232,7 +2210,7 @@ ManagerImpl::createSettingsPath (void)
std::string xdg_config, xdg_env;
- _debug ("XDG_CONFIG_HOME: %s\n", XDG_CONFIG_HOME);
+ _debug ("XDG_CONFIG_HOME: %s", XDG_CONFIG_HOME);
xdg_config = std::string (HOMEDIR) + DIR_SEPARATOR_STR + ".config" + DIR_SEPARATOR_STR + PROGDIR;
@@ -2246,7 +2224,7 @@ ManagerImpl::createSettingsPath (void)
if (mkdir (_path.data(), 0700) != 0) {
// If directory creation failed
if (errno != EEXIST) {
- _debug ("Cannot create directory: %s\n", strerror (errno));
+ _debug ("Cannot create directory: %s", strerror (errno));
return -1;
}
}
@@ -2263,7 +2241,7 @@ ManagerImpl::createSettingsPath (void)
void
ManagerImpl::initConfigFile (bool load_user_value, std::string alternate)
{
- _debug ("ManagerImpl::InitConfigFile\n");
+ _debug ("ManagerImpl::InitConfigFile");
// Default values, that will be overwritten by the call to
// 'populateFromFile' below.
@@ -2288,10 +2266,10 @@ ManagerImpl::initConfigFile (bool load_user_value, std::string alternate)
_config.addDefaultValue (std::pair<std::string, std::string> (TLS_REQUIRE_CLIENT_CERTIFICATE, TRUE_STR), IP2IP_PROFILE);
_config.addDefaultValue (std::pair<std::string, std::string> (TLS_NEGOTIATION_TIMEOUT_SEC, "2"), IP2IP_PROFILE);
_config.addDefaultValue (std::pair<std::string, std::string> (TLS_NEGOTIATION_TIMEOUT_MSEC, "0"), IP2IP_PROFILE);
+ _config.addDefaultValue (std::pair<std::string, std::string> (LOCAL_INTERFACE, "default"), IP2IP_PROFILE);
_config.addDefaultValue (std::pair<std::string, std::string> (PUBLISHED_SAMEAS_LOCAL, TRUE_STR), IP2IP_PROFILE);
_config.addDefaultValue (std::pair<std::string, std::string> (LOCAL_PORT, DEFAULT_SIP_PORT), IP2IP_PROFILE);
_config.addDefaultValue (std::pair<std::string, std::string> (PUBLISHED_PORT, DEFAULT_SIP_PORT), IP2IP_PROFILE);
- _config.addDefaultValue (std::pair<std::string, std::string> (LOCAL_ADDRESS, DEFAULT_ADDRESS), IP2IP_PROFILE);
_config.addDefaultValue (std::pair<std::string, std::string> (PUBLISHED_ADDRESS, DEFAULT_ADDRESS), IP2IP_PROFILE);
_config.addDefaultValue (std::pair<std::string, std::string> (STUN_ENABLE, DFT_STUN_ENABLE), IP2IP_PROFILE);
_config.addDefaultValue (std::pair<std::string, std::string> (STUN_SERVER, DFT_STUN_SERVER), IP2IP_PROFILE);
@@ -2425,11 +2403,11 @@ ManagerImpl::initAudioCodec (void)
void
ManagerImpl::setActiveCodecList (const std::vector< std::string >& list)
{
- _debug ("Set active codecs list\n");
+ _debug ("Set active codecs list");
_codecDescriptorMap.saveActiveCodecs (list);
// setConfig
std::string s = serialize (list);
- _debug ("Setting codec with payload number %s to the active list\n", s.c_str());
+ _debug ("Setting codec with payload number %s to the active list", s.c_str());
setConfig ("Audio", "ActiveCodecs", s);
}
@@ -2474,7 +2452,7 @@ ManagerImpl::serialize (std::vector<std::string> v)
std::vector <std::string>
ManagerImpl::getActiveCodecList (void)
{
- _debug ("ManagerImpl::getActiveCodecList\n");
+ _debug ("ManagerImpl::getActiveCodecList");
std::vector< std::string > v;
CodecOrder active = _codecDescriptorMap.getActiveCodecs();
unsigned int i=0;
@@ -2484,7 +2462,7 @@ ManagerImpl::getActiveCodecList (void)
std::stringstream ss;
ss << active[i];
v.push_back ( (ss.str()).data());
- _debug ("Codec with payload number %s is active\n", ss.str().data());
+ _debug ("Codec with payload number %s is active", ss.str().data());
i++;
}
@@ -2563,7 +2541,7 @@ std::vector<std::string>
ManagerImpl::getInputAudioPluginList (void)
{
std::vector<std::string> v;
- _debug ("Get input audio plugin list\n");
+ _debug ("Get input audio plugin list");
v.push_back ("default");
v.push_back ("surround40");
@@ -2579,7 +2557,7 @@ std::vector<std::string>
ManagerImpl::getOutputAudioPluginList (void)
{
std::vector<std::string> v;
- _debug ("Get output audio plugin list\n");
+ _debug ("Get output audio plugin list");
v.push_back (PCM_DEFAULT);
v.push_back (PCM_DMIX);
@@ -2596,7 +2574,7 @@ ManagerImpl::setInputAudioPlugin (const std::string& audioPlugin)
int layer = _audiodriver -> getLayerType();
if (CHECK_INTERFACE (layer , ALSA)) {
- _debug ("Set input audio plugin\n");
+ _debug ("Set input audio plugin");
_audiodriver -> setErrorMessage (-1);
_audiodriver -> openDevice (_audiodriver -> getIndexIn(),
_audiodriver -> getIndexOut(),
@@ -2620,7 +2598,7 @@ ManagerImpl::setOutputAudioPlugin (const std::string& audioPlugin)
int res;
- _debug ("Set output audio plugin\n");
+ _debug ("Set output audio plugin");
_audiodriver -> setErrorMessage (-1);
res = _audiodriver -> openDevice (_audiodriver -> getIndexIn(),
_audiodriver -> getIndexOut(),
@@ -2642,7 +2620,7 @@ ManagerImpl::setOutputAudioPlugin (const std::string& audioPlugin)
std::vector<std::string>
ManagerImpl::getAudioOutputDeviceList (void)
{
- _debug ("Get audio output device list\n");
+ _debug ("Get audio output device list");
AlsaLayer *layer;
std::vector <std::string> devices;
@@ -2662,14 +2640,14 @@ ManagerImpl::setAudioOutputDevice (const int index)
{
AlsaLayer *alsalayer;
std::string alsaplugin;
- _debug ("Set audio output device: %i\n", index);
+ _debug ("Set audio output device: %i", index);
_audiodriver -> setErrorMessage (-1);
alsalayer = dynamic_cast<AlsaLayer*> (getAudioDriver ());
alsaplugin = alsalayer->getAudioPlugin ();
- _debug (" set output plugin: %s\n", alsaplugin.c_str());
+ _debug (" set output plugin: %s", alsaplugin.c_str());
_audiodriver->openDevice (_audiodriver->getIndexIn(), index, _audiodriver->getSampleRate(), _audiodriver->getFrameSize(), SFL_PCM_PLAYBACK, alsaplugin);
@@ -2707,14 +2685,14 @@ ManagerImpl::setAudioInputDevice (const int index)
AlsaLayer *alsalayer;
std::string alsaplugin;
- _debug ("Set audio input device %i\n", index);
+ _debug ("Set audio input device %i", index);
_audiodriver -> setErrorMessage (-1);
alsalayer = dynamic_cast<AlsaLayer*> (getAudioDriver ());
alsaplugin = alsalayer->getAudioPlugin ();
- _debug (" set input plugin: %s\n", alsaplugin.c_str());
+ _debug (" set input plugin: %s", alsaplugin.c_str());
_audiodriver->openDevice (index, _audiodriver->getIndexOut(), _audiodriver->getSampleRate(), _audiodriver->getFrameSize(), SFL_PCM_CAPTURE, alsaplugin);
@@ -2731,7 +2709,7 @@ ManagerImpl::setAudioInputDevice (const int index)
std::vector<std::string>
ManagerImpl::getCurrentAudioDevicesIndex()
{
- _debug ("Get current audio devices index\n");
+ _debug ("Get current audio devices index");
std::vector<std::string> v;
std::stringstream ssi , sso;
sso << _audiodriver->getIndexOut();
@@ -2778,7 +2756,7 @@ ManagerImpl::getRingtoneChoice (void)
tone_path = tone_name ;
}
- _debug ("%s\n", tone_path.c_str());
+ _debug ("%s", tone_path.c_str());
return tone_path;
}
@@ -2799,7 +2777,7 @@ ManagerImpl::getRecordPath (void)
void
ManagerImpl::setRecordPath (const std::string& recPath)
{
- _debug ("ManagerImpl::setRecordPath(%s)! \n", recPath.c_str());
+ _debug ("ManagerImpl::setRecordPath(%s)! ", recPath.c_str());
setConfig (AUDIO, RECORD_PATH, recPath);
}
@@ -2860,7 +2838,7 @@ void
ManagerImpl::setRecordingCall (const CallID& id)
{
/*
- _debug ("ManagerImpl::setRecording()! \n");
+ _debug ("ManagerImpl::setRecording()! ");
AccountID accountid = getAccountFromCall (id);
getAccountLink (accountid)->setRecording (id);
@@ -2875,7 +2853,7 @@ bool
ManagerImpl::isRecording (const CallID& id)
{
/*
- _debug ("ManagerImpl::isRecording()! \n");
+ _debug ("ManagerImpl::isRecording()! ");
AccountID accountid = getAccountFromCall (id);
return getAccountLink (accountid)->isRecording (id);
@@ -2967,7 +2945,7 @@ void ManagerImpl::setAudioManager (const int32_t& api)
int type;
std::string alsaPlugin;
- _debug ("Setting audio manager \n");
+ _debug ("Setting audio manager ");
if (!_audiodriver)
return;
@@ -2975,7 +2953,7 @@ void ManagerImpl::setAudioManager (const int32_t& api)
type = _audiodriver->getLayerType();
if (type == api) {
- _debug ("Audio manager chosen already in use. No changes made. \n");
+ _debug ("Audio manager chosen already in use. No changes made. ");
return;
}
@@ -3002,7 +2980,7 @@ void
ManagerImpl::notifyErrClient (const int32_t& errCode)
{
if (_dbus) {
- _debug ("NOTIFY ERR NUMBER %i\n" , errCode);
+ _debug ("NOTIFY ERR NUMBER %i" , errCode);
_dbus -> getConfigurationManager() -> errorAlert (errCode);
}
}
@@ -3012,7 +2990,7 @@ ManagerImpl::getAudioDeviceIndex (const std::string name)
{
AlsaLayer *alsalayer;
- _debug ("Get audio device index\n");
+ _debug ("Get audio device index");
alsalayer = dynamic_cast<AlsaLayer *> (getAudioDriver());
@@ -3027,7 +3005,7 @@ ManagerImpl::getCurrentAudioOutputPlugin (void)
{
AlsaLayer *alsalayer;
- _debug ("Get alsa plugin\n");
+ _debug ("Get alsa plugin");
alsalayer = dynamic_cast<AlsaLayer *> (getAudioDriver());
@@ -3068,16 +3046,16 @@ ManagerImpl::initAudioDriver (void)
_audiodriver->setMainBuffer (&_mainBuffer);
}
} else
- _debug ("Error - Audio API unknown\n");
+ _debug ("Error - Audio API unknown");
if (_audiodriver == 0) {
- _debug ("Init audio driver error\n");
+ _debug ("Init audio driver error");
return false;
} else {
error = getAudioDriver()->getErrorMessage();
if (error == -1) {
- _debug ("Init audio driver: %i\n", error);
+ _debug ("Init audio driver: %i", error);
return false;
}
}
@@ -3097,7 +3075,7 @@ ManagerImpl::selectAudioDriver (void)
AlsaLayer *alsalayer;
layer = _audiodriver->getLayerType();
- _debug ("Audio layer type: %i\n" , layer);
+ _debug ("Audio layer type: %i" , layer);
/* Retrieve the global devices info from the user config */
alsaPlugin = getConfigString (AUDIO , ALSA_PLUGIN);
@@ -3117,13 +3095,13 @@ ManagerImpl::selectAudioDriver (void)
alsalayer = dynamic_cast<AlsaLayer*> (getAudioDriver ());
if (!alsalayer -> soundCardIndexExist (numCardIn , SFL_PCM_CAPTURE)) {
- _debug (" Card with index %i doesn't exist or cannot capture. Switch to 0.\n", numCardIn);
+ _debug (" Card with index %i doesn't exist or cannot capture. Switch to 0.", numCardIn);
numCardIn = ALSA_DFT_CARD_ID ;
setConfig (AUDIO , ALSA_CARD_ID_IN , ALSA_DFT_CARD_ID);
}
if (!alsalayer -> soundCardIndexExist (numCardOut , SFL_PCM_PLAYBACK)) {
- _debug (" Card with index %i doesn't exist or cannot playback . Switch to 0.\n", numCardOut);
+ _debug (" Card with index %i doesn't exist or cannot playback . Switch to 0.", numCardOut);
numCardOut = ALSA_DFT_CARD_ID ;
setConfig (AUDIO , ALSA_CARD_ID_OUT , ALSA_DFT_CARD_ID);
}
@@ -3145,7 +3123,7 @@ void ManagerImpl::switchAudioManager (void)
int type, samplerate, framesize, numCardIn, numCardOut;
std::string alsaPlugin;
- _debug ("Switching audio manager \n");
+ _debug ("Switching audio manager ");
if (!_audiodriver)
return;
@@ -3164,7 +3142,10 @@ void ManagerImpl::switchAudioManager (void)
numCardOut = getConfigInt (AUDIO , ALSA_CARD_ID_OUT);
- _debug ("Deleting current layer... \n");
+ _debug ("Deleting current layer... ");
+
+ // ost::MutexLock lock (*getAudioLayerMutex());
+ getAudioLayerMutex()->enter();
// _audiodriver->closeLayer();
delete _audiodriver;
@@ -3174,19 +3155,19 @@ void ManagerImpl::switchAudioManager (void)
switch (type) {
case ALSA:
- _debug ("Creating Pulseaudio layer...\n");
+ _debug ("Creating Pulseaudio layer...");
_audiodriver = new PulseLayer (this);
_audiodriver->setMainBuffer (&_mainBuffer);
break;
case PULSEAUDIO:
- _debug ("Creating ALSA layer...\n");
+ _debug ("Creating ALSA layer...");
_audiodriver = new AlsaLayer (this);
_audiodriver->setMainBuffer (&_mainBuffer);
break;
default:
- _debug ("Error: audio layer unknown\n");
+ _debug ("Error: audio layer unknown");
break;
}
@@ -3197,17 +3178,19 @@ void ManagerImpl::switchAudioManager (void)
if (_audiodriver -> getErrorMessage() != -1)
notifyErrClient (_audiodriver -> getErrorMessage());
- _debug ("Current device: %i \n", type);
+ _debug ("Current device: %i ", type);
- _debug ("has current call: %i \n", hasCurrentCall());
+ _debug ("has current call: %i ", hasCurrentCall());
if (hasCurrentCall())
_audiodriver->startStream();
+ // ost::MutexLock unlock (*getAudioLayerMutex());
+ getAudioLayerMutex()->leave();
// need to stop audio streams if there is currently no call
// if ( (type != PULSEAUDIO) && (!hasCurrentCall())) {
- // _debug("There is currently a call!!\n");
+ // _debug("There is currently a call!!");
// _audiodriver->stopStream();
// }
@@ -3251,52 +3234,11 @@ void ManagerImpl::setMicVolume (unsigned short mic_vol)
-
-
-void ManagerImpl::setLocalIp2IpInfo (const std::string& address)
-{
-
- std::string ip_address = std::string (address);
-
- int index = ip_address.find_first_of (":");
-
- std::string local_address = ip_address.substr (0,index);
- std::string local_port = ip_address.substr (index+1);
- int newPort = atoi (local_port.c_str());
-
- _debug ("Setting new address %s and port %s for default account (ip to ip calls)\n", local_address.c_str(), local_port.c_str());
-
- int prevPort = getConfigInt (IP2IP_PROFILE, LOCAL_PORT);
- std::string prevAddress = getConfigString (IP2IP_PROFILE, LOCAL_ADDRESS);
-
- if ( (prevPort != newPort) || (prevAddress.compare (local_address) != 0)) {
-
-
- if (_directIpAccount) {
-
- SIPAccount* account = dynamic_cast<SIPAccount*> (_directIpAccount);
-
- account->setLocalPort (newPort);
- account->setLocalAddress (local_address);
- }
-
- setConfig (IP2IP_PROFILE, LOCAL_ADDRESS, local_address);
-
- setConfig (IP2IP_PROFILE, LOCAL_PORT, newPort);
-
- SIPVoIPLink* siplink = SIPVoIPLink::instance ("");
- // if(siplink)
- siplink->updateAccountInfo (_directIpAccount->getAccountID());
- // this->restartPJSIP ();
- }
-}
-
-
+
int ManagerImpl::getLocalIp2IpPort (void)
{
-
- /* The SIP port used for default account (IP to IP) calls */
- _debug ("Default account port %i\n", getConfigInt (IP2IP_PROFILE, LOCAL_PORT));
+ // The SIP port used for default account (IP to IP) calls
+ _debug ("Default account port %i", getConfigInt (IP2IP_PROFILE, LOCAL_PORT));
return getConfigInt (IP2IP_PROFILE, LOCAL_PORT);
@@ -3467,7 +3409,7 @@ ManagerImpl::getConfigString (const std::string& section, const std::string&
bool
ManagerImpl::setConfig (const std::string& section, const std::string& name, const std::string& value)
{
- _debug ("ManagerImpl::setConfig %s %s %s\n", section.c_str(), name.c_str(), value.c_str());
+ _debug ("ManagerImpl::setConfig %s %s %s", section.c_str(), name.c_str(), value.c_str());
return _config.setConfigTreeItem (section, name, value);
}
@@ -3482,7 +3424,7 @@ ManagerImpl::setConfig (const std::string& section, const std::string& name, int
void ManagerImpl::setAccountsOrder (const std::string& order)
{
- _debug ("Setcreate accounts order : %s\n", order.c_str());
+ _debug ("Setcreate accounts order : %s", order.c_str());
// Set the new config
setConfig (PREFERENCES, CONFIG_ACCOUNTS_ORDER, order);
}
@@ -3504,7 +3446,8 @@ ManagerImpl::getAccountList()
iter = _accountMap.begin ();
while (iter != _accountMap.end()) {
- if (iter->second != NULL) {
+
+ if (iter->second != NULL && iter->first != IP2IP_PROFILE) {
//_debug("PUSHING BACK %s\n", iter->first.c_str());
v.push_back (iter->first.data());
}
@@ -3521,13 +3464,11 @@ ManagerImpl::getAccountList()
// This account has not been loaded, so we ignore it
if ( (iter=_accountMap.find (account_order[i])) != _accountMap.end()) {
// If the account is valid
- if (iter->second != NULL) {
+ if (iter->second != NULL && iter->first != IP2IP_PROFILE) {
v.push_back (iter->first.data ());
}
}
}
-
-
}
return v;
@@ -3540,7 +3481,7 @@ std::map< std::string, std::string > ManagerImpl::getAccountDetails (const Accou
Account * account = _accountMap[accountID];
if (account == NULL) {
- _debug ("Cannot getAccountDetails on a non-existing accountID %s. Defaults will be used.\n", accountID.c_str());
+ _debug ("Cannot getAccountDetails on a non-existing accountID %s. Defaults will be used.", accountID.c_str());
}
a.insert (std::pair<std::string, std::string> (CONFIG_ACCOUNT_ALIAS, getConfigString (accountID, CONFIG_ACCOUNT_ALIAS)));
@@ -3555,8 +3496,8 @@ std::map< std::string, std::string > ManagerImpl::getAccountDetails (const Accou
a.insert (std::pair<std::string, std::string> (AUTHENTICATION_USERNAME, getConfigString (accountID, AUTHENTICATION_USERNAME)));
a.insert (std::pair<std::string, std::string> (CONFIG_ACCOUNT_MAILBOX, getConfigString (accountID, CONFIG_ACCOUNT_MAILBOX)));
a.insert (std::pair<std::string, std::string> (CONFIG_ACCOUNT_REGISTRATION_EXPIRE, getConfigString (accountID, CONFIG_ACCOUNT_REGISTRATION_EXPIRE)));
+ a.insert (std::pair<std::string, std::string> (LOCAL_INTERFACE, getConfigString (accountID, LOCAL_INTERFACE)));
a.insert (std::pair<std::string, std::string> (PUBLISHED_SAMEAS_LOCAL, getConfigString (accountID, PUBLISHED_SAMEAS_LOCAL)));
- a.insert (std::pair<std::string, std::string> (LOCAL_ADDRESS, getConfigString (accountID, LOCAL_ADDRESS)));
a.insert (std::pair<std::string, std::string> (PUBLISHED_ADDRESS, getConfigString (accountID, PUBLISHED_ADDRESS)));
a.insert (std::pair<std::string, std::string> (LOCAL_PORT, getConfigString (accountID, LOCAL_PORT)));
a.insert (std::pair<std::string, std::string> (PUBLISHED_PORT, getConfigString (accountID, PUBLISHED_PORT)));
@@ -3666,7 +3607,7 @@ void ManagerImpl::setCredential (const std::string& accountID, const int32_t& in
std::string section = "Credential" + std::string (":") + accountID + std::string (":") + credentialIndex;
- _debug ("Setting credential in section %s\n", section.c_str());
+ _debug ("Setting credential in section %s", section.c_str());
it = credentialInformation.find (USERNAME);
std::string username;
@@ -3766,7 +3707,7 @@ void ManagerImpl::setAccountDetails (const std::string& accountID, const std::ma
// it is already saved as a MD5 Hash.
// TODO: This test is weak. Fix this.
if ( (password.compare (getConfigString (accountID, PASSWORD)) != 0)) {
- _debug ("Password sent and password from config are different. Re-hashing\n");
+ _debug ("Password sent and password from config are different. Re-hashing");
std::string hash;
if (authenticationName.empty()) {
@@ -3789,6 +3730,7 @@ void ManagerImpl::setAccountDetails (const std::string& accountID, const std::ma
std::string hostname;
std::string displayName;
+ std::string localInterface;
std::string publishedSameasLocal;
std::string localAddress;
std::string publishedAddress;
@@ -3825,12 +3767,12 @@ void ManagerImpl::setAccountDetails (const std::string& accountID, const std::ma
displayName = iter->second;
}
- if ( (iter = map_cpy.find (PUBLISHED_SAMEAS_LOCAL)) != map_cpy.end()) {
- publishedSameasLocal = iter->second;
+ if ( (iter = map_cpy.find (LOCAL_INTERFACE)) != map_cpy.end()) {
+ localInterface = iter->second;
}
- if ( (iter = map_cpy.find (LOCAL_ADDRESS)) != map_cpy.end()) {
- localAddress = iter->second;
+ if ( (iter = map_cpy.find (PUBLISHED_SAMEAS_LOCAL)) != map_cpy.end()) {
+ publishedSameasLocal = iter->second;
}
if ( (iter = map_cpy.find (PUBLISHED_ADDRESS)) != map_cpy.end()) {
@@ -3955,8 +3897,8 @@ void ManagerImpl::setAccountDetails (const std::string& accountID, const std::ma
setConfig (accountID, HOSTNAME, hostname);
+ setConfig (accountID, LOCAL_INTERFACE, localInterface);
setConfig (accountID, PUBLISHED_SAMEAS_LOCAL, publishedSameasLocal);
- setConfig (accountID, LOCAL_ADDRESS, localAddress);
setConfig (accountID, PUBLISHED_ADDRESS, publishedAddress);
setConfig (accountID, LOCAL_PORT, localPort);
setConfig (accountID, PUBLISHED_PORT, publishedPort);
@@ -4007,7 +3949,7 @@ void ManagerImpl::setAccountDetails (const std::string& accountID, const std::ma
acc->unregisterVoIPLink();
}
} else {
- _debug ("ManagerImpl::setAccountDetails: account is NULL\n");
+ _debug ("ManagerImpl::setAccountDetails: account is NULL");
}
// Update account details to the client side
@@ -4015,30 +3957,6 @@ void ManagerImpl::setAccountDetails (const std::string& accountID, const std::ma
}
-void
-ManagerImpl::sendRegister (const std::string& accountID , const int32_t& enable)
-{
-
- // Update the active field
- setConfig (accountID, CONFIG_ACCOUNT_ENABLE, (enable == 1) ? TRUE_STR:FALSE_STR);
-
- Account* acc = getAccount (accountID);
- acc->loadConfig();
-
- // Test on the freshly updated value
-
- if (acc->isEnabled()) {
- // Verify we aren't already registered, then register
- _debug ("Send register for account %s\n" , accountID.c_str());
- acc->registerVoIPLink();
- } else {
- // Verify we are already registered, then unregister
- _debug ("Send unregister for account %s\n" , accountID.c_str());
- acc->unregisterVoIPLink();
- }
-
-}
-
std::string
ManagerImpl::addAccount (const std::map< std::string, std::string >& details)
{
@@ -4055,16 +3973,17 @@ ManagerImpl::addAccount (const std::map< std::string, std::string >& details)
// Get the type
accountType = (*details.find (CONFIG_ACCOUNT_TYPE)).second;
- _debug ("%s\n", newAccountID.c_str());
+ _debug ("%s", newAccountID.c_str());
/** @todo Verify the uniqueness, in case a program adds accounts, two in a row. */
if (accountType == "SIP") {
newAccount = AccountCreator::createAccount (AccountCreator::SIP_ACCOUNT, newAccountID);
+ newAccount->setVoIPLink();
} else if (accountType == "IAX") {
newAccount = AccountCreator::createAccount (AccountCreator::IAX_ACCOUNT, newAccountID);
} else {
- _debug ("Unknown %s param when calling addAccount(): %s\n", CONFIG_ACCOUNT_TYPE, accountType.c_str());
+ _debug ("Unknown %s param when calling addAccount(): %s", CONFIG_ACCOUNT_TYPE, accountType.c_str());
return "";
}
@@ -4129,7 +4048,7 @@ ManagerImpl::removeAccount (const AccountID& accountID)
saveConfig();
- _debug ("REMOVE ACCOUNT\n");
+ _debug ("REMOVE ACCOUNT");
if (_dbus) _dbus->getConfigurationManager()->accountsChanged();
@@ -4143,7 +4062,7 @@ ManagerImpl::associateCallToAccount (const CallID& callID, const AccountID& acco
if (accountExists (accountID)) { // account id exist in AccountMap
ost::MutexLock m (_callAccountMapMutex);
_callAccountMap[callID] = accountID;
- _debug ("Associate Call %s with Account %s\n", callID.data(), accountID.data());
+ _debug ("Associate Call %s with Account %s", callID.data(), accountID.data());
return true;
} else {
return false;
@@ -4211,7 +4130,7 @@ short
ManagerImpl::loadAccountMap()
{
- _debug ("ManagerImpl::loadAccountMap\n");
+ _debug ("Loading account map\n");
short nbAccount = 0;
TokenList sections = _config.getSections();
@@ -4230,16 +4149,28 @@ ManagerImpl::loadAccountMap()
_directIpAccount = AccountCreator::createAccount (AccountCreator::SIP_DIRECT_IP_ACCOUNT, "");
if (_directIpAccount == NULL) {
+
_debug ("Failed to create direct ip calls \"account\"\n");
} else {
- // Force the options to be loaded
- // No registration in the sense of
- // the REGISTER method is performed.
+
_debug ("Succeed to create direct ip calls \"account\"\n");
_accountMap[IP2IP_PROFILE] = _directIpAccount;
- _directIpAccount->registerVoIPLink();
+
+ // Force IP2IP settings to be loaded to be loaded
+ // No registration in the sense of the REGISTER method is performed.
+ _directIpAccount->registerVoIPLink();
+
+ // SIPVoIPlink is used as a singleton, it is the first call to instance here
+ // The SIP library initialization is done in the SIPVoIPLink constructor
+ // We need the IP2IP settings to be loaded at this time as they are used
+ // for default sip transport
+
+ // _directIpAccount->setVoIPLink(SIPVoIPLink::instance (""));
+ _directIpAccount->setVoIPLink();
+
}
+ // initialize other accounts
while (iter != sections.end()) {
// Check if it starts with "Account:" (SIP and IAX pour le moment)
if ( (int) (iter->find ("Account:")) != 0) {
@@ -4258,31 +4189,21 @@ ManagerImpl::loadAccountMap()
}
else {
- _debug ("Unknown %s param in config file (%s)\n", CONFIG_ACCOUNT_TYPE, accountType.c_str());
+ _debug ("Unknown %s param in config file (%s)", CONFIG_ACCOUNT_TYPE, accountType.c_str());
}
if (tmpAccount != NULL) {
- _debug ("Loading account %s \n", iter->c_str());
+ _debug ("Loading account %s ", iter->c_str());
_accountMap[iter->c_str() ] = tmpAccount;
+ // tmpAccount->setVoIPLink(SIPVoIPLink::instance (""));
+ tmpAccount->setVoIPLink();
nbAccount++;
}
iter++;
}
- /*
- if (_directIpAccount == NULL) {
- _debug ("Failed to create direct ip calls \"account\"\n");
- } else {
- // Force the options to be loaded
- // No registration in the sense of
- // the REGISTER method is performed.
- _debug ("Succeed to create direct ip calls \"account\"\n");
- _directIpAccount->registerVoIPLink();
- _accountMap[IP2IP_PROFILE] = _directIpAccount;
- }
- */
- _debug ("nbAccount loaded %i \n", nbAccount);
+ _debug ("nb account loaded %i \n", nbAccount);
return nbAccount;
}
@@ -4295,7 +4216,8 @@ ManagerImpl::unloadAccountMap()
while (iter != _accountMap.end()) {
- _debug ("-> Unloading account %s\n", iter->first.c_str());
+ _debug ("Unloading account %s\n", iter->first.c_str());
+
delete iter->second;
iter->second = 0;
@@ -4323,7 +4245,7 @@ ManagerImpl::getAccount (const AccountID& accountID)
// In our definition,
// this is the "direct ip calls account"
if (accountID == AccountNULL) {
- _debug ("Returns the direct IP account\n");
+ _debug ("Returns the direct IP account");
return _directIpAccount;
}
@@ -4341,16 +4263,16 @@ ManagerImpl::getAccountIdFromNameAndServer (const std::string& userName, const s
{
AccountMap::iterator iter;
SIPAccount *account;
- _debug ("getAccountIdFromNameAndServer : username = %s , server = %s\n", userName.c_str(), server.c_str());
+ _debug ("getAccountIdFromNameAndServer : username = %s , server = %s", userName.c_str(), server.c_str());
// Try to find the account id from username and server name by full match
for (iter = _accountMap.begin(); iter != _accountMap.end(); ++iter) {
- _debug ("for : account = %s\n", iter->first.c_str());
+ _debug ("for : account = %s", iter->first.c_str());
account = dynamic_cast<SIPAccount *> (iter->second);
if (account != NULL) {
if (account->fullMatch (userName, server)) {
- _debug ("Matching accountId in request is a fullmatch\n");
+ _debug ("Matching accountId in request is a fullmatch");
return iter->first;
}
}
@@ -4362,7 +4284,7 @@ ManagerImpl::getAccountIdFromNameAndServer (const std::string& userName, const s
if (account != NULL) {
if (account->hostnameMatch (server)) {
- _debug ("Matching accountId in request with hostname\n");
+ _debug ("Matching accountId in request with hostname");
return iter->first;
}
}
@@ -4374,7 +4296,7 @@ ManagerImpl::getAccountIdFromNameAndServer (const std::string& userName, const s
if (account != NULL) {
if (account->userMatch (userName)) {
- _debug ("Matching accountId in request with username\n");
+ _debug ("Matching accountId in request with username");
return iter->first;
}
}
@@ -4384,124 +4306,6 @@ ManagerImpl::getAccountIdFromNameAndServer (const std::string& userName, const s
return AccountNULL;
}
-void ManagerImpl::restartPJSIP (void)
-{
- _debug ("ManagerImpl::restartPJSIP\n");
- VoIPLink *link = getSIPAccountLink();
- SIPVoIPLink *siplink = NULL;
-
- if (link) {
- siplink = dynamic_cast<SIPVoIPLink*> (getSIPAccountLink ());
- }
-
- _debug ("ManagerImpl::unregister sip account\n");
-
- this->unregisterCurSIPAccounts();
- /* Terminate and initialize the PJSIP library */
-
- if (siplink) {
- _debug ("ManagerImpl::Terminate sip\n");
- siplink->terminate ();
- siplink = SIPVoIPLink::instance ("");
- _debug ("ManagerImpl::Init new sip\n");
- siplink->init ();
- }
-
- _debug ("ManagerImpl::register sip account\n");
-
- /* Then register all enabled SIP accounts */
- this->registerCurSIPAccounts ();
-}
-
-VoIPLink* ManagerImpl::getAccountLink (const AccountID& accountID)
-{
- if (accountID!=AccountNULL) {
- Account* acc = getAccount (accountID);
-
- if (acc) {
- return acc->getVoIPLink();
- }
-
- return 0;
- } else
- return SIPVoIPLink::instance ("");
-}
-
-VoIPLink* ManagerImpl::getSIPAccountLink()
-{
- /* We are looking for the first SIP account we met because all the SIP accounts have the same voiplink */
- Account *account;
- AccountMap::iterator iter = _accountMap.begin();
-
- while (iter != _accountMap.end()) {
-
- account = iter->second;
-
- if (account->getType() == "sip") {
- return account->getVoIPLink();
- }
-
- ++iter;
- }
-
- return NULL;
-}
-
-
-
-
-pjsip_regc *getSipRegcFromID (const AccountID& id UNUSED)
-{
- /*SIPAccount *tmp = dynamic_cast<SIPAccount *>getAccount(id);
- if(tmp != NULL)
- return tmp->getSipRegc();
- else*/
- return NULL;
-}
-
-void ManagerImpl::unregisterCurSIPAccounts()
-{
- Account *current;
-
- AccountMap::iterator iter = _accountMap.begin();
-
- while (iter != _accountMap.end()) {
- current = iter->second;
-
- if (current) {
- if (current->isEnabled() && current->getType() == "sip") {
- current->unregisterVoIPLink();
- }
- }
-
- iter++;
- }
-}
-
-void ManagerImpl::registerCurSIPAccounts (void)
-{
-
- Account *current;
-
- AccountMap::iterator iter = _accountMap.begin();
-
- while (iter != _accountMap.end()) {
- current = iter->second;
-
- if (current) {
- if (current->isEnabled() && current->getType() == "sip") {
- //current->setVoIPLink(link);
- current->registerVoIPLink();
- }
- }
-
- current = NULL;
-
- iter++;
- }
-}
-
-
std::map<std::string, int32_t> ManagerImpl::getAddressbookSettings ()
{
@@ -4581,7 +4385,7 @@ void ManagerImpl::check_call_configuration (const CallID& id, const std::string
Call::CallConfiguration config;
if (to.find (SIP_SCHEME) == 0 || to.find (SIPS_SCHEME) == 0) {
- _debug ("Sending Sip Call \n");
+ _debug ("Sending Sip Call ");
config = Call::IPtoIP;
} else {
config = Call::Classic;
@@ -4598,7 +4402,7 @@ bool ManagerImpl::associateConfigToCall (const CallID& callID, Call::CallConfigu
if (getConfigFromCall (callID) == CallConfigNULL) { // nothing with the same ID
_callConfigMap[callID] = config;
- _debug ("Associate Call %s with config %i\n", callID.data(), config);
+ _debug ("Associate Call %s with config %i", callID.data(), config);
return true;
} else {
return false;
@@ -4644,7 +4448,7 @@ std::map< std::string, std::string > ManagerImpl::getCallDetails (const CallID&
// So first we fetch the account
accountid = getAccountFromCall (callID);
- _debug ("%s\n",callID.c_str());
+ _debug ("%s",callID.c_str());
// Then the VoIP link this account is linked with (IAX2 or SIP)
if ( (account=getAccount (accountid)) != 0) {
@@ -4664,7 +4468,7 @@ std::map< std::string, std::string > ManagerImpl::getCallDetails (const CallID&
call_details.insert (std::pair<std::string, std::string> ("CALL_STATE", call->getStateStr ()));
call_details.insert (std::pair<std::string, std::string> ("CALL_TYPE", type.str ()));
} else {
- _debug ("Error: Managerimpl - getCallDetails ()\n");
+ _debug ("Error: Managerimpl - getCallDetails ()");
call_details.insert (std::pair<std::string, std::string> ("ACCOUNTID", AccountNULL));
call_details.insert (std::pair<std::string, std::string> ("PEER_NUMBER", "Unknown"));
call_details.insert (std::pair<std::string, std::string> ("PEER_NAME", "Unknown"));
@@ -4729,7 +4533,7 @@ ManagerImpl::getConferenceDetails (const ConfID& confID)
std::vector< std::string >
ManagerImpl::getConferenceList (void)
{
- _debug ("ManagerImpl::getConferenceList\n");
+ _debug ("ManagerImpl::getConferenceList");
std::vector< std::string > v;
ConferenceMap::iterator iter = _conferencemap.begin();
@@ -4746,7 +4550,7 @@ ManagerImpl::getConferenceList (void)
std::vector< std::string >
ManagerImpl::getParticipantList (const std::string& confID)
{
- _debug ("ManagerImpl::getParticipantList\n");
+ _debug ("ManagerImpl::getParticipantList");
std::vector< std::string > v;
ConferenceMap::iterator iter_conf = _conferencemap.find (confID);
diff --git a/sflphone-common/src/managerimpl.h b/sflphone-common/src/managerimpl.h
index 627170e88f5ea80012b414b881f395fc70253e7b..ca88a42939c7c8fd36d316f4dad4eaa36deafed4 100644
--- a/sflphone-common/src/managerimpl.h
+++ b/sflphone-common/src/managerimpl.h
@@ -1027,6 +1027,14 @@ class ManagerImpl {
*/
bool isCurrentCall(const CallID& callId);
+
+ /**
+ * Send registration to all enabled accounts
+ * @return 0 on registration success
+ * 1 otherelse
+ */
+ int registerAccounts();
+
/**
* Restart PJSIP
* @param void
@@ -1042,6 +1050,8 @@ class ManagerImpl {
* Initialize audiodriver
*/
bool initAudioDriver(void);
+
+ ost::Mutex* getAudioLayerMutex() { return &_audiolayer_mutex; }
private:
/* Transform digest to string.
@@ -1147,6 +1157,8 @@ class ManagerImpl {
/** Mutex to protect access to code section */
ost::Mutex _mutex;
+ ost::Mutex _audiolayer_mutex;
+
// Multithread variable (non protected)
DBusManagerImpl * _dbus;
@@ -1307,8 +1319,6 @@ class ManagerImpl {
int getLocalIp2IpPort();
- void setLocalIp2IpInfo( const std::string& address );
-
std::string getStunServer (void);
void setStunServer (const std::string &server);
diff --git a/sflphone-common/src/managerimpl_registration.cpp b/sflphone-common/src/managerimpl_registration.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..241a8b4078db80e6450d79f8f6e68f43b4738ba6
--- /dev/null
+++ b/sflphone-common/src/managerimpl_registration.cpp
@@ -0,0 +1,258 @@
+/*
+ * Copyright (C) 2004-2007 Savoir-Faire Linux inc.
+ * Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
+ * Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
+ * Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
+ * Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
+ * Author: Guillaume Carmel-Archambault <guillaume.carmel-archambault@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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "managerimpl.h"
+
+#include "account.h"
+#include "dbus/callmanager.h"
+#include "user_cfg.h"
+#include "global.h"
+#include "sip/sipaccount.h"
+
+#include "audio/audiolayer.h"
+#include "sip/sipvoiplink.h"
+#include "manager.h"
+#include "dbus/configurationmanager.h"
+
+#include "conference.h"
+
+#include <errno.h>
+#include <cstdlib>
+
+int
+ManagerImpl::registerAccounts()
+{
+ int status;
+ bool flag = true;
+ AccountMap::iterator iter;
+
+ _debugInit ("Initiate VoIP Links Registration");
+ iter = _accountMap.begin();
+
+ /* Loop on the account map previously loaded */
+
+ while (iter != _accountMap.end()) {
+ if (iter->second) {
+
+ if (iter->second->isEnabled()) {
+
+ _debug("Register account %s", iter->first.c_str());
+
+ status = iter->second->registerVoIPLink();
+
+ if (status != SUCCESS) {
+ flag = false;
+ }
+ }
+ }
+
+ iter++;
+ }
+
+ // calls the client notification here in case of errors at startup...
+ if (_audiodriver -> getErrorMessage() != -1)
+ notifyErrClient (_audiodriver -> getErrorMessage());
+
+ ASSERT (flag, true);
+
+ return SUCCESS;
+}
+
+//THREAD=Main
+int
+ManagerImpl::initRegisterAccounts()
+{
+ int status;
+ bool flag = true;
+ AccountMap::iterator iter;
+
+ _debugInit ("Initiate VoIP Links Registration");
+ iter = _accountMap.begin();
+
+ /* Loop on the account map previously loaded */
+
+ while (iter != _accountMap.end()) {
+ if (iter->second) {
+ iter->second->loadConfig();
+
+ /* If the account is set as enabled, try to register */
+ if (iter->second->isEnabled()) {
+ status = iter->second->registerVoIPLink();
+
+ if (status != SUCCESS) {
+ flag = false;
+ }
+ }
+ }
+
+ iter++;
+ }
+
+ // calls the client notification here in case of errors at startup...
+ if (_audiodriver -> getErrorMessage() != -1)
+ notifyErrClient (_audiodriver -> getErrorMessage());
+
+ ASSERT (flag, true);
+
+ return SUCCESS;
+}
+
+void ManagerImpl::restartPJSIP (void)
+{
+ _debug ("ManagerImpl::restartPJSIP\n");
+ VoIPLink *link = getSIPAccountLink();
+ SIPVoIPLink *siplink = NULL;
+
+ if (link) {
+ siplink = dynamic_cast<SIPVoIPLink*> (getSIPAccountLink ());
+ }
+
+ _debug ("ManagerImpl::unregister sip account\n");
+
+ this->unregisterCurSIPAccounts();
+ /* Terminate and initialize the PJSIP library */
+
+ if (siplink) {
+ _debug ("ManagerImpl::Terminate sip\n");
+ siplink->terminate ();
+ siplink = SIPVoIPLink::instance ("");
+ _debug ("ManagerImpl::Init new sip\n");
+ siplink->init ();
+ }
+
+ _debug ("ManagerImpl::register sip account\n");
+
+ /* Then register all enabled SIP accounts */
+ this->registerCurSIPAccounts ();
+}
+
+VoIPLink* ManagerImpl::getAccountLink (const AccountID& accountID)
+{
+ if (accountID!=AccountNULL) {
+ Account* acc = getAccount (accountID);
+
+ if (acc) {
+ return acc->getVoIPLink();
+ }
+
+ return 0;
+ } else
+ return SIPVoIPLink::instance ("");
+}
+
+VoIPLink* ManagerImpl::getSIPAccountLink()
+{
+ /* We are looking for the first SIP account we met because all the SIP accounts have the same voiplink */
+ Account *account;
+ AccountMap::iterator iter = _accountMap.begin();
+
+ while (iter != _accountMap.end()) {
+
+ account = iter->second;
+
+ if (account->getType() == "sip") {
+ return account->getVoIPLink();
+ }
+
+ ++iter;
+ }
+
+ return NULL;
+}
+
+pjsip_regc *getSipRegcFromID (const AccountID& id UNUSED)
+{
+ /*SIPAccount *tmp = dynamic_cast<SIPAccount *>getAccount(id);
+ if(tmp != NULL)
+ return tmp->getSipRegc();
+ else*/
+ return NULL;
+}
+
+void ManagerImpl::unregisterCurSIPAccounts()
+{
+ Account *current;
+
+ AccountMap::iterator iter = _accountMap.begin();
+
+ while (iter != _accountMap.end()) {
+ current = iter->second;
+
+ if (current) {
+ if (current->isEnabled() && current->getType() == "sip") {
+ current->unregisterVoIPLink();
+ }
+ }
+
+ iter++;
+ }
+}
+
+void ManagerImpl::registerCurSIPAccounts (void)
+{
+
+ Account *current;
+
+ AccountMap::iterator iter = _accountMap.begin();
+
+ while (iter != _accountMap.end()) {
+ current = iter->second;
+
+ if (current) {
+ if (current->isEnabled() && current->getType() == "sip") {
+ //current->setVoIPLink(link);
+ current->registerVoIPLink();
+ }
+ }
+
+ current = NULL;
+
+ iter++;
+ }
+}
+
+void
+ManagerImpl::sendRegister (const std::string& accountID , const int32_t& enable)
+{
+
+ // Update the active field
+ setConfig (accountID, CONFIG_ACCOUNT_ENABLE, (enable == 1) ? TRUE_STR:FALSE_STR);
+
+ Account* acc = getAccount (accountID);
+ acc->loadConfig();
+
+ // Test on the freshly updated value
+
+ if (acc->isEnabled()) {
+ // Verify we aren't already registered, then register
+ _debug ("Send register for account %s\n" , accountID.c_str());
+ acc->registerVoIPLink();
+ } else {
+ // Verify we are already registered, then unregister
+ _debug ("Send unregister for account %s\n" , accountID.c_str());
+ acc->unregisterVoIPLink();
+ }
+
+}
+
diff --git a/sflphone-common/src/plug-in/audiorecorder/audiodsp.cpp b/sflphone-common/src/plug-in/audiorecorder/audiodsp.cpp
index 49ea4417cce81a6ee9e15193960b88b6804bba7f..f9b5c014ef5c7c4e5976946afb08ac2df028051c 100644
--- a/sflphone-common/src/plug-in/audiorecorder/audiodsp.cpp
+++ b/sflphone-common/src/plug-in/audiorecorder/audiodsp.cpp
@@ -39,8 +39,8 @@ AudioDSP::~AudioDSP()
float AudioDSP::getRMS (int data)
{
- // printf("AudioDSP::getRMS() : bufPointer_ %i \n ", bufPointer_);
- printf ("AudioDSP::getRMS() : %i \n", data);
+ // printf("AudioDSP::getRMS() : bufPointer_ %i ", bufPointer_);
+ printf ("AudioDSP::getRMS() : %i ", data);
circBuffer_[bufPointer_++] = (float) data;
if (bufPointer_ >= bufferLength_)
@@ -57,13 +57,13 @@ float AudioDSP::computeRMS()
for (int i = 0; i < bufferLength_; i++) {
- // printf("AudioDSP::computeRMS() : i_ %i \n ", i);
+ // printf("AudioDSP::computeRMS() : i_ %i ", i);
rms += (float) (circBuffer_[i]*circBuffer_[i]);
}
rms = sqrt (rms / (float) bufferLength_);
- // printf("AudioDSP::computeRMS() : RMS VALUE: %f \n", rms);
+ // printf("AudioDSP::computeRMS() : RMS VALUE: %f ", rms);
return rms;
}
diff --git a/sflphone-common/src/plug-in/audiorecorder/audiorecord.cpp b/sflphone-common/src/plug-in/audiorecorder/audiorecord.cpp
index 9b265de0ee33c9f53f73026cb14c676f949948a4..4ab7c6c9708ac4a4d2143ee410ebec482dfce5f1 100644
--- a/sflphone-common/src/plug-in/audiorecorder/audiorecord.cpp
+++ b/sflphone-common/src/plug-in/audiorecorder/audiorecord.cpp
@@ -93,12 +93,12 @@ void AudioRecord::initFileName (std::string peerNumber)
if (fileType_ == FILE_RAW) {
if (strstr (fileName_, ".raw") == NULL) {
- printf ("AudioRecord::openFile::concatenate .raw file extension: name : %s \n", fileName_);
+ printf ("AudioRecord::openFile::concatenate .raw file extension: name : %s ", fileName_);
fName.append (".raw");
}
} else if (fileType_ == FILE_WAV) {
if (strstr (fileName_, ".wav") == NULL) {
- printf ("AudioRecord::openFile::concatenate .wav file extension: name : %s \n", fileName_);
+ printf ("AudioRecord::openFile::concatenate .wav file extension: name : %s ", fileName_);
fName.append (".wav");
}
}
@@ -110,14 +110,14 @@ void AudioRecord::openFile()
{
- _debug ("AudioRecord::openFile()\n");
+ _debug ("AudioRecord::openFile()");
bool result = false;
- _debug ("AudioRecord::openFile()\n");
+ _debug ("AudioRecord::openFile()");
if (isFileExist()) {
- _debug ("AudioRecord::Filename does not exist, creating one \n");
+ _debug ("AudioRecord::Filename does not exist, creating one ");
byteCounter_ = 0;
if (fileType_ == FILE_RAW) {
@@ -126,7 +126,7 @@ void AudioRecord::openFile()
result = setWavFile();
}
} else {
- _debug ("AudioRecord::Filename already exist opening it \n");
+ _debug ("AudioRecord::Filename already exist opening it ");
if (fileType_ == FILE_RAW) {
result = openExistingRawFile();
@@ -156,10 +156,10 @@ bool AudioRecord::isOpenFile()
{
if (fp) {
- _debug ("AudioRecord::isOpenFile(): file already openend\n");
+ _debug ("AudioRecord::isOpenFile(): file already openend");
return true;
} else {
- _debug ("AudioRecord::isOpenFIle(): file not openend \n");
+ _debug ("AudioRecord::isOpenFIle(): file not openend ");
return false;
}
}
@@ -167,7 +167,7 @@ bool AudioRecord::isOpenFile()
bool AudioRecord::isFileExist()
{
- _debug ("AudioRecord::isFileExist(): try to open name : %s \n", fileName_);
+ _debug ("AudioRecord::isFileExist(): try to open name : %s ", fileName_);
if (fopen (fileName_,"rb") ==0) {
return true;
@@ -178,7 +178,7 @@ bool AudioRecord::isFileExist()
bool AudioRecord::isRecording()
{
- _debug ("AudioRecording::isRecording() %i \n", recordingEnabled_);
+ _debug ("AudioRecording::isRecording() %i ", recordingEnabled_);
if (recordingEnabled_)
@@ -190,17 +190,17 @@ bool AudioRecord::isRecording()
bool AudioRecord::setRecording()
{
- _debug ("AudioRecord::setRecording() \n");
+ _debug ("AudioRecord::setRecording() ");
if (isOpenFile()) {
- _debug ("AudioRecord::setRecording()::file already opened \n");
+ _debug ("AudioRecord::setRecording()::file already opened ");
if (!recordingEnabled_)
recordingEnabled_ = true;
else
recordingEnabled_ = false;
} else {
- _debug ("AudioRecord::setRecording():Opening the wave file in call during call instantiation \n");
+ _debug ("AudioRecord::setRecording():Opening the wave file in call during call instantiation ");
openFile();
recordingEnabled_ = true; // once opend file, start recording
@@ -213,7 +213,7 @@ bool AudioRecord::setRecording()
void AudioRecord::stopRecording()
{
- _debug ("AudioRecording::stopRecording() \n");
+ _debug ("AudioRecording::stopRecording() ");
if (recordingEnabled_)
recordingEnabled_ = false;
@@ -270,7 +270,7 @@ void AudioRecord::createFilename()
// fileName_ = out.str();
strncpy (fileName_, out.str().c_str(), 8192);
- printf ("AudioRecord::createFilename::filename for this call %s \n",fileName_);
+ printf ("AudioRecord::createFilename::filename for this call %s ",fileName_);
}
bool AudioRecord::setRawFile()
@@ -279,16 +279,16 @@ bool AudioRecord::setRawFile()
fp = fopen (savePath_.c_str(), "wb");
if (!fp) {
- _debug ("AudioRecord::setRawFile() : could not create RAW file!\n");
+ _debug ("AudioRecord::setRawFile() : could not create RAW file!");
return false;
}
if (sndFormat_ != INT16) { // TODO need to change INT16 to SINT16
sndFormat_ = INT16;
- _debug ("AudioRecord::setRawFile() : using 16-bit signed integer data format for file.\n");
+ _debug ("AudioRecord::setRawFile() : using 16-bit signed integer data format for file.");
}
- _debug ("AudioRecord:setRawFile() : created RAW file.\n");
+ _debug ("AudioRecord:setRawFile() : created RAW file.");
return true;
}
@@ -300,7 +300,7 @@ bool AudioRecord::setWavFile()
fp = fopen (savePath_.c_str(), "wb");
if (!fp) {
- _debug ("AudioRecord::setWavFile() : could not create WAV file.\n");
+ _debug ("AudioRecord::setWavFile() : could not create WAV file.");
return false;
}
@@ -328,11 +328,11 @@ bool AudioRecord::setWavFile()
if (fwrite (&hdr, 4, 11, fp) != 11) {
- _debug ("AudioRecord::setWavFile() : could not write WAV header for file. \n");
+ _debug ("AudioRecord::setWavFile() : could not write WAV header for file. ");
return false;
}
- _debug ("AudioRecord::setWavFile() : created WAV file. \n");
+ _debug ("AudioRecord::setWavFile() : created WAV file. ");
return true;
}
@@ -343,7 +343,7 @@ bool AudioRecord::openExistingRawFile()
fp = fopen (fileName_, "ab+");
if (!fp) {
- _debug ("AudioRecord::openExistingRawFile() : could not create RAW file!\n");
+ _debug ("AudioRecord::openExistingRawFile() : could not create RAW file!");
return false;
}
@@ -353,42 +353,42 @@ bool AudioRecord::openExistingRawFile()
bool AudioRecord::openExistingWavFile()
{
- _debug ("AudioRecord::openExistingWavFile() \n");
+ _debug ("AudioRecord::openExistingWavFile() ");
fp = fopen (fileName_, "rb+");
if (!fp) {
- _debug ("AudioRecord::openExistingWavFile() : could not open WAV file rb+!\n");
+ _debug ("AudioRecord::openExistingWavFile() : could not open WAV file rb+!");
return false;
}
- printf ("AudioRecord::openExistingWavFile()::Tried to open %s \n",fileName_);
+ printf ("AudioRecord::openExistingWavFile()::Tried to open %s ",fileName_);
if (fseek (fp, 40, SEEK_SET) != 0) // jump to data length
- _debug ("AudioRecord::OpenExistingWavFile: 1.Couldn't seek offset 40 in the file \n");
+ _debug ("AudioRecord::OpenExistingWavFile: 1.Couldn't seek offset 40 in the file ");
if (fread (&byteCounter_, 4, 1, fp))
- _debug ("AudioRecord::OpenExistingWavFile : bytecounter Read successfully \n");
+ _debug ("AudioRecord::OpenExistingWavFile : bytecounter Read successfully ");
if (fseek (fp, 0 , SEEK_END) != 0)
- _debug ("AudioRecors::OpenExistingWavFile : 2.Couldn't seek at the en of the file \n");
+ _debug ("AudioRecors::OpenExistingWavFile : 2.Couldn't seek at the en of the file ");
- printf ("AudioRecord::OpenExistingWavFile : Byte counter after oppening : %d \n", (int) byteCounter_);
+ printf ("AudioRecord::OpenExistingWavFile : Byte counter after oppening : %d ", (int) byteCounter_);
if (fclose (fp) != 0)
- _debug ("AudioRecord::openExistingWavFile()::ERROR: can't close file r+ \n");
+ _debug ("AudioRecord::openExistingWavFile()::ERROR: can't close file r+ ");
fp = fopen (fileName_, "ab+");
if (!fp) {
- _debug ("AudioRecord::openExistingWavFile() : could not createopen WAV file ab+!\n");
+ _debug ("AudioRecord::openExistingWavFile() : could not createopen WAV file ab+!");
return false;
}
if (fseek (fp, 4 , SEEK_END) != 0)
- _debug ("AudioRecors::OpenExistingWavFile : 2.Couldn't seek at the en of the file \n");
+ _debug ("AudioRecors::OpenExistingWavFile : 2.Couldn't seek at the en of the file ");
return true;
@@ -398,7 +398,7 @@ bool AudioRecord::openExistingWavFile()
void AudioRecord::closeWavFile()
{
if (fp == 0) {
- _debug ("AudioRecord:: Can't closeWavFile, a file has not yet been opened!\n");
+ _debug ("AudioRecord:: Can't closeWavFile, a file has not yet been opened!");
return;
}
@@ -407,28 +407,28 @@ void AudioRecord::closeWavFile()
fseek (fp, 40, SEEK_SET); // jump to data length
- if (ferror (fp)) perror ("AudioRecord::closeWavFile()::ERROR: can't reach offset 40\n");
+ if (ferror (fp)) perror ("AudioRecord::closeWavFile()::ERROR: can't reach offset 40");
fwrite (&bytes, sizeof (SINT32), 1, fp);
- if (ferror (fp)) perror ("AudioRecord::closeWavFile()::ERROR: can't write bytes for data length \n");
+ if (ferror (fp)) perror ("AudioRecord::closeWavFile()::ERROR: can't write bytes for data length ");
- printf ("AudioRecord::closeWavFile : data bytes: %i \n", (int) bytes);
+ printf ("AudioRecord::closeWavFile : data bytes: %i ", (int) bytes);
bytes = byteCounter_ * channels_ + 44; // + 44 for the wave header
fseek (fp, 4, SEEK_SET); // jump to file size
- if (ferror (fp)) perror ("AudioRecord::closeWavFile()::ERROR: can't reach offset 4\n");
+ if (ferror (fp)) perror ("AudioRecord::closeWavFile()::ERROR: can't reach offset 4");
fwrite (&bytes, 4, 1, fp);
- if (ferror (fp)) perror ("AudioRecord::closeWavFile()::ERROR: can't reach offset 4\n");
+ if (ferror (fp)) perror ("AudioRecord::closeWavFile()::ERROR: can't reach offset 4");
- printf ("AudioRecord::closeWavFile : bytes : %i \n", (int) bytes);
+ printf ("AudioRecord::closeWavFile : bytes : %i ", (int) bytes);
if (fclose (fp) != 0)
- _debug ("AudioRecord::closeWavFile()::ERROR: can't close file\n");
+ _debug ("AudioRecord::closeWavFile()::ERROR: can't close file");
}
@@ -470,7 +470,7 @@ void AudioRecord::recData (SFLDataFormat* buffer, int nSamples)
if (recordingEnabled_) {
if (fp == 0) {
- _debug ("AudioRecord: Can't record data, a file has not yet been opened!\n");
+ _debug ("AudioRecord: Can't record data, a file has not yet been opened!");
return;
}
@@ -478,7 +478,7 @@ void AudioRecord::recData (SFLDataFormat* buffer, int nSamples)
if (sndFormat_ == INT16) { // TODO change INT16 to SINT16
if (fwrite (buffer, sizeof (SFLDataFormat), nSamples, fp) != (unsigned int) nSamples)
- _debug ("AudioRecord: Could not record data! \n");
+ _debug ("AudioRecord: Could not record data! ");
else {
fflush (fp);
byteCounter_ += (unsigned long) (nSamples*sizeof (SFLDataFormat));
@@ -496,7 +496,7 @@ void AudioRecord::recData (SFLDataFormat* buffer_1, SFLDataFormat* buffer_2, int
if (recordingEnabled_) {
if (fp == 0) {
- _debug ("AudioRecord: Can't record data, a file has not yet been opened!\n");
+ _debug ("AudioRecord: Can't record data, a file has not yet been opened!");
return;
}
@@ -508,7 +508,7 @@ void AudioRecord::recData (SFLDataFormat* buffer_1, SFLDataFormat* buffer_2, int
if (fwrite (&mixBuffer_[k], 2, 1, fp) != 1)
- _debug ("AudioRecord: Could not record data!\n");
+ _debug ("AudioRecord: Could not record data!");
else {
fflush (fp);
}
diff --git a/sflphone-common/src/plug-in/librarymanager.cpp b/sflphone-common/src/plug-in/librarymanager.cpp
index 24b8396469149d224db7999b28d923cb132ea103..f4fba8683bfd985075e7ede79cba759e535d23eb 100644
--- a/sflphone-common/src/plug-in/librarymanager.cpp
+++ b/sflphone-common/src/plug-in/librarymanager.cpp
@@ -36,14 +36,14 @@ LibraryManager::LibraryHandle LibraryManager::loadLibrary (const std::string &fi
LibraryHandle pluginHandlePtr = NULL;
const char *error;
- _debug ("Loading dynamic library %s\n", filename.c_str());
+ _debug ("Loading dynamic library %s", filename.c_str());
/* Load the library */
pluginHandlePtr = dlopen (filename.c_str(), RTLD_LAZY);
if (!pluginHandlePtr) {
error = dlerror();
- _debug ("Error while opening plug-in: %s\n", error);
+ _debug ("Error while opening plug-in: %s", error);
return NULL;
}
@@ -57,12 +57,12 @@ int LibraryManager::unloadLibrary ()
if (_handlePtr == NULL)
return 1;
- _debug ("Unloading dynamic library ...\n");
+ _debug ("Unloading dynamic library ...");
dlclose (_handlePtr);
if (dlerror()) {
- _debug ("Error unloading the library : %s\n...", dlerror());
+ _debug ("Error unloading the library : %s...", dlerror());
return 1;
}
@@ -96,7 +96,7 @@ LibraryManagerException::LibraryManagerException (const std::string &libraryName
{
if (_reason == loadingFailed)
- _details = "Error when loading " + libraryName + "\n" + details;
+ _details = "Error when loading " + libraryName + "" + details;
else
_details = "Error when resolving symbol " + details + " in " + libraryName;
}
diff --git a/sflphone-common/src/plug-in/pluginmanager.cpp b/sflphone-common/src/plug-in/pluginmanager.cpp
index 80197f6ccef529d2b0d19ef4a415d251923c3858..431f3eb8744bc2ea02b4ed9f37fa1908844abcd4 100644
--- a/sflphone-common/src/plug-in/pluginmanager.cpp
+++ b/sflphone-common/src/plug-in/pluginmanager.cpp
@@ -59,7 +59,7 @@ PluginManager::loadPlugins (const std::string &path)
/* The directory in which plugins are dropped. Default: /usr/lib/sflphone/plugins/ */
(path == "") ? pluginDir = std::string (PLUGINS_DIR).append ("/") :pluginDir = path;
- _debug ("Loading plugins from %s...\n", pluginDir.c_str());
+ _debug ("Loading plugins from %s...", pluginDir.c_str());
dir = opendir (pluginDir.c_str());
/* Test if the directory exists or is readable */
@@ -79,13 +79,13 @@ PluginManager::loadPlugins (const std::string &path)
/* Instanciate the plugin object */
if (instanciatePlugin (library, &plugin) != 0) {
- _debug ("Error instanciating the plugin ...\n");
+ _debug ("Error instanciating the plugin ...");
return 1;
}
/* Regitering the current plugin */
if (registerPlugin (plugin, library) != 0) {
- _debug ("Error registering the plugin ...\n");
+ _debug ("Error registering the plugin ...");
return 1;
}
}
@@ -115,14 +115,14 @@ PluginManager::unloadPlugins (void)
info = iter->second;
if (deletePlugin (info) != 0) {
- _debug ("Error deleting the plugin ... \n");
+ _debug ("Error deleting the plugin ... ");
return 1;
}
unloadDynamicLibrary (info->_libraryPtr);
if (unregisterPlugin (info) != 0) {
- _debug ("Error unregistering the plugin ... \n");
+ _debug ("Error unregistering the plugin ... ");
return 1;
}
@@ -161,7 +161,7 @@ PluginManager::loadDynamicLibrary (const std::string& filename)
int
PluginManager::unloadDynamicLibrary (LibraryManager *libraryPtr)
{
- _debug ("Unloading dynamic library ...\n");
+ _debug ("Unloading dynamic library ...");
/* Close it */
return libraryPtr->unloadLibrary ();
}
diff --git a/sflphone-common/src/sip/Makefile.am b/sflphone-common/src/sip/Makefile.am
index 778494b0b6874fdf3e723ee7838905830cfe2cbf..8cb4829edc3797aa8e107d2a2b8af0cdf87393ec 100644
--- a/sflphone-common/src/sip/Makefile.am
+++ b/sflphone-common/src/sip/Makefile.am
@@ -3,17 +3,23 @@ include $(top_srcdir)/globals.mak
noinst_LTLIBRARIES = libsiplink.la
libsiplink_la_SOURCES = \
+ Pattern.cpp \
+ SdesNegotiator.cpp \
sdp.cpp \
sdpmedia.cpp \
sipaccount.cpp \
sipcall.cpp \
- sipvoiplink.cpp
+ sipvoiplink.cpp
noinst_HEADERS = \
+ Pattern.h \
+ SdesNegotiator.h \
sdp.h \
sdpmedia.h \
sipaccount.h \
sipcall.h \
sipvoiplink.h
+libsiplink_la_CXXFLAGS = \
+ @PCRE_LIBS@
\ No newline at end of file
diff --git a/sflphone-common/src/util/Pattern.cpp b/sflphone-common/src/sip/Pattern.cpp
similarity index 92%
rename from sflphone-common/src/util/Pattern.cpp
rename to sflphone-common/src/sip/Pattern.cpp
index 85cb60392bb6356e5e380e6396eb6b38bc8cee7c..290c9f7a79c52319aae430c78f7e9d143c20e6a7 100644
--- a/sflphone-common/src/util/Pattern.cpp
+++ b/sflphone-common/src/sip/Pattern.cpp
@@ -23,8 +23,7 @@
namespace sfl
{
-namespace util {
-Pattern::Pattern (const std::string& pattern, const std::string& options = "") :
+Pattern::Pattern (const std::string& pattern, const std::string& options) :
_pattern (pattern),
_ovector (NULL),
_ovectorSize (0),
@@ -32,6 +31,8 @@ Pattern::Pattern (const std::string& pattern, const std::string& options = "") :
_count (0),
_options (0)
{
+
+ // printf("Pattern constructor called for %s!\n", pattern.c_str());
// Set offsets
_offset[0] = _offset[1] = 0;
@@ -125,7 +126,7 @@ std::vector<std::string> Pattern::groups (void)
while (stringList[i] != NULL) {
matchedSubstrings.push_back (stringList[i]);
- printf ("Substr: <start>%s<end>\n", stringList[i]);
+ // printf ("Substr: <start>%s<end>", stringList[i]);
i++;
}
@@ -138,6 +139,8 @@ std::string Pattern::group (int groupNumber)
{
const char * stringPtr;
+ // printf("_subject.substr : %s\n", _subject.substr (_offset[0]).c_str());
+
int rc = pcre_get_substring (
_subject.substr (_offset[0]).c_str(),
_ovector,
@@ -177,7 +180,7 @@ std::string Pattern::group (const std::string& groupName)
_count,
groupName.c_str(),
&stringPtr);
-
+
if (rc < 0) {
switch (rc) {
@@ -241,14 +244,11 @@ size_t Pattern::end (void) const
bool Pattern::matches (void) throw (match_error)
{
- matches (_subject);
+ return matches (_subject);
}
bool Pattern::matches (const std::string& subject) throw (match_error)
{
- //printf("\n\n\nCurrent offset: %d, old offset: %d\n", _offset[1], _offset[0]);
- //printf("Trying <start>%s<end>\n", subject.substr(_offset[1]).c_str());
-
// Try to find a match for this pattern
int rc = pcre_exec (
_re,
@@ -261,10 +261,9 @@ bool Pattern::matches (const std::string& subject) throw (match_error)
_ovectorSize);
// Matching failed.
-
if (rc < 0) {
_offset[0] = _offset[1] = 0;
- //printf("Matching failed with %d\n", rc);
+ // printf(" Matching failed with %d\n", rc);
return false;
}
@@ -275,8 +274,6 @@ bool Pattern::matches (const std::string& subject) throw (match_error)
_offset[1] = _ovector[1] + _offset[0];
}
- //printf("Matching succeeded with %d to %d\n", (int) start(), (int) end());
-
// Matching succeded but not enough space.
if (rc == 0) {
throw match_error ("No space to store all substrings.");
@@ -285,7 +282,7 @@ bool Pattern::matches (const std::string& subject) throw (match_error)
// Matching succeeded. Keep the number of substrings for
// subsequent calls to group().
- _count = rc;
+ _count = rc;
return true;
}
@@ -301,14 +298,15 @@ std::vector<std::string> Pattern::split (void)
tokenStart = start();
substringSplitted.push_back (_subject.substr (tokenEnd + 1,
tokenStart - tokenEnd - 1));
+ // printf("split: %s\n", _subject.substr (tokenEnd + 1,
+ // tokenStart - tokenEnd - 1).c_str());
tokenEnd = end();
}
- substringSplitted.push_back (_subject.substr (tokenEnd + 1,
+ substringSplitted.push_back (_subject.substr (tokenEnd + 1, tokenStart - tokenEnd - 1));
- tokenStart - tokenEnd - 1));
return substringSplitted;
}
}
-}
+
diff --git a/sflphone-common/src/sip/Pattern.h b/sflphone-common/src/sip/Pattern.h
new file mode 100644
index 0000000000000000000000000000000000000000..b07c92acddbfd4466710c83fb6ce7e40d38e1383
--- /dev/null
+++ b/sflphone-common/src/sip/Pattern.h
@@ -0,0 +1,339 @@
+/*
+ * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Author: Pierre-Luc Bacon <pierre-luc.bacon@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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#ifndef __SFL_PATTERN_H__
+#define __SFL_PATTERN_H__
+
+#include <stdexcept>
+#include <string>
+#include <vector>
+#include <pcre.h>
+
+namespace sfl {
+
+ /**
+ * Exception object that is thrown when
+ * an error occured while compiling the
+ * regular expression.
+ */
+ class compile_error : public std::invalid_argument
+ {
+ public:
+ explicit compile_error(const std::string& error) :
+ std::invalid_argument(error) {}
+ };
+
+ /**
+ * Exception object that is thrown when
+ * an error occured while mathing a
+ * pattern to an expression.
+ */
+ class match_error : public std::invalid_argument
+ {
+ public:
+ match_error(const std::string& error) :
+ std::invalid_argument(error) {}
+ };
+
+ /**
+ * This class implements in its way
+ * some of the libpcre library.
+ */
+
+ class Pattern {
+
+ public:
+
+ /**
+ * Constructor for a regular expression
+ * pattern evaluator/matcher.
+ *
+ * @param pattern
+ * The regular expression to
+ * be used for this instance.
+ */
+
+ Pattern(const std::string& pattern,
+ const std::string& options = "");
+
+ /**
+ * Destructor. Pcre pattern gets freed
+ * here.
+ */
+ ~Pattern();
+
+ /**
+ * Assignment operator overloading.
+ * Set the regular expression
+ * to be used on subject strings
+ * and compile the regular expression
+ * from that string.
+ *
+ * @param pattern The new pattern
+ */
+ void operator=(const std::string& pattern) {
+ _pattern = pattern;
+ compile();
+ }
+
+ void operator=(const char * pattern) {
+ _pattern = pattern;
+ compile();
+ }
+
+ /**
+ * Compile the regular expression
+ * from the pattern that was set for
+ * this object.
+ */
+ void compile(void);
+
+ /**
+ * Get the currently set regular expression
+ * that is used on subject strings
+ *
+ * @return The currently set pattern
+ */
+ inline std::string getPattern(void) { return _pattern; }
+
+ /**
+ * << operator overload. Sets the the subject
+ * for latter use on the >> operator.
+ *
+ * @param subject
+ * The expression to be evaluated
+ * by the pattern.
+ *
+ */
+ void operator<<(const std::string& subject) {
+ _subject = subject;
+ }
+
+ /**
+ * Get the start position of the overall match.
+ *
+ * @return the start position of the overall match.
+ */
+ size_t start(void) const;
+
+ /**
+ * Get the start position of the specified match.
+ *
+ * @param groupNumber The capturing group number.
+ *
+ * @return the start position of the specified match.
+ */
+ size_t start(unsigned int groupNumber) const;
+
+ /**
+ * Get the start position of the specified match.
+ *
+ * @param groupName The capturing group name.
+ *
+ * @return the start position of the specified match.
+ */
+ size_t start(const std::string& groupName) const;
+
+ /**
+ * Get the end position of the overall match.
+ *
+ * @return the end position of the overall match.
+ */
+ size_t end(void) const;
+
+ /**
+ * Get the end position of the specified match.
+ *
+ * @param groupNumber The capturing group number.
+ *
+ * @return the end position of the specified match.
+ */
+ size_t end(unsigned int groupNumber) const;
+
+ /**
+ * Get the end position of the specified match.
+ *
+ * @param groupName The capturing group name.
+ *
+ * @return the end position of the specified match.
+ */
+ size_t end(const std::string& groupName) const;
+
+ /**
+ * Get the number of capturing groups in the
+ * compiled regex.
+ *
+ * @return The number of capture groups.
+ *
+ * @pre The regular expression should have been
+ * compiled prior to the execution of this method.
+ */
+ unsigned int getCaptureGroupCount(void);
+
+ /**
+ * Get the substring matched in a capturing
+ * group (named or unnamed).
+ *
+ * This methods only performs a basic lookup
+ * inside its internal substring table. Thus,
+ * matches() should have been called prior to
+ * this method in order to obtain the desired
+ * output.
+ *
+ * @param groupName The name of the group
+ *
+ * @return the substring matched by the
+ * regular expression designated
+ * the group name.
+ */
+ std::string group(const std::string& groupName);
+
+ /**
+ * Get the substring matched in a named group.
+ *
+ * This methods only performs a basic lookup
+ * inside its internal substring table. Thus,
+ * matches() should have been called prior to
+ * this method in order to obtain the desired
+ * output.
+ *
+ * @param groupNumber The number of the group.
+ *
+ * @return the substring matched by the
+ * regular expression designated
+ * the group number.
+ */
+ std::string group(int groupNumber);
+
+ /**
+ * Similar to python's MatchObject.groups. Get all
+ * the substrings matched by the capture groups defined
+ * in the pattern. The complete (implicit) capture group
+ * is not returned : ie only groups from 1 up to the number
+ * of groups in the pattern are returned.
+ *
+ * @return A vector of stings that were matched by some
+ * capturing group in the pattern.
+ *
+ * @pre The regular expression should have been
+ * compiled prior to the execution of this method.
+ */
+ std::vector<std::string> groups(void);
+
+ /**
+ * Try to match the compiled pattern with a
+ * subject.
+ *
+ * @param subject Subject to be matched
+ * by the pattern.
+ *
+ * @return true If the subject matches the pattern,
+ * false otherwise.
+ *
+ * @pre The regular expression should have been
+ * compiled prior to the execution of this method.
+ *
+ * @post The internal substring table will be updated
+ * with the new matches. Therefore, subsequent
+ * calls to group may return different results.
+ */
+ bool matches(const std::string& subject) throw(match_error);
+
+ /**
+ * Try to match the compiled pattern with the implicit
+ * subject.
+ *
+ * @return true If the subject matches the pattern,
+ * false otherwise.
+ *
+ * @pre The regular expression should have been
+ * compiled prior to the execution of this method.
+ *
+ * @post The internal substring table will be updated
+ * with the new matches. Therefore, subsequent
+ * calls to group may return different results.
+ */
+ bool matches(void) throw(match_error);
+
+ /**
+ * Split the subject into a list of substrings.
+ *
+ * @return A vector of substrings.
+ *
+ * @pre The regular expression should have been
+ * compiled prior to the execution of this method.
+ *
+ * @post The internal subject won't be affected by this
+ * by this operation. In other words: subject_before =
+ * subject_after.
+ */
+ std::vector<std::string> split(void); // throw(match_error);
+
+ private:
+ /**
+ * The regular expression that represents that pattern.
+ */
+ std::string _pattern;
+
+ /**
+ * The optional subject string.
+ */
+ std::string _subject;
+
+ /**
+ * PCRE struct that
+ * contains the compiled regular
+ * expression
+ */
+ pcre * _re;
+
+ /**
+ * The internal output vector used by PCRE.
+ */
+ int * _ovector;
+
+ /**
+ * The size of the _ovector
+ */
+ int _ovectorSize;
+
+ /**
+ * Current offset in the _ovector;
+ */
+
+ int _offset[2];
+
+ /**
+ * The number of substrings matched after calling
+ * pcre_exec.
+ */
+ int _count;
+
+ /**
+ * PCRE options for this pattern.
+ */
+ int _options;
+
+ /**
+ * String representation of the options.
+ */
+ std::string _optionsDescription;
+ };
+}
+
+
+#endif
diff --git a/sflphone-common/src/sip/SdesNegotiator.cpp b/sflphone-common/src/sip/SdesNegotiator.cpp
index 74442abafee1aa5ca51b69cfec6e85c31f308b73..b2d1aafd3e00e73b932da64dd6f56ce0bfaac6a6 100644
--- a/sflphone-common/src/sip/SdesNegotiator.cpp
+++ b/sflphone-common/src/sip/SdesNegotiator.cpp
@@ -1,6 +1,7 @@
/*
* Copyright (C) 2009 Savoir-Faire Linux inc.
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
+ * Author: Alexandre Savard <alexandre.savard@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
@@ -18,21 +19,15 @@
#include "SdesNegotiator.h"
-#include "util/Pattern.h"
+#include "Pattern.h"
+#include <cstdio>
#include <iostream>
#include <sstream>
#include <algorithm>
#include <stdexcept>
-using namespace sfl::util;
-
-struct CryptoAttribute {
- std::string tag;
- std::string cryptoSuite;
- std::string keyParams;
- std::string sessionParams;
-};
+using namespace sfl;
SdesNegotiator::SdesNegotiator (const std::vector<CryptoSuiteDefinition>& localCapabilites,
const std::vector<std::string>& remoteAttribute) :
@@ -42,7 +37,7 @@ SdesNegotiator::SdesNegotiator (const std::vector<CryptoSuiteDefinition>& localC
}
-void SdesNegotiator::parse (void)
+std::vector<CryptoAttribute *> SdesNegotiator::parse (void)
{
// The patterns below try to follow
// the ABNF grammar rules described in
@@ -58,6 +53,8 @@ void SdesNegotiator::parse (void)
* sessionParamPattern;
try {
+
+ // used to match white space (which are used as separator)
generalSyntaxPattern = new Pattern ("[\x20\x09]+", "g");
tagPattern = new Pattern ("^a=crypto:(?P<tag>[0-9]{1,9})");
@@ -81,32 +78,32 @@ void SdesNegotiator::parse (void)
"UNENCRYPTED_SRTCP|" \
"UNAUTHENTICATED_SRTP|" \
"FEC_ORDER=(?P<fecOrder>FEC_SRTP|SRTP_FEC)|" \
- "FEC_KEY=(?P<fecKey>" + keyParamsPattern.getPattern() + ")|" \
+ "FEC_KEY=(?P<fecKey>" + keyParamsPattern->getPattern() + ")|" \
"WSH=(?P<wsh>[0-9]{1,2})|" \
"(?<!\\-)[[:graph:]]+))*", "g"); // srtp-session-extension
} catch (compile_error& exception) {
throw parse_error ("A compile exception occured on a pattern.");
-
}
+
// Take each line from the vector
// and parse its content
+
std::vector<std::string>::iterator iter;
-
+ std::vector<CryptoAttribute *> cryptoAttributeVector;
+
for (iter = _remoteAttribute.begin(); iter != _remoteAttribute.end(); iter++) {
- std::cout << (*iter) << std::endl;
-
// Split the line into its component
// that we will analyze further down.
-
- generalSyntaxPattern << (*iter);
std::vector<std::string> sdesLine;
-
+
+ *generalSyntaxPattern << (*iter);
+
try {
- sdesLine = generalSyntaxPattern.split();
+ sdesLine = generalSyntaxPattern->split();
if (sdesLine.size() < 3) {
throw parse_error ("Missing components in SDES line");
@@ -114,54 +111,55 @@ void SdesNegotiator::parse (void)
} catch (match_error& exception) {
throw parse_error ("Error while analyzing the SDES line.");
}
+
// Check if the attribute starts with a=crypto
// and get the tag for this line
- tagPattern << sdesLine.at (0);
-
- try {
- std::string tag = tagPattern.group ("tag");
- std::cout << "tag = " << tag << std::endl;
- } catch (match_error& exception) {
- throw parse_error ("Error while parsing the tag field");
- }
+ *tagPattern << sdesLine.at (0);
+
+ std::string tag;
+ if (tagPattern->matches()) {
+ try {
+ tag = tagPattern->group ("tag");
+ } catch (match_error& exception) {
+ throw parse_error ("Error while parsing the tag field");
+ }
+ } else {
+ return cryptoAttributeVector;
+ }
// Check if the crypto suite is valid and retreive
// its value.
- cryptoSuitePattern << sdesLine.at (1);
-
- try {
- std::string cryptoSuite
- cryptoSuite = cryptoSuitePattern.group ("cryptoSuite");
- std::cout << "crypto-suite = " << cryptoSuite << std::endl;
- } catch (match_error& exception) {
- throw parse_error ("Error while parsing the crypto-suite field");
- }
-
+ *cryptoSuitePattern << sdesLine.at (1);
+
+ std::string cryptoSuite;
+
+ if (cryptoSuitePattern->matches()) {
+ try {
+ cryptoSuite = cryptoSuitePattern->group ("cryptoSuite");
+ } catch (match_error& exception) {
+ throw parse_error ("Error while parsing the crypto-suite field");
+ }
+ } else {
+ return cryptoAttributeVector;
+ }
+
// Parse one or more key-params field.
- keyParamsPattern << sdesLine.at (2);
-
+ *keyParamsPattern << sdesLine.at (2);
+
+ std::string srtpKeyInfo;
+ std::string srtpKeyMethod;
+ std::string lifetime;
+ std::string mkiLength;
+ std::string mkiValue;
+
try {
- while (keyParamsPattern.matches()) {
- std::string srtpKeyMethod;
- srtpKeyMethod = keyParamsMatched.group ("srtpKeyMethod");
- std::cout << "srtp-key-method = " << srtpKeyMethod << std::endl;
-
- std::string srtpKeyInfo;
- srtpKeyInfo = keyParamsPattern.group ("srtpKeyInfo");
- std::cout << "srtp-key-info = " << srtpKeyInfo << std::endl;
-
- std::string lifetime;
- lifetime = keyParamsPattern.group ("lifetime");
- std::cout << "lifetime = " << lifetime << std::endl;
-
- std::string mkiValue
- mkiValue = keyParamsPattern.group ("mkiValue");
- std::cout << "mkiValue = " << mkiValue << std::endl;
-
- std::string mkiLength;
- mkiLength = keyParamsPattern.group ("mkiLength");
- std::cout << "mkiLength = " << mkiLength << std::endl;
+ while (keyParamsPattern->matches()) {
+ srtpKeyMethod = keyParamsPattern->group ("srtpKeyMethod");
+ srtpKeyInfo = keyParamsPattern->group ("srtpKeyInfo");
+ lifetime = keyParamsPattern->group ("lifetime");
+ mkiValue = keyParamsPattern->group ("mkiValue");
+ mkiLength = keyParamsPattern->group ("mkiLength");
}
} catch (match_error& exception) {
throw parse_error ("Error while parsing the key-params field");
@@ -169,7 +167,7 @@ void SdesNegotiator::parse (void)
/**
* Parse the optional session-param fields
- * @todo Implement this !
+ * @TODO Implement this !
*/
/*
if (sdesLine.size() == 3) continue;
@@ -184,12 +182,68 @@ void SdesNegotiator::parse (void)
}
}
} */
+
+ // Add the new CryptoAttribute to the vector
+ std::cout << (*iter) << std::endl;
+ CryptoAttribute * cryptoAttribute = new CryptoAttribute(tag, cryptoSuite, srtpKeyMethod, srtpKeyInfo, lifetime, mkiValue, mkiLength);
+ cryptoAttributeVector.push_back(cryptoAttribute);
}
-
+ return cryptoAttributeVector;
}
bool SdesNegotiator::negotiate (void)
{
- parse();
+ std::vector<CryptoAttribute *> cryptoAttributeVector = parse();
+ std::vector<CryptoAttribute *>::iterator iter_offer = cryptoAttributeVector.begin();
+
+ std::vector<CryptoSuiteDefinition>::iterator iter_local = _localCapabilities.begin();
+
+ bool negotiationSuccess = false;
+
+ try {
+
+ while (!negotiationSuccess && (iter_offer != cryptoAttributeVector.end())) {
+
+ /*
+ std::cout << "Negotiate tag: " + (*iter_offer)->getTag() << std::endl;
+ std::cout << "Crypto Suite: " + (*iter_offer)->getCryptoSuite() << std::endl;
+ std::cout << "SRTP Key Method: " + (*iter_offer)->getSrtpKeyMethod() << std::endl;
+ std::cout << "SRTP Key Info: " + (*iter_offer)->getSrtpKeyInfo() << std::endl;
+ std::cout << "Lifetime: " + (*iter_offer)->getLifetime() << std::endl;
+ std::cout << "MKI Value: " + (*iter_offer)->getMkiValue() << std::endl;
+ std::cout << "MKI Length: " + (*iter_offer)->getMkiLength() << std::endl;
+ */
+
+ iter_local = _localCapabilities.begin();
+
+ while(!negotiationSuccess && (iter_local != _localCapabilities.end())) {
+
+ if((*iter_offer)->getCryptoSuite().compare((*iter_local).name)){
+
+ negotiationSuccess = true;
+
+ _cryptoSuite = (*iter_offer)->getCryptoSuite();
+ _srtpKeyMethod = (*iter_offer)->getSrtpKeyMethod();
+ _srtpKeyInfo = (*iter_offer)->getSrtpKeyInfo();
+ _lifetime = (*iter_offer)->getLifetime();
+ _mkiValue = (*iter_offer)->getMkiValue();
+ _mkiLength = (*iter_offer)->getMkiLength();
+ }
+
+ iter_local++;
+ }
+
+ delete (*iter_offer);
+
+ iter_offer++;
+ }
+
+ } catch (parse_error& exception) {
+ return false;
+ } catch (match_error& exception) {
+ return false;
+ }
+
+ return negotiationSuccess;
}
diff --git a/sflphone-common/src/sip/SdesNegotiator.h b/sflphone-common/src/sip/SdesNegotiator.h
index 2dded5b1a7582002646dc07451ca8e8bb40fb107..f038d012bacab8abbde0f72b1093aa92c155a98e 100644
--- a/sflphone-common/src/sip/SdesNegotiator.h
+++ b/sflphone-common/src/sip/SdesNegotiator.h
@@ -1,6 +1,7 @@
/*
* Copyright (C) 2009 Savoir-Faire Linux inc.
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
+ * Author: Alexandre Savard <alexandre.savard@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
@@ -74,11 +75,43 @@ namespace sfl {
{"AES_CM_128_HMAC_SHA1_32", 128, 112, 48, 31, AESCounterMode, 128, HMACSHA1, 32, 80, 160, 160 },
{"F8_128_HMAC_SHA1_80", 128, 112, 48, 31, AESF8Mode, 128, HMACSHA1, 80, 80, 160, 160 } };
- /**
- * Internal structure
- * used during parsing.
- */
- struct CryptoAttribute;
+
+ class CryptoAttribute {
+
+ public:
+ CryptoAttribute(std::string tag,
+ std::string cryptoSuite,
+ std::string srtpKeyMethod,
+ std::string srtpKeyInfo,
+ std::string lifetime,
+ std::string mkiValue,
+ std::string mkiLength) :
+ tag(tag),
+ cryptoSuite(cryptoSuite),
+ srtpKeyMethod(srtpKeyMethod),
+ srtpKeyInfo(srtpKeyInfo),
+ lifetime(lifetime),
+ mkiValue(mkiValue),
+ mkiLength(mkiLength) {};
+
+
+ inline std::string getTag() { return tag; };
+ inline std::string getCryptoSuite() { return cryptoSuite; };
+ inline std::string getSrtpKeyMethod() { return srtpKeyMethod; };
+ inline std::string getSrtpKeyInfo() { return srtpKeyInfo; };
+ inline std::string getLifetime() { return lifetime; };
+ inline std::string getMkiValue() { return mkiValue; };
+ inline std::string getMkiLength() { return mkiLength; };
+
+ private:
+ std::string tag;
+ std::string cryptoSuite;
+ std::string srtpKeyMethod;
+ std::string srtpKeyInfo;
+ std::string lifetime;
+ std::string mkiValue;
+ std::string mkiLength;
+ };
class SdesNegotiator
{
@@ -97,9 +130,38 @@ namespace sfl {
SdesNegotiator(const std::vector<CryptoSuiteDefinition>& localCapabilites, const std::vector<std::string>& remoteAttribute);
~SdesNegotiator() { };
- public:
bool negotiate(void);
+ /**
+ * Return crypto suite after negotiation
+ */
+ std::string getCryptoSuite(void) { return _cryptoSuite; }
+
+ /**
+ * Return key method after negotiation (most likely inline:)
+ */
+ std::string getKeyMethod(void) { return _srtpKeyMethod; }
+
+ /**
+ * Return crypto suite after negotiation
+ */
+ std::string getKeyInfo(void) { return _srtpKeyInfo; }
+
+ /**
+ * Return key lifetime after negotiation
+ */
+ std::string getLifeTime(void) { return _lifetime; }
+
+ /**
+ * Return mki value after negotiation
+ */
+ std::string getMkiValue(void) { return _mkiValue; }
+
+ /**
+ * Return mki length after negotiation
+ */
+ std::string getMkiLength(void) { return _mkiLength; }
+
private:
/**
* A vector list containing the remote attributes.
@@ -107,13 +169,40 @@ namespace sfl {
* prefered method is then chosen from that list.
*/
std::vector<std::string> _remoteAttribute;
- std::vector<CryptoSuiteDefinition> _localCapabilities;
-
+ std::vector<CryptoSuiteDefinition> _localCapabilities;
- private:
- void parse(void);
- CryptoAttribute * tokenize(const std::string& attributeLine);
+ /**
+ * Selected crypto suite after negotiation
+ */
+ std::string _cryptoSuite;
+
+ /**
+ * Selected key method after negotiation (most likely inline:)
+ */
+ std::string _srtpKeyMethod;
+
+ /**
+ * Selected crypto suite after negotiation
+ */
+ std::string _srtpKeyInfo;
+
+ /**
+ * Selected key lifetime after negotiation
+ */
+ std::string _lifetime;
+
+ /**
+ * Selected mki value after negotiation
+ */
+ std::string _mkiValue;
+
+ /**
+ * Selected mki length after negotiation
+ */
+ std::string _mkiLength;
+
+ std::vector<CryptoAttribute *> parse(void);
};
}
#endif
diff --git a/sflphone-common/src/sip/sdp.cpp b/sflphone-common/src/sip/sdp.cpp
index 942da7db35588c36871dc10e1133bb42bcd3c35e..45efccf15bb75e95544ed4ba67c6dd49030bd3d4 100644
--- a/sflphone-common/src/sip/sdp.cpp
+++ b/sflphone-common/src/sip/sdp.cpp
@@ -2,6 +2,7 @@
* Copyright (C) 2009 Savoir-Faire Linux inc.
*
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
+ * Author: Alexandre Savard <alexandre.savard@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
@@ -32,6 +33,8 @@ static const pj_str_t STR_RTP_AVP = { (char*) "RTP/AVP", 7 };
static const pj_str_t STR_SDP_NAME = { (char*) "sflphone", 8 };
static const pj_str_t STR_SENDRECV = { (char*) "sendrecv", 8 };
static const pj_str_t STR_RTPMAP = { (char*) "rtpmap", 6 };
+static const pj_str_t STR_CRYPTO = { (char*) "crypto", 6 };
+
Sdp::Sdp (pj_pool_t *pool)
: _local_media_cap()
@@ -91,7 +94,7 @@ void Sdp::set_media_descriptor_line (sdpMedia *media, pjmedia_sdp_media** p_med)
for (i=0; i<count; i++) {
codec = media->get_media_codec_list() [i];
tmp = this->convert_int_to_string (codec->getPayload ());
- _debug ("%s\n", tmp.c_str());
+ _debug ("%s", tmp.c_str());
pj_strdup2 (_pool, &med->desc.fmt[i], tmp.c_str());
// Add a rtpmap field for each codec
@@ -127,7 +130,7 @@ void Sdp::set_media_descriptor_line (sdpMedia *media, pjmedia_sdp_media** p_med)
throw;
}
} else {
- _debug ("No hash specified\n");
+ _debug ("No hash specified");
}
*p_med = med;
@@ -137,7 +140,7 @@ int Sdp::create_local_offer ()
{
pj_status_t status;
- _debug ("Create local offer\n");
+ _debug ("Create local offer");
// Build local media capabilities
set_local_media_capabilities ();
@@ -156,6 +159,10 @@ int Sdp::create_local_offer ()
//sdp_addAttributes( _pool );
sdp_add_media_description();
+ if(!_srtp_crypto.empty()) {
+ sdp_add_sdes_attribute(_srtp_crypto);
+ }
+
//toString ();
// Validate the sdp session
@@ -172,12 +179,12 @@ int Sdp::create_initial_offer()
pj_status_t status;
pjmedia_sdp_neg_state state;
- _debug ("Create initial offer\n");
+ _debug ("Create initial offer");
// Build the SDP session descriptor
status = create_local_offer();
if (status != PJ_SUCCESS) {
- _debug (" Error: Failled to create initial offer\n");
+ _debug (" Error: Failled to create initial offer");
return status;
}
@@ -185,7 +192,7 @@ int Sdp::create_initial_offer()
status = pjmedia_sdp_neg_create_w_local_offer (_pool, get_local_sdp_session(), &_negociator);
if (status != PJ_SUCCESS) {
- _debug (" Error: Failled to create an initial SDP negociator\n");
+ _debug (" Error: Failled to create an initial SDP negociator");
return status;
}
@@ -193,7 +200,7 @@ int Sdp::create_initial_offer()
PJ_ASSERT_RETURN (status == PJ_SUCCESS, 1);
- _debug (" Initial offer created succesfully\n");
+ _debug (" Initial offer created succesfully");
return PJ_SUCCESS;
}
@@ -205,8 +212,6 @@ int Sdp::receiving_initial_offer (pjmedia_sdp_session* remote)
pj_status_t status;
- _debug ("Receiving initial offer\n");
-
// Create the SDP negociator instance by calling
// pjmedia_sdp_neg_create_w_remote_offer with the remote offer, and by providing the local offer ( optional )
@@ -246,12 +251,12 @@ pj_status_t Sdp::check_sdp_answer (pjsip_inv_session *inv, pjsip_rx_data *rdata)
}
if (message->body == NULL) {
- _debug ("Empty message body\n");
+ _debug ("Empty message body");
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");
+ _debug ("Incoming Message does not contain SDP");
return PJMEDIA_SDP_EINSDP;
}
@@ -263,17 +268,17 @@ pj_status_t Sdp::check_sdp_answer (pjsip_inv_session *inv, pjsip_rx_data *rdata)
}
if (status != PJ_SUCCESS) {
- _debug ("SDP cannot be validated\n");
+ _debug ("SDP cannot be validated");
return PJMEDIA_SDP_EINSDP;
}
// This is an answer
- _debug ("Got SDP answer %s\n", pjsip_rx_data_get_info (rdata));
+ _debug ("Got SDP answer %s", 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));
+ _debug ("An error occured while processing remote answer %s", pjsip_rx_data_get_info (rdata));
return PJMEDIA_SDP_EINSDP;
}
@@ -282,9 +287,9 @@ pj_status_t Sdp::check_sdp_answer (pjsip_inv_session *inv, pjsip_rx_data *rdata)
status = pjmedia_sdp_neg_negotiate (inv->pool, inv->neg, 0);
- _debug ("Negotiation returned with status %d PJ_SUCCESS being %d\n", status, PJ_SUCCESS);
+ _debug ("Negotiation returned with status %d PJ_SUCCESS being %d", status, PJ_SUCCESS);
} else {
- _debug ("No need to check sdp answer since we are UAS\n");
+ _debug ("No need to check sdp answer since we are UAS");
return PJ_SUCCESS;
}
@@ -360,6 +365,50 @@ void Sdp::sdp_add_media_description()
}
}
+// @TODO crypto should be a vector of string
+void Sdp::sdp_add_sdes_attribute (std::vector<std::string>& crypto)
+{
+
+ // temporary buffer used to store crypto attribute
+ char tempbuf[256];
+
+ std::vector<std::string>::iterator iter = crypto.begin();
+
+ while(iter != crypto.end()) {
+
+ // the attribute to add to sdp
+ pjmedia_sdp_attr *attribute = (pjmedia_sdp_attr*) pj_pool_zalloc(_pool, sizeof(pjmedia_sdp_attr));
+
+ attribute->name = pj_strdup3(_pool, "crypto");
+
+ // _debug("crypto from sdp: %s", crypto.c_str());
+
+
+ int len = pj_ansi_snprintf(tempbuf, sizeof(tempbuf),
+ "%.*s",(int)(*iter).size(), (*iter).c_str());
+
+ attribute->value.slen = len;
+ attribute->value.ptr = (char*) pj_pool_alloc (_pool, attribute->value.slen+1);
+ pj_memcpy (attribute->value.ptr, tempbuf, attribute->value.slen+1);
+
+ // get number of media for this SDP
+ int media_count = _local_offer->media_count;
+
+ // add crypto attribute to media
+ for(int i = 0; i < media_count; i++) {
+
+ if(pjmedia_sdp_media_add_attr(_local_offer->media[i], attribute) != PJ_SUCCESS) {
+ // if(pjmedia_sdp_attr_add(&(_local_offer->attr_count), _local_offer->attr, attribute) != PJ_SUCCESS){
+ throw sdpException();
+ }
+ }
+
+
+ iter++;
+ }
+}
+
+
void Sdp::sdp_add_zrtp_attribute (pjmedia_sdp_media* media, std::string hash)
{
pjmedia_sdp_attr *attribute;
@@ -446,9 +495,9 @@ void Sdp::set_negotiated_sdp (const pjmedia_sdp_session *sdp)
pjmedia_sdp_attr_to_rtpmap (_pool, attribute, &rtpmap);
- // _debug("================== set_negociated_offer ===================== %i\n", pj_strtoul(&rtpmap->pt));
- // _debug("================== set_negociated_offer ===================== %s\n", current->desc.fmt[j].ptr);
- // _debug("================== set_negociated_offer ===================== %i\n", atoi(current->desc.fmt[j].ptr));
+ // _debug("================== set_negociated_offer ===================== %i", pj_strtoul(&rtpmap->pt));
+ // _debug("================== set_negociated_offer ===================== %s", current->desc.fmt[j].ptr);
+ // _debug("================== set_negociated_offer ===================== %i", atoi(current->desc.fmt[j].ptr));
iter = codecs_list.find ( (AudioCodecType) pj_strtoul (&rtpmap->pt));
if (iter==codecs_list.end())
@@ -469,7 +518,7 @@ AudioCodec* Sdp::get_session_media (void)
AudioCodec *codec = NULL;
std::vector<sdpMedia*> media_list;
- _debug ("Executing sdp line %d - get_session_media ()\n", __LINE__);
+ _debug ("Executing sdp line %d - get_session_media ()", __LINE__);
media_list = get_session_media_list ();
nb_media = media_list.size();
@@ -521,8 +570,7 @@ void Sdp::toString (void)
sdp << "\n";
- _debug ("LOCAL SDP: \n%s\n", sdp.str().c_str());
-
+ _debug ("LOCAL SDP: \n%s", sdp.str().c_str());
}
void Sdp::set_local_media_capabilities ()
@@ -537,7 +585,7 @@ void Sdp::set_local_media_capabilities ()
// Clean it first
_local_media_cap.clear();
- _debug ("Fetch local media capabilities. Local extern audio port: %i\n" , get_local_extern_audio_port());
+ _debug ("Fetch local media capabilities. Local extern audio port: %i" , get_local_extern_audio_port());
/* Only one audio media used right now */
audio = new sdpMedia (MIME_TYPE_AUDIO);
@@ -585,7 +633,7 @@ void Sdp::set_remote_ip_from_sdp (const pjmedia_sdp_session *r_sdp)
{
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());
+ _debug (" Remote IP from fetching SDP: %s", remote_ip.c_str());
this->set_remote_ip (remote_ip);
}
@@ -595,27 +643,28 @@ void Sdp::set_remote_audio_port_from_sdp (pjmedia_sdp_media *r_media)
int remote_port;
remote_port = r_media->desc.port;
- _debug (" Remote Audio Port from fetching SDP: %d\n", remote_port);
+ _debug (" Remote Audio Port from fetching SDP: %d", remote_port);
this->set_remote_audio_port (remote_port);
}
void Sdp::set_media_transport_info_from_remote_sdp (const pjmedia_sdp_session *remote_sdp)
{
- _debug ("Fetching media from sdp\n");
+ _debug ("Fetching media from sdp");
pjmedia_sdp_media *r_media;
this->get_remote_sdp_media_from_offer (remote_sdp, &r_media);
if (r_media==NULL) {
- _debug ("SDP Failure: no remote sdp media found in the remote offer\n");
+ _debug ("SDP Failure: no remote sdp media found in the remote offer");
return;
}
this->set_remote_audio_port_from_sdp (r_media);
this->set_remote_ip_from_sdp (remote_sdp);
+
}
void Sdp::get_remote_sdp_media_from_offer (const pjmedia_sdp_session* remote_sdp, pjmedia_sdp_media** r_media)
@@ -633,3 +682,55 @@ void Sdp::get_remote_sdp_media_from_offer (const pjmedia_sdp_session* remote_sdp
}
}
+void Sdp::get_remote_sdp_crypto_from_offer (const pjmedia_sdp_session* remote_sdp, CryptoOffer& crypto_offer)
+{
+
+ int i, j;
+ int attr_count, media_count;
+ pjmedia_sdp_attr *attribute;
+ pjmedia_sdp_media *media;
+
+ // get the number of media for this sdp session
+ media_count = remote_sdp->media_count;
+
+ // *r_crypto = pjmedia_sdp_media_find_attr(attribute, &STR_CRYPTO, NULL);
+
+ _debug("****************** Parse for Crypto ********************");
+
+ CryptoOffer remoteOffer;
+
+ // iterate over all media
+ for (i = 0; i < media_count; ++i) {
+
+ // _debug("%.*s", (int)remote_sdp->attr[i]->name.slen, remote_sdp->attr[i]->name.ptr);
+ // _debug("%.*s", (int)remote_sdp->attr[i]->value.slen, remote_sdp->attr[i]->value.ptr);
+
+ // get media
+ media = remote_sdp->media[i];
+
+ // get number of attribute for this memdia
+ attr_count = media->attr_count;
+
+ // iterate over all attribute for this media
+ for(j = 0; j < attr_count; j++) {
+
+ attribute = media->attr[j];
+
+ // test if this attribute is a crypto
+ if (pj_stricmp2 (&attribute->name, "crypto") == 0) {
+
+ _debug("****************** Found a Crypto ********************");
+ std::string attr(attribute->value.ptr, attribute->value.slen);
+
+ // @TODO our parser require the "a=crypto:" to be present
+ std::string full_attr = "a=crypto:";
+ full_attr += attr;
+
+ crypto_offer.push_back(full_attr);
+ }
+
+ }
+ }
+
+}
+
diff --git a/sflphone-common/src/sip/sdp.h b/sflphone-common/src/sip/sdp.h
index 9500fa318539b7185742747d1d6103398cd3c2f8..afba2e67d460fbaa63767f0160016f8717a033ee 100644
--- a/sflphone-common/src/sip/sdp.h
+++ b/sflphone-common/src/sip/sdp.h
@@ -29,6 +29,7 @@
#include <pjmedia/errno.h>
#include <pj/pool.h>
#include <pj/assert.h>
+#include <vector>
#include "audio/codecs/codecDescriptor.h"
#include "sdpmedia.h"
@@ -43,6 +44,8 @@ class sdpException: public std::exception
}
};
+typedef std::vector<std::string> CryptoOffer;
+
class Sdp {
public:
@@ -101,6 +104,11 @@ class Sdp {
* @param hash The hello hash of a rtp session. (Only audio at the moment)
*/
inline void set_zrtp_hash(const std::string& hash) { _zrtp_hello_hash = hash; _debug("Zrtp hash set with %s\n", hash.c_str()); }
+
+ /* Set the srtp _master_key
+ * @param mk The Master Key of a srtp session.
+ */
+ inline void set_srtp_crypto(const std::vector<std::string> lc) { _srtp_crypto = lc; }
/*
* On building an invite outside a dialog, build the local offer and create the
@@ -213,6 +221,8 @@ class Sdp {
std::vector<sdpMedia*> get_session_media_list (void) { return _session_media; }
+ void get_remote_sdp_crypto_from_offer (const pjmedia_sdp_session* remote_sdp, CryptoOffer& crypto_offer);
+
private:
/** Codec Map */
std::vector<sdpMedia*> _local_media_cap;
@@ -246,7 +256,10 @@ class Sdp {
/** Remote's audio port */
unsigned int _remote_audio_port;
- std::string _zrtp_hello_hash;
+ std::string _zrtp_hello_hash;
+
+ /** "a=crypto" sdes local attributes obtained from AudioSrtpSession */
+ std::vector<std::string> _srtp_crypto;
Sdp(const Sdp&); //No Copy Constructor
Sdp& operator=(const Sdp&); //No Assignment Operator
@@ -336,6 +349,14 @@ class Sdp {
void get_remote_sdp_media_from_offer (const pjmedia_sdp_session* r_sdp, pjmedia_sdp_media** r_media);
+
+ /*
+ * Adds a sdes attribute to the given media section.
+ *
+ * @param media The media to add the srtp attribute to
+ */
+ void sdp_add_sdes_attribute(std::vector<std::string>& crypto);
+
/*
* Adds a zrtp-hash attribute to
* the given media section. The hello hash is
diff --git a/sflphone-common/src/sip/sipaccount.cpp b/sflphone-common/src/sip/sipaccount.cpp
index fe36571c986ff556d92fe9c158a3fa4b81807b1f..29e1ace7999a4dd17639ae33118b30563c0ef960 100644
--- a/sflphone-common/src/sip/sipaccount.cpp
+++ b/sflphone-common/src/sip/sipaccount.cpp
@@ -30,7 +30,6 @@ SIPAccount::SIPAccount (const AccountID& accountID)
, _bRegister (false)
, _registrationExpire ("")
, _publishedSameasLocal (true)
- , _localIpAddress ("")
, _publishedIpAddress ("")
, _localPort (atoi (DEFAULT_SIP_PORT))
, _publishedPort (atoi (DEFAULT_SIP_PORT))
@@ -44,14 +43,13 @@ SIPAccount::SIPAccount (const AccountID& accountID)
, _tlsSetting (NULL)
, _displayName ("")
{
- /* SIPVoIPlink is used as a singleton, because we want to have only one link for all the SIP accounts created */
- /* So instead of creating a new instance, we just fetch the static instance, or create one if it is not yet */
- /* The SIP library initialization is done in the SIPVoIPLink constructor */
- /* The SIP voip link is now independant of the account ID as it can manage several SIP accounts */
- _link = SIPVoIPLink::instance ("");
+
+ // IP2IP settings must be loaded before singleton instanciation, cannot call it here...
+
+ // _link = SIPVoIPLink::instance ("");
/* Represents the number of SIP accounts connected the same link */
- dynamic_cast<SIPVoIPLink*> (_link)->incrementClients();
+ // dynamic_cast<SIPVoIPLink*> (_link)->incrementClients();
}
@@ -59,12 +57,23 @@ SIPAccount::~SIPAccount()
{
/* One SIP account less connected to the sip voiplink */
dynamic_cast<SIPVoIPLink*> (_link)->decrementClients();
+
/* Delete accounts-related information */
_regc = NULL;
free (_cred);
free (_tlsSetting);
}
+
+// void SIPAccount::setVoIPLink(VoIPLink *link) {
+void SIPAccount::setVoIPLink() {
+
+ _link = SIPVoIPLink::instance ("");
+ dynamic_cast<SIPVoIPLink*> (_link)->incrementClients();
+
+}
+
+
int SIPAccount::initCredential (void)
{
int credentialCount = 0;
@@ -76,17 +85,17 @@ int SIPAccount::initCredential (void)
md5HashingEnabled = Manager::instance().getConfigBool (PREFERENCES, CONFIG_MD5HASH);
std::string digest;
-// Create the credential array
+ // Create the credential array
pjsip_cred_info * cred_info = (pjsip_cred_info *) malloc (sizeof (pjsip_cred_info) * (credentialCount));
if (cred_info == NULL) {
- _debug ("Failed to set cred_info for account %s\n", _accountID.c_str());
+ _debug ("Failed to set cred_info for account %s", _accountID.c_str());
return !SUCCESS;
}
pj_bzero (cred_info, sizeof (pjsip_cred_info) *credentialCount);
-// Use authentication username if provided
+ // Use authentication username if provided
if (!_authenticationUsername.empty()) {
cred_info[0].username = pj_str (strdup (_authenticationUsername.c_str()));
@@ -94,26 +103,26 @@ int SIPAccount::initCredential (void)
cred_info[0].username = pj_str (strdup (_username.c_str()));
}
-// Set password
+ // Set password
cred_info[0].data = pj_str (strdup (_password.c_str()));
-// Set realm for that credential. * by default.
+ // Set realm for that credential. * by default.
cred_info[0].realm = pj_str (strdup (_realm.c_str()));
-// We want to make sure that the password is really
-// 32 characters long. Otherwise, pjsip will fail
-// on an assertion.
+ // We want to make sure that the password is really
+ // 32 characters long. Otherwise, pjsip will fail
+ // on an assertion.
if (md5HashingEnabled && _password.length() == 32) {
dataType = PJSIP_CRED_DATA_DIGEST;
- _debug ("Setting digest \n");
+ _debug ("Setting digest ");
} else {
dataType = PJSIP_CRED_DATA_PLAIN_PASSWD;
}
-// Set the datatype
+ // Set the datatype
cred_info[0].data_type = dataType;
-
-// Set the secheme
+
+ // Set the secheme
cred_info[0].scheme = pj_str ( (char*) "digest");
int i;
@@ -140,7 +149,7 @@ int SIPAccount::initCredential (void)
if (md5HashingEnabled && _password.length() == 32) {
dataType = PJSIP_CRED_DATA_DIGEST;
- _debug ("Setting digest \n");
+ _debug ("Setting digest ");
} else {
dataType = PJSIP_CRED_DATA_PLAIN_PASSWD;
}
@@ -149,7 +158,7 @@ int SIPAccount::initCredential (void)
cred_info[i].scheme = pj_str ( (char*) "digest");
- _debug ("Setting credential %d realm = %s passwd = %s username = %s data_type = %d\n", i, realm.c_str(), password.c_str(), username.c_str(), cred_info[i].data_type);
+ _debug ("Setting credential %d realm = %s passwd = %s username = %s data_type = %d", i, realm.c_str(), password.c_str(), username.c_str(), cred_info[i].data_type);
}
_credentialCount = credentialCount;
@@ -203,7 +212,7 @@ int SIPAccount::registerVoIPLink()
int SIPAccount::unregisterVoIPLink()
{
- _debug ("Unregister account %s\n" , getAccountID().c_str());
+ _debug ("Unregister account %s" , getAccountID().c_str());
if (_accountID == IP2IP_PROFILE) {
return true;
@@ -331,11 +340,13 @@ void SIPAccount::loadConfig()
// Load network settings
// Local parameters
- std::string localPort = Manager::instance().getConfigString (_accountID, LOCAL_PORT);
+ // Load local interface
+ setLocalInterface(Manager::instance().getConfigString (_accountID, LOCAL_INTERFACE));
+
+ std::string localPort = Manager::instance().getConfigString (_accountID, LOCAL_PORT);
setLocalPort (atoi (localPort.c_str()));
- setLocalAddress (Manager::instance().getConfigString (_accountID, LOCAL_ADDRESS));
// Published parameters
setPublishedSameasLocal (Manager::instance().getConfigString (_accountID, PUBLISHED_SAMEAS_LOCAL) == TRUE_STR ? true : false);
@@ -402,6 +413,16 @@ std::string SIPAccount::getLoginName (void)
return username;
}
+std::string SIPAccount::getTransportMapKey(void)
+{
+
+ std::stringstream out;
+ out << getLocalPort();
+ std::string localPort = out.str();
+
+ return localPort;
+}
+
std::string SIPAccount::getFromUri (void)
{
@@ -533,7 +554,7 @@ std::string SIPAccount::getContactHeader (const std::string& address, const std:
_displayName = Manager::instance().getConfigString (_accountID, DISPLAY_NAME);
- _debug ("Display Name: %s\n", _displayName.c_str());
+ _debug ("Display Name: %s", _displayName.c_str());
int len = pj_ansi_snprintf (contact, PJSIP_MAX_URL_SIZE,
diff --git a/sflphone-common/src/sip/sipaccount.h b/sflphone-common/src/sip/sipaccount.h
index 7a3a17d887a4551938d2229a3b96e23b3eaf1757..ae454a533353680c23a169cc8d0945f523a7efc2 100644
--- a/sflphone-common/src/sip/sipaccount.h
+++ b/sflphone-common/src/sip/sipaccount.h
@@ -24,6 +24,8 @@
#ifndef SIPACCOUNT_H
#define SIPACCOUNT_H
+#include <sstream>
+
#include "account.h"
#include "sipvoiplink.h"
#include "pjsip/sip_transport_tls.h"
@@ -56,6 +58,12 @@ class SIPAccount : public Account
*/
virtual ~SIPAccount();
+ /**
+ * Special setVoIPLink which increment SipVoIPLink's number of client.
+ */
+ // void setVoIPLink(VoIPLink *link);
+ void setVoIPLink();
+
/**
* Actually unuseful, since config loading is done in init()
*/
@@ -188,6 +196,17 @@ class SIPAccount : public Account
*/
std::string getContactHeader(const std::string& address, const std::string& port);
+ /**
+ * Set the interface name on which this account is bound, "default" means
+ * that the account is bound to the ANY interafec (0.0.0.0). This method should be
+ * when binding the account to a new sip transport only.
+ */
+ inline void setLocalInterface(const std::string& interface) {_interface = interface;}
+
+ /**
+ * Get the local interface name on which this account is bound.
+ */
+ inline std::string getLocalInterface(void) { return _interface; }
/**
* Get a flag which determine the usage in sip headers of either the local
@@ -229,19 +248,6 @@ class SIPAccount : public Account
* @pram port The port used by this account.
*/
inline void setPublishedPort(pj_uint16_t port) { _publishedPort = port; }
-
- /**
- * Get the bound address set by the user.
- * @return std::string The public IPV4 address formatted in the standard dot notation.
- */
- inline std::string getLocalAddress(void) { return _localIpAddress; }
-
- /**
- * Set the bound address chosen by the user.
- * @param The public IPV4 address in the standard dot notation.
- * @return void
- */
- inline void setLocalAddress(const std::string& address) { _localIpAddress = address; }
/**
* Get the public IP address set by the user for this account.
@@ -268,7 +274,9 @@ class SIPAccount : public Account
inline void setAccountTransport (pjsip_transport *transport) { _transport = transport; }
- private:
+ std::string getTransportMapKey(void);
+
+ private:
/* Maps a string description of the SSL method
* to the corresponding enum value in pjsip_ssl_method.
@@ -283,10 +291,10 @@ class SIPAccount : public Account
*/
void initTlsConfiguration(void);
- /*
- * Initializes STUN config from the config file
- */
- void initStunConfiguration (void);
+ /*
+ * Initializes STUN config from the config file
+ */
+ void initStunConfiguration (void);
/*
* Initializes set of additional credentials, if supplied by the user.
@@ -308,8 +316,7 @@ class SIPAccount : public Account
* @return std::string The login name under which SFLPhone is running.
*/
std::string getLoginName(void);
-
- private:
+
// The pjsip client registration information
pjsip_regc *_regc;
@@ -319,11 +326,13 @@ class SIPAccount : public Account
// Network settings
std::string _registrationExpire;
- // Flag which determine if _localIpAddress or _publishedIpAddress is used in
+ // interface name on which this account is bound
+ std::string _interface;
+
+ // Flag which determine if _localIpAddress or _publishedIpAddress is used in
// sip headers
- bool _publishedSameasLocal;
+ bool _publishedSameasLocal;
- std::string _localIpAddress;
std::string _publishedIpAddress;
pj_uint16_t _localPort;
@@ -350,8 +359,8 @@ class SIPAccount : public Account
// The STUN server name, if applicable
pj_str_t _stunServerName;
- // The STUN server port, if applicable
- pj_uint16_t _stunPort;
+ // The STUN server port, if applicable
+ pj_uint16_t _stunPort;
// Display Name that can be used in SIP URI.
std::string _displayName;
diff --git a/sflphone-common/src/sip/sipcall.cpp b/sflphone-common/src/sip/sipcall.cpp
index 60680c779a8cf3f0e0b8dbf505b17e7e06f5ba97..d1e22660c64e97650684a27048114b875de382e2 100644
--- a/sflphone-common/src/sip/sipcall.cpp
+++ b/sflphone-common/src/sip/sipcall.cpp
@@ -34,7 +34,7 @@ SIPCall::SIPCall (const CallID& id, Call::CallType type, pj_pool_t *pool) : Call
, _local_sdp (0)
{
_local_sdp = new Sdp (pool);
- _debug ("SIPCALL::Constructor for this class is called \n");
+ _debug ("SIPCALL::Constructor for this class is called ");
}
SIPCall::~SIPCall()
@@ -43,7 +43,7 @@ SIPCall::~SIPCall()
_audiortp = 0;
delete _local_sdp;
_local_sdp = 0;
- _debug ("SIPCALL::Destructor for this class is called \n");
+ _debug ("SIPCALL::Destructor for this class is called ");
}
diff --git a/sflphone-common/src/sip/sipvoiplink.cpp b/sflphone-common/src/sip/sipvoiplink.cpp
index 21f12a44f41052db14873419d69cd8faec4191d6..8d597bc2523a51a15b0aabfde9cb421168334f8b 100644
--- a/sflphone-common/src/sip/sipvoiplink.cpp
+++ b/sflphone-common/src/sip/sipvoiplink.cpp
@@ -4,6 +4,7 @@
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Yun Liu <yun.liu@savoirfairelinux.com>
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
+ * Author: Alexandre Savard <alexandre.savard@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
@@ -28,6 +29,7 @@
#include "sipcall.h"
#include "sipaccount.h"
#include "eventthread.h"
+#include "SdesNegotiator.h"
#include "dbus/dbusmanager.h"
#include "dbus/callmanager.h"
@@ -43,6 +45,11 @@
#include <resolv.h>
#include <istream>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <linux/if.h>
+
#define CAN_REINVITE 1
static char * invitationStateMap[] = {
@@ -239,6 +246,8 @@ SIPVoIPLink::SIPVoIPLink (const AccountID& accountID)
SIPVoIPLink::~SIPVoIPLink()
{
+ _debug("SIPVoIPLink destructor called");
+
terminate();
}
@@ -246,7 +255,7 @@ SIPVoIPLink* SIPVoIPLink::instance (const AccountID& id)
{
if (!_instance) {
- _debug ("Create new SIPVoIPLink instance\n");
+ _debug ("Create new SIPVoIPLink instance");
_instance = new SIPVoIPLink (id);
}
@@ -258,6 +267,8 @@ void SIPVoIPLink::decrementClients (void)
_clients--;
if (_clients == 0) {
+
+ _debug("No SIP account anymore, terminate SIPVoIPLink");
terminate();
SIPVoIPLink::_instance=NULL;
}
@@ -286,21 +297,18 @@ bool SIPVoIPLink::init()
void
SIPVoIPLink::terminate()
{
- _debug ("SIPVoIPLink::terminate");
-
-
+ _debug ("Terminating SIPVoIPLink");
if (_evThread) {
- _debug ("SIPVoIPLink:: delete eventThread");
+ _debug ("Deleting sip eventThread");
delete _evThread;
_evThread = NULL;
}
-
/* Clean shutdown of pjsip library */
if (initDone()) {
- _debug ("pjsip_shutdown\n");
+ _debug ("Shuting down PJSIP");
pjsip_shutdown();
}
@@ -366,6 +374,38 @@ void get_remote_sdp_from_offer (pjsip_rx_data *rdata, pjmedia_sdp_session** r_sd
}
+std::string SIPVoIPLink::getInterfaceAddrFromName(std::string ifaceName) {
+
+ struct ifreq ifr;
+ int fd;
+ int rval = 0;
+ int err;
+
+ struct sockaddr_in *saddr_in;
+ struct in_addr *addr_in;
+
+ if((fd = socket (AF_INET, SOCK_DGRAM,0)) < 0)
+ _debug("getInterfaceAddrFromName error could not open socket\n");
+
+ memset (&ifr, 0, sizeof (struct ifreq));
+
+ strcpy (ifr.ifr_name, ifaceName.c_str());
+ ifr.ifr_addr.sa_family = AF_INET;
+
+ if((err = ioctl(fd, SIOCGIFADDR, &ifr)) < 0)
+ _debug("getInterfaceAddrFromName use default interface (0.0.0.0)\n");
+
+ // printf("Local address: %s\n", inet_ntos( ((struct sockaddr_in *) &ifr.ifr_ifru.ifru_addr)->sin_addr ));
+
+ saddr_in = (struct sockaddr_in *)&ifr.ifr_addr;
+ addr_in = &(saddr_in->sin_addr);
+
+ std::string addr(pj_inet_ntoa(*((pj_in_addr*)addr_in)));
+
+ return addr;
+}
+
+
std::string SIPVoIPLink::get_useragent_name (void)
{
std::ostringstream useragent;
@@ -389,6 +429,7 @@ SIPVoIPLink::getEvent()
int SIPVoIPLink::sendRegister (AccountID id)
{
+
int expire_value;
pj_status_t status;
@@ -434,15 +475,15 @@ int SIPVoIPLink::sendRegister (AccountID id)
while (result.status == 0x12345678) {
pj_time_val timeout = { 1, 0 };
pjsip_endpt_handle_events (_endpt, &timeout);
- _debug ("status : %d\n", result.status);
+ _debug ("status : %d", result.status);
}
if (result.status != PJ_SUCCESS) {
_debug ("Failed to resolve hostname only once."
" Default resolver will be used on"
- " hostname for all requests.\n");
+ " hostname for all requests.");
} else {
- _debug ("%d servers where obtained from name resolution.\n", result.servers.count);
+ _debug ("%d servers where obtained from name resolution.", result.servers.count);
char addr_buf[80];
pj_sockaddr_print ( (pj_sockaddr_t*) &result.servers.entry[0].addr, addr_buf, sizeof (addr_buf), 3);
@@ -450,39 +491,17 @@ int SIPVoIPLink::sendRegister (AccountID id)
}
}
- // Launch a new TLS listener/transport
- // if the user did choose it.
- if (account->isTlsEnabled()) {
- pj_status_t status;
-
- _debug (" sendRegister: createTlsTransport\n");
- status = createTlsTransportRetryOnFailure (id);
-
- if (status != PJ_SUCCESS) {
- _debug ("Failed to initialize TLS transport for account %s\n", id.c_str());
- }
- }
-
- else {
- // Launch a new UDP listener/transport, using the published address
- if (account->isStunEnabled ()) {
- pj_status_t status;
-
- _debug (" sendRegister: createAlternateUdpTransport\n");
- status = createAlternateUdpTransport (id);
+ // Create SIP transport or get existent SIP transport from internal map
+ // according to account settings, if the transport could not be created but
+ // one is already set in account, use this one (most likely this is the
+ // transport we tried to create)
+ acquireTransport(account->getAccountID());
- if (status != PJ_SUCCESS) {
- _debug ("Failed to initialize UDP transport with an extern published address for account %s\n", id.c_str());
- }
- } else {
-
- status = createUDPServer (id);
-
- if (status != PJ_SUCCESS) {
- _debug ("Use the local UDP transport\n");
- account->setAccountTransport (_localUDPTransport);
- }
- }
+ if (account->getAccountTransport()) {
+ _debug("Acquire transport in account registration: %s %s (refcnt=%d)",
+ account->getAccountTransport()->obj_name,
+ account->getAccountTransport()->info,
+ (int)pj_atomic_get(account->getAccountTransport()->ref_cnt));
}
_mutexSIP.enterMutex();
@@ -506,7 +525,7 @@ int SIPVoIPLink::sendRegister (AccountID id)
status = pjsip_regc_create (_endpt, (void*) account, ®c_cb, ®c);
if (status != PJ_SUCCESS) {
- _debug ("UserAgent: Unable to create regc.\n");
+ _debug ("UserAgent: Unable to create regc.");
_mutexSIP.leaveMutex();
return false;
}
@@ -538,7 +557,7 @@ int SIPVoIPLink::sendRegister (AccountID id)
contactUri = account->getContactHeader (address, portStr);
- _debug ("sendRegister: fromUri: %s serverUri: %s contactUri: %s\n",
+ _debug ("sendRegister: fromUri: %s serverUri: %s contactUri: %s",
fromUri.c_str(),
srvUri.c_str(),
contactUri.c_str());
@@ -559,7 +578,7 @@ int SIPVoIPLink::sendRegister (AccountID id)
status = pjsip_regc_init (regc, &pjSrv, &pjFrom, &pjFrom, 1, &pjContact, expire_value);
if (status != PJ_SUCCESS) {
- _debug ("UserAgent: Unable to initialize account %d in sendRegister\n", status);
+ _debug ("UserAgent: Unable to initialize account %d in sendRegister", status);
_mutexSIP.leaveMutex();
return false;
}
@@ -567,7 +586,7 @@ int SIPVoIPLink::sendRegister (AccountID id)
pjsip_cred_info *cred = account->getCredInfo();
int credential_count = account->getCredentialCount();
- _debug ("setting %d credentials in sendRegister\n", credential_count);
+ _debug ("setting %d credentials in sendRegister", credential_count);
pjsip_regc_set_credentials (regc, credential_count, cred);
// Add User-Agent Header
@@ -584,27 +603,48 @@ int SIPVoIPLink::sendRegister (AccountID id)
status = pjsip_regc_register (regc, PJ_TRUE, &tdata);
if (status != PJ_SUCCESS) {
- _debug ("UserAgent: Unable to register regc.\n");
+ _debug ("UserAgent: Unable to register regc.");
_mutexSIP.leaveMutex();
return false;
}
pjsip_tpselector *tp;
- init_transport_selector (account->getAccountTransport (), &tp);
+ init_transport_selector (account->getAccountTransport (), &tp);
+
+ // pjsip_regc_set_transport increments transport ref count by one
status = pjsip_regc_set_transport (regc, tp);
+ if(account->getAccountTransport()) {
+ // decrease transport's ref count, counter icrementation is
+ // managed when acquiring transport
+ pjsip_transport_dec_ref(account->getAccountTransport ());
+
+ _debug("After setting the transport in account registration using transport: %s %s (refcnt=%d)",
+ account->getAccountTransport()->obj_name,
+ account->getAccountTransport()->info,
+ (int)pj_atomic_get(account->getAccountTransport()->ref_cnt));
+ }
+
if (status != PJ_SUCCESS) {
- _debug ("UserAgent: Unable to set transport.\n");
+ _debug ("UserAgent: Unable to set transport.");
_mutexSIP.leaveMutex ();
return false;
}
// Send registration request
+ // pjsip_regc_send increment the transport ref count by one,
status = pjsip_regc_send (regc, tdata);
+ if(account->getAccountTransport()) {
+ // Decrease transport's ref count, since coresponding reference counter decrementation
+ // is performed in pjsip_regc_destroy. This function is never called in SFLphone as the
+ // regc data structure is permanently associated to the account at first registration.
+ pjsip_transport_dec_ref(account->getAccountTransport ());
+ }
+
if (status != PJ_SUCCESS) {
- _debug ("UserAgent: Unable to send regc request.\n");
+ _debug ("UserAgent: Unable to send regc request.");
_mutexSIP.leaveMutex();
return false;
}
@@ -613,12 +653,21 @@ int SIPVoIPLink::sendRegister (AccountID id)
account->setRegistrationInfo (regc);
+ if(account->getAccountTransport()) {
+
+ _debug("Sent account registration using transport: %s %s (refcnt=%d)",
+ account->getAccountTransport()->obj_name,
+ account->getAccountTransport()->info,
+ (int)pj_atomic_get(account->getAccountTransport()->ref_cnt));
+ }
+
return true;
}
int
SIPVoIPLink::sendUnregister (AccountID id)
{
+
pj_status_t status = 0;
pjsip_tx_data *tdata = NULL;
SIPAccount *account;
@@ -627,6 +676,18 @@ SIPVoIPLink::sendUnregister (AccountID id)
account = dynamic_cast<SIPAccount *> (Manager::instance().getAccount (id));
regc = account->getRegistrationInfo();
+ // If an transport is attached to this account, detach it and decrease reference counter
+ if(account->getAccountTransport()) {
+
+ _debug("Sent account unregistration using transport: %s %s (refcnt=%d)",
+ account->getAccountTransport()->obj_name,
+ account->getAccountTransport()->info,
+ (int)pj_atomic_get(account->getAccountTransport()->ref_cnt));
+
+ // shutdownSipTransport(account->getAccountID());
+ }
+
+ // This may occurs if account failed to register and is in state INVALID
if (!account->isRegister()) {
account->setRegistrationState (Unregistered);
return true;
@@ -636,18 +697,18 @@ SIPVoIPLink::sendUnregister (AccountID id)
status = pjsip_regc_unregister (regc, &tdata);
if (status != PJ_SUCCESS) {
- _debug ("UserAgent: Unable to unregister regc.\n");
+ _debug ("UserAgent: Unable to unregister regc.");
return false;
}
-
+
status = pjsip_regc_send (regc, tdata);
if (status != PJ_SUCCESS) {
- _debug ("UserAgent: Unable to send regc request.\n");
+ _debug ("UserAgent: Unable to send regc request.");
return false;
}
} else {
- _debug ("UserAgent: regc is null!\n");
+ _debug ("UserAgent: regc is null!");
return false;
}
@@ -662,7 +723,7 @@ SIPVoIPLink::newOutgoingCall (const CallID& id, const std::string& toUrl)
{
SIPAccount * account = NULL;
pj_status_t status;
- std::string localAddr;
+ std::string localAddr, addrSdp;
SIPCall* call = new SIPCall (id, Call::Outgoing, _pool);
@@ -670,7 +731,7 @@ SIPVoIPLink::newOutgoingCall (const CallID& id, const std::string& toUrl)
account = dynamic_cast<SIPAccount *> (Manager::instance().getAccount (Manager::instance().getAccountFromCall (id)));
if (account == NULL) {
- _debug ("Error retrieving the account to the make the call with\n");
+ _debug ("Error retrieving the account to the make the call with");
call->setConnectionState (Call::Disconnected);
call->setState (Call::Error);
delete call;
@@ -682,23 +743,33 @@ SIPVoIPLink::newOutgoingCall (const CallID& id, const std::string& toUrl)
call->setPeerNumber (toUri);
- // TODO May use the published address as well
- localAddr = account->getLocalAddress ();
+ localAddr = getInterfaceAddrFromName(account->getLocalInterface ());
+
+ if (localAddr == "0.0.0.0")
+ loadSIPLocalIP (&localAddr);
+
setCallAudioLocal (call, localAddr);
+ // May use the published address as well
+ account->isStunEnabled () ? addrSdp = account->getPublishedAddress () : addrSdp = getInterfaceAddrFromName(account->getLocalInterface ());
+
+ if (addrSdp == "0.0.0.0")
+ loadSIPLocalIP (&addrSdp);
+
try {
- _debug ("Creating new rtp session in newOutgoingCall\n");
+ _debug ("Creating new rtp session in newOutgoingCall");
+ call->getAudioRtp()->initAudioRtpConfig (call);
call->getAudioRtp()->initAudioRtpSession (call);
} catch (...) {
- _debug ("Failed to create rtp thread from newOutGoingCall\n");
+ _debug ("Failed to create rtp thread from newOutGoingCall");
}
call->initRecFileName();
- _debug ("Try to make a call to: %s with call ID: %s\n", toUrl.data(), id.data());
+ _debug ("Try to make a call to: %s with call ID: %s", toUrl.data(), id.data());
// Building the local SDP offer
// localAddr = getLocalAddressAssociatedToAccount (account->getAccountID());
- call->getLocalSDP()->set_ip_address (localAddr);
+ call->getLocalSDP()->set_ip_address (addrSdp);
status = call->getLocalSDP()->create_initial_offer();
if (status != PJ_SUCCESS) {
@@ -729,22 +800,24 @@ SIPVoIPLink::answer (const CallID& id)
Sdp *local_sdp;
pjsip_inv_session *inv_session;
- _debug ("SIPVoIPLink::answer: start answering \n");
+ _debug ("SIPVoIPLink::answer: start answering ");
call = getSIPCall (id);
if (call==0) {
- _debug ("! SIP Failure: SIPCall doesn't exists\n");
+ _debug ("! SIP Failure: SIPCall doesn't exists");
return false;
}
local_sdp = call->getLocalSDP();
+ /*
try {
call->getAudioRtp()->initAudioRtpSession (call);
} catch (...) {
- _debug ("Failed to create rtp thread from answer\n");
+ _debug ("Failed to create rtp thread from answer");
}
+ */
inv_session = call->getInvSession();
@@ -752,7 +825,7 @@ SIPVoIPLink::answer (const CallID& id)
if (status == PJ_SUCCESS) {
- _debug ("SIPVoIPLink::answer:UserAgent: Negociation success! : call %s \n", call->getCallId().c_str());
+ _debug ("SIPVoIPLink::answer:UserAgent: Negociation success! : call %s ", call->getCallId().c_str());
// Create and send a 200(OK) response
status = pjsip_inv_answer (inv_session, PJSIP_SC_OK, NULL, NULL, &tdata);
PJ_ASSERT_RETURN (status == PJ_SUCCESS, 1);
@@ -773,7 +846,7 @@ SIPVoIPLink::answer (const CallID& id)
PJ_ASSERT_RETURN (status == PJ_SUCCESS, 1);
// Terminate the call
- _debug ("SIPVoIPLink::answer: fail terminate call %s \n",call->getCallId().c_str());
+ _debug ("SIPVoIPLink::answer: fail terminate call %s ",call->getCallId().c_str());
if (call->getAudioRtp())
call->getAudioRtp()->stop ();
@@ -796,10 +869,11 @@ SIPVoIPLink::hangup (const CallID& id)
call = getSIPCall (id);
if (call==0) {
- _debug ("! SIP Error: Call doesn't exist\n");
+ _debug ("! SIP Error: Call doesn't exist");
return false;
}
+
// User hangup current call. Notify peer
status = pjsip_inv_end_session (call->getInvSession(), 404, NULL, &tdata);
@@ -819,9 +893,10 @@ SIPVoIPLink::hangup (const CallID& id)
call->getInvSession()->mod_data[getModId() ] = NULL;
+
// Release RTP thread
if (Manager::instance().isCurrentCall (id)) {
- _debug ("* SIP Info: Stopping AudioRTP for hangup\n");
+ _debug ("* SIP Info: Stopping AudioRTP for hangup");
call->getAudioRtp()->stop();
}
@@ -842,7 +917,7 @@ SIPVoIPLink::peerHungup (const CallID& id)
call = getSIPCall (id);
if (call==0) {
- _debug ("! SIP Error: Call doesn't exist\n");
+ _debug ("! SIP Error: Call doesn't exist");
return false;
}
@@ -862,12 +937,14 @@ SIPVoIPLink::peerHungup (const CallID& id)
call->getInvSession()->mod_data[getModId() ] = NULL;
+
// Release RTP thread
if (Manager::instance().isCurrentCall (id)) {
- _debug ("* SIP Info: Stopping AudioRTP for hangup\n");
+ _debug ("* SIP Info: Stopping AudioRTP for hangup");
call->getAudioRtp()->stop();
}
+
terminateOneCall (id);
removeCall (id);
@@ -881,11 +958,11 @@ SIPVoIPLink::cancel (const CallID& id)
SIPCall* call = getSIPCall (id);
if (call==0) {
- _debug ("! SIP Error: Call doesn't exist\n");
+ _debug ("! SIP Error: Call doesn't exist");
return false;
}
- _debug ("- SIP Action: Cancel call %s [cid: %3d]\n", id.data(), call->getCid());
+ _debug ("- SIP Action: Cancel call %s [cid: %3d]", id.data(), call->getCid());
terminateOneCall (id);
removeCall (id);
@@ -903,7 +980,7 @@ SIPVoIPLink::onhold (const CallID& id)
call = getSIPCall (id);
if (call==0) {
- _debug ("! SIP Error: call doesn't exist\n");
+ _debug ("! SIP Error: call doesn't exist");
return false;
}
@@ -913,7 +990,7 @@ SIPVoIPLink::onhold (const CallID& id)
call->setState (Call::Hold);
- _debug ("* SIP Info: Stopping AudioRTP for onhold action\n");
+ _debug ("* SIP Info: Stopping AudioRTP for onhold action");
call->getAudioRtp()->stop();
@@ -937,11 +1014,11 @@ int SIPVoIPLink::inv_session_reinvite (SIPCall *call, std::string direction)
local_sdp = call->getLocalSDP()->get_local_sdp_session();
if (local_sdp == NULL) {
- _debug ("! SIP Failure: unable to find local_sdp\n");
+ _debug ("! SIP Failure: unable to find local_sdp");
return !PJ_SUCCESS;
}
- // reinvite only if connected
+ // Reinvite only if connected
// Build the local SDP offer
status = call->getLocalSDP()->create_initial_offer();
@@ -955,7 +1032,6 @@ int SIPVoIPLink::inv_session_reinvite (SIPCall *call, std::string direction)
pjmedia_sdp_media_add_attr (local_sdp->media[0], attr);
// Build the reinvite request
-
status = pjsip_inv_reinvite (call->getInvSession(), NULL,
local_sdp, &tdata);
@@ -981,14 +1057,15 @@ SIPVoIPLink::offhold (const CallID& id)
call = getSIPCall (id);
if (call==0) {
- _debug ("! SIP Error: Call doesn't exist\n");
+ _debug ("! SIP Error: Call doesn't exist");
return false;
}
try {
+ call->getAudioRtp()->initAudioRtpConfig (call);
call->getAudioRtp()->initAudioRtpSession (call);
} catch (...) {
- _debug ("! SIP Failure: Unable to create RTP Session (%s:%d)\n", __FILE__, __LINE__);
+ _debug ("! SIP Failure: Unable to create RTP Session (%s:%d)", __FILE__, __LINE__);
}
/* Create re-INVITE with new offer */
@@ -1022,12 +1099,12 @@ SIPVoIPLink::transfer (const CallID& id, const std::string& to)
account = dynamic_cast<SIPAccount *> (Manager::instance().getAccount (account_id));
if (account == NULL) {
- _debug ("SIPVoIPLink::transfer account is null. Returning.\n");
+ _debug ("SIPVoIPLink::transfer account is null. Returning.");
return false;
}
if (call==0) {
- _debug ("! SIP Failure: Call doesn't exist\n");
+ _debug ("! SIP Failure: Call doesn't exist");
return false;
}
@@ -1040,7 +1117,7 @@ SIPVoIPLink::transfer (const CallID& id, const std::string& to)
pj_cstr (&pjDest, dest.c_str());
}
- _debug ("Transfering to %s\n", dest.c_str());
+ _debug ("Transfering to %s", dest.c_str());
/* Create xfer client subscription. */
pj_bzero (&xfer_cb, sizeof (xfer_cb));
@@ -1049,7 +1126,7 @@ SIPVoIPLink::transfer (const CallID& id, const std::string& to)
status = pjsip_xfer_create_uac (call->getInvSession()->dlg, &xfer_cb, &sub);
if (status != PJ_SUCCESS) {
- _debug ("UserAgent: Unable to create xfer -- %d\n", status);
+ _debug ("UserAgent: Unable to create xfer -- %d", status);
return false;
}
@@ -1066,7 +1143,7 @@ SIPVoIPLink::transfer (const CallID& id, const std::string& to)
status = pjsip_xfer_initiate (sub, &pjDest, &tdata);
if (status != PJ_SUCCESS) {
- _debug ("UserAgent: Unable to create REFER request -- %d\n", status);
+ _debug ("UserAgent: Unable to create REFER request -- %d", status);
return false;
}
@@ -1074,7 +1151,7 @@ SIPVoIPLink::transfer (const CallID& id, const std::string& to)
status = pjsip_xfer_send_request (sub, tdata);
if (status != PJ_SUCCESS) {
- _debug ("UserAgent: Unable to send REFER request -- %d\n", status);
+ _debug ("UserAgent: Unable to send REFER request -- %d", status);
return false;
}
@@ -1098,13 +1175,13 @@ SIPVoIPLink::refuse (const CallID& id)
call = getSIPCall (id);
if (call==0) {
- _debug ("Call doesn't exist\n");
+ _debug ("Call doesn't exist");
return false;
}
// can't refuse outgoing call or connected
if (!call->isIncoming() || call->getConnectionState() == Call::Connected) {
- _debug ("It's not an incoming call, or it's already answered\n");
+ _debug ("It's not an incoming call, or it's already answered");
return false;
}
@@ -1163,7 +1240,7 @@ SIPVoIPLink::carryingDTMFdigits (const CallID& id, char code)
call = getSIPCall (id);
if (call==0) {
- _debug ("Call doesn't exist\n");
+ _debug ("Call doesn't exist");
return false;
}
@@ -1180,7 +1257,7 @@ SIPVoIPLink::carryingDTMFdigits (const CallID& id, char code)
status = pjsip_dlg_create_request (call->getInvSession()->dlg, &method, -1, &tdata);
if (status != PJ_SUCCESS) {
- _debug ("UserAgent: Unable to create INFO request -- %d\n", status);
+ _debug ("UserAgent: Unable to create INFO request -- %d", status);
return false;
}
@@ -1195,7 +1272,7 @@ SIPVoIPLink::carryingDTMFdigits (const CallID& id, char code)
tdata->msg->body = pjsip_msg_body_create (tdata->pool, &ctype.type, &ctype.subtype, &content);
if (tdata->msg->body == NULL) {
- _debug ("UserAgent: Unable to create msg body!\n");
+ _debug ("UserAgent: Unable to create msg body!");
pjsip_tx_data_dec_ref (tdata);
return false;
}
@@ -1204,7 +1281,7 @@ SIPVoIPLink::carryingDTMFdigits (const CallID& id, char code)
status = pjsip_dlg_send_request (call->getInvSession()->dlg, tdata, getModId(), NULL);
if (status != PJ_SUCCESS) {
- _debug ("UserAgent: Unable to send MESSAGE request -- %d\n", status);
+ _debug ("UserAgent: Unable to send MESSAGE request -- %d", status);
return false;
}
@@ -1216,7 +1293,7 @@ SIPVoIPLink::SIPOutgoingInvite (SIPCall* call)
{
// If no SIP proxy setting for direct call with only IP address
if (!SIPStartCall (call, "")) {
- _debug ("! SIP Failure: call not started\n");
+ _debug ("! SIP Failure: call not started");
return false;
}
@@ -1244,7 +1321,7 @@ SIPVoIPLink::SIPStartCall (SIPCall* call, const std::string& subject UNUSED)
account = dynamic_cast<SIPAccount *> (Manager::instance().getAccount (id));
if (account == NULL) {
- _debug ("Account is null in SIPStartCall\n");
+ _debug ("Account is null in SIPStartCall");
return false;
}
@@ -1273,7 +1350,7 @@ SIPVoIPLink::SIPStartCall (SIPCall* call, const std::string& subject UNUSED)
contactUri = account->getContactHeader (address, portStr);
- _debug ("SIPStartCall: fromUri: %s toUri: %s contactUri: %s\n",
+ _debug ("SIPStartCall: fromUri: %s toUri: %s contactUri: %s",
fromUri.c_str(),
toUri.c_str(),
contactUri.c_str());
@@ -1298,7 +1375,7 @@ SIPVoIPLink::SIPStartCall (SIPCall* call, const std::string& subject UNUSED)
&dialog);
if (status != PJ_SUCCESS) {
- _debug ("UAC creation failed\n");
+ _debug ("UAC creation failed");
return false;
}
@@ -1325,15 +1402,28 @@ SIPVoIPLink::SIPStartCall (SIPCall* call, const std::string& subject UNUSED)
init_transport_selector (account->getAccountTransport (), &tp);
+ // increment transport's ref count by one
status = pjsip_dlg_set_transport (dialog, tp);
+ // decrement transport's ref count
+ // pjsip_transport_dec_ref(account->getAccountTransport());
+
+
status = pjsip_inv_send_msg (inv, tdata);
if (status != PJ_SUCCESS) {
- _debug (" SIPStartCall: failed to send invite\n");
+ _debug (" SIPStartCall: failed to send invite");
return false;
}
+ if(account->getAccountTransport()) {
+
+ _debug("Sent invite request using transport: %s %s (refcnt=%d)",
+ account->getAccountTransport()->obj_name,
+ account->getAccountTransport()->info,
+ (int)pj_atomic_get(account->getAccountTransport()->ref_cnt));
+ }
+
return true;
}
@@ -1341,7 +1431,7 @@ void
SIPVoIPLink::SIPCallServerFailure (SIPCall *call)
{
if (call != 0) {
- _debug ("Server error!\n");
+ _debug ("Server error!");
CallID id = call->getCallId();
Manager::instance().callFailure (id);
terminateOneCall (id);
@@ -1363,16 +1453,16 @@ SIPVoIPLink::SIPCallClosed (SIPCall *call)
if (Manager::instance().isCurrentCall (id)) {
call->setAudioStart (false);
- _debug ("* SIP Info: Stopping AudioRTP when closing\n");
+ _debug ("* SIP Info: Stopping AudioRTP when closing");
call->getAudioRtp()->stop();
}
- _debug ("After close RTP\n");
+ _debug ("After close RTP");
Manager::instance().peerHungupCall (id);
terminateOneCall (id);
removeCall (id);
- _debug ("After remove call ID\n");
+ _debug ("After remove call ID");
}
void
@@ -1383,7 +1473,7 @@ SIPVoIPLink::SIPCallReleased (SIPCall *call)
}
// if we are here.. something when wrong before...
- _debug ("SIP call release\n");
+ _debug ("SIP call release");
CallID id = call->getCallId();
@@ -1399,20 +1489,20 @@ void
SIPVoIPLink::SIPCallAnswered (SIPCall *call, pjsip_rx_data *rdata)
{
- _debug ("SIPCallAnswered\n");
+ _debug ("SIPCallAnswered");
if (!call) {
- _debug ("! SIP Failure: unknown call\n");
+ _debug ("! SIP Failure: unknown call");
return;
}
if (call->getConnectionState() != Call::Connected) {
- _debug ("Update call state , id = %s\n", call->getCallId().c_str());
+ _debug ("Update call state , id = %s", call->getCallId().c_str());
call->setConnectionState (Call::Connected);
call->setState (Call::Active);
Manager::instance().peerAnsweredCall (call->getCallId());
} else {
- _debug ("* SIP Info: Answering call (on/off hold to send ACK)\n");
+ _debug ("* SIP Info: Answering call (on/off hold to send ACK)");
}
}
@@ -1436,7 +1526,7 @@ bool SIPVoIPLink::new_ip_to_ip_call (const CallID& id, const std::string& to)
pjsip_dialog *dialog;
pjsip_inv_session *inv;
pjsip_tx_data *tdata;
- std::string localAddress;
+ std::string localAddress, addrSdp;
/* Create the call */
call = new SIPCall (id, Call::Outgoing, _pool);
@@ -1451,46 +1541,56 @@ bool SIPVoIPLink::new_ip_to_ip_call (const CallID& id, const std::string& to)
account = dynamic_cast<SIPAccount *> (Manager::instance().getAccount (IP2IP_PROFILE));
if (account == NULL) {
- _debug ("Account is null. Returning\n");
+
+ _debug ("Account %s is null. Returning", IP2IP_PROFILE);
return !PJ_SUCCESS;
}
- // Set SDP parameters
- localAddress = account->getLocalAddress ();
+ // Set the local address
+ localAddress = getInterfaceAddrFromName(account->getLocalInterface ());
+ // Set SDP parameters - Set to local
+ addrSdp = localAddress;
- _debug ("new_ip_to_ip_call localAddress: %s\n", localAddress.c_str());
+ _debug ("new_ip_to_ip_call localAddress: %s", localAddress.c_str());
if (localAddress == "0.0.0.0") {
- _debug ("Here is the local address: %s\n", localAddress.c_str ());
+ _debug ("Local address: %s", localAddress.c_str ());
loadSIPLocalIP (&localAddress);
}
- setCallAudioLocal (call, localAddress);
+ if (addrSdp == "0.0.0.0") {
+ addrSdp = localAddress;
+ }
- _debug ("toUri received in new_ip_to_ip call %s\n", to.c_str());
+ setCallAudioLocal (call, localAddress);
+ _debug ("toUri received in new_ip_to_ip call %s", to.c_str());
std::string toUri = account->getToUri (to);
call->setPeerNumber (toUri);
- _debug ("toUri in new_ip_to_ip call %s\n", toUri.c_str());
- // Building the local SDP offer
- call->getLocalSDP()->set_ip_address (localAddress);
- call->getLocalSDP()->create_initial_offer();
+ _debug ("toUri in new_ip_to_ip call %s", toUri.c_str());
- try {
+ // Audio Rtp Session must be initialized before creating initial offer in SDP session
+ // since SDES require crypto attribute.
+ try {
+ call->getAudioRtp()->initAudioRtpConfig (call);
call->getAudioRtp()->initAudioRtpSession (call);
} catch (...) {
- _debug ("! SIP Failure: Unable to create RTP Session in SIPVoIPLink::new_ip_to_ip_call (%s:%d)\n", __FILE__, __LINE__);
+ _debug ("! SIP Failure: Unable to create RTP Session in SIPVoIPLink::new_ip_to_ip_call (%s:%d)", __FILE__, __LINE__);
}
+ // Building the local SDP offer
+ call->getLocalSDP()->set_ip_address (addrSdp);
+ call->getLocalSDP()->create_initial_offer();
+
// If no account already set, use the default one created at pjsip initialization
if (account->getAccountTransport() == NULL) {
- _debug ("No transport for this account, using the default one\n");
+ _debug ("No transport for this account, using the default one");
account->setAccountTransport (_localUDPTransport);
}
- _debug ("IptoIP local port %i\n", account->getLocalPort());
+ _debug ("IptoIP local port %i", account->getLocalPort());
- _debug ("IptoIP local address %s\n", account->getLocalAddress().c_str());
+ _debug ("IptoIP local address in sdp %s", localAddress.c_str());
// Create URI
std::string fromUri;
@@ -1513,7 +1613,7 @@ bool SIPVoIPLink::new_ip_to_ip_call (const CallID& id, const std::string& to)
contactUri = account->getContactHeader (address, portStr);
- _debug ("new_ip_to_ip_call: fromUri: %s toUri: %s contactUri: %s\n",
+ _debug ("new_ip_to_ip_call: fromUri: %s toUri: %s contactUri: %s",
fromUri.c_str(),
toUri.c_str(),
contactUri.c_str());
@@ -1546,10 +1646,14 @@ bool SIPVoIPLink::new_ip_to_ip_call (const CallID& id, const std::string& to)
init_transport_selector (account->getAccountTransport(), &tp);
+ // set_transport methods increment transport's ref_count
status = pjsip_dlg_set_transport (dialog, tp);
+ // decrement transport's ref count
+ // pjsip_transport_dec_ref(account->getAccountTransport());
+
if (status != PJ_SUCCESS) {
- _debug ("Failed to set the transport for an IP call\n");
+ _debug ("Failed to set the transport for an IP call");
return status;
}
@@ -1599,7 +1703,7 @@ bool get_dns_server_addresses (std::vector<std::string> *servers)
// Read configuration files
if (res_init () != 0) {
- _debug ("Resolver initialization failed\n");
+ _debug ("Resolver initialization failed");
return false;
}
@@ -1628,17 +1732,20 @@ pj_status_t SIPVoIPLink::enable_dns_srv_resolver (pjsip_endpoint *endpt, pj_dns_
status = pjsip_endpt_create_resolver (endpt, &resv);
if (status != PJ_SUCCESS) {
- _debug ("Error creating the DNS resolver instance\n");
+ _debug ("Error creating the DNS resolver instance");
return status;
}
if (!get_dns_server_addresses (&dns_servers)) {
- _debug ("Error while fetching DNS information\n");
+ _debug ("Error while fetching DNS information");
return -1;
}
// Build the nameservers list needed by pjsip
- scount = dns_servers.size ();
+ if ( (scount = dns_servers.size ()) <= 0) {
+ _debug ("No server detected while fetching DNS information, stop dns resolution");
+ return 0;
+ }
pj_str_t nameservers[scount];
@@ -1650,7 +1757,7 @@ pj_status_t SIPVoIPLink::enable_dns_srv_resolver (pjsip_endpoint *endpt, pj_dns_
status = pj_dns_resolver_set_ns (resv, scount, nameservers, NULL);
if (status != PJ_SUCCESS) {
- _debug ("Error updating the name servers for the DNS resolver\n");
+ _debug ("Error updating the name servers for the DNS resolver");
return status;
}
@@ -1658,7 +1765,7 @@ pj_status_t SIPVoIPLink::enable_dns_srv_resolver (pjsip_endpoint *endpt, pj_dns_
status = pjsip_endpt_set_resolver (endpt, resv);
if (status != PJ_SUCCESS) {
- _debug ("Error setting the DNS resolver instance of the SIP resolver engine\n");
+ _debug ("Error setting the DNS resolver instance of the SIP resolver engine");
return status;
}
@@ -1681,7 +1788,7 @@ bool SIPVoIPLink::pjsip_init()
name_mod = "sflphone";
- _debug ("pjsip_init\n");
+ _debug ("pjsip_init");
// Init PJLIB: must be called before any call to the pjsip library
status = pj_init();
@@ -1706,7 +1813,7 @@ bool SIPVoIPLink::pjsip_init()
_pool = pj_pool_create (&_cp.factory, "sflphone", 4000, 4000, NULL);
if (!_pool) {
- _debug ("UserAgent: Could not initialize memory pool\n");
+ _debug ("UserAgent: Could not initialize memory pool");
return PJ_ENOMEM;
}
@@ -1716,7 +1823,7 @@ bool SIPVoIPLink::pjsip_init()
PJ_ASSERT_RETURN (status == PJ_SUCCESS, 1);
if (!loadSIPLocalIP (&addr)) {
- _debug ("UserAgent: Unable to determine network capabilities\n");
+ _debug ("UserAgent: Unable to determine network capabilities");
return false;
}
@@ -1727,51 +1834,59 @@ bool SIPVoIPLink::pjsip_init()
bool directIpCallsTlsEnabled = false;
- account = dynamic_cast<SIPAccount *> (Manager::instance().getAccount (AccountNULL));
+ // Use IP2IP_PROFILE to init default udp transport settings
+ account = dynamic_cast<SIPAccount *> (Manager::instance().getAccount (IP2IP_PROFILE));
- if (account == NULL) {
- _debug ("Account is null in pjsip init\n");
- port = _regPort;
- } else {
- directIpCallsTlsEnabled = account->isTlsEnabled();
- port = account->getLocalPort ();
- }
+ // Create a UDP listener meant for all accounts for which TLS was not enabled
+ // Cannot acquireTransport since default UDP transport must be created regardless of TLS
+ errPjsip = createUDPServer(IP2IP_PROFILE);
+
+ if(account && (errPjsip == PJ_SUCCESS)) {
- // Create a UDP listener meant for all accounts
- // for which TLS was not enabled
- errPjsip = createUDPServer();
+ _debug("UserAgent: Initialized sip listener on port %d", account->getLocalPort ());
+ addTransportToMap(account->getTransportMapKey(), account->getAccountTransport());
+ // if account is not NULL, use IP2IP trasport as default one
+ _localUDPTransport = account->getAccountTransport();
+
+ }
// If the above UDP server
// could not be created, then give it another try
// on a random sip port
- if (errPjsip != PJ_SUCCESS) {
- _debug ("UserAgent: Could not initialize SIP listener on port %d\n", port);
- port = RANDOM_SIP_PORT;
+ else if (errPjsip != PJ_SUCCESS) {
+ _debug ("UserAgent: Could not initialize SIP listener on port %d", _regPort);
+ _regPort = RANDOM_SIP_PORT;
- _debug ("UserAgent: Trying to initialize SIP listener on port %d\n", port);
+ _debug ("UserAgent: Trying to initialize SIP listener on port %d", _regPort);
+ // If no AccountID specified, pointer to transport is stored in _localUDPTransport
errPjsip = createUDPServer();
if (errPjsip != PJ_SUCCESS) {
- _debug ("UserAgent: Fail to initialize SIP listener on port %d\n", port);
+ _debug ("UserAgent: Fail to initialize SIP listener on port %d", _regPort);
return errPjsip;
}
}
- // Bind the newly created transport to the ip to ip account
- // setAccountTransport
-
- _debug ("pjsip_init -- listening on port %d\n", port);
+ acquireTransport(IP2IP_PROFILE);
+ /*
// Create a TLS listener meant for Direct IP calls
// if the user did enabled it.
+ if (account != NULL) {
+
+ directIpCallsTlsEnabled = account->isTlsEnabled();
+ port = account->getLocalPort ();
+
+ }
if (directIpCallsTlsEnabled) {
- errPjsip = createTlsTransportRetryOnFailure (AccountNULL);
+ errPjsip = createTlsTransportRetryOnFailure (IP2IP_PROFILE);
}
if (errPjsip != PJ_SUCCESS) {
_debug ("pj_init(): could not start TLS transport for Direct Calls");
}
+ */
// TODO: For TLS, retry on random port, just we already do above
// for UDP transport.
@@ -1844,7 +1959,7 @@ bool SIPVoIPLink::pjsip_init()
PJ_ASSERT_RETURN (status == PJ_SUCCESS, 1);
- _debug ("UserAgent: VOIP callbacks initialized\n");
+ _debug ("UserAgent: VOIP callbacks initialized");
// Add endpoint capabilities (INFO, OPTIONS, etc) for this UA
pj_str_t allowed[] = { { (char*) "INFO", 4}, { (char*) "REGISTER", 8}, { (char*) "OPTIONS", 7} }; // //{"INVITE", 6}, {"ACK",3}, {"BYE",3}, {"CANCEL",6}
@@ -1857,7 +1972,7 @@ bool SIPVoIPLink::pjsip_init()
// Register "application/sdp" in ACCEPT header
pjsip_endpt_add_capability (_endpt, &_mod_ua, PJSIP_H_ACCEPT, NULL, 1, &accepted);
- _debug ("UserAgent: pjsip version %s for %s initialized\n", pj_get_version(), PJ_OS_NAME);
+ _debug ("UserAgent: pjsip version %s for %s initialized", pj_get_version(), PJ_OS_NAME);
// Create the secondary thread to poll sip events
_evThread->start();
@@ -1880,7 +1995,7 @@ pj_status_t SIPVoIPLink::stunServerResolve (AccountID id)
account = dynamic_cast<SIPAccount *> (Manager::instance().getAccount (id));
if (account == NULL) {
- _debug ("stunServerResolve: Account is null. Returning\n");
+ _debug ("stunServerResolve: Account is null. Returning");
return !PJ_SUCCESS;
}
@@ -1923,6 +2038,167 @@ pj_status_t SIPVoIPLink::stunServerResolve (AccountID id)
return status;
}
+
+
+bool SIPVoIPLink::acquireTransport(const AccountID& accountID) {
+
+ SIPAccount* account = dynamic_cast<SIPAccount *> (Manager::instance().getAccount (accountID));
+
+ if(!account)
+ return false;
+
+ // If an account is already bound to this account, decrease its reference
+ // as it is going to change. If the same transport is selected, reference
+ // counter will be increased
+ if(account->getAccountTransport()) {
+
+ _debug("pjsip_transport_dec_ref in acquireTransport");
+ pjsip_transport_dec_ref(account->getAccountTransport());
+ }
+
+ // Try to create a new transport
+ if(createSipTransport(accountID)) {
+
+ return true;
+ }
+ /*
+ else if(account->getAccountTransport()) {
+
+ // Transport could not be created, account account already have one set.
+ // Most likely this is the transport we tried to create.
+ _debug("Transport (%s) already set for this account, use it\n", account->getTransportMapKey().c_str());
+
+ return true;
+ }
+ */
+ else {
+
+ _debug("Searching transport (%s) in transport map", account->getTransportMapKey().c_str());
+
+ // Could not create new transport, this transport may already exists
+ SipTransportMap::iterator transport;
+ transport = _transportMap.find(account->getTransportMapKey());
+
+ if(transport != _transportMap.end()) {
+
+ // Transport already exist, use it for this account
+ _debug("Found transport (%s) in transport map", account->getTransportMapKey().c_str());
+
+ pjsip_transport* tr = transport->second;
+
+ // Set transport to be used for transaction involving this account
+ account->setAccountTransport(tr);
+
+ // Increment newly associated transport reference counter
+ // If the account is shutdowning, time is automatically canceled
+ pjsip_transport_add_ref(tr);
+
+ return true;
+ }
+ else {
+
+ // Transport could not either be created, socket not available
+ _debug("Did not find transport (%s) in transport map", account->getTransportMapKey().c_str());
+
+ account->setAccountTransport(_localUDPTransport);
+
+ std::string localHostName(_localUDPTransport->local_name.host.ptr, _localUDPTransport->local_name.host.slen);
+
+ _debug("Use default one instead (%s:%i)", localHostName.c_str(), _localUDPTransport->local_name.port);
+
+ // account->setLocalAddress(localHostName);
+ account->setLocalPort(_localUDPTransport->local_name.port);
+
+ // Transport could not either be created or found in the map, socket not available
+ return false;
+ }
+ }
+}
+
+
+bool SIPVoIPLink::createSipTransport(AccountID id) {
+
+
+ SIPAccount* account = dynamic_cast<SIPAccount *> (Manager::instance().getAccount (id));
+
+ if (!account)
+ return false;
+
+ pj_status_t status;
+
+ // Launch a new TLS listener/transport
+ // if the user did choose it.
+ if (account->isTlsEnabled()) {
+
+ _debug ("Create TLS transport");
+ status = createTlsTransportRetryOnFailure (id);
+
+ if (status != PJ_SUCCESS) {
+ _debug ("Failed to initialize TLS transport for account %s", id.c_str());
+ return false;
+ }
+ }
+ else {
+
+ // Launch a new UDP listener/transport, using the published address
+ if (account->isStunEnabled ()) {
+
+ _debug ("Create Alternate UDP transport");
+ status = createAlternateUdpTransport (id);
+
+ if (status != PJ_SUCCESS) {
+ _debug ("Failed to initialize UDP transport with an extern published address for account %s", id.c_str());
+ return false;
+ }
+
+ } else {
+
+ _debug ("Create UDP transport");
+ status = createUDPServer (id);
+
+ if (status != PJ_SUCCESS) {
+ _debug ("Failed to initialize UDP transport for account %s", id.c_str());
+ return false;
+ }
+ else {
+
+ // If transport succesfully created, store it in the internal map.
+ // STUN aware transport are account specific and should not be stored in map.
+ // TLS transport is ephemeral and is managed by PJSIP, should not be stored either.
+ addTransportToMap(account->getTransportMapKey(), account->getAccountTransport());
+ }
+
+
+ }
+
+ }
+
+ return true;
+
+
+}
+
+
+
+bool SIPVoIPLink::addTransportToMap(std::string key, pjsip_transport* transport)
+{
+
+ SipTransportMap::iterator iter_transport;
+ iter_transport = _transportMap.find(key);
+
+ // old transport in transport map, erase it
+ if(iter_transport != _transportMap.end()){
+ _transportMap.erase(iter_transport);
+ }
+
+ _debug("Storing the newly created transport in transport map using key %s", key.c_str());
+ _transportMap.insert(pair<std::string, pjsip_transport*>(key, transport));
+
+ return true;
+
+}
+
+
int SIPVoIPLink::createUDPServer (AccountID id)
{
@@ -1935,94 +2211,112 @@ int SIPVoIPLink::createUDPServer (AccountID id)
int listeningPort = _regPort;
/* Use my local address as default value */
-
if (!loadSIPLocalIP (&listeningAddress))
return !PJ_SUCCESS;
- _debug ("SIPVoIPLink::createUDPServer\n");
+ _debug ("Create UDP transport for account \"%s\"", id.c_str());
/*
* Retrieve the account information
*/
SIPAccount * account = NULL;
- account = dynamic_cast<SIPAccount *> (Manager::instance().getAccount (id));
+ // if account id is not specified, init _localUDPTransport
+ if (id != "") {
- // Set information to the local address and port
+ account = dynamic_cast<SIPAccount *> (Manager::instance().getAccount (id));
+ }
+ // Set information to the local address and port
if (account == NULL) {
- _debug ("Account with id \"%s\" is null in createUDPServer.\n", id.c_str());
- // account = Manager::instance()->getAccount(IP2IP_PROFILE);
+
+ _debug ("Account with id \"%s\" is null in createUDPServer.", id.c_str());
+
} else {
+
// We are trying to initialize a UDP transport available for all local accounts and direct IP calls
- if (account->getLocalAddress () != "0.0.0.0") {
- listeningAddress = account->getLocalAddress ();
+ _debug("Found account %s in map", account->getAccountID().c_str());
+
+ if (account->getLocalInterface () != "default") {
+ listeningAddress = getInterfaceAddrFromName(account->getLocalInterface());
}
listeningPort = account->getLocalPort ();
}
- // Init bound address to ANY
pj_memset (&bound_addr, 0, sizeof (bound_addr));
- bound_addr.sin_addr.s_addr = pj_htonl (PJ_INADDR_ANY);
+ pj_str_t temporary_address;
- bound_addr.sin_port = pj_htons ( (pj_uint16_t) listeningPort);
+ if (account && account->getLocalInterface () == "default") {
- bound_addr.sin_family = PJ_AF_INET;
+ // Init bound address to ANY
+ bound_addr.sin_addr.s_addr = pj_htonl (PJ_INADDR_ANY);
+ }
+ else {
+ // bind this account to a specific interface
+ pj_strdup2(_pool, &temporary_address, listeningAddress.c_str());
+ bound_addr.sin_addr = pj_inet_addr(&temporary_address);
+ }
+
+ bound_addr.sin_port = pj_htons ( (pj_uint16_t) listeningPort);
+ bound_addr.sin_family = PJ_AF_INET;
pj_bzero (bound_addr.sin_zero, sizeof (bound_addr.sin_zero));
// Create UDP-Server (default port: 5060)
// Use here either the local information or the published address
if (account != NULL && !account->getPublishedSameasLocal ()) {
+
// Set the listening address to the published address
listeningAddress = account->getPublishedAddress ();
// Set the listening port to the published port
listeningPort = account->getPublishedPort ();
- _debug (" ******************************** Use the published address %s:%i\n", listeningAddress.c_str (), listeningPort);
+ _debug ("Creating UDP transport published %s:%i", listeningAddress.c_str (), listeningPort);
+
}
+
//strcpy (tmpIP, listeningAddress.data());
/* Init published name */
pj_bzero (&a_name, sizeof (pjsip_host_port));
-
pj_cstr (&a_name.host, listeningAddress.c_str());
-
a_name.port = listeningPort;
-
//pj_strdup2 (_pool, &a_name.host, tmpIP);
-
//a_name.port = (pj_uint16_t) listeningPort;
status = pjsip_udp_transport_start (_endpt, &bound_addr, &a_name, 1, &transport);
- // Get the transport manager associated with
- // this endpoint
- pjsip_tpmgr * tpmgr = NULL;
-
- tpmgr = pjsip_endpt_get_tpmgr (_endpt);
-
- _debug ("number of transport: %i\n", pjsip_tpmgr_get_transport_count (tpmgr));
-
+ // Print info from transport manager associated to endpoint
+ pjsip_tpmgr * tpmgr = pjsip_endpt_get_tpmgr (_endpt);
pjsip_tpmgr_dump_transports (tpmgr);
if (status != PJ_SUCCESS) {
- _debug ("UserAgent: (%d) Unable to start UDP transport on %s:%d\n", status, listeningAddress.data(), listeningPort);
- // Try to acquire an existing one
- // pjsip_tpmgr_acquire_transport ()
+
+ _debug ("UserAgent: (%d) Unable to start UDP transport on %s:%d", status, listeningAddress.data(), listeningPort);
return status;
+
} else {
- _debug ("UserAgent: UDP server listening on port %d\n", listeningPort);
- if (account == NULL)
+ _debug ("UserAgent: UDP server listening on port %d", listeningPort);
+
+ if (account == NULL) {
+
+ _debug("Use transport as local UDP server");
_localUDPTransport = transport;
- else
- account->setAccountTransport (transport);
+ }
+ else {
+
+ _debug("Bind transport to account %s", account->getAccountID().c_str());
+ account->setAccountTransport (transport);
+ }
}
- _debug ("Transport initialized successfully on %s:%i\n", listeningAddress.c_str (), listeningPort);
+ if (status == PJ_SUCCESS) {
+ _debug ("Transport initialized successfully on %s:%i", listeningAddress.c_str (), listeningPort);
+
+ }
return PJ_SUCCESS;
}
@@ -2033,7 +2327,7 @@ std::string SIPVoIPLink::findLocalAddressFromUri (const std::string& uri, pjsip_
pjsip_transport_type_e transportType;
pjsip_tpselector *tp_sel;
- _debug ("SIPVoIPLink::findLocalAddressFromUri\n");
+ _debug ("SIPVoIPLink::findLocalAddressFromUri");
// Find the transport that must be used with the given uri
pj_str_t tmp;
@@ -2046,7 +2340,7 @@ std::string SIPVoIPLink::findLocalAddressFromUri (const std::string& uri, pjsip_
std::string machineName (pjMachineName.ptr, pjMachineName.slen);
if (genericUri == NULL) {
- _debug ("genericUri is NULL in findLocalAddressFromUri\n");
+ _debug ("genericUri is NULL in findLocalAddressFromUri");
return machineName;
}
@@ -2055,15 +2349,16 @@ std::string SIPVoIPLink::findLocalAddressFromUri (const std::string& uri, pjsip_
sip_uri = (pjsip_sip_uri*) pjsip_uri_get_uri (genericUri);
if (sip_uri == NULL) {
- _debug ("Invalid uri in findLocalAddressFromTransport\n");
+ _debug ("Invalid uri in findLocalAddressFromTransport");
return machineName;
}
if (PJSIP_URI_SCHEME_IS_SIPS (sip_uri)) {
transportType = PJSIP_TRANSPORT_TLS;
+
} else {
if (transport == NULL) {
- _debug ("transport is NULL in findLocalAddressFromUri\n. Try the local UDP transport");
+ _debug ("transport is NULL in findLocalAddressFromUri. Try the local UDP transport");
transport = _localUDPTransport;
}
@@ -2077,7 +2372,7 @@ std::string SIPVoIPLink::findLocalAddressFromUri (const std::string& uri, pjsip_
tpmgr = pjsip_endpt_get_tpmgr (_endpt);
if (tpmgr == NULL) {
- _debug ("Unexpected: Cannot get tpmgr from endpoint.\n");
+ _debug ("Unexpected: Cannot get tpmgr from endpoint.");
return machineName;
}
@@ -2088,7 +2383,7 @@ std::string SIPVoIPLink::findLocalAddressFromUri (const std::string& uri, pjsip_
pj_status_t status;
/* Init the transport selector */
- //_debug ("Transport ID: %s\n", transport->obj_name);
+ //_debug ("Transport ID: %s", transport->obj_name);
if (transportType == PJSIP_TRANSPORT_UDP) {
status = init_transport_selector (transport, &tp_sel);
@@ -2096,19 +2391,23 @@ std::string SIPVoIPLink::findLocalAddressFromUri (const std::string& uri, pjsip_
status = pjsip_tpmgr_find_local_addr (tpmgr, _pool, transportType, tp_sel, &localAddress, &port);
else
status = pjsip_tpmgr_find_local_addr (tpmgr, _pool, transportType, NULL, &localAddress, &port);
- } else
+ } else {
+
status = pjsip_tpmgr_find_local_addr (tpmgr, _pool, transportType, NULL, &localAddress, &port);
+ }
if (status != PJ_SUCCESS) {
- _debug ("Failed to find local address from transport\n");
+ _debug ("Failed to find local address from transport");
return machineName;
}
- _debug ("Local address discovered from attached transport: %s\n", localAddress.ptr);
+ _debug ("Local address discovered from attached transport: %s", localAddress.ptr);
return std::string (localAddress.ptr, localAddress.slen);
}
+
+
pj_status_t SIPVoIPLink::init_transport_selector (pjsip_transport *transport, pjsip_tpselector **tp_sel)
{
pjsip_tpselector *tp;
@@ -2140,7 +2439,7 @@ int SIPVoIPLink::findLocalPortFromUri (const std::string& uri, pjsip_transport *
genericUri = pjsip_parse_uri (_pool, tmp.ptr, tmp.slen, 0);
if (genericUri == NULL) {
- _debug ("genericUri is NULL in findLocalPortFromUri\n");
+ _debug ("genericUri is NULL in findLocalPortFromUri");
return atoi (DEFAULT_SIP_PORT);
}
@@ -2149,7 +2448,7 @@ int SIPVoIPLink::findLocalPortFromUri (const std::string& uri, pjsip_transport *
sip_uri = (pjsip_sip_uri*) pjsip_uri_get_uri (genericUri);
if (sip_uri == NULL) {
- _debug ("Invalid uri in findLocalAddressFromTransport\n");
+ _debug ("Invalid uri in findLocalAddressFromTransport");
return atoi (DEFAULT_SIP_PORT);
}
@@ -2158,7 +2457,7 @@ int SIPVoIPLink::findLocalPortFromUri (const std::string& uri, pjsip_transport *
port = atoi (DEFAULT_SIP_TLS_PORT);
} else {
if (transport == NULL) {
- _debug ("transport is NULL in findLocalPortFromUri - Try the local UDP transport\n");
+ _debug ("transport is NULL in findLocalPortFromUri - Try the local UDP transport");
transport = _localUDPTransport;
}
@@ -2174,7 +2473,7 @@ int SIPVoIPLink::findLocalPortFromUri (const std::string& uri, pjsip_transport *
tpmgr = pjsip_endpt_get_tpmgr (_endpt);
if (tpmgr == NULL) {
- _debug ("Unexpected: Cannot get tpmgr from endpoint.\n");
+ _debug ("Unexpected: Cannot get tpmgr from endpoint.");
return port;
}
@@ -2185,7 +2484,7 @@ int SIPVoIPLink::findLocalPortFromUri (const std::string& uri, pjsip_transport *
pj_status_t status;
if (transportType == PJSIP_TRANSPORT_UDP) {
- _debug ("Transport ID: %s\n", transport->obj_name);
+ _debug ("Transport ID: %s", transport->obj_name);
status = init_transport_selector (transport, &tp_sel);
@@ -2198,11 +2497,10 @@ int SIPVoIPLink::findLocalPortFromUri (const std::string& uri, pjsip_transport *
if (status != PJ_SUCCESS) {
- _debug ("Failed to find local address from transport\n");
+ _debug ("Failed to find local address from transport");
}
- _debug ("Local port discovered from attached transport: %i\n", port);
-
+ _debug ("Local port discovered from attached transport: %i", port);
return port;
}
@@ -2225,7 +2523,7 @@ pj_status_t SIPVoIPLink::createTlsTransportRetryOnFailure (AccountID id)
account = dynamic_cast<SIPAccount *> (Manager::instance().getAccount (id));
if (account == NULL) {
- _debug ("createTlsTransportRetryOnFailure: Account is null. Returning\n");
+ _debug ("createTlsTransportRetryOnFailure: Account is null. Returning");
return !PJ_SUCCESS;
}
@@ -2236,11 +2534,11 @@ pj_status_t SIPVoIPLink::createTlsTransportRetryOnFailure (AccountID id)
success = createTlsTransport (id);
if (success != PJ_SUCCESS) {
- _debug ("createTlsTransportRetryOnFailure: failed to retry on random port %d\n", randomPort);
+ _debug ("createTlsTransportRetryOnFailure: failed to retry on random port %d", randomPort);
return success;
}
- _debug ("createTlsTransportRetryOnFailure: TLS transport listening on port %d\n", randomPort);
+ _debug ("createTlsTransportRetryOnFailure: TLS transport listening on port %d", randomPort);
}
return PJ_SUCCESS;
@@ -2265,7 +2563,7 @@ pj_status_t SIPVoIPLink::createAlternateUdpTransport (AccountID id)
account = dynamic_cast<SIPAccount *> (Manager::instance().getAccount (id));
if (account == NULL) {
- _debug ("Account is null. Returning\n");
+ _debug ("Account is null. Returning");
return !PJ_SUCCESS;
}
@@ -2276,19 +2574,19 @@ pj_status_t SIPVoIPLink::createAlternateUdpTransport (AccountID id)
status = stunServerResolve (id);
if (status != PJ_SUCCESS) {
- _debug ("Error resolving STUN server: %i\n", status);
+ _debug ("Error resolving STUN server: %i", status);
return status;
}
// Init socket
sock = PJ_INVALID_SOCKET;
- _debug ("Initializing IPv4 socket on %s:%i\n", stunServer.ptr, stunPort);
+ _debug ("Initializing IPv4 socket on %s:%i", stunServer.ptr, stunPort);
status = pj_sockaddr_in_init (&boundAddr, &stunServer, 0);
if (status != PJ_SUCCESS) {
- _debug ("Error when initializing IPv4 socket on %s:%i\n", stunServer.ptr, stunPort);
+ _debug ("Error when initializing IPv4 socket on %s:%i", stunServer.ptr, stunPort);
return status;
}
@@ -2296,7 +2594,7 @@ pj_status_t SIPVoIPLink::createAlternateUdpTransport (AccountID id)
status = pj_sock_socket (pj_AF_INET(), pj_SOCK_DGRAM(), 0, &sock);
if (status != PJ_SUCCESS) {
- _debug ("Socket() error (%d)\n", status);
+ _debug ("Socket() error (%d)", status);
return status;
}
@@ -2329,14 +2627,40 @@ pj_status_t SIPVoIPLink::createAlternateUdpTransport (AccountID id)
status = pjsip_udp_transport_attach2 (_endpt, PJSIP_TRANSPORT_UDP, sock, &a_name, 1, &transport);
if (status != PJ_SUCCESS) {
- _debug ("Error creating alternate SIP UDP listener (%d)\n", status);
+ _debug ("Error creating alternate SIP UDP listener (%d)", status);
return status;
}
- _debug ("UDP Transport successfully created on %s:%i\n", listeningAddress.c_str (), listeningPort);
+ _debug ("UDP Transport successfully created on %s:%i", listeningAddress.c_str (), listeningPort);
account->setAccountTransport (transport);
+ if(transport) {
+
+ _debug("INITIAL REF COUNT: %s %s (refcnt=%i)",
+ transport->obj_name,
+ transport->info,
+ (int)pj_atomic_get(transport->ref_cnt));
+
+
+ pj_sockaddr *addr = (pj_sockaddr*)&(transport->key.rem_addr);
+
+ static char str[PJ_INET6_ADDRSTRLEN];
+ pj_inet_ntop(((const pj_sockaddr*)addr)->addr.sa_family,
+ pj_sockaddr_get_addr(addr),
+ str, sizeof(str));
+
+
+ _debug("KEY: %s:%d",
+ // addr_string(account->getAccountTransport()->key.rem_addr),
+ str,
+ pj_sockaddr_get_port((const pj_sockaddr*)&(transport->key.rem_addr)));
+
+ }
+ pjsip_tpmgr * tpmgr = pjsip_endpt_get_tpmgr (_endpt);
+
+ pjsip_tpmgr_dump_transports (tpmgr);
+
return PJ_SUCCESS;
}
@@ -2356,7 +2680,7 @@ pj_status_t SIPVoIPLink::createTlsTransport (AccountID id)
account = dynamic_cast<SIPAccount *> (Manager::instance().getAccount (id));
if (account == NULL) {
- _debug ("Account is null. Returning\n");
+ _debug ("Account is null. Returning");
return !PJ_SUCCESS;
}
@@ -2376,24 +2700,58 @@ pj_status_t SIPVoIPLink::createTlsTransport (AccountID id)
local_addr.sin_port = pj_htons (localTlsPort);
}
- std::string localAddress = account->getLocalAddress();
+ /*
+ std::string localAddress;
+ if (account->getLocalInterface() == "default"){
+
+ // Current selected interface address is 0.0.0.0, resolve local address using
+ loadSIPLocalIP (&localAddress);
+ }
+ else {
+
+ // Specific interface selected, reslove it
+ localAddress = getInterfaceAddrFromName(account->getLocalInterface());
+ }
+ */
+
+ std::string localAddress = getInterfaceAddrFromName(account->getLocalInterface());
if (!localAddress.empty()) {
pj_str_t pjAddress;
- pj_cstr (&pjAddress, (account->getLocalAddress()).c_str());
+ pj_cstr (&pjAddress, localAddress.c_str());
pj_status_t success;
success = pj_sockaddr_in_set_str_addr (&local_addr, &pjAddress);
if (success != PJ_SUCCESS) {
- _debug ("Failed to set local address in %d\n", __LINE__);
+ _debug ("Failed to set local address in %d", __LINE__);
}
}
+ std::string publishedAddress;
+ if (account->getPublishedSameasLocal()) {
+
+ // if "default" interface is selected, loadSIPLocalIP() is used to get local address
+ if (account->getLocalInterface() == "default"){
+
+ loadSIPLocalIP (&publishedAddress);
+ }
+ else {
+
+ // Specific interface selected
+ publishedAddress = localAddress;
+ }
+ }
+ else {
+
+ publishedAddress = account->getPublishedAddress();
+ }
+
+
/* Init published name */
pj_bzero (&a_name, sizeof (pjsip_host_port));
- pj_cstr (&a_name.host, (account->getPublishedAddress()).c_str());
+ pj_cstr (&a_name.host, publishedAddress.c_str());
a_name.port = account->getPublishedPort();
@@ -2401,7 +2759,7 @@ pj_status_t SIPVoIPLink::createTlsTransport (AccountID id)
pjsip_tls_setting * tls_setting = account->getTlsSetting();
_debug ("TLS transport to be initialized with published address %.*s,"
- " published port %d, local address %s, local port %d\n",
+ " published port %d, local address %s, local port %d",
(int) a_name.host.slen, a_name.host.ptr,
(int) a_name.port, localAddress.c_str(), (int) localTlsPort);
@@ -2410,17 +2768,52 @@ pj_status_t SIPVoIPLink::createTlsTransport (AccountID id)
status = pjsip_tls_transport_start (_endpt, tls_setting, &local_addr, &a_name, 1, &tls);
if (status != PJ_SUCCESS) {
- _debug ("Error creating SIP TLS listener (%d)\n", status);
+ _debug ("Error creating SIP TLS listener (%d)", status);
}
return PJ_SUCCESS;
}
+void SIPVoIPLink::shutdownSipTransport(const AccountID& accountID)
+{
+ _debug("Shutdown Sip Transport");
+
+ pj_status_t status = 0;
+
+ SIPAccount* account = dynamic_cast<SIPAccount *> (Manager::instance().getAccount (accountID));
+
+ if(!account)
+ return;
+
+ if(account->getAccountTransport()) {
+
+ _debug("Transport bound to account, decrease ref count");
+
+ // decrease reference count added by pjsip_regc_send
+ // PJSIP's IDLE timer is set if counter reach 0
+ status = pjsip_transport_dec_ref(account->getAccountTransport());
+
+ // detach transport from this account
+ account->setAccountTransport(NULL);
+
+ }
+
+}
+
+
void SIPVoIPLink::updateAccountInfo (const AccountID& accountID)
{
- createUDPServer (accountID);
+ // createSipTransport (accountID);
+ acquireTransport(accountID);
+
+ if(accountID == IP2IP_PROFILE) {
+
+ SIPAccount* account = dynamic_cast<SIPAccount *> (Manager::instance().getAccount (accountID));
+ // Store new IP2IP UDP transport as default
+ _localUDPTransport = account->getAccountTransport();
+ }
}
@@ -2434,11 +2827,11 @@ bool SIPVoIPLink::loadSIPLocalIP (std::string *addr)
if (pj_gethostip (pj_AF_INET(), &ip_addr) != PJ_SUCCESS) {
// Update the registration state if no network capabilities found
- _debug ("UserAgent: Get host ip failed!\n");
+ _debug ("UserAgent: Get host ip failed!");
returnValue = false;
} else {
localAddress = std::string (pj_inet_ntoa (ip_addr.ipv4.sin_addr));
- _debug ("UserAgent: Checking network, setting local IP address to: %s\n", localAddress.data());
+ _debug ("UserAgent: Checking network, setting local IP address to: %s", localAddress.data());
}
*addr = localAddress;
@@ -2477,7 +2870,7 @@ void SIPVoIPLink::busy_sleep (unsigned msec)
bool SIPVoIPLink::pjsip_shutdown (void)
{
if (_endpt) {
- _debug ("UserAgent: Shutting down...\n");
+ _debug ("UserAgent: Shutting down...");
busy_sleep (1000);
}
@@ -2503,7 +2896,7 @@ bool SIPVoIPLink::pjsip_shutdown (void)
/* Shutdown PJLIB */
pj_shutdown();
- _debug ("UserAgent: Shutted down succesfully\n");
+ _debug ("UserAgent: Shutted down succesfully");
/* Done. */
return true;
@@ -2534,7 +2927,7 @@ void set_voicemail_info (AccountID account, pjsip_msg_body *body)
std::string delimiter = "/";
std::string msg_body, voicemail_str;
- _debug ("UserAgent: checking the voice message!\n");
+ _debug ("UserAgent: checking the voice message!");
// The voicemail message is formated like that:
// Voice-Message: 1/0 . 1 is the number we want to retrieve in this case
@@ -2564,23 +2957,30 @@ void set_voicemail_info (AccountID account, pjsip_msg_body *body)
void SIPVoIPLink::handle_reinvite (SIPCall *call)
{
+ /*
// Close the previous RTP session
call->getAudioRtp()->stop ();
call->setAudioStart (false);
- _debug ("Create new rtp session from handle_reinvite : %s:%i\n", call->getLocalIp().c_str(), call->getLocalAudioPort());
+ _debug ("Create new rtp session from handle_reinvite : %s:%i", call->getLocalIp().c_str(), call->getLocalAudioPort());
try {
call->getAudioRtp()->initAudioRtpSession (call);
} catch (...) {
- _debug ("! SIP Failure: Unable to create RTP Session (%s:%d)\n", __FILE__, __LINE__);
+ _debug ("! SIP Failure: Unable to create RTP Session (%s:%d)", __FILE__, __LINE__);
}
+ */
+ _debug("******************************************");
+ _debug("* handle_reinvite *");
+ _debug("******************************************");
+
+ call->getAudioRtp()->updateDestinationIpAddress();
}
// 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 to state %s\n", invitationStateMap[inv->state]);
+ _debug ("call_on_state_changed to state %s", invitationStateMap[inv->state]);
pjsip_rx_data *rdata;
pj_status_t status;
@@ -2593,8 +2993,8 @@ void call_on_state_changed (pjsip_inv_session *inv, pjsip_event *e)
_debug ("Call is NULL in call_on_state_changed");
return;
} else {
- // _debug(" call_on_state_changed: call id %s\n", call->getCallId().c_str());
- // _debug(" call_on_state_changed: call state %s\n", invitationStateMap[call->getInvSession()->state]);
+ // _debug(" call_on_state_changed: call id %s", call->getCallId().c_str());
+ // _debug(" call_on_state_changed: call state %s", invitationStateMap[call->getInvSession()->state]);
}
//Retrieve the body message
@@ -2669,12 +3069,12 @@ void call_on_state_changed (pjsip_inv_session *inv, pjsip_event *e)
NULL, &tdata);
if (status != PJ_SUCCESS) {
- _debug ("UserAgent: Unable to create NOTIFY -- %d\n", status);
+ _debug ("UserAgent: Unable to create NOTIFY -- %d", status);
} else {
status = pjsip_xfer_send_request (call->getXferSub(), tdata);
if (status != PJ_SUCCESS) {
- _debug ("UserAgent: Unable to send NOTIFY -- %d\n", status);
+ _debug ("UserAgent: Unable to send NOTIFY -- %d", status);
}
}
}
@@ -2711,7 +3111,7 @@ void call_on_state_changed (pjsip_inv_session *inv, pjsip_event *e)
status = call->getLocalSDP()->check_sdp_answer (inv, rdata);
if (status != PJ_SUCCESS) {
- _debug ("Failed to check_incoming_sdp in call_on_state_changed\n");
+ _debug ("Failed to check_incoming_sdp in call_on_state_changed");
return;
}
}
@@ -2723,7 +3123,7 @@ void call_on_state_changed (pjsip_inv_session *inv, pjsip_event *e)
} else if (inv->state == PJSIP_INV_STATE_DISCONNECTED) {
- _debug ("State: %s. Cause: %.*s\n", invitationStateMap[inv->state], (int) inv->cause_text.slen, inv->cause_text.ptr);
+ _debug ("State: %s. Cause: %.*s", invitationStateMap[inv->state], (int) inv->cause_text.slen, inv->cause_text.ptr);
switch (inv->cause) {
/* The call terminates normally - BYE / CANCEL */
@@ -2767,7 +3167,7 @@ void call_on_state_changed (pjsip_inv_session *inv, pjsip_event *e)
break;
default:
- _debug ("sipvoiplink.cpp - line %d : Unhandled call state. This is probably a bug.\n", __LINE__);
+ _debug ("sipvoiplink.cpp - line %d : Unhandled call state. This is probably a bug.", __LINE__);
break;
}
}
@@ -2777,7 +3177,7 @@ void call_on_state_changed (pjsip_inv_session *inv, pjsip_event *e)
// 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");
+ _debug ("call_on_media_update");
const pjmedia_sdp_session *local_sdp;
const pjmedia_sdp_session *remote_sdp;
@@ -2788,19 +3188,19 @@ void call_on_media_update (pjsip_inv_session *inv, pj_status_t status)
call = reinterpret_cast<SIPCall *> (inv->mod_data[getModId() ]);
if (!call) {
- _debug ("Call declined by peer, SDP negociation stopped\n");
+ _debug ("Call declined by peer, SDP negociation stopped");
return;
}
link = dynamic_cast<SIPVoIPLink *> (Manager::instance().getAccountLink (AccountNULL));
if (link == NULL) {
- _debug ("Failed to get sip link\n");
+ _debug ("Failed to get sip link");
return;
}
if (status != PJ_SUCCESS) {
- _debug ("Error while negotiating the offer\n");
+ _debug ("Error while negotiating the offer");
link->hangup (call->getCallId());
Manager::instance().callFailure (call->getCallId());
return;
@@ -2826,11 +3226,70 @@ void call_on_media_update (pjsip_inv_session *inv, pj_status_t status)
// Set remote ip / port
call->getLocalSDP()->set_media_transport_info_from_remote_sdp (remote_sdp);
+ // Get the crypto attribute containing srtp's cryptographic context (keys, cipher)
+ CryptoOffer crypto_offer;
+ call->getLocalSDP()->get_remote_sdp_crypto_from_offer(remote_sdp, crypto_offer);
+
+
+ bool nego_success = false;
+ if(!crypto_offer.empty()) {
+
+ _debug("Crypto attribute in SDP: init Srtp session");
+
+ // init local cryptografic capabilities for negotiation
+ std::vector<sfl::CryptoSuiteDefinition>localCapabilities;
+ for(int i = 0; i < 3; i++) {
+ localCapabilities.push_back(sfl::CryptoSuites[i]);
+ }
+
+ sfl::SdesNegotiator sdesnego(localCapabilities, crypto_offer);
+
+ if(sdesnego.negotiate()) {
+ _debug("SDES negociation successfull \n");
+ nego_success = true;
+
+ if(call->getAudioRtp()->getAudioRtpType() == sfl::Sdes) {
+ _debug("Set remote cryptographic context\n");
+ call->getAudioRtp()->setRemoteCryptoInfo(sdesnego);
+ }
+ }
+ else {
+
+ //@TODO Handle fallback mechanism here
+ // - Call may Failed if SrtpOnly
+ // - Call fallback to RTP (make sure PBX support it, if not ...)
+ // - Ask (display a pop-up message)
+
+ call->getAudioRtp()->getAudioRtpType();
+
+ }
+ }
+
+ // We did not found any crypto context for this media
+ if(!nego_success && call->getAudioRtp()->getAudioRtpType() == sfl::Sdes) {
+
+ // We did not found any crypto context for this media
+ // @TODO if SRTPONLY, CallFail
+
+ // if RTPFALLBACK, change RTP session
+ _debug("Did not found any crypto or negociation failed but Sdes enabled");
+ call->getAudioRtp()->stop();
+ call->getAudioRtp()->setSrtpEnabled(false);
+ call->getAudioRtp()->initAudioRtpSession(call);
+ }
+
+ if(nego_success && call->getAudioRtp()->getAudioRtpType() != sfl::Sdes) {
+
+ // We found a crypto context for this media but Sdes is not
+ // enabled for this call, make a try using RTP only...
+ _debug("Sdes not initialized for this call\n");
+ }
+
try {
call->setAudioStart (true);
call->getAudioRtp()->start();
} catch (exception& rtpException) {
- _debug ("%s\n", rtpException.what());
+ _debug ("%s", rtpException.what());
}
}
@@ -2841,12 +3300,36 @@ void call_on_forked (pjsip_inv_session *inv, pjsip_event *e)
void call_on_tsx_changed (pjsip_inv_session *inv, pjsip_transaction *tsx, pjsip_event *e)
{
- _debug ("call_on_tsx_changed to state %s\n", transactionStateMap[tsx->state]);
+ _debug("call_on_tsx_changed to state %s", transactionStateMap[tsx->state]);
+
+
if (tsx->role==PJSIP_ROLE_UAS && tsx->state==PJSIP_TSX_STATE_TRYING &&
pjsip_method_cmp (&tsx->method, &pjsip_refer_method) ==0) {
/** Handle the refer method **/
onCallTransfered (inv, e->body.tsx_state.src.rdata);
+ } else if (tsx->role==PJSIP_ROLE_UAS && tsx->state==PJSIP_TSX_STATE_TRYING) {
+
+ if (e && e->body.rx_msg.rdata) {
+
+ pjsip_tx_data* t_data;
+ pjsip_rx_data* r_data = e->body.rx_msg.rdata;
+
+ if (r_data->msg_info.msg->line.req.method.id == PJSIP_OTHER_METHOD) {
+
+ std::string method_name = "INFO";
+ std::string request = r_data->msg_info.msg->line.req.method.name.ptr;
+
+ if (request.find (method_name) != (size_t)-1) {
+
+ _debug ("%s", pjsip_rx_data_get_info (r_data));
+
+ pjsip_dlg_create_response (inv->dlg, r_data, PJSIP_SC_OK, NULL, &t_data);
+
+ pjsip_dlg_send_response (inv->dlg, tsx, t_data);
+ }
+ }
+ }
}
}
@@ -2856,7 +3339,7 @@ void regc_cb (struct pjsip_regc_cbparam *param)
account = static_cast<SIPAccount *> (param->token);
if (account == NULL) {
- _debug ("Account is NULL in regc_cb.\n");
+ _debug ("Account is NULL in regc_cb.");
return;
}
@@ -2878,7 +3361,7 @@ void regc_cb (struct pjsip_regc_cbparam *param)
/* Sometimes, the status is OK, but we still failed.
* So checking the code for real result
*/
- _debug ("UserAgent: The error is: %d\n", param->code);
+ _debug ("UserAgent: The error is: %d", param->code);
switch (param->code) {
@@ -2906,6 +3389,13 @@ void regc_cb (struct pjsip_regc_cbparam *param)
}
account->setRegister (false);
+
+ // shutdown this transport since useless
+ // if(account->getAccountTransport() != _localUDPTransport) {
+
+ SIPVoIPLink::instance("")->shutdownSipTransport(account->getAccountID());
+ //}
+
} else {
// Registration/Unregistration is success
if (account->isRegister())
@@ -2913,11 +3403,18 @@ void regc_cb (struct pjsip_regc_cbparam *param)
else {
account->setRegistrationState (Unregistered);
account->setRegister (false);
+
+ SIPVoIPLink::instance("")->shutdownSipTransport(account->getAccountID());
+
+ // pjsip_regc_destroy(param->regc);
+ // account->setRegistrationInfo(NULL);
}
}
} else {
account->setRegistrationState (ErrorAuth);
account->setRegister (false);
+
+ SIPVoIPLink::instance("")->shutdownSipTransport(account->getAccountID());
}
}
@@ -2949,7 +3446,12 @@ mod_on_rx_request (pjsip_rx_data *rdata)
std::string request;
// Handle the incoming call invite in this function
- _debug ("UserAgent: Callback on_rx_request is involved! \n");
+ _debug ("UserAgent: Callback on_rx_request is involved! ");
+
+ _debug("Receiving REQUEST using transport: %s %s (refcnt=%d)",
+ rdata->tp_info.transport->obj_name,
+ rdata->tp_info.transport->info,
+ (int)pj_atomic_get(rdata->tp_info.transport->ref_cnt));
/* First, let's got the username and server name from the invite.
* We will use them to detect which account is the callee.
@@ -2960,7 +3462,7 @@ mod_on_rx_request (pjsip_rx_data *rdata)
userName = std::string (sip_uri->user.ptr, sip_uri->user.slen);
server = std::string (sip_uri->host.ptr, sip_uri->host.slen);
- _debug ("mod_on_rx_request: %s@%s\n", userName.c_str(), server.c_str());
+ _debug ("mod_on_rx_request: %s@%s", userName.c_str(), server.c_str());
// Get the account id of callee from username and server
account_id = Manager::instance().getAccountIdFromNameAndServer (userName, server);
@@ -2968,7 +3470,7 @@ mod_on_rx_request (pjsip_rx_data *rdata)
/* If we don't find any account to receive the call */
if (account_id == AccountNULL) {
- _debug ("UserAgent: Username %s doesn't match any account!\n",userName.c_str());
+ _debug ("UserAgent: Username %s doesn't match any account!",userName.c_str());
//return false;
}
@@ -2978,7 +3480,7 @@ mod_on_rx_request (pjsip_rx_data *rdata)
/* If we can't find any voIP link to handle the incoming call */
if (link == 0) {
- _debug ("ERROR: can not retrieve the voiplink from the account ID...\n");
+ _debug ("ERROR: can not retrieve the voiplink from the account ID...");
return false;
}
@@ -2990,15 +3492,18 @@ mod_on_rx_request (pjsip_rx_data *rdata)
std::string temp (from_header);
int begin_displayName = temp.find ("\"") + 1;
int end_displayName = temp.rfind ("\"");
- // _debug("The display name start at %i, end at %i\n", begin_displayName, end_displayName);
+ // _debug("The display name start at %i, end at %i", begin_displayName, end_displayName);
displayName = temp.substr (begin_displayName, end_displayName - begin_displayName);//display_name);
+ if(displayName.size() > 25) {
+ displayName = std::string ("");
+ }
} else {
displayName = std::string ("");
}
- _debug ("UserAgent: The receiver is : %s@%s\n", userName.data(), server.data());
+ _debug ("UserAgent: The receiver is : %s@%s", userName.data(), server.data());
- _debug ("UserAgent: The callee account id is %s\n", account_id.c_str());
+ _debug ("UserAgent: The callee account id is %s", account_id.c_str());
/* Now, it is the time to find the information of the caller */
uri = rdata->msg_info.from->uri;
@@ -3077,12 +3582,14 @@ mod_on_rx_request (pjsip_rx_data *rdata)
Manager::instance().getConfigString (HOOKS, URLHOOK_COMMAND));
}
} else
- throw length_error ("Url exceeds std::string max_size\n");
+ throw length_error ("Url exceeds std::string max_size");
}
/************************************************************************************************/
+ _debug ("create a new call");
+
// Generate a new call ID for the incoming call!
id = Manager::instance().getNewCallID();
@@ -3094,36 +3601,42 @@ mod_on_rx_request (pjsip_rx_data *rdata)
return false;
}
- std::string addrToUse;
+
+
+ std::string addrToUse, addrSdp ="0.0.0.0";
+
+ pjsip_tpselector *tp;
account = dynamic_cast<SIPAccount *> (Manager::instance().getAccount (account_id));
if (account != NULL) {
- // TODO May use the published address as well
- addrToUse = account->getLocalAddress ();
- }
- if (addrToUse == "0.0.0.0") {
- link->loadSIPLocalIP (&addrToUse);
- }
+ // May use the published address as well
- // Have to do some stuff with the SDP
- // Set the codec map, IP, peer number and so on... for the SIPCall object
- setCallAudioLocal (call, addrToUse);
+ addrToUse = SIPVoIPLink::instance("")->getInterfaceAddrFromName(account->getLocalInterface ());
+ account->isStunEnabled () ? addrSdp = account->getPublishedAddress () : addrSdp = addrToUse;
+ // Set the appropriate transport to have the right VIA header
+ link->init_transport_selector (account->getAccountTransport (), &tp);
- // We retrieve the remote sdp offer in the rdata struct to begin the negociation
- call->getLocalSDP()->set_ip_address (addrToUse);
+ if(account->getAccountTransport()) {
- get_remote_sdp_from_offer (rdata, &r_sdp);
+ _debug("Process INVITE request using transport: %s %s (refcnt=%i)",
+ account->getAccountTransport()->obj_name,
+ account->getAccountTransport()->info,
+ (int)pj_atomic_get(account->getAccountTransport()->ref_cnt));
+ }
- status = call->getLocalSDP()->receiving_initial_offer (r_sdp);
+ }
- if (status!=PJ_SUCCESS) {
- delete call;
- call=0;
- return false;
+ if (addrToUse == "0.0.0.0") {
+ link->loadSIPLocalIP (&addrToUse);
+ }
+
+ if (addrSdp == "0.0.0.0") {
+ addrSdp = addrToUse;
}
+
call->setConnectionState (Call::Progressing);
call->setPeerNumber (peerNumber);
@@ -3134,6 +3647,8 @@ mod_on_rx_request (pjsip_rx_data *rdata)
// Notify UI there is an incoming call
+ _debug ("Add call to account link");
+
if (Manager::instance().incomingCall (call, account_id)) {
// Add this call to the callAccountMap in ManagerImpl
Manager::instance().getAccountLink (account_id)->addCall (call);
@@ -3141,7 +3656,31 @@ mod_on_rx_request (pjsip_rx_data *rdata)
// Fail to notify UI
delete call;
call = NULL;
- _debug ("UserAgent: Fail to notify UI!\n");
+ _debug ("UserAgent: Fail to notify UI!");
+ return false;
+ }
+
+ // Have to do some stuff with the SDP
+ // Set the codec map, IP, peer number and so on... for the SIPCall object
+ setCallAudioLocal (call, addrToUse);
+
+ // We retrieve the remote sdp offer in the rdata struct to begin the negociation
+ call->getLocalSDP()->set_ip_address (addrSdp);
+
+ try {
+ call->getAudioRtp()->initAudioRtpConfig (call);
+ call->getAudioRtp()->initAudioRtpSession (call);
+ } catch (...) {
+ _debug ("Failed to create rtp thread from answer");
+ }
+
+ get_remote_sdp_from_offer (rdata, &r_sdp);
+
+ status = call->getLocalSDP()->receiving_initial_offer (r_sdp);
+
+ if (status!=PJ_SUCCESS) {
+ delete call;
+ call=0;
return false;
}
@@ -3158,6 +3697,12 @@ mod_on_rx_request (pjsip_rx_data *rdata)
// Specify media capability during invite session creation
status = pjsip_inv_create_uas (dialog, rdata, call->getLocalSDP()->get_local_sdp_session(), 0, &inv);
+ // Explicitly set the transport, set_transport methods increment transport's reference counter
+ status = pjsip_dlg_set_transport (dialog, tp);
+
+ // decrement transport's reference counter
+ // pjsip_transport_dec_ref(rdata->tp_info.transport);
+
PJ_ASSERT_RETURN (status == PJ_SUCCESS, 1);
// Associate the call in the invite session
@@ -3217,7 +3762,7 @@ void onCallTransfered (pjsip_inv_session *inv, pjsip_rx_data *rdata)
/* Invalid Request.
* No Refer-To header!
*/
- _debug ("UserAgent: Received REFER without Refer-To header!\n");
+ _debug ("UserAgent: Received REFER without Refer-To header!");
pjsip_dlg_respond (inv->dlg, rdata, 400, NULL, NULL, NULL);
return;
}
@@ -3241,7 +3786,7 @@ void onCallTransfered (pjsip_inv_session *inv, pjsip_rx_data *rdata)
/* Notify callback */
code = PJSIP_SC_ACCEPTED;
- _debug ("UserAgent: Call to %.*s is being transfered to %.*s\n",
+ _debug ("UserAgent: Call to %.*s is being transfered to %.*s",
(int) inv->dlg->remote.info_str.slen,
inv->dlg->remote.info_str.ptr,
(int) refer_to->hvalue.slen,
@@ -3259,7 +3804,7 @@ void onCallTransfered (pjsip_inv_session *inv, pjsip_rx_data *rdata)
&tdata);
if (status != PJ_SUCCESS) {
- _debug ("UserAgent: Unable to create 2xx response to REFER -- %d\n", status);
+ _debug ("UserAgent: Unable to create 2xx response to REFER -- %d", status);
return;
}
@@ -3276,7 +3821,7 @@ void onCallTransfered (pjsip_inv_session *inv, pjsip_rx_data *rdata)
tdata);
if (status != PJ_SUCCESS) {
- _debug ("UserAgent: Unable to create 2xx response to REFER -- %d\n", status);
+ _debug ("UserAgent: Unable to create 2xx response to REFER -- %d", status);
return;
}
@@ -3299,7 +3844,7 @@ void onCallTransfered (pjsip_inv_session *inv, pjsip_rx_data *rdata)
status = pjsip_xfer_create_uas (inv->dlg, &xfer_cb, rdata, &sub);
if (status != PJ_SUCCESS) {
- _debug ("UserAgent: Unable to create xfer uas -- %d\n", status);
+ _debug ("UserAgent: Unable to create xfer uas -- %d", status);
pjsip_dlg_respond (inv->dlg, rdata, 500, NULL, NULL, NULL);
return;
}
@@ -3335,7 +3880,7 @@ void onCallTransfered (pjsip_inv_session *inv, pjsip_rx_data *rdata)
status = pjsip_xfer_send_request (sub, tdata);
if (status != PJ_SUCCESS) {
- _debug ("UserAgent: Unable to send NOTIFY to REFER -- %d\n", status);
+ _debug ("UserAgent: Unable to send NOTIFY to REFER -- %d", status);
return;
}
}
@@ -3353,7 +3898,7 @@ void onCallTransfered (pjsip_inv_session *inv, pjsip_rx_data *rdata)
tmp = std::string (uri);
if (existing_call == NULL) {
- _debug ("UserAgent: Call doesn't exist!\n");
+ _debug ("UserAgent: Call doesn't exist!");
return;
}
@@ -3369,14 +3914,14 @@ void onCallTransfered (pjsip_inv_session *inv, pjsip_rx_data *rdata)
500, NULL, &tdata);
if (status != PJ_SUCCESS) {
- _debug ("UserAgent: Unable to create NOTIFY to REFER -- %d\n", status);
+ _debug ("UserAgent: Unable to create NOTIFY to REFER -- %d", status);
return;
}
status = pjsip_xfer_send_request (sub, tdata);
if (status != PJ_SUCCESS) {
- _debug ("UserAgent: Unable to send NOTIFY to REFER -- %d\n", status);
+ _debug ("UserAgent: Unable to send NOTIFY to REFER -- %d", status);
return;
}
}
@@ -3392,7 +3937,7 @@ void onCallTransfered (pjsip_inv_session *inv, pjsip_rx_data *rdata)
newCall = dynamic_cast<SIPCall *> (link->getCall (newCallId));
if (!newCall) {
- _debug ("UserAgent: can not find the call from sipvoiplink!\n");
+ _debug ("UserAgent: can not find the call from sipvoiplink!");
return;
}
}
@@ -3425,7 +3970,7 @@ void xfer_func_cb (pjsip_evsub *sub, pjsip_event *event)
if (pjsip_evsub_get_state (sub) == PJSIP_EVSUB_STATE_ACCEPTED) {
- _debug ("Transfer accepted! Waiting for notifications. \n");
+ _debug ("Transfer accepted! Waiting for notifications. ");
}
@@ -3457,13 +4002,13 @@ void xfer_func_cb (pjsip_evsub *sub, pjsip_event *event)
if (pjsip_evsub_get_state (sub) == PJSIP_EVSUB_STATE_TERMINATED) {
pjsip_evsub_set_mod_data (sub, _mod_ua.id, NULL);
- _debug ("UserAgent: Xfer client subscription terminated\n");
+ _debug ("UserAgent: Xfer client subscription terminated");
}
if (!link || !event) {
/* Application is not interested with call progress status */
- _debug ("UserAgent: Either link or event is empty!\n");
+ _debug ("UserAgent: Either link or event is empty!");
return;
}
@@ -3484,10 +4029,10 @@ void xfer_func_cb (pjsip_evsub *sub, pjsip_event *event)
if (!body) {
// if (call->getCallConfiguration () == Call::IPtoIP) {
- // _debug("UserAgent: IptoIp NOTIFY without message body\n");
+ // _debug("UserAgent: IptoIp NOTIFY without message body");
// }
// else{
- _debug ("UserAgent: Warning! Received NOTIFY without message body\n");
+ _debug ("UserAgent: Warning! Received NOTIFY without message body");
return;
// }
}
@@ -3497,7 +4042,7 @@ void xfer_func_cb (pjsip_evsub *sub, pjsip_event *event)
/* Check for appropriate content */
if (pj_stricmp2 (&body->content_type.type, "message") != 0 ||
pj_stricmp2 (&body->content_type.subtype, "sipfrag") != 0) {
- _debug ("UserAgent: Warning! Received NOTIFY with non message/sipfrag content\n");
+ _debug ("UserAgent: Warning! Received NOTIFY with non message/sipfrag content");
return;
}
@@ -3506,12 +4051,12 @@ void xfer_func_cb (pjsip_evsub *sub, pjsip_event *event)
&status_line);
if (status != PJ_SUCCESS) {
- _debug ("UserAgent: Warning! Received NOTIFY with invalid message/sipfrag content\n");
+ _debug ("UserAgent: Warning! Received NOTIFY with invalid message/sipfrag content");
return;
}
} else {
- _debug ("UserAgent: Set code to 500!\n");
+ _debug ("UserAgent: Set code to 500!");
status_line.code = 500;
status_line.reason = *pjsip_get_status_text (500);
}
@@ -3520,7 +4065,7 @@ void xfer_func_cb (pjsip_evsub *sub, pjsip_event *event)
SIPCall *call = dynamic_cast<SIPCall *> (link->getCall (Manager::instance().getCurrentCallId()));
if (!call) {
- _debug ("UserAgent: Call doesn't exit!\n");
+ _debug ("UserAgent: Call doesn't exit!");
return;
}
@@ -3529,7 +4074,7 @@ void xfer_func_cb (pjsip_evsub *sub, pjsip_event *event)
request = event->body.rx_msg.rdata->msg_info.msg_buf;
if ( (int) request.find (noresource) != -1) {
- _debug ("UserAgent: NORESOURCE for transfer!\n");
+ _debug ("UserAgent: NORESOURCE for transfer!");
link->transferStep2 (call);
pjsip_evsub_terminate (sub, PJ_TRUE);
@@ -3538,7 +4083,7 @@ void xfer_func_cb (pjsip_evsub *sub, pjsip_event *event)
}
if ( (int) request.find (ringing) != -1) {
- _debug ("UserAgent: transfered call RINGING!\n");
+ _debug ("UserAgent: transfered call RINGING!");
link->transferStep2 (call);
pjsip_evsub_terminate (sub, PJ_TRUE);
@@ -3555,18 +4100,18 @@ void xfer_func_cb (pjsip_evsub *sub, pjsip_event *event)
if (status_line.code/100 == 2) {
- _debug ("UserAgent: Try to stop rtp!\n");
+ _debug ("UserAgent: Try to stop rtp!");
pjsip_tx_data *tdata;
status = pjsip_inv_end_session (call->getInvSession(), PJSIP_SC_GONE, NULL, &tdata);
if (status != PJ_SUCCESS) {
- _debug ("UserAgent: Fail to create end session msg!\n");
+ _debug ("UserAgent: Fail to create end session msg!");
} else {
status = pjsip_inv_send_msg (call->getInvSession(), tdata);
if (status != PJ_SUCCESS)
- _debug ("UserAgent: Fail to send end session msg!\n");
+ _debug ("UserAgent: Fail to send end session msg!");
}
link->transferStep2 (call);
@@ -3606,7 +4151,7 @@ void xfer_svr_cb (pjsip_evsub *sub, pjsip_event *event)
call->setXferSub (NULL);
- _debug ("UserAgent: Xfer server subscription terminated\n");
+ _debug ("UserAgent: Xfer server subscription terminated");
}
}
@@ -3615,7 +4160,7 @@ void on_rx_offer (pjsip_inv_session *inv, const pjmedia_sdp_session *offer)
#ifdef CAN_REINVITE
- _debug ("%s (%d): on_rx_offer REINVITE\n", __FILE__, __LINE__);
+ _debug ("%s (%d): on_rx_offer REINVITE", __FILE__, __LINE__);
SIPCall *call;
pj_status_t status;
@@ -3691,6 +4236,7 @@ void handle_incoming_options (pjsip_rx_data *rdata)
status = pjsip_endpt_send_response (_endpt, &res_addr, tdata, NULL, NULL);
+
if (status != PJ_SUCCESS)
pjsip_tx_data_dec_ref (tdata);
}
@@ -3712,12 +4258,13 @@ bool setCallAudioLocal (SIPCall* call, std::string localIP)
if (account->isStunEnabled ()) {
// If use Stun server
callLocalExternAudioPort = account->getStunPort ();
+ //localIP = account->getPublishedAddress ();
}
- _debug (" Setting local ip address: %s\n", localIP.c_str());
+ _debug (" Setting local ip address: %s", localIP.c_str());
- _debug (" Setting local audio port to: %d\n", callLocalAudioPort);
- _debug (" Setting local audio port (external) to: %d\n", callLocalExternAudioPort);
+ _debug (" Setting local audio port to: %d", callLocalAudioPort);
+ _debug (" Setting local audio port (external) to: %d", callLocalExternAudioPort);
// Set local audio port for SIPCall(id)
call->setLocalIp (localIP);
@@ -3777,7 +4324,7 @@ std::vector<std::string> SIPVoIPLink::getAllIpInterface (void)
return ifaceList;
}
- _debug ("Detecting available interfaces...\n");
+ _debug ("Detecting available interfaces...");
int i;
@@ -3785,13 +4332,61 @@ std::vector<std::string> SIPVoIPLink::getAllIpInterface (void)
char tmpAddr[PJ_INET_ADDRSTRLEN];
pj_sockaddr_print (&addrList[i], tmpAddr, sizeof (tmpAddr), 0);
ifaceList.push_back (std::string (tmpAddr));
- _debug ("Local interface %s\n", tmpAddr);
+ _debug ("Local interface %s", tmpAddr);
}
return ifaceList;
}
+int get_iface_list(struct ifconf *ifconf)
+{
+ int sock, rval;
+
+ if((sock = socket(AF_INET,SOCK_STREAM,0)) < 0)
+ _debug("get_iface_list error could not open socket\n");
+
+
+ if((rval = ioctl(sock, SIOCGIFCONF , (char*) ifconf )) < 0 )
+ _debug("get_iface_list error ioctl(SIOGIFCONF)\n");
+
+ close(sock);
+
+ return rval;
+}
+
+
+std::vector<std::string> SIPVoIPLink::getAllIpInterfaceByName(void)
+{
+ std::vector<std::string> ifaceList;
+
+ static struct ifreq ifreqs[20];
+ struct ifconf ifconf;
+ int nifaces;
+
+ // add the default
+ ifaceList.push_back(std::string("default"));
+
+ memset(&ifconf,0,sizeof(ifconf));
+ ifconf.ifc_buf = (char*) (ifreqs);
+ ifconf.ifc_len = sizeof(ifreqs);
+
+ if(get_iface_list(&ifconf) < 0)
+ _debug("getAllIpInterfaceByName error could not get interface list\n");
+
+ nifaces = ifconf.ifc_len/sizeof(struct ifreq);
+
+ _debug("Interfaces (count = %d):\n", nifaces);
+ for(int i = 0; i < nifaces; i++) {
+ _debug(" %s ", ifreqs[i].ifr_name);
+ ifaceList.push_back(std::string (ifreqs[i].ifr_name));
+ printf(" %s\n", getInterfaceAddrFromName(std::string (ifreqs[i].ifr_name)).c_str());
+ }
+
+ return ifaceList;
+}
+
+
pj_bool_t stun_sock_on_status (pj_stun_sock *stun_sock, pj_stun_sock_op op, pj_status_t status)
{
if (status == PJ_SUCCESS)
@@ -3818,7 +4413,7 @@ std::string getLocalAddressAssociatedToAccount (AccountID id)
// Set the local address
- if (account != NULL) {
+ if (account != NULL && account->getAccountTransport ()) {
tspt = account->getAccountTransport ();
if (tspt != NULL) {
@@ -3832,12 +4427,12 @@ std::string getLocalAddressAssociatedToAccount (AccountID id)
local_addr_ipv4 = _localUDPTransport->local_addr.ipv4;
}
- _debug ("slbvasjklbvaskbvaskvbaskvaskvbsdfk: %i\n", local_addr_ipv4.sin_addr.s_addr);
+ _debug ("slbvasjklbvaskbvaskvbaskvaskvbsdfk: %i", local_addr_ipv4.sin_addr.s_addr);
tmp = pj_str (pj_inet_ntoa (local_addr_ipv4.sin_addr));
localAddr = std::string (tmp.ptr);
- _debug ("slbvasjklbvaskbvaskvbaskvaskvbsdfk: %s\n", localAddr.c_str());
+ _debug ("slbvasjklbvaskbvaskvbaskvaskvbsdfk: %s", localAddr.c_str());
return localAddr;
diff --git a/sflphone-common/src/sip/sipvoiplink.h b/sflphone-common/src/sip/sipvoiplink.h
index 69d79d8b7c7e370d94ddcc8979e342c75d20b46c..94b08bdc898182a9c22163b5634942cca67275a1 100644
--- a/sflphone-common/src/sip/sipvoiplink.h
+++ b/sflphone-common/src/sip/sipvoiplink.h
@@ -4,6 +4,7 @@
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Yun Liu <yun.liu@savoirfairelinux.com>
* Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
+ * Author: Alexandre Savard <alexandre.savard@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
@@ -36,6 +37,9 @@
#include <pjnath/stun_config.h>
///////////////////////////////
+#include <map>
+#include <sstream>
+
class EventThread;
class SIPCall;
@@ -45,6 +49,8 @@ class SIPCall;
// To set the verbosity. From 0 (min) to 6 (max)
#define PJ_LOG_LEVEL 6
+#define SipTransportMap std::map<std::string, pjsip_transport*>
+
/**
* @file sipvoiplink.h
* @brief Specific VoIPLink for SIP (SIP core for incoming and outgoing events).
@@ -286,15 +292,44 @@ class SIPVoIPLink : public VoIPLink
*/
std::vector<std::string> getAllIpInterface(void);
- /**
- * Initialize the transport selector
- * @param transport A transport associated with an account
- * @param tp_sel A pointer to receive the transport selector structure
- *
- * @return pj_status_t PJ_SUCCESS if the structure was successfully initialized
- */
- pj_status_t init_transport_selector (pjsip_transport *transport, pjsip_tpselector **tp_sel);
+ /**
+ * List all the interfaces on the system and return
+ * a vector list containing their name (eth0, eth0:1 ...).
+ * @param void
+ * @return std::vector<std::string> A std::string vector
+ * of interface name available on all of the interfaces on
+ * the system.
+ */
+ std::vector<std::string> getAllIpInterfaceByName(void);
+
+
+ /**
+ * List all the interfaces on the system and return
+ * a vector list containing their name (eth0, eth0:1 ...).
+ * @param void
+ * @return std::vector<std::string> A std::string vector
+ * of interface name available on all of the interfaces on
+ * the system.
+ */
+ std::string getInterfaceAddrFromName(std::string ifaceName);
+
+
+ /**
+ * Initialize the transport selector
+ * @param transport A transport associated with an account
+ * @param tp_sel A pointer to receive the transport selector structure
+ *
+ * @return pj_status_t PJ_SUCCESS if the structure was successfully initialized
+ */
+ pj_status_t init_transport_selector (pjsip_transport *transport, pjsip_tpselector **tp_sel);
+
+ /**
+ * Requests PJSIP library for local IP address, using pj_gethostbyname()
+ * @param addr* A string to be initialized
+ *
+ * @return bool True if addr successfully initialized
+ */
bool loadSIPLocalIP (std::string *addr);
/**
@@ -302,6 +337,14 @@ class SIPVoIPLink : public VoIPLink
*/
void updateAccountInfo(const AccountID& accountID);
+ /**
+ * This function unset the transport for a given account. It tests wether the
+ * associated transport is used by other accounts. If not, it shutdown the transport
+ * putting its reference counter to zero. PJSIP assumes transport destruction since
+ * this action can be delayed by ongoing SIP transactions.
+ */
+ void shutdownSipTransport(const AccountID& accountID);
+
private:
/**
* Constructor
@@ -338,6 +381,27 @@ class SIPVoIPLink : public VoIPLink
pj_status_t stunServerResolve (AccountID id);
+
+ /**
+ * Function used to create a new sip transport or get an existing one from the map.
+ * The SIP transport is "acquired" according to account's current settings.
+ * This function should be called before registering an account
+ * @param accountID An account id for which transport is to be set
+ *
+ * @return bool True if the account is succesfully created or
+ * successfully obtained from the transport map
+ */
+ bool acquireTransport(const AccountID& accountID);
+
+
+ /**
+ * Create a new sip transport according to the trasport type specified in account settings
+ */
+ bool createSipTransport(AccountID id);
+
+
+ bool addTransportToMap(std::string key, pjsip_transport* transport);
+
/** Create SIP UDP Listener */
int createUDPServer (AccountID = "");
@@ -369,8 +433,10 @@ class SIPVoIPLink : public VoIPLink
*/
pj_status_t createTlsTransport(AccountID id);
- pj_status_t createAlternateUdpTransport (AccountID id);
-
+ pj_status_t createAlternateUdpTransport (AccountID id);
+
+ SipTransportMap _transportMap;
+
/** For registration use only */
int _regPort;
diff --git a/sflphone-common/src/util/Pattern.h b/sflphone-common/src/util/Pattern.h
deleted file mode 100644
index 676ecbd85ef966cdff2456b45ad03b3102aca18b..0000000000000000000000000000000000000000
--- a/sflphone-common/src/util/Pattern.h
+++ /dev/null
@@ -1,339 +0,0 @@
-/*
- * Copyright (C) 2009 Savoir-Faire Linux inc.
- * Author: Pierre-Luc Bacon <pierre-luc.bacon@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., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-#ifndef __SFL_PATTERN_H__
-#define __SFL_PATTERN_H__
-
-#include <stdexcept>
-#include <string>
-#include <vector>
-#include <pcre.h>
-
-namespace sfl {
-namespace util {
- /**
- * Exception object that is thrown when
- * an error occured while compiling the
- * regular expression.
- */
- class compile_error : public std::invalid_argument
- {
- public:
- explicit compile_error(const std::string& error) :
- std::invalid_argument(error) {}
- };
-
- /**
- * Exception object that is thrown when
- * an error occured while mathing a
- * pattern to an expression.
- */
- class match_error : public std::invalid_argument
- {
- public:
- match_error(const std::string& error) :
- std::invalid_argument(error) {}
- };
-
- /**
- * This class implements in its way
- * some of the libpcre library.
- */
-
- class Pattern {
-
- public:
-
- /**
- * Constructor for a regular expression
- * pattern evaluator/matcher.
- *
- * @param pattern
- * The regular expression to
- * be used for this instance.
- */
-
- Pattern(const std::string& pattern,
- const std::string& options);
-
- /**
- * Destructor. Pcre pattern gets freed
- * here.
- */
- ~Pattern();
-
- /**
- * Assignment operator overloading.
- * Set the regular expression
- * to be used on subject strings
- * and compile the regular expression
- * from that string.
- *
- * @param pattern The new pattern
- */
- void operator=(const std::string& pattern) {
- _pattern = pattern;
- compile();
- }
-
- void operator=(const char * pattern) {
- _pattern = pattern;
- compile();
- }
-
- /**
- * Compile the regular expression
- * from the pattern that was set for
- * this object.
- */
- void compile(void);
-
- /**
- * Get the currently set regular expression
- * that is used on subject strings
- *
- * @return The currently set pattern
- */
- inline std::string getPattern(void) { return _pattern; }
-
- /**
- * << operator overload. Sets the the subject
- * for latter use on the >> operator.
- *
- * @param subject
- * The expression to be evaluated
- * by the pattern.
- *
- */
- void operator<<(const std::string& subject) {
- _subject = subject;
- }
-
- /**
- * Get the start position of the overall match.
- *
- * @return the start position of the overall match.
- */
- size_t start(void) const;
-
- /**
- * Get the start position of the specified match.
- *
- * @param groupNumber The capturing group number.
- *
- * @return the start position of the specified match.
- */
- size_t start(unsigned int groupNumber) const;
-
- /**
- * Get the start position of the specified match.
- *
- * @param groupName The capturing group name.
- *
- * @return the start position of the specified match.
- */
- size_t start(const std::string& groupName) const;
-
- /**
- * Get the end position of the overall match.
- *
- * @return the end position of the overall match.
- */
- size_t end(void) const;
-
- /**
- * Get the end position of the specified match.
- *
- * @param groupNumber The capturing group number.
- *
- * @return the end position of the specified match.
- */
- size_t end(unsigned int groupNumber) const;
-
- /**
- * Get the end position of the specified match.
- *
- * @param groupName The capturing group name.
- *
- * @return the end position of the specified match.
- */
- size_t end(const std::string& groupName) const;
-
- /**
- * Get the number of capturing groups in the
- * compiled regex.
- *
- * @return The number of capture groups.
- *
- * @pre The regular expression should have been
- * compiled prior to the execution of this method.
- */
- unsigned int getCaptureGroupCount(void);
-
- /**
- * Get the substring matched in a capturing
- * group (named or unnamed).
- *
- * This methods only performs a basic lookup
- * inside its internal substring table. Thus,
- * matches() should have been called prior to
- * this method in order to obtain the desired
- * output.
- *
- * @param groupName The name of the group
- *
- * @return the substring matched by the
- * regular expression designated
- * the group name.
- */
- std::string group(const std::string& groupName);
-
- /**
- * Get the substring matched in a named group.
- *
- * This methods only performs a basic lookup
- * inside its internal substring table. Thus,
- * matches() should have been called prior to
- * this method in order to obtain the desired
- * output.
- *
- * @param groupNumber The number of the group.
- *
- * @return the substring matched by the
- * regular expression designated
- * the group number.
- */
- std::string group(int groupNumber);
-
- /**
- * Similar to python's MatchObject.groups. Get all
- * the substrings matched by the capture groups defined
- * in the pattern. The complete (implicit) capture group
- * is not returned : ie only groups from 1 up to the number
- * of groups in the pattern are returned.
- *
- * @return A vector of stings that were matched by some
- * capturing group in the pattern.
- *
- * @pre The regular expression should have been
- * compiled prior to the execution of this method.
- */
- std::vector<std::string> groups(void);
-
- /**
- * Try to match the compiled pattern with a
- * subject.
- *
- * @param subject Subject to be matched
- * by the pattern.
- *
- * @return true If the subject matches the pattern,
- * false otherwise.
- *
- * @pre The regular expression should have been
- * compiled prior to the execution of this method.
- *
- * @post The internal substring table will be updated
- * with the new matches. Therefore, subsequent
- * calls to group may return different results.
- */
- bool matches(const std::string& subject) throw(match_error);
-
- /**
- * Try to match the compiled pattern with the implicit
- * subject.
- *
- * @return true If the subject matches the pattern,
- * false otherwise.
- *
- * @pre The regular expression should have been
- * compiled prior to the execution of this method.
- *
- * @post The internal substring table will be updated
- * with the new matches. Therefore, subsequent
- * calls to group may return different results.
- */
- bool matches(void) throw(match_error);
-
- /**
- * Split the subject into a list of substrings.
- *
- * @return A vector of substrings.
- *
- * @pre The regular expression should have been
- * compiled prior to the execution of this method.
- *
- * @post The internal subject won't be affected by this
- * by this operation. In other words: subject_before =
- * subject_after.
- */
- std::vector<std::string> split(void) throw(match_error);
-
- private:
- /**
- * The regular expression that represents that pattern.
- */
- std::string _pattern;
-
- /**
- * The optional subject string.
- */
- std::string _subject;
-
- /**
- * PCRE struct that
- * contains the compiled regular
- * expression
- */
- pcre * _re;
-
- /**
- * The internal output vector used by PCRE.
- */
- int * _ovector;
-
- /**
- * The size of the _ovector
- */
- int _ovectorSize;
-
- /**
- * Current offset in the _ovector;
- */
-
- int _offset[2];
-
- /**
- * The number of substrings matched after calling
- * pcre_exec.
- */
- int _count;
-
- /**
- * PCRE options for this pattern.
- */
- int _options;
-
- /**
- * String representation of the options.
- */
- std::string _optionsDescription;
- };
-}
-}
-
-#endif
diff --git a/sflphone-common/test/Makefile.am b/sflphone-common/test/Makefile.am
index 87264309aa0f6008c2e6a5704122de0593a5d097..e3679eb678549f698cf3d25c20c994b7c10a4bdf 100644
--- a/sflphone-common/test/Makefile.am
+++ b/sflphone-common/test/Makefile.am
@@ -1,28 +1,31 @@
include ../globals.mak
-noinst_PROGRAMS = numbercleanerTester pluginmanagerTester hookmanagerTester audiolayerTester historyTester mainbufferTester #rtpTester
+noinst_PROGRAMS = numbercleanerTester pluginmanagerTester hookmanagerTester audiolayerTester historyTester mainbufferTester sdesnegotiatorTester #rtpTester
OBJECT_FILES= \
+ ../src/sflphoned-logger.o \
../src/sflphoned-managerimpl.o \
+ ../src/sflphoned-account.o\
../src/sflphoned-accountcreator.o \
../src/sflphoned-call.o \
- ../src/sip/sipcall.o \
- ../src/iax/libiaxlink_la-iaxcall.o \
+ ../src/sflphoned-conference.o \
+ ../src/sflphoned-eventthread.o \
+ ../src/sflphoned-managerimpl_registration.o \
+ ../src/sflphoned-numbercleaner.o \
+ ../src/sflphoned-observer.o \
../src/sflphoned-voiplink.o \
- ../src/sip/sipvoiplink.o \
+ ../src/sip/libsiplink_la-sipcall.o \
+ ../src/iax/libiaxlink_la-iaxcall.o \
+ ../src/sip/libsiplink_la-sipvoiplink.o \
../src/iax/libiaxlink_la-iaxvoiplink.o \
- ../src/sflphoned-account.o \
- ../src/sip/sipaccount.o \
+ ../src/sip/libsiplink_la-sipaccount.o \
../src/iax/libiaxlink_la-iaxaccount.o \
- ../src/sflphoned-eventthread.o \
- ../src/sflphoned-conference.o \
+ ../src/sip/libsiplink_la-sdp.o \
+ ../src/sip/libsiplink_la-sdpmedia.o \
../src/plug-in/pluginmanager.o \
../src/plug-in/audiorecorder/audiorecord.o \
../src/audio/samplerateconverter.o \
- ../src/sip/sdp.o \
- ../src/sip/sdpmedia.o \
- ../src/sflphoned-numbercleaner.o \
../src/history/historymanager.o
../
@@ -65,7 +68,7 @@ pluginmanagerTester_LDADD = \
@SAMPLERATE_LIBS@ \
$(PJSIP_LIBS) \
$(OBJECT_FILES)
-
+
hookmanagerTester_SOURCES = \
hookmanagerTest.cpp \
TestMain.cpp
@@ -145,3 +148,23 @@ mainbufferTester_LDADD = \
@SAMPLERATE_LIBS@ \
$(PJSIP_LIBS) \
$(OBJECT_FILES)
+
+sdesnegotiatorTester_SOURCES = \
+ sdesnegotiatorTest.h \
+ sdesnegotiatorTest.cpp \
+ TestMain.cpp
+
+sdesnegotiatorTester_LDADD = \
+ ../src/libsflphone.la \
+ $(SFLPHONE_LIBS) $(ZEROCONFLIB) $(LIB_DNSSD) \
+ @ALSA_LIBS@ \
+ @PULSEAUDIO_LIBS@ \
+ @CPPUNIT_LIBS@ \
+ @CCEXT2_LIBS@ \
+ @CCGNU2_LIBS@ \
+ @CCRTP_LIBS@ \
+ @ZRTPCPP_LIBS@ \
+ @libssl_LIBS@ \
+ @SAMPLERATE_LIBS@ \
+ $(PJSIP_LIBS) \
+ $(OBJECT_FILES)
diff --git a/sflphone-common/test/audiolayerTest.cpp b/sflphone-common/test/audiolayerTest.cpp
index cf0552f4833f2bc862707dc04942ca3c0f6826b7..065b396c47ba801d95da7aa082610f4c861322dd 100644
--- a/sflphone-common/test/audiolayerTest.cpp
+++ b/sflphone-common/test/audiolayerTest.cpp
@@ -80,13 +80,13 @@ void AudioLayerTest::testAudioLayerConfig()
void AudioLayerTest::testAudioLayerSwitch()
{
- _debug ("---------- AudioLayerTest::testAudioLayerSwitch ---------------------------\n");
+ _debug ("---------- AudioLayerTest::testAudioLayerSwitch ---------------------------");
int previous_layer = Manager::instance().getAudioDriver()->getLayerType();
for (int i = 0; i < 2; i++) {
- _debug ("---------- AudioLayerTest::testAudioLayerSwitch - %i -------------\n",i);
+ _debug ("---------- AudioLayerTest::testAudioLayerSwitch - %i -------------",i);
Manager::instance().switchAudioManager();
if (previous_layer == ALSA) {
@@ -106,7 +106,7 @@ void AudioLayerTest::testAudioLayerSwitch()
void AudioLayerTest::testPulseConnect()
{
- _debug ("---------- AudioLayerTest::testPulseConnect ---------------------------\n");
+ _debug ("---------- AudioLayerTest::testPulseConnect ---------------------------");
ManagerImpl* manager;
manager = &Manager::instance();
@@ -133,7 +133,7 @@ void AudioLayerTest::testPulseConnect()
try {
CPPUNIT_ASSERT (_pulselayer->openDevice (numCardIn, numCardOut, sampleRate, frameSize, SFL_PCM_BOTH, alsaPlugin) == true);
} catch (...) {
- _debug ("Exception occured wile opening device! \n");
+ _debug ("Exception occured wile opening device! ");
}
usleep (100000);
@@ -184,7 +184,7 @@ void AudioLayerTest::testPulseConnect()
void AudioLayerTest::testAlsaConnect()
{
- _debug ("---------- AudioLayerTest::testAlsaConnect ---------------------------\n");
+ _debug ("---------- AudioLayerTest::testAlsaConnect ---------------------------");
int layer = Manager::instance().getAudioDriver()->getLayerType();
diff --git a/sflphone-common/test/audiorecorderTest.cpp b/sflphone-common/test/audiorecorderTest.cpp
index fc349f08c20745dc684918034cd920705d9dec91..d4dda35db6300499aeba05c5019a04ceec205349 100644
--- a/sflphone-common/test/audiorecorderTest.cpp
+++ b/sflphone-common/test/audiorecorderTest.cpp
@@ -40,7 +40,7 @@ void AudioRecorderTest::testRecordData()
_ar->setSndSamplingRate(44100);
_ar->openFile("theWavFile.wav",ft,sf);
- cout << "file opened!\n";
+ cout << "file opened!";
SFLDataFormat buf [2];
for (SFLDataFormat i = -32768; i < 32767; i++ ){
diff --git a/sflphone-common/test/hookmanagerTest.cpp b/sflphone-common/test/hookmanagerTest.cpp
index d5b8cb6a80a4a0fcca0e55c7440a0853d443b66f..817533a9277592570a8c2b5db7e5e7c0630dcd62 100644
--- a/sflphone-common/test/hookmanagerTest.cpp
+++ b/sflphone-common/test/hookmanagerTest.cpp
@@ -38,7 +38,7 @@ void HookManagerTest::testAddAction ()
int status;
- status = urlhook->addAction ("www.google.ca", "x-www-browser");
+ status = urlhook->addAction ("http://www.google.ca/?arg1=arg1&arg2=nvls&x=2&y=45&z=1", "x-www-browser");
CPPUNIT_ASSERT (status == 0);
}
diff --git a/sflphone-common/test/mainbufferTest.cpp b/sflphone-common/test/mainbufferTest.cpp
index 9551715a29eed00a3ec89de9fc9e27123fbdd309..830ff2c76979e67b867861c1433643c766dd609a 100644
--- a/sflphone-common/test/mainbufferTest.cpp
+++ b/sflphone-common/test/mainbufferTest.cpp
@@ -53,7 +53,7 @@ void MainBufferTest::tearDown()
void MainBufferTest::testRingBufferCreation()
{
- _debug ("MainBufferTest::testRingBufferCreation()\n");
+ _debug ("MainBufferTest::testRingBufferCreation()");
CallID test_id = "1234";
CallID null_id = "null id";
@@ -100,7 +100,7 @@ void MainBufferTest::testRingBufferCreation()
void MainBufferTest::testRingBufferReadPointer()
{
- _debug ("MainBufferTest::testRingBufferReadPointer()\n");
+ _debug ("MainBufferTest::testRingBufferReadPointer()");
CallID call_id = "call id";
CallID read_id = "read id";
@@ -147,7 +147,7 @@ void MainBufferTest::testRingBufferReadPointer()
void MainBufferTest::testCallIDSet()
{
- _debug ("MainBufferTest::testCallIDSet()\n");
+ _debug ("MainBufferTest::testCallIDSet()");
CallID test_id = "set id";
CallID false_id = "false set id";
@@ -231,7 +231,7 @@ void MainBufferTest::testCallIDSet()
void MainBufferTest::testRingBufferInt()
{
- _debug ("MainBufferTest::testRingbufferInt()\n");
+ _debug ("MainBufferTest::testRingbufferInt()");
// CallID test_id = "test_int";
@@ -348,7 +348,7 @@ void MainBufferTest::testRingBufferInt()
void MainBufferTest::testRingBufferNonDefaultID()
{
- _debug ("MainBufferTest::testRingBufferNonDefaultID()\n");
+ _debug ("MainBufferTest::testRingBufferNonDefaultID()");
CallID test_id = "test_int";
@@ -436,7 +436,7 @@ void MainBufferTest::testRingBufferNonDefaultID()
void MainBufferTest::testRingBufferFloat()
{
- _debug ("MainBufferTest::testRingBufferFloat()\n");
+ _debug ("MainBufferTest::testRingBufferFloat()");
float testfloat1 = 12.5;
float testfloat2 = 13.4;
@@ -471,7 +471,7 @@ void MainBufferTest::testRingBufferFloat()
void MainBufferTest::testTwoPointer()
{
- _debug ("MainBufferTest::testTwoPointer()\n");
+ _debug ("MainBufferTest::testTwoPointer()");
RingBuffer* input_buffer = _mainbuffer.createRingBuffer (default_id);
@@ -490,7 +490,7 @@ void MainBufferTest::testTwoPointer()
void MainBufferTest::testBindUnbindBuffer()
{
- _debug ("MainBufferTest::testBindUnbindBuffer()\n");
+ _debug ("MainBufferTest::testBindUnbindBuffer()");
CallID test_id1 = "bind unbind 1";
CallID test_id2 = "bind unbind 2";
@@ -554,7 +554,7 @@ void MainBufferTest::testBindUnbindBuffer()
// unbind test_id1 with default_id
_mainbuffer.unBindCallID (test_id1);
- _debug ("%i\n", (int) (_mainbuffer._ringBufferMap.size()));
+ _debug ("%i", (int) (_mainbuffer._ringBufferMap.size()));
CPPUNIT_ASSERT (_mainbuffer._ringBufferMap.size() == 0);
CPPUNIT_ASSERT (_mainbuffer._callIDMap.size() == 0);
@@ -767,7 +767,7 @@ void MainBufferTest::testBindUnbindBuffer()
CPPUNIT_ASSERT (iter_readpointer->second == 0);
- _debug ("ok1\n");
+ _debug ("ok1");
// unbind test_id1 with test_id2
// calling it twice not supposed to break anything
@@ -890,7 +890,7 @@ void MainBufferTest::testBindUnbindBuffer()
void MainBufferTest::testGetPutDataByID()
{
- _debug ("MainBufferTest::testGetPutData()\n");
+ _debug ("MainBufferTest::testGetPutData()");
CallID test_id = "getData putData";
CallID false_id = "false id";
@@ -946,7 +946,7 @@ void MainBufferTest::testGetPutDataByID()
void MainBufferTest::testGetPutData()
{
- _debug ("MainBufferTest::testGetDataAndCallID()\n");
+ _debug ("MainBufferTest::testGetDataAndCallID()");
CallID test_id = "incoming rtp session";
@@ -995,7 +995,7 @@ void MainBufferTest::testGetPutData()
void MainBufferTest::testDiscardFlush()
{
- _debug ("MainBufferTest::testDiscardFlush()\n");
+ _debug ("MainBufferTest::testDiscardFlush()");
CallID test_id = "flush discard";
// _mainbuffer.createRingBuffer(test_id);
@@ -1038,7 +1038,7 @@ void MainBufferTest::testDiscardFlush()
void MainBufferTest::testReadPointerInit()
{
- _debug ("MainBufferTest::testReadPointerInit()\n");
+ _debug ("MainBufferTest::testReadPointerInit()");
CallID test_id = "test read pointer init";
// RingBuffer* test_ring_buffer = _mainbuffer.createRingBuffer(test_id);
@@ -1067,7 +1067,7 @@ void MainBufferTest::testReadPointerInit()
void MainBufferTest::testRingBufferSeveralPointers()
{
- _debug ("MainBufferTest::testRingBufferSeveralPointers\n");
+ _debug ("MainBufferTest::testRingBufferSeveralPointers");
CallID test_id = "test multiple read pointer";
RingBuffer* test_ring_buffer = _mainbuffer.createRingBuffer (test_id);
@@ -1181,7 +1181,7 @@ void MainBufferTest::testRingBufferSeveralPointers()
void MainBufferTest::testConference()
{
- _debug ("MainBufferTest::testConference()\n");
+ _debug ("MainBufferTest::testConference()");
CallID test_id1 = "participant A";
CallID test_id2 = "participant B";
@@ -1695,7 +1695,7 @@ void MainBufferTest::testConference()
CPPUNIT_ASSERT (test_ring_buffer->AvailForGet (test_id1) == sizeof (int));
CPPUNIT_ASSERT (test_ring_buffer->AvailForGet (test_id2) == sizeof (int));
test_ring_buffer = _mainbuffer.getRingBuffer (test_id1);
- _debug ("%i\n", test_ring_buffer->putLen());
+ _debug ("%i", test_ring_buffer->putLen());
test_ring_buffer->debug();
CPPUNIT_ASSERT (test_ring_buffer->putLen() == sizeof (int));
CPPUNIT_ASSERT (test_ring_buffer->AvailForPut() == (int) (init_put_id1 - sizeof (int)));
diff --git a/sflphone-common/test/rtpTest.cpp b/sflphone-common/test/rtpTest.cpp
index 48f8ef5e4cbcfb6739f8e56bf29a9052a57a410e..31dfcc81663b2c3842a3b4a0be2a1bb63dc1ab02 100644
--- a/sflphone-common/test/rtpTest.cpp
+++ b/sflphone-common/test/rtpTest.cpp
@@ -41,7 +41,7 @@ using std::endl;
void RtpTest::setUp()
{
- _debug ("------ Set up rtp test------\n");
+ _debug ("------ Set up rtp test------");
Manager::instance().initConfigFile();
Manager::instance().init();
@@ -69,7 +69,7 @@ bool RtpTest::pjsipInit()
_pool = pj_pool_create (&_cp.factory, "rtpTest", 4000, 4000, NULL);
if (!_pool) {
- _debug ("----- RtpTest: Could not initialize pjsip memory pool ------\n");
+ _debug ("----- RtpTest: Could not initialize pjsip memory pool ------");
return PJ_ENOMEM;
}
@@ -83,16 +83,16 @@ void RtpTest::testRtpInitClose()
audiortp = new AudioSymmetricRtpSession (Manager::instance(), sipcall);
- _debug ("------ void RtpTest::testRtpInit() ------\n");
+ _debug ("------ void RtpTest::testRtpInit() ------");
try {
- _debug ("-------- Open Rtp Session ----------\n");
+ _debug ("-------- Open Rtp Session ----------");
audiortp->createNewSession (sipcall);
} catch (...) {
- _debug ("!!! Exception occured while Oppenning Rtp !!!\n");
+ _debug ("!!! Exception occured while Oppenning Rtp !!!");
}
@@ -103,18 +103,18 @@ void RtpTest::testRtpInitClose()
// computeNbByteAudioLayer
- _debug ("------ Finilize Rtp Initialization ------ \n");
+ _debug ("------ Finilize Rtp Initialization ------ ");
- _debug ("------ RtpTest::testRtpClose() ------\n");
+ _debug ("------ RtpTest::testRtpClose() ------");
try {
- _debug ("------ Close Rtp Session -------\n");
+ _debug ("------ Close Rtp Session -------");
CPPUNIT_ASSERT (audiortp->closeRtpSession());
} catch (...) {
- _debug ("!!! Exception occured while closing Rtp !!!\n");
+ _debug ("!!! Exception occured while closing Rtp !!!");
}
@@ -129,7 +129,7 @@ void RtpTest::testRtpThread()
audiortp = new AudioRtp();
- _debug ("-------- Open Rtp Session ----------\n");
+ _debug ("-------- Open Rtp Session ----------");
try {
@@ -137,11 +137,11 @@ void RtpTest::testRtpThread()
} catch (...) {
- _debug ("!!! Exception occured while Oppenning Rtp !!!\n");
+ _debug ("!!! Exception occured while Oppenning Rtp !!!");
}
- _debug ("------ void RtpTest::testRtpThread ------\n");
+ _debug ("------ void RtpTest::testRtpThread ------");
CPPUNIT_ASSERT (audiortp->_RTXThread->computeCodecFrameSize (160,8000) == 20.0f);
CPPUNIT_ASSERT (audiortp->_RTXThread->computeCodecFrameSize (320,16000) == 20.0f);
@@ -150,7 +150,7 @@ void RtpTest::testRtpThread()
// 20 ms at 44.1 khz corespond to 882 samples (1764 byte)
CPPUNIT_ASSERT (audiortp->_RTXThread->computeNbByteAudioLayer (20.f) == 1764);
- _debug ("------ Close Rtp Session -------\n");
+ _debug ("------ Close Rtp Session -------");
try {
@@ -158,7 +158,7 @@ void RtpTest::testRtpThread()
} catch (...) {
- _debug ("!!! Exception occured while closing Rtp !!!\n");
+ _debug ("!!! Exception occured while closing Rtp !!!");
}
@@ -184,7 +184,7 @@ void RtpTest::testRtpResampling()
audiortp = new AudioRtp();
- _debug ("-------- Open Rtp Session ----------\n");
+ _debug ("-------- Open Rtp Session ----------");
try {
@@ -192,28 +192,28 @@ void RtpTest::testRtpResampling()
} catch (...) {
- _debug ("!!! Exception occured while Oppenning Rtp !!!\n");
+ _debug ("!!! Exception occured while Oppenning Rtp !!!");
}
- _debug ("------ void RtpTest::testRtpResampling ------\n");
+ _debug ("------ void RtpTest::testRtpResampling ------");
CPPUNIT_ASSERT (0 == 0);
rsmpl_nbSample = audiortp->_RTXThread->reSampleData (data, rsmpl_data, 8000, nbSample, UP_SAMPLING);
- _debug ("ORIGINAL DATA SET\n");
+ _debug ("ORIGINAL DATA SET");
for (int i = 0; i < nbSample; i++)
printf (" %i=>%i ", i, data[i]);
- _debug ("RESAMPLED DATA SET\n");
+ _debug ("RESAMPLED DATA SET");
for (int i = 0; i < rsmpl_nbSample; i++)
printf (" %i=>%i ", i, rsmpl_data[i]);
- printf ("\n");
+ printf ("");
- _debug ("------ Close Rtp Session -------\n");
+ _debug ("------ Close Rtp Session -------");
try {
@@ -221,7 +221,7 @@ void RtpTest::testRtpResampling()
} catch (...) {
- _debug ("!!! Exception occured while closing Rtp !!!\n");
+ _debug ("!!! Exception occured while closing Rtp !!!");
}
diff --git a/sflphone-common/test/sdesnegotiatorTest.cpp b/sflphone-common/test/sdesnegotiatorTest.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..2db3fdff7ba55aaabd63f48374e33d2ad321a285
--- /dev/null
+++ b/sflphone-common/test/sdesnegotiatorTest.cpp
@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Author: Alexandre Savard <alexandre.savard@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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <stdio.h>
+#include <sstream>
+#include <ccrtp/rtp.h>
+#include <assert.h>
+#include <string>
+#include <cstring>
+#include <math.h>
+#include <dlfcn.h>
+#include <iostream>
+#include <sstream>
+
+
+#include "sdesnegotiatorTest.h"
+
+#include <unistd.h>
+
+
+using std::cout;
+using std::endl;
+
+
+void SdesNegotiatorTest::setUp()
+{
+ // Add a new SDES crypto line to be processed.
+ remoteOffer = new std::vector<std::string>();
+ remoteOffer->push_back(std::string("a=crypto:1 AES_CM_128_HMAC_SHA1_80 inline:AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwd|2^20|1:32"));
+ remoteOffer->push_back(std::string("a=crypto:2 AES_CM_128_HMAC_SHA1_32 inline:NzB4d1BINUAvLEw6UzF3WSJ+PSdFcGdUJShpX1Zj|2^20|1:32"));
+
+ // Register the local capabilities.
+ localCapabilities = new std::vector<sfl::CryptoSuiteDefinition>();
+ for(int i = 0; i < 3; i++) {
+ localCapabilities->push_back(sfl::CryptoSuites[i]);
+ }
+
+ sdesnego = new sfl::SdesNegotiator(*localCapabilities, *remoteOffer);
+}
+
+
+void SdesNegotiatorTest::tearDown()
+{
+
+ delete remoteOffer;
+ remoteOffer = NULL;
+
+ delete localCapabilities;
+ localCapabilities = NULL;
+
+ delete sdesnego;
+ sdesnego = NULL;
+
+}
+
+void SdesNegotiatorTest::testTagPattern()
+{
+ std::string subject = "a=crypto:4";
+
+ pattern = new sfl::Pattern("^a=crypto:(?P<tag>[0-9]{1,9})");
+ *pattern << subject;
+
+ CPPUNIT_ASSERT(pattern->matches());
+ CPPUNIT_ASSERT(pattern->group("tag").compare("4") == 0);
+
+ delete pattern;
+ pattern = NULL;
+}
+
+
+void SdesNegotiatorTest::testCryptoSuitePattern()
+{
+ std::string subject = "AES_CM_128_HMAC_SHA1_80";
+
+ pattern = new sfl::Pattern("(?P<cryptoSuite>AES_CM_128_HMAC_SHA1_80|" \
+ "AES_CM_128_HMAC_SHA1_32|" \
+ "F8_128_HMAC_SHA1_80|" \
+ "[A-Za-z0-9_]+)");
+ *pattern << subject;
+
+ CPPUNIT_ASSERT(pattern->matches());
+ CPPUNIT_ASSERT(pattern->group("cryptoSuite").compare("AES_CM_128_HMAC_SHA1_80") == 0);
+
+ delete pattern;
+ pattern = NULL;
+}
+
+
+void SdesNegotiatorTest::testKeyParamsPattern()
+{
+
+ std::string subject = "inline:d0RmdmcmVCspeEc3QGZiNWpVLFJhQX1cfHAwJSoj|2^20|1:32";
+
+ pattern = new sfl::Pattern("(?P<srtpKeyMethod>inline|[A-Za-z0-9_]+)\\:" \
+ "(?P<srtpKeyInfo>[A-Za-z0-9\x2B\x2F\x3D]+)\\|" \
+ "2\\^(?P<lifetime>[0-9]+)\\|" \
+ "(?P<mkiValue>[0-9]+)\\:" \
+ "(?P<mkiLength>[0-9]{1,3})\\;?", "g");
+
+ *pattern << subject;
+
+ pattern->matches();
+ CPPUNIT_ASSERT(pattern->group("srtpKeyMethod").compare("inline:"));
+
+ delete pattern;
+ pattern = NULL;
+}
+
+/**
+ * Make sure that all the fields can be extracted
+ * properly from the syntax.
+ */
+void SdesNegotiatorTest::testNegotiation()
+{
+ CPPUNIT_ASSERT(sdesnego->negotiate());
+}
+
+/**
+ * Make sure that unproperly formatted crypto lines are rejected.
+ */
+void SdesNegotiatorTest::testComponent()
+{
+ // Register the local capabilities.
+ std::vector<sfl::CryptoSuiteDefinition> * capabilities = new std::vector<sfl::CryptoSuiteDefinition>();
+
+ //Support all the CryptoSuites
+ for(int i = 0; i < 3; i++) {
+ capabilities->push_back(sfl::CryptoSuites[i]);
+ }
+
+ // Make sure that if a component is missing, negotiate will fail
+ std::string cryptoLine("a=crypto:1 AES_CM_128_HMAC_SHA1_80 inline:|2^20|1:32");
+ std::vector<std::string> * cryptoOffer = new std::vector<std::string>();
+ cryptoOffer->push_back(cryptoLine);
+
+ sfl::SdesNegotiator * negotiator = new sfl::SdesNegotiator(*capabilities, *cryptoOffer);
+
+ CPPUNIT_ASSERT(negotiator->negotiate() == false);
+}
+
+
diff --git a/sflphone-common/test/sdesnegotiatorTest.h b/sflphone-common/test/sdesnegotiatorTest.h
new file mode 100644
index 0000000000000000000000000000000000000000..2a7b552222a5c1c223fa74f293eff8f91e4d6c2d
--- /dev/null
+++ b/sflphone-common/test/sdesnegotiatorTest.h
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Author: Alexandre Savard <alexandre.savard@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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+// Cppunit import
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestCaller.h>
+#include <cppunit/TestCase.h>
+#include <cppunit/TestSuite.h>
+
+#include <assert.h>
+
+#include <stdio.h>
+#include <sstream>
+#include <ccrtp/rtp.h>
+
+#include <vector>
+
+// pjsip import
+#include <pjsip.h>
+#include <pjlib.h>
+#include <pjsip_ua.h>
+#include <pjlib-util.h>
+#include <pjnath/stun_config.h>
+
+// Application import
+#include "sip/SdesNegotiator.h"
+#include "sip/Pattern.h"
+// #include "config/config.h"
+// #include "user_cfg.h"
+
+
+
+/*
+ * @file sdesnegotiationTest.cpp
+ * @brief Regroups unitary tests related to the plugin manager.
+ */
+
+#ifndef _SDESNEGOTIATOR_TEST_
+#define _SDESNEGOTIATOR_TEST_
+
+
+
+class SdesNegotiatorTest : public CppUnit::TestCase {
+
+ /*
+ * Use cppunit library macros to add unit test the factory
+ */
+ CPPUNIT_TEST_SUITE( SdesNegotiatorTest );
+ CPPUNIT_TEST( testTagPattern );
+ CPPUNIT_TEST( testCryptoSuitePattern );
+ CPPUNIT_TEST( testKeyParamsPattern );
+ CPPUNIT_TEST( testNegotiation );
+ // CPPUNIT_TEST( testComponent );
+ CPPUNIT_TEST_SUITE_END();
+
+ public:
+
+ SdesNegotiatorTest() : CppUnit::TestCase("Sdes Tests") {}
+
+ /*
+ * Code factoring - Common resources can be initialized here.
+ * This method is called by unitcpp before each test
+ */
+ void setUp();
+
+ /*
+ * Code factoring - Common resources can be released here.
+ * This method is called by unitcpp after each test
+ */
+ inline void tearDown();
+
+ void testTagPattern();
+
+ void testCryptoSuitePattern();
+
+ void testKeyParamsPattern();
+
+ void testNegotiation();
+
+ void testComponent();
+
+ private:
+
+ sfl::Pattern *pattern;
+
+ sfl::SdesNegotiator *sdesnego;
+
+ std::vector<std::string> *remoteOffer;
+
+ std::vector<sfl::CryptoSuiteDefinition> *localCapabilities;
+};
+
+/* Register our test module */
+CPPUNIT_TEST_SUITE_REGISTRATION( SdesNegotiatorTest );
+
+#endif
diff --git a/tools/build-system/README b/tools/build-system/README
deleted file mode 100644
index c12a4bbfc40c9996c34d27a21e82deb5588f7720..0000000000000000000000000000000000000000
--- a/tools/build-system/README
+++ /dev/null
@@ -1,42 +0,0 @@
-# register image
-VBoxManage registerimage disk VDI/ubuntu-9.04.vdi -type normal
-
-# check registration
-VBoxManage showvdiinfo VDI/ubuntu-9.04.vdi
-
-# create VM
-VBoxManage createvm -name "ubuntu-9.04" -register
-
-# check vm creation
-VBoxManage list vms
-
-# update configuration
-VBoxManage modifyvm "ubuntu-9.04" -hda "VDI/ubuntu-9.04.vdi" -memory "1024MB" -acpi on -nic1 nat
-
-#si 64 bits
-# VBoxManage modifyvm ubuntu-9.04-64 --ostype Ubuntu_64
-# VBoxManage modifyvm ubuntu-9.04-64 --hwvirtex on
-
-VBoxManage setextradata "ubuntu-9.04" "VBoxInternal/Devices/pcnet/0/LUN#0/Config/ssh/Protocol" TCP
-VBoxManage setextradata "ubuntu-9.04" "VBoxInternal/Devices/pcnet/0/LUN#0/Config/ssh/HostPort" 50001
-VBoxManage setextradata "ubuntu-9.04" "VBoxInternal/Devices/pcnet/0/LUN#0/Config/ssh/GuestPort" 22
-
-# start vm
-VBoxHeadless -startvm "ubuntu-9.04" -p 50000
-
-# install ssh support
-sudo apt-get install openssh-server
-
-# add office-srv-01 sflphone user ssh key in authorized_keys of vm
-ssh -o LogLevel=ERROR -o CheckHostIP=no -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p 50001 sflphone@127.0.0.1 "mkdir ~/.ssh/"
-scp -o LogLevel=ERROR -o CheckHostIP=no -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -P 50001 /home/projects/sflphone/.ssh/id_dsa.pub sflphone@127.0.0.1:~/.ssh/authorized_keys
-ssh -o LogLevel=ERROR -o CheckHostIP=no -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p 50001 sflphone@127.0.0.1 "chmod 0600 ~/.ssh/authorized_keys"
-
-# si nécessaire
-# scp -o LogLevel=ERROR -o CheckHostIP=no -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -P 50001 /home/projects/sflphone/build-system/git-buildpackage_0.4.45_all.deb sflphone@127.0.0.1:
-
-# update /etc/sudoers
-sflphone ALL = NOPASSWD: /sbin/shutdown, /usr/bin/apt-get, /usr/bin/dpkg
-
-# stop vm
-VBoxManage controlvm "ubuntu-9-04" poweroff
diff --git a/tools/build-system/build-osc.sh b/tools/build-system/build-osc.sh
index 30fb9ab3c0e319730d6104fbf53f42d62c684fdc..8735ba83dfde2e019d8033e173f3676ac67cc4af 100755
--- a/tools/build-system/build-osc.sh
+++ b/tools/build-system/build-osc.sh
@@ -23,7 +23,7 @@ LAUNCHPAD_PACKAGES=( "sflphone-client-gnome" "sflphone-common" )
REFERENCE_REPOSITORY="${ROOT_DIR}/sflphone-source-repository"
-SOFTWARE_VERSION="0.9.7.beta"
+SOFTWARE_VERSION="0.9.7.rc2"
VERSION_INDEX=1
diff --git a/tools/build-system/distributions/build-packages.sh b/tools/build-system/distributions/build-packages.sh
deleted file mode 100755
index 0b9e09fbec4846af807dc51515e17b687a50d2e2..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/build-packages.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/bash
-#####################################################
-# File Name: build-packages.sh
-#
-# Purpose :
-#
-# Author: Julien Bonjean (julien@bonjean.info)
-#
-# Creation Date: 2009-05-29
-# Last Modified: 2009-06-01 17:27:25 -0400
-#####################################################
-
-. ./globals
-
-if [ "$?" -ne 0 ]; then
- echo "!! Cannot source global file"
- exit -1
-fi
-
-cd ${PACKAGING_DIR}
-
-if [ ! ${PACKAGING_DIR} ];then
- echo "!! Cannot go to working directory"
- exit -1
-fi
-
-# check if version is ok
-if [ ! ${VERSION} ]; then
- echo "!! Cannot detect current version"
- exit -1
-fi
-
-# open log file
-exec 3<>${LOG_FILE}
-
-# redirect outputs (stdout & stderr)
-exec 1>&3
-exec 2>&3
-
-echo "SFLPhone version is ${VERSION}"
-
-# check user
-if [ "${WHOAMI}" != "${USER}" ]; then
- echo "!! Please use user ${USER} to run this script"
- exit -1;
-fi
-
-if [ ${RELEASE_MODE} ]; then
- echo "Release mode : ${RELEASE_MODE}"
-else
- echo "Snapshot mode"
-fi
-
-# decompress repository
-echo "Untar repository"
-cd ${BUILD_DIR} && tar xf ${REPOSITORY_ARCHIVE} >/dev/null 2>&1
-
-if [ "$?" -ne "0" ]; then
- echo " !! Cannot untar repository"
- exit -1
-fi
-
-# launch distribution specific script
-if [ "${DISTRIBUTION}" = "ubuntu" ];then
- echo "Launch packaging for Ubuntu (hardy/intrepid/jaunty)"
- cd ${UBUNTU_DIR} && ./build-packages-ubuntu.sh $*
-
-elif [ "${DISTRIBUTION}" = "opensuse" ]; then
- echo "Launch packaging for openSUSE 11"
- cd ${OPENSUSE_DIR} && ./build-packages-opensuse.sh $*
-
-elif [ "${DISTRIBUTION}" = "mandriva" ]; then
- echo "Launch packaging for Mandriva 2009.1"
- cd ${MANDRIVA_DIR} && ./build-packages-mandriva.sh $*
-
-elif [ "${DISTRIBUTION}" = "fedora" ]; then
- echo "Launch packaging for Fedora 11"
- cd ${FEDORA_DIR} && ./build-packages-fedora.sh $*
-
-else
- echo "!! Cannot detect distribution"
- exit -1
-fi
-
-if [ "$?" -ne 0 ]; then
- echo "!! Error in subprocess"
- exit -1
-fi
-
-echo "All done"
-
-# close file descriptor
-exec 3>&-
-
-exit 0
diff --git a/tools/build-system/distributions/globals b/tools/build-system/distributions/globals
deleted file mode 100644
index 0de0f01a92526f8b14998b8d8a4ed4c91137b8b1..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/globals
+++ /dev/null
@@ -1,53 +0,0 @@
-#####################################################
-# File Name: globals
-#
-# Purpose :
-#
-# Author: Julien Bonjean (julien@bonjean.info)
-#
-# Creation Date: 2009-05-28
-# Last Modified: 2009-05-28 15:55:14 -0400
-#####################################################
-
-# general
-RELEASE_MODE="$1"
-ROOT_DIR="/home/sflphone"
-PACKAGING_DIR="${ROOT_DIR}/sflphone-packaging"
-
-# distributions
-UBUNTU_DIR="${PACKAGING_DIR}/ubuntu"
-OPENSUSE_DIR="${PACKAGING_DIR}/opensuse"
-MANDRIVA_DIR="${PACKAGING_DIR}/mandriva"
-FEDORA_DIR="${PACKAGING_DIR}/fedora"
-
-# where packaging will be donne
-BUILD_DIR="${PACKAGING_DIR}/build"
-REPOSITORY_ARCHIVE="${BUILD_DIR}/sflphone.tar.gz"
-REPOSITORY_DIR="${BUILD_DIR}/sflphone"
-
-# target directories
-DEB_RESULT_DIR="${PACKAGING_DIR}/deb/dists"
-RPM_RESULT_DIR="${PACKAGING_DIR}/rpm"
-
-# system information
-ARCH_FLAG=`getconf -a|grep LONG_BIT | sed -e 's/LONG_BIT\s*//'`
-OS_VERSION=`lsb_release -d -s -c | sed -e '1d'`
-DISTRIBUTION=`lsb_release -s -d | sed 's/"//g' | tr 'A-Z' 'a-z' | cut -d " " -f1`
-VERSION=`cat ${BUILD_DIR}/VERSION`
-
-# other stuff
-EDITOR=echo
-export EDITOR
-RELEASE_MODE=$1
-USER="sflphone"
-WHOAMI=`whoami`
-
-# packages we will build
-PACKAGES=('sflphone-common sflphone-client-gnome' 'sflphone-client-kde')
-
-# log file
-LOG_ID="${OS_VERSION}"
-if [ "${LOG_ID}" = "" ]; then
- LOG_ID="${DISTRIBUTION}"
-fi
-LOG_FILE=${PACKAGING_DIR}/sflphone-${LOG_ID}-${ARCH_FLAG}.log
diff --git a/tools/build-system/distributions/mandriva/build-packages-mandriva.sh b/tools/build-system/distributions/mandriva/build-packages-mandriva.sh
deleted file mode 100755
index 88137cba65e6d74f405d6b6c3e773bd31458ddae..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/mandriva/build-packages-mandriva.sh
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/bash
-#####################################################
-# File Name: build-packages-mandriva.sh
-#
-# Purpose :
-#
-# Author: Julien Bonjean (julien@bonjean.info)
-#
-# Creation Date: 2009-05-27
-# Last Modified: 2009-06-04 16:29:34 -0400
-#####################################################
-
-. ../globals
-
-cd ${MANDRIVA_DIR}
-
-if [ "$?" -ne "0" ]; then
- echo " !! Cannot cd to Mandriva directory"
- exit -1
-fi
-
-echo "Do updates"
-sudo /usr/sbin/urpmi --auto-update --auto >/dev/null
-
-# create build directories
-echo "Create directories"
-mkdir -p ${BUILD_DIR}/BUILD
-mkdir -p ${RPM_RESULT_DIR}
-mkdir -p ${BUILD_DIR}/SOURCES
-mkdir -p ${BUILD_DIR}/SPECS
-
-# create rpm macros
-echo "Create RPM macros"
-cat > ~/.rpmmacros << STOP
-%packager Julien Bonjean (julien.bonjean@savoirfairelinux.com)
-%distribution Savoir-faire Linux
-%vendor Savoir-faire Linux
-
-%_signature gpg
-%_gpg_name Julien Bonjean
-
-%_topdir ${BUILD_DIR}
-%_builddir %{_topdir}/BUILD
-%_rpmdir ${RPM_RESULT_DIR}
-%_sourcedir %{_topdir}/SOURCES
-%_specdir %{_topdir}/SPECS
-%_srcrpmdir ${RPM_RESULT_DIR}
-STOP
-
-# create packages
-for PACKAGE in ${PACKAGES[@]}
-do
- echo "Prepare ${PACKAGE}"
-
- cd ${REPOSITORY_DIR}
-
- echo " -> create source archive"
- mv ${PACKAGE} ${PACKAGE}-${VERSION} 2>/dev/null && \
- tar cf ${PACKAGE}.tar.gz ${PACKAGE}-${VERSION} >/dev/null && \
- mv ${PACKAGE}-${VERSION} ${PACKAGE}
-
- if [ "$?" -ne "0" ]; then
- echo "!! Cannot create source archive"
- exit -1
- fi
-
- echo " -> move archive to source directory"
- mv ${PACKAGE}.tar.gz ${BUILD_DIR}/SOURCES
-
- if [ "$?" -ne "0" ]; then
- echo "!! Cannot move archive"
- exit -1
- fi
-
- cd ${PACKAGING_DIR}
-
- echo " -> update spec file"
- sed "s/VERSION/${VERSION}/g" mandriva/${PACKAGE}.spec > ${BUILD_DIR}/SPECS/${PACKAGE}.spec
-
- if [ "$?" -ne "0" ]; then
- echo "!! Cannot update spec file"
- exit -1
- fi
-done
-
-# launch build
-echo "Launch build"
-rpmbuild -ba ${BUILD_DIR}/SPECS/*.spec
-
-if [ "$?" -ne "0" ]; then
- echo "!! Cannot build packages"
- exit -1
-fi
-
diff --git a/tools/build-system/distributions/mandriva/sflphone-client-gnome.spec b/tools/build-system/distributions/mandriva/sflphone-client-gnome.spec
deleted file mode 100644
index 0e7ac8beb0139bd47b7de053070e0018604a62ef..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/mandriva/sflphone-client-gnome.spec
+++ /dev/null
@@ -1,75 +0,0 @@
-#####################################################
-# File Name: sflphone-client-gnome.spec
-#
-# Purpose :
-#
-# Author: Julien Bonjean (julien@bonjean.info)
-#
-# Creation Date: 2009-05-27
-# Last Modified: 2009-05-27 17:23:32 -0400
-#####################################################
-
-Name: sflphone-client-gnome
-License: GNU General Public License (GPL)
-Group: Productivity/Networking/System
-Summary: GNOME client for SFLphone
-Version: VERSION
-Release: mandriva
-URL: http://www.sflphone.org/
-Vendor: Savoir-faire Linux
-Packager: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
-
-BuildRoot: %{_tmppath}/%{name}-%{version}
-Source0: sflphone-client-gnome.tar.gz
-BuildRequires: gtk2-devel
-BuildRequires: libnotify-devel
-BuildRequires: libsexy-devel
-BuildRequires: evolution-data-server-devel
-BuildRequires: check-devel
-BuildRequires: libdbus-glib-devel
-BuildRequires: log4c-devel
-Requires: sflphone-common = %{version}
-Requires: dbus-1-glib
-Requires: gtk2
-Requires: glib2
-Requires: dbus-1-glib
-Requires: libnotify
-Requires: librsvg
-Requires: log4c
-Requires: libsexy
-Conflicts: sflphone
-Prefix: %{_prefix}
-
-%description
-Provide a GNOME client for SFLphone.
- SFLphone is meant to be a robust enterprise-class desktop phone.
- SFLphone is released under the GNU General Public License.
- SFLphone is being developed by the global community, and maintained by
- Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
-
-Authors:
---------
- Julien Bonjean <julien.bonjean@savoirfairelinux.com>
-
-%lang_package
-
-%prep
-%setup -q
-
-%build
-./autogen.sh
-./configure --prefix=%{_prefix}
-make -j
-
-%install
-make DESTDIR=%{buildroot} install
-
-%clean
-make clean
-
-%files
-%defattr(-, root, root)
-%{_prefix}/*
-%doc AUTHORS COPYING README
-
-%changelog
diff --git a/tools/build-system/distributions/mandriva/sflphone-client-kde.spec b/tools/build-system/distributions/mandriva/sflphone-client-kde.spec
deleted file mode 100644
index a453cf9144f244b82e4e56fd14a168a8ceeaa732..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/mandriva/sflphone-client-kde.spec
+++ /dev/null
@@ -1,68 +0,0 @@
-#####################################################
-# File Name: sflphone-client-kde.spec
-#
-# Purpose :
-#
-# Author: Julien Bonjean (julien@bonjean.info)
-#
-# Creation Date: 2009-05-27
-# Last Modified: 2009-05-27 17:23:32 -0400
-#####################################################
-
-Name: sflphone-client-kde
-License: GNU General Public License (GPL)
-Group: Productivity/Networking/System
-Summary: KDE client for SFLphone
-Version: VERSION
-Release: mandriva
-URL: http://www.sflphone.org/
-Vendor: Savoir-faire Linux
-Packager: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
-
-BuildRoot: %{_tmppath}/%{name}-%{version}
-Source0: sflphone-client-kde.tar.gz
-Requires: sflphone-common = %{version}
-Requires: commoncpp2
-Requires: libkdepimlibs4
-Requires: libqt4-dbus-1
-Requires: libqt4-svg
-Requires: libqt4-x11
-BuildRequires: cmake
-BuildRequires: libcommoncpp-devel
-BuildRequires: kdepimlibs4-devel
-BuildRequires: libqt4-devel >= 4.3
-Conflicts: sflphone
-Prefix: %{_prefix}
-
-%description
-Provide a KDE client for SFLphone.
- SFLphone is meant to be a robust enterprise-class desktop phone.
- SFLphone is released under the GNU General Public License.
- SFLphone is being developed by the global community, and maintained by
- Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
-
-Authors:
---------
- Julien Bonjean <julien.bonjean@savoirfairelinux.com>
-
-%lang_package
-
-%prep
-%setup -q
-
-%build
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
-make
-
-%install
-make DESTDIR=%{buildroot} install
-
-%clean
-make clean
-
-%files
-%defattr(-, root, root)
-%{_prefix}/*
-%doc AUTHORS COPYING README
-
-%changelog
diff --git a/tools/build-system/distributions/mandriva/sflphone-common.spec b/tools/build-system/distributions/mandriva/sflphone-common.spec
deleted file mode 100644
index 84f14d414a2870c2e59aa776fe548409cd85f13f..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/mandriva/sflphone-common.spec
+++ /dev/null
@@ -1,91 +0,0 @@
-#####################################################
-# File Name: sflphone-common.spec
-#
-# Purpose :
-#
-# Author: Julien Bonjean (julien@bonjean.info)
-#
-# Creation Date: 2009-05-27
-# Last Modified: 2009-05-27 17:23:32 -0400
-#####################################################
-
-Name: sflphone-common
-License: GNU General Public License (GPL)
-Group: System Environment/Daemons
-Summary: SIP and IAX2 compatible softphone - Core
-Version: VERSION
-Release: mandriva
-URL: http://www.sflphone.org/
-Vendor: Savoir-faire Linux
-Packager: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
-
-BuildRoot: %{_tmppath}/%{name}-%{version}
-Source0: sflphone-common.tar.gz
-BuildRequires: glibc-devel
-BuildRequires: libccrtp-devel
-BuildRequires: libsamplerate-devel
-BuildRequires: libdbus-1-devel
-BuildRequires: libexpat-devel
-BuildRequires: libgsm-devel
-BuildRequires: speex-devel
-BuildRequires: libcppunit-devel
-BuildRequires: libcommoncpp-devel
-BuildRequires: libalsa2-devel
-BuildRequires: libpulseaudio-devel
-BuildRequires: libext2fs-devel
-Requires: libsamplerate
-Requires: libexpat1
-Requires: commoncpp2
-Requires: libgsm1
-Requires: libspeex
-Requires: dbus-1
-Requires: libasound2
-Requires: libpulse0
-Requires: libccrtp1
-Conflicts: sflphone
-Prefix: %{_prefix}
-
-%description
-SFLphone is meant to be a robust enterprise-class desktop phone.
- SFLphone is released under the GNU General Public License.
- SFLphone is being developed by the global community, and maintained by
- Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
-
-Authors:
---------
- Julien Bonjean <julien.bonjean@savoirfairelinux.com>
-
-%prep
-%setup -q
-
-%build
-cd libs/pjproject
-./autogen.sh
-./configure --prefix=%{_prefix}
-make dep
-make clean
-make
-cd -
-./autogen.sh
-./configure --prefix=%{_prefix}
-make -j
-
-%install
-cd libs/pjproject
-make DESTDIR=%{buildroot} install
-cd -
-make DESTDIR=%{buildroot} install
-
-%clean
-cd libs/pjproject
-make clean
-cd -
-make clean
-
-%files
-%defattr(-, root, root)
-%{_prefix}/*
-%exclude %{_prefix}/include
-%doc AUTHORS COPYING README TODO
-
-%changelog
diff --git a/tools/build-system/distributions/opensuse/build-packages-opensuse.sh b/tools/build-system/distributions/opensuse/build-packages-opensuse.sh
deleted file mode 100755
index 8ea2639ad390c91f7efe6e2038fc2d49a1124c91..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/opensuse/build-packages-opensuse.sh
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/bash
-#####################################################
-# File Name: build-packages-opensuse.sh
-#
-# Purpose :
-#
-# Author: Julien Bonjean (julien@bonjean.info)
-#
-# Creation Date: 2009-05-27
-# Last Modified: 2009-09-11 11:22:27 -0400
-#####################################################
-
-. ../globals
-
-cd ${OPENSUSE_DIR}
-
-if [ "$?" -ne "0" ]; then
- echo " !! Cannot cd to openSUSE directory"
- exit -1
-fi
-
-echo "Do updates"
-sudo /usr/bin/zypper -n update --auto-agree-with-licenses >/dev/null
-
-# create build directories
-echo "Create directories"
-mkdir -p ${BUILD_DIR}/BUILD
-mkdir -p ${RPM_RESULT_DIR}
-mkdir -p ${BUILD_DIR}/SOURCES
-mkdir -p ${BUILD_DIR}/SPECS
-
-# create rpm macros
-echo "Create RPM macros"
-cat > ~/.rpmmacros << STOP
-%packager Julien Bonjean (julien.bonjean@savoirfairelinux.com)
-%distribution Savoir-faire Linux
-%vendor Savoir-faire Linux
-
-%_signature gpg
-%_gpg_name Julien Bonjean
-
-%_topdir ${BUILD_DIR}
-%_builddir %{_topdir}/BUILD
-%_rpmdir ${RPM_RESULT_DIR}
-%_sourcedir %{_topdir}/SOURCES
-%_specdir %{_topdir}/SPECS
-%_srcrpmdir ${RPM_RESULT_DIR}
-STOP
-
-# create packages
-for PACKAGE in ${PACKAGES[@]}
-do
- echo "Prepare ${PACKAGE}"
-
- cd ${REPOSITORY_DIR}
-
- echo " -> create source archive"
- mv ${PACKAGE} ${PACKAGE}-${VERSION} 2>/dev/null && \
- tar cf ${PACKAGE}.tar.gz ${PACKAGE}-${VERSION} >/dev/null && \
- mv ${PACKAGE}-${VERSION} ${PACKAGE}
-
- if [ "$?" -ne "0" ]; then
- echo "!! Cannot create source archive"
- exit -1
- fi
-
- echo " -> move archive to source directory"
- mv ${PACKAGE}.tar.gz ${BUILD_DIR}/SOURCES
-
- if [ "$?" -ne "0" ]; then
- echo "!! Cannot move archive"
- exit -1
- fi
-
- cd ${PACKAGING_DIR}
-
- echo " -> update spec file"
- sed "s/VERSION/${VERSION}/g" opensuse/${PACKAGE}.spec > ${BUILD_DIR}/SPECS/${PACKAGE}.spec
-
- if [ "$?" -ne "0" ]; then
- echo "!! Cannot update spec file"
- exit -1
- fi
-done
-
-# launch build
-echo "Launch build"
-rpmbuild -ba ${BUILD_DIR}/SPECS/*.spec
-
-if [ "$?" -ne "0" ]; then
- echo "!! Cannot build packages"
- exit -1
-fi
-
diff --git a/tools/build-system/distributions/opensuse/sflphone-client-gnome.spec b/tools/build-system/distributions/opensuse/sflphone-client-gnome.spec
deleted file mode 100644
index c6f20e7a0f68cf17ee31470fa290271b64cc4e48..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/opensuse/sflphone-client-gnome.spec
+++ /dev/null
@@ -1,75 +0,0 @@
-#####################################################
-# File Name: sflphone-client-gnome.spec
-#
-# Purpose :
-#
-# Author: Julien Bonjean (julien@bonjean.info)
-#
-# Creation Date: 2009-05-27
-# Last Modified: 2009-05-27 17:23:32 -0400
-#####################################################
-
-Name: sflphone-client-gnome
-License: GNU General Public License (GPL)
-Group: Productivity/Networking/System
-Summary: GNOME client for SFLphone
-Version: VERSION
-Release: opensuse
-URL: http://www.sflphone.org/
-Vendor: Savoir-faire Linux
-Packager: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
-
-BuildRoot: %{_tmppath}/%{name}-%{version}
-Source0: sflphone-client-gnome.tar.gz
-BuildRequires: liblog4c-devel
-BuildRequires: gtk2-devel
-BuildRequires: dbus-1-glib-devel
-BuildRequires: libnotify-devel
-BuildRequires: libsexy-devel
-BuildRequires: evolution-data-server-devel
-BuildRequires: check-devel
-Requires: sflphone-common = %{version}
-Requires: dbus-1-glib
-Requires: gtk2
-Requires: glib2
-Requires: dbus-1-glib
-Requires: libnotify
-Requires: librsvg
-Requires: liblog4c3
-Requires: libsexy
-Conflicts: sflphone
-Prefix: %{_prefix}
-
-%description
-Provide a GNOME client for SFLphone.
- SFLphone is meant to be a robust enterprise-class desktop phone.
- SFLphone is released under the GNU General Public License.
- SFLphone is being developed by the global community, and maintained by
- Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
-
-Authors:
---------
- Julien Bonjean <julien.bonjean@savoirfairelinux.com>
-
-%lang_package
-
-%prep
-%setup -q
-
-%build
-./autogen.sh
-./configure --prefix=%{_prefix}
-make -j
-
-%install
-make DESTDIR=%{buildroot} install
-
-%clean
-make clean
-
-%files
-%defattr(-, root, root)
-%{_prefix}/*
-%doc AUTHORS COPYING README
-
-%changelog
diff --git a/tools/build-system/distributions/opensuse/sflphone-client-kde.spec b/tools/build-system/distributions/opensuse/sflphone-client-kde.spec
deleted file mode 100644
index f558d9b0cd6a71d64ad8021412803e2e7b36667a..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/opensuse/sflphone-client-kde.spec
+++ /dev/null
@@ -1,69 +0,0 @@
-#####################################################
-# File Name: sflphone-client-kde.spec
-#
-# Purpose :
-#
-# Author: Julien Bonjean (julien@bonjean.info)
-#
-# Creation Date: 2009-05-27
-# Last Modified: 2009-05-27 17:23:32 -0400
-#####################################################
-
-Name: sflphone-client-kde
-License: GNU General Public License (GPL)
-Group: Productivity/Networking/System
-Summary: KDE client for SFLphone
-Version: VERSION
-Release: opensuse
-URL: http://www.sflphone.org/
-Vendor: Savoir-faire Linux
-Packager: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
-
-BuildRoot: %{_tmppath}/%{name}-%{version}
-Source0: sflphone-client-kde.tar.gz
-Requires: sflphone-common = %{version}
-Requires: commoncpp2
-Requires: libkdepimlibs4
-Requires: libqt4-dbus-1
-Requires: libqt4-svg
-Requires: libqt4-x11
-BuildRequires: cmake
-BuildRequires: libkdepimlibs4-devel
-BuildRequires: commoncpp2-devel
-BuildRequires: libqt4-devel >= 4.3
-BuildRequires: gettext-tools
-Conflicts: sflphone
-Prefix: %{_prefix}
-
-%description
-Provide a KDE client for SFLphone.
- SFLphone is meant to be a robust enterprise-class desktop phone.
- SFLphone is released under the GNU General Public License.
- SFLphone is being developed by the global community, and maintained by
- Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
-
-Authors:
---------
- Julien Bonjean <julien.bonjean@savoirfairelinux.com>
-
-%lang_package
-
-%prep
-%setup -q
-
-%build
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
-make
-
-%install
-make DESTDIR=%{buildroot} install
-
-%clean
-make clean
-
-%files
-%defattr(-, root, root)
-%{_prefix}/*
-%doc AUTHORS COPYING README
-
-%changelog
diff --git a/tools/build-system/distributions/opensuse/sflphone-common.spec b/tools/build-system/distributions/opensuse/sflphone-common.spec
deleted file mode 100644
index 1929b7e222f4ab3a723a04b05d4e2fa9d85e1d5f..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/opensuse/sflphone-common.spec
+++ /dev/null
@@ -1,90 +0,0 @@
-#####################################################
-# File Name: sflphone-common.spec
-#
-# Purpose :
-#
-# Author: Julien Bonjean (julien@bonjean.info)
-#
-# Creation Date: 2009-05-27
-# Last Modified: 2009-05-27 17:23:32 -0400
-#####################################################
-
-Name: sflphone-common
-License: GNU General Public License (GPL)
-Group: System Environment/Daemons
-Summary: SIP and IAX2 compatible softphone - Core
-Version: VERSION
-Release: opensuse
-URL: http://www.sflphone.org/
-Vendor: Savoir-faire Linux
-Packager: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
-
-BuildRoot: %{_tmppath}/%{name}-%{version}
-Source0: sflphone-common.tar.gz
-BuildRequires: libpulse-devel
-BuildRequires: commoncpp2-devel
-BuildRequires: libccrtp-devel
-BuildRequires: libsamplerate-devel
-BuildRequires: dbus-1-devel
-BuildRequires: libexpat-devel
-BuildRequires: libgsm-devel
-BuildRequires: speex-devel
-BuildRequires: libcppunit-devel
-BuildRequires: alsa-devel
-BuildRequires: libuuid-devel
-Requires: libsamplerate
-Requires: libexpat1
-Requires: commoncpp2
-Requires: libgsm1
-Requires: libspeex
-Requires: dbus-1
-Requires: libasound2
-Requires: libpulse0
-Requires: libccrtp1
-Conflicts: sflphone
-Prefix: %{_prefix}
-
-%description
-SFLphone is meant to be a robust enterprise-class desktop phone.
- SFLphone is released under the GNU General Public License.
- SFLphone is being developed by the global community, and maintained by
- Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
-
-Authors:
---------
- Julien Bonjean <julien.bonjean@savoirfairelinux.com>
-
-%prep
-%setup -q
-
-%build
-cd libs/pjproject
-./autogen.sh
-./configure --prefix=%{_prefix}
-make dep
-make clean
-make
-cd -
-./autogen.sh
-./configure --prefix=%{_prefix}
-make -j
-
-%install
-cd libs/pjproject
-make DESTDIR=%{buildroot} install
-cd -
-make DESTDIR=%{buildroot} install
-
-%clean
-cd libs/pjproject
-make clean
-cd -
-make clean
-
-%files
-%defattr(-, root, root)
-%{_prefix}/*
-%exclude %{_prefix}/include
-%doc AUTHORS COPYING README TODO
-
-%changelog
diff --git a/tools/build-system/distributions/ubuntu/build-packages-ubuntu.sh b/tools/build-system/distributions/ubuntu/build-packages-ubuntu.sh
deleted file mode 100755
index 8dd8a30ed5dfe3dbbe9812a8afc606a3465be21b..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/build-packages-ubuntu.sh
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/bin/bash
-#
-# @author: Yun Liu <yun.liu@savoirfairelinux.com>, Julien Bonjean <julien.bonjean@savoirfairelinux.com>
-#
-# Refer to http://www.sflphone.org for futher information
-#
-
-. ../globals
-
-cd ${UBUNTU_DIR}
-
-if [ "$?" -ne "0" ]; then
- echo " !! Cannot cd to Ubuntu directory"
- exit -1
-fi
-
-PACKAGE_SYSVER="0ubuntu1"
-FULL_VERSION="${VERSION}-${PACKAGE_SYSVER}"
-
-#########################
-# BEGIN
-#########################
-
-DIST="${OS_VERSION}"
-if [ ${RELEASE_MODE} ]; then
- if [ "${RELEASE_MODE}" != "release" ]; then
- DIST="${DIST}-testing"
- fi
-else
- DIST="${DIST}-daily"
-fi
-
-echo "Do updates and dependencies build"
-sudo apt-get update >/dev/null
-sudo apt-get upgrade -y >/dev/null
-sudo apt-get build-dep sflphone-common >/dev/null
-sudo apt-get build-dep sflphone-client-gnome >/dev/null
-sudo apt-get build-dep sflphone-client-kde >/dev/null
-
-for PACKAGE in ${PACKAGES[@]}
-do
- echo "Process ${PACKAGE}"
-
- echo " -> prepare debian directories"
- mv ${UBUNTU_DIR}/debian-${PACKAGE} ${REPOSITORY_DIR}/${PACKAGE}/debian
-
- # generate the changelog
- echo " -> generate changelog"
- sed -i 's/SYSTEM/'${OS_VERSION}'/g' ${REPOSITORY_DIR}/${PACKAGE}/debian/changelog && \
- sed -i 's/SYSVER/'${PACKAGE_SYSVER}'/g' ${REPOSITORY_DIR}/${PACKAGE}/debian/changelog
-
- if [ "$?" -ne "0" ]; then
- echo "!! Cannot generate changelog"
- exit -1
- fi
-
- # copy the appropriate control file based on architecture
- echo " -> generate control file"
- if [ ! -e ${REPOSITORY_DIR}/${PACKAGE}/debian/control.$OS_VERSION ];then
- echo " -> no control file, skipping"
- continue
- fi
- cp ${REPOSITORY_DIR}/${PACKAGE}/debian/control.$OS_VERSION ${REPOSITORY_DIR}/${PACKAGE}/debian/control && \
- sed -i "s/VERSION/${FULL_VERSION}/g" ${REPOSITORY_DIR}/${PACKAGE}/debian/control
-
- if [ "$?" -ne "0" ]; then
- echo "!! Cannot generate control file"
- exit -1
- fi
-
- # provide prerequisite directories used by debuild
- echo " -> prepare directories"
- cp -r ${REPOSITORY_DIR}/${PACKAGE} ${REPOSITORY_DIR}/${PACKAGE}-${FULL_VERSION}.orig && \
- mv ${REPOSITORY_DIR}/${PACKAGE} ${REPOSITORY_DIR}/${PACKAGE}-${FULL_VERSION}
-
- # build package sflphone-common
- cd ${REPOSITORY_DIR}/${PACKAGE}-${FULL_VERSION}/debian && \
- debuild -us -uc
-
- if [ "$?" -ne "0" ]; then
- echo "!! Cannot generate package ${PACKAGE}"
- exit -1
- fi
-done
-
-# move to dist
-echo "Deploy files in dist directories"
-BINARY_DIR=""
-if [ "${ARCH_FLAG}" -eq "32" ]; then
- BINARY_DIR="binary-i386"
-else
- BINARY_DIR="binary-amd64"
-fi
-
-mkdir -p ${DEB_RESULT_DIR}/${DIST}/universe/source
-mkdir -p ${DEB_RESULT_DIR}/${DIST}/universe/${BINARY_DIR}
-
-mv ${REPOSITORY_DIR}/sflphone*.deb ${DEB_RESULT_DIR}/${DIST}/universe/${BINARY_DIR} && \
-mv ${REPOSITORY_DIR}/sflphone*.dsc ${DEB_RESULT_DIR}/${DIST}/universe/source/ && \
-mv ${REPOSITORY_DIR}/sflphone*.build ${DEB_RESULT_DIR}/${DIST}/universe/source/ && \
-mv ${REPOSITORY_DIR}/sflphone*.changes ${DEB_RESULT_DIR}/${DIST}/universe/source/ && \
-mv ${REPOSITORY_DIR}/sflphone*.orig.tar.gz ${DEB_RESULT_DIR}/${DIST}/universe/source/ && \
-mv ${REPOSITORY_DIR}/sflphone*.diff.gz ${DEB_RESULT_DIR}/${DIST}/universe/source/
-
-if [ "$?" -ne "0" ]; then
- echo "!! Cannot copy dist files"
- exit -1
-fi
-
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/changelog b/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/changelog
deleted file mode 100644
index 003c33d69cbe10ad5a83b1bebc81c43be2f76df3..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/changelog
+++ /dev/null
@@ -1,1284 +0,0 @@
-sflphone-client-gnome (0.9.6-SYSVER) SYSTEM; urgency=low
-
- ** 0.9.6 **
-
- * Documentation on echo test
- * [redmine_down] codec names not displayed in total
- * [redmine_down] crash when hanging up a dialing call because tries to
- add it to history whereas no starttime
- * [#1927] alternate every time screen changed to call history
- * [#1886] clean code
- * [#1886] debug messages when loading history removed
- * [redmine_down] sflphone-kde icons
- * [#1855] Update language files
- * [#1502] Update version number
- * [redmine_down] setHistory at close
- * [#redmine_down] Handle PJ_DECLINE_SC as failure
- * [#1923] Fix segmentation fault when adding a new account
- * [#1923] Check on iterator before setting the config
- * [#1904] Added mnemonic to tabs in sflphone-client-gnome.
- * [#1905] The daemon was not sending the currentSelectedCodec signal
- on dbus when answering a call.
- * [#1922] Default values set to all account details
- * [#1886] Spinbox reg expire enables apply, and address book is not
- visible when disabled
- * [#1905] Bug fix for segmentation fault caused by an empty string,
- * [#1910] Warnings in test directory
- * [#1919] Error fixed
- * [#1855] Update russian translation - Hussein Abdallah
- * [#1910] Remove files
- * [#1919] fixed
- * [#1777] Code indentation
- * [#1918] fixed
- * [#1917] fixed
- * [#1910] Remove warnings compilation in src
- * [#1886] removed AccountListModel in configskeleton
- * [#1914]
- * [#1911] check previous and new port
- * [#1910] Remove compilation warnings in src/dbus and src/history
- * [#1910] Remove compilation warnings in src/audio
- * [1855] Update german translation - Sven Werlen
- * [#1909] removed
- * [#1906] Done
- * [#1904] The registration expire value is now configurable from the
- * Cleaned up debug messages.
- * [#1886] separated initCallItem in two functions
- * [#1886] reversed error in commit
- * [#1886] clean debug
- * [#1886] changed Name of classes and files
- * [#1886] clean
- * [#1870] In call_state_cb (dbus.c:126), _time_stop was overridden by
- the actual time.
- * [#1884] Added some new gpg flags to prevent tty warnings
- * [#1886] Clean audio config dialog
- * [#1886] No more compile warnings. + 1 comm
- * [#1872] Check if the user input is smaller than PJ_MAX_HOSTNAME.
- * [#1886]
- * [#1785] Fixed build when no new commit
- * [#1852] If chosen by the user, the hostname can now be solved and
- used
- * [#1871] * and # inverted back
- * [#1869] Conditional compilation that checks if
- * [#1309] removed test in main
- * [#1425] Put actions in SFLPhone window class instead of ui view,
- made a separate toolbar for screens.
-
- -- SFLphone Automatic Build System <team@sflphone.org> Mon, 27 Jul 2009 09:53:19 -0400
-
-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 **
-
- * spec files for mandriva and opensuse updated with buildrequires
- libqt4-dev >=4.3
- * [#1700] Cannot build on ubuntu 8.10 and a few other distribs
- * [#1502] Update version number where applicable
- * [#1642] Update client icons
- * [#1450] Clean up useless debug and comments in sipvoiplink and
- audiortp
- * [#1450] Remove Semaphore object in AudioRtp thread deletion
- * [#1450] Audio RTP init now synchronized with Sip/SDP
- * [#1693] kde client crashes when changing codecs order/activation
- * [#1450] Deep refactoring of audiortp
- * [#1450] setRtpSessionRemoteIp
- * [#1689] getCallList at start
- * [#1224] Change path in package files
- * [#1450] Audio RTP initialized only once, payload and remote ip set
- at runtime
- * [#1450] Add setRtpSessionMedia and setRtpSessionRemoteIp address
- * [#1642] Make GNOME GUI fresher and younger ;)
- * [#1686] Status bar displaying used account
- * added sflphone-kde icon so that it compiles
- * [#1659] Ending a call causes the daemon to crash
- * corrected introspection XMLs, po files...
- * [#1211] g722 media descriptor in codecDescriptor
- * [#1310] Install sflphoned in $(prefix)/lib/sflphone
- * [#1502] Do not install test binaries and dbus utilitaries
- * [#1224] hack for pjsip build system!
- * [#1224] Remove pjsip binaries from repo
- * [#1224] Upgrade to pjsip 1.0.2
- * [#1658] About SFLphone (bugs)
- * [#1658] About SFLphone
- * [#1660] Displaying all dialed numbers in a call
- * Tested status bar.
- * [#790] Optimize pulse audio streams parameters
- * [#1678] Some usefull debug messages for mutex/semaphore deadlock
- problem
- * [#1669] Add/remove some usefull/unusefull debug
- * [#1665] Fix latency related to pulse audio stream openning/closing
- * [#1457] Make the menus and panels accessible in french
- * [#1457] Improve broken keyboard accessibility in menus and conf
- panels
- * [#961] Instanciate only once the searchbar icons
- * [#961] Restore transfer fonction
- * [#961] Filter on the history type OK
- * [#961] Fix compilation problems on hardy/intrepid
- * [#1157] Commit missing files
- * [#790] Reduce number of start/stop streams call on pulse audio
- * [#1639] kde client crashes when no account registered
- * [#1620] Fix the searchbar
- * [#1620] Get back caltree as it was during gtkcritical area
- * [#1620] Add history filter reinit function
- * [#1335] Add a missing label in address book preferences
- * [#1561] Update russian translation - Hussein Abdallah
- * [#1605] Fix edit menu french translation
- * [#961] Enable to search in the history according to the call type
- * [#1449] Searchbar does not work anymore
- * [#961] Add popup menu on the entry primary icon for history
- * [#1317] Fixed KDE client package dependency
- * [#936] speex 32 khz integration completed
- * [#936] Use 320 frame size
- * [#936] Test using a frame size at 320 smpls
- * [#1214] Enable / Disable history
- * [#1607] Fix compilation problem for ubuntu 8.10 (libsexy)
- * [#1313] Implement processDataEncode processDataDecode in audiortp
- * [#1613] codec list order can't be set
- * Better handling of localisation + added languages + corrected
- warnings + begginning of new config dialog with kconfig + 14px
- account leds
- * [#1214] Save and load history according to the limit timestamp +
- unit tests
- * [1609] Fix call number copy/paste feature
- * [1607] Restore clear action icon in searchbar
- * [#936] Try to decode using 1280 samples
- * [#936] Add some debug
- * [#936] Add .cpp file
- * [#936] Oops Forgot speex 32 khz
- * [#1214] Add configuration panel for history + D-Bus calls
- * [#1313] Test rtp thread function, frame size, nbbytes, resampling
- * [#790] Flush audio data before closing audio streams
- * [#1214] History displays local time
- * [#1214] Skip empty field on display
- * [#1214] Associate an account to an history entry
- * [#1342] Get addressbook options sensitive/non-sensitive
- * [#1211] Clean up and comments
- * [#1211] Get back to 20 ms framesize
- * [#1211] Use sendImmediate instead of putData in RTP
- * [#1211] Fix nb byte available in RTP
- * [#1211] Clear condition on maxNbSamples in RTP
- * [#1211] Fix max byte available in RTP session
- * [#1211] G722: Use 160 samples per frame instead of 320
- * [#1211] Test using a dynamic payload
- * [#1211] Test using a dynamic payload type
- * [#1211] Rename size variable (nb_samples, nb_bytes)
- * [#1211] Test g722 ip-to-ip sending twice the data lenth
- * [#1211] Test g722 ip-to-ip
- * [#1214] Do not select an history item by default at startup
- * [#1214] Remove some compilation warnings
- * [#1214] Handle empty field - remove g_print
- * [#1214] Add each history item only once
- * [#1214] Handle call timestamps properlier
- * [#1214] Do not need timestamp files anymore
- * [#1214] Use the saved date for history entry
- * Clean up
- * [#1214] Client doesn't crash if the D-Bus call fails
- * [#1214] Client is able to save its history - still some glitches
- * [#1211] Forgot 16000 for g722
- * [#1211] G722 initialization
- * [#1214] Save name/number, successfully load the history if no fields
- are empty
- * [#1499] Fixed destination directory bug
- * [#1214] Restore all the functionalities; peer name/number way more
- easy to handle !!
- * [#1214] Add callable_object instead of call_t, refactoring
- * [#1211] Test with polycom soundstation 16000
- * [#1211] Remove C like inline function in g722 codec
- * [#1342] Finalize gnome client preference window formating
- * [#1214] Retrieve the history when the gnome client startsup
- * [#1306] Implement localization for KDE client
- * [#1593] enable accounts apply button when account checked/unchecked
- * [#1214] Implement the dbus calls on server side
- * [#1214] Add serialized/unserialized functions to pass data on DBUS
- * [#1342] Formating gnome client configuration windows
- * [#1214] Save sucessfully a map of history items
- * [#1499] Removed multiple jobs compilation for KDE client (2)
- * [#1214] Load history from file into memory, add unit tests
- * [#1534] Throws a length_error exception in case URL exceeds
- std::string max_size
- * [#1499] Removed multiple jobs compilation for KDE client
- * [#1565] make account leds smaller
- * [1430] Fix dbus debug
- * [#1562] crashes when trying to change item of a call of state "OVER"
- * [#1116] Fix compilation bug
- * [#1317] Added mandriva and opensuse-11 64 bits
- * [#1108] Add messges in main window concerning transfer success
- failure
- * [#1116] Fix compilation problems
- * [#1211] g722 Makefile
- * [#1108] Client side transferFailed/trasferSucceded signals handling
- * [#1211] G722 mostly completed,
- * [#1555] make bigger toolbar (24x24)
- * [#1551] remove default mailbox number in wizard and disable mailbox
- button when first account doesn't have mailbox number
- * [#1342] Re-add sflphone manpages
- * [#1116] Fix compilation on non-jaunty distros
- * [#1317] Fixed opensuse startup sleep
- * [#1108] Add a signal in the client to notify successful or failed
- transfer
- * [#1108] Dbus signals concerning call transfer success/failure
- * [#1317] Added opensuse to automatic build system
- * [#1223] Fix manpages bug
- * [#1060] german translation glitch
- * Clean up some gnome client warnings
- * [#1547] replace ugly account leds by beautiful icons
- * [#1548] add close button that hides windowand just hide on clicking
- the cross
- * [#1549] put introspec XMLs in the client's source
- * [#1312] Implement getCallList D-BUS method
- * [#1116] Clear text in history and contacts
- * [#1499] KDE integration
- * [#1469] Modify header linkers in dbus-c++'s Makefile.am's
- * [#1469] Remove examples folder from dbus-c++
- * [#1214] History integration in build system; unit test squeleton
- * [#1317] Cleaning
- * [#1469] Remove configure stuff in dbus-c++
- * [#1469] Add unofficial mainline dbus-c++
- * [#1469] Remove dbus-c++ from freedesktop
- * [#1430] Bring account changed signal/callback back to normal
- * [#1060] Update german translation - Sven Werlen
- * [#1430] Add marshaller one string define
- * [#1430] Send account change signal broadcast using account id
- * [#1430] Remove condition on setRegistrationState, cause stun to
- crash
- * [#1317] Centralized version handling
- * [#1317] Fixed version number on sfl-git-dch
- * [#1317] Refactoring for new distributions
- * [#1215] Fix account order at startup if latency
- * [#1088] Restore sip dns srv
- * [#1214] Add squeleton for history manager
- * [#1430] Add accout id to accout changed method
- * [#1430] No connectionStatusNotification (account changed) if no
- changes
- * [#1538] Add COPYING file
- * [#1430] Add audio rtp thread tests
- * [#1317] Changed version detection
- * [#1538] Document license in libs/stund
- * [#1317] Added version files
- * [#1538] Apply François patches - debian packages
- * [#1317] Updated spec files
- * add files
- * [#1538] Apply François patches - debian packages
- * [#1535] Change program file structure (directory src...)
- * [#1317] Updated build system scripts
- * [#1317] Cleaning
- * [#1317] Copied introspect files to gnome client
- * [#1317] Added opensuse to build-system : first-shot
- * [#1317] Remove spec files from configure
- * [#1317] Added missing prefix
- * removed debug for daemon account fix
- * [#1430] Add a connection reference which most likely belong to
- libdbus
- * [#1430] Use shared connection instead of private
- * make daemon find the account, added userMatch
- * Clean code, add comments...
- * [#1317] Fixed packaging rules
- * [#1317] Updated autogen
- * Updated autogen.sh for pjsip
- * [#1526] Set accounts order
- * [#1317] Fixed pjsip lib dirs
- * [#1317] Updated debian packaging for new pjsip configuration script
- * [#1317] Switch to autogenerated guess and sub files
- * [#1317] Updated pjsip inclusion in build system
- * [#1317] Replaced pjsip guess and sub files
- * [#1317] Fixed compilation issues on opensuse 11
- * [#1505] account list seem to crash the application when clicking
- Apply very fast...
- * [#1456] Add a flag to be replaced in the control files
- * [#1456] Added version dependancy handling
- * put account alias in AccountWidgetItem rather than in the item with
- " " before.
- * [#1034] The KDE client should start sflphoned if it is not started
- * [#1500] Handle options for notifications and display on incoming
- call.
- * [#1443] Client should not crash when receive an unexpected
- stateChanged signal
- * [#1403] Do not stop the notification anymore
- * [#1456] Added version dependancy handling
- * [#1426] Daemon crashes when get alsa plugin
- * [#1422] Improved error messages
- * commit for merge
- * [#1424] Change logo in tray icon and put a different one when
- incoming call
- * [#1425] first part done, window title...
- * [#1413] add manpages creating and installing in build system
- * [#1417] The client should start the account creation wizard if
- started for the first time (if config file doesn't exist)
- * [#1421] Make volume bars horizontal when dialpad is hidden.
- * Changed main window title and fixed a mistake in sflphone_const.h
- * [#1412] make debian package building work
- * changelog changed.
- * Changed addAccount method in gnome client.
- * Debian and man folders added.
- * [#1388] Change project name from sflphone_kde to sflphone-client-kde
- * Better handle of kabc check.
- * [#1351] Automatic generation of dbus interfaces in makefile
- generated by cmake
- * [#1307] Implement "edit before call" in history and address book.
- * [#1344] change action_call label in call history from "call" to
- "call back".
- * [#1308] Implement Hook feature in kde client
- * Improved build system.
- * #1219 : Add address book configuration page
- * Better handling of registration to the daemon.
- * #1039 : Add tray icon in kde.
- * Issue no 1216 : Double click on item in history or address book
- causes call.
- * display peer name in call list and call history when called from
- address book.
- * Address book functionnal with photo displayed.
- * Help menu kde available but actions disappeared. All fonctions in
- view.
- * Address book functionnal but ugly and making its own sort in the
- complete address book.
- * Account choice on right click, clean out includes, page address
- book, fixed bugs...
- * Wizard, double click, context menu...
- * Removed sflphone_kde.kdevelop.filelist
- * Added account creation wizard and translated interface in english.
- * Transfer functionnal but ugly.
- * transfer not functionnal
- * Bug fixed : unholding (UNHOLD_CURRENT, UNHOLD_RECORD)
- * Commit functional for push. With install.sh
- * Before merge.
- * Problem with enable accounts. Account display increased.
- * Functional with codec order working , playDTMF.
- * Commit functional.
- * sflphone_kde/build added in .gitignore.
- * complete commit for checkout previous.
- * Commit before checkout previous version to check the display
- bug(little font everywhere...)
- * Functionnal client. Rest : history icons, config icons and
- functionalities
- * commit before merge asavard for isRecording.
- * Call and Automate fusion done and seems to work.
- * Commiting before putting Automate class in Call class.
- * Functionnal main window without recording, history, voicemail, kio
- widgets.
- * client kde avec kdevelop.
- * Config Dialog almost finished.
- * Base of QT client
-
- -- SFLphone Automatic Build System <team@sflphone.org> Tue, 23 Jun 2009 11:13:42 -0400
-
-sflphone-client-gnome (0.9.5-SYSVER) SYSTEM; urgency=low
-
- ** 0.9.5 release **
-
- * [#1060] FIx bug in chinese translation
- * [#1313] git add rtpTest.cpp rtpTest.h
- * [#1313] Add init/close rtp tests
- * [#1313] Basic instanciation of the rtp layer
- * [#1449] Gtk-Critical concerning history filters and new calls
- * [#1400] Make the match with the hostname instead of username
- * [#1324] Change status bar label for "Using %s (%s)"
- * [#1403] Icon size: 60x60 px
- * [#1403] Do not remove notification, improve icon quality
- * [#1403] Add smaller icon for gnome notifications
- * [#1403] Prevent crash when hangup && no notification
- * [#1403] Remove all actions on notifications; code refactoring
- * [#1451] Use stun.sflphone.org as default STUN server
- * [#1060] New po files - need to be translated
- * [#1060] Update french translation - Rebuild template file
- * [#1456] Add a flag to be replaced in the control files
- * [#1454] Make cppunit optional; remove from build deps in control
- files
- * [#1401] Add libexpat1-dev dependency in control files
- * [#1448] Take off these ugly debug messages
- * [#1448] fixed getTelephoneTone and getTelephoneFile() called
- repeatedly
- * [#1406] add liblog4c-dev in build-depends
- * [#1409] Restore .desktop icon
-
- -- SFLphone Automatic Build System <team@sflphone.org> Mon, 25 May 2009 11:34:48 -0400
-
-sflphone-client-gnome (0.9.5-SYSVER~rc2) SYSTEM; urgency=low
-
- ** 0.9.5 rc2 **
-
- * [#1422] Improved error message
- * [#1402] Fix pjsip build
- * [#1404] Clear GTK-Critical Bug at client startup
- * [#1422] Added automatic VM shutdown when building on more than one
- VM
- * [#1422] Fixed some issues with new changelog generation script
- * [#1422] Moved distribution update to specific file
- * [#1422] Dropped git-dch, replace by home made implementation
- * [#1402] Fix pjsip build
- * [#1404] Clear GTK-Critical Bug at client startup
- * Changes for name based dbus connection
- * Clean changelogs
- * [#1343] Gnome: Implement a callback system to handle focus on
- different widgets
- * Debus Session
- * Refactoring Python code, PEP8
- * [#1430] Get back dbus_g_proxy_new_for_name
- * [#1430] Get back DBUS_BUS_SESSION type
- * [#1430] Dbus fixed owner message binding
- * Second test with DBUS owner
- * [#1404] Gnome -> Preferences -> Hooks
- * [#1404] Gnome -> Preferences -> Recordings
- * [#1404] Call History
- * [#1404] Gnome -> Preferences -> Address Book
- * [#1404] IF the first notification option disable the second
- notification
- * Dbus with fixed owner does not automatically start the deamon
- * Add codec debug tests in pysflphone
- * [#1407] Some print info
- * [#1407] Add a scenario to pick_up action
- * Test client dbus connection to a fixed owner
- * Add python dbus test suite
- * [#1161] Modified version handling in build system
- * [#1314] Test pulse audio and audio streams connect and disconnect
- * [#1402] Add info message after configure
- * [#1402] Build the daemon with the local pjsip library (vs the
- installed one)
- * [#1009] Fix Codec Sampling Rate set to zeros
- * [#1314] Add mutex to pulse layer audio streams
- * [#1314] Refactoring pulseaudio stream to test connect disconnect
- * [#1314] Refactoring of pulselayer to test conect/disconnect
- * Add debug messages in debus calls concerning account
- * [#1314] Add some return values to audio init functions
- * [#1406] add liblog4c-dev in build-depends
- * [#1409] Restore .desktop icon
- * Bug #1405: Fix strings as requested.
- * Bug #1404: Fix strings in preferences panel.
-
- -- SFLphone Automatic Build System <team@sflphone.org> Tue, 19 May 2009 12:08:18 -0400
-
-sflphone-client-gnome (0.9.5-0ubuntu1~rc1) SYSTEM; urgency=low
-
- [ SFLphone Project ]
- * [#1262] Updated changelogs for version 0.9.5-0ubuntu1 Snapshot 2009-
- 05-05
-
- [ Emmanuel Milou ]
- * Add some python CLI client code; not really functional
- * [#1108] Fix peerHungup method for IP to IP call
-
- [ Alexandre Savard ]
- * [#1108] Correct setting of SIP contact for direct IP call
- * [#1108] SIP user agent handles incoming REFER
-
- [ Emmanuel Milou ]
- * Remove website from repository
- * Update translation
-
- [ Alexandre Savard ]
- * Sflphone icon's tooltip changed for "configured" instead of
- "registered"
-
- [ Emmanuel Milou ]
- * Update translation
-
- [ Sflphone Project ]
-
- -- Sflphone Project <sflphone@mtl.savoirfairelinux.net> Tue, 05 May 2009 19:16:13 -0400
-
-sflphone-client-gnome (0.9.5-0ubuntu1~beta) SYSTEM; urgency=low
-
- [ Julien Bonjean ]
- * Updated Eclipse stuff
- * Improved addressbook config window
- * Added sflphone Eclipse stuff
- * Implemented addressbook list server side
- * Moved dbus stuff in dbus directory
- * Updated addressbook configuration
-
- [ Emmanuel Milou ]
- * Remove unuseful installation scripts. Use apt-get build-dep sflphone
- instead
- * fix bug #1090
-
- [ Alexandre Savard ]
- * defining speex 16khz
-
- [ Emmanuel Milou ]
- * Remove unuseful file from build system
- * Start dns srv resolver
-
- [ Alexandre Savard ]
- * Basic ogg/vorbis initialization
-
- [ Emmanuel Milou ]
- * Handle incoming IP-to-IP invite correctly
-
- [ Alexandre Savard ]
- * speex wideband 16000
-
- [ Emmanuel Milou ]
- * Better handling of incoming IP to IP call
- * DNS SRV resolution functional
- * Implement IAX2 incoming URL
- * Allow user to make IP call without any accounts configured
- * Add a contextual menu to edit a number from the contacts tab
- * Add comments, tooltip and new button to the contextual menu
- * add delete event, migrate to GTK 2.16 for sexy icons
- * Resolve ticket #1118
- * Update suse spec file
- * Add phone number cleanup functions, unit tests and panel
- configuration
- * Add pertinent test that fails
- * fix dependencies for suse package
- * Add contextual edit menu in history - #1120
-
- [ Alexandre Savard ]
- * Temporary comit: make speex wideband (16 khz)
- * Temporary: shared object for speex narrow band
- * Temporary: speex narrowband and wideband coexist
-
- [ Julien Bonjean ]
- * Fixed bug when no book selected
- * Fixed addressbook related compilation warnings
- * Fixed GTK client remaining compilation warnings
- * Fixed segfault when book removed since last sflphone run
- * Fixed bug when book is unreachable (ldap error)
-
- [ Alexandre Savard ]
- * Fix codec list in audio config window
- * Active/inactive speex codec by payload
-
- [ Julien Bonjean ]
- * Updated gitignore
- * Added some comments
-
- [ Emmanuel Milou ]
- * Add callto: handler script for browsers and al.
- * Integrate test compilation in the daemon build-system
-
- [ Julien Bonjean ]
- * Fixed g_object_unref warning for pixbuf
- * Cleaned too verbose output
- * Fixed toolbar update warning
- * Added support for asynchornous books open (first shot)
-
- [ Emmanuel Milou ]
- * Add a DBus call to fetch the call details from a call ID - Ticket
- #928
-
- [ Julien Bonjean ]
- * Improved async open books
- * Fixed bug #1139
-
- [ Emmanuel Milou ]
- * Add a way to save account order
- * commit missing files
-
- [ Julien Bonjean ]
- * Introduced log4c (ticket #1162)
-
- [ Emmanuel Milou ]
- * Load/save account order functionnal - ticket #813
-
- [ Alexandre Savard ]
- * Add CELT codec (#1143)
- * Make celt frame size 256 (*1143)
-
- [ Julien Bonjean ]
- * Switched everything to log4c (ticket #1162)
- * Updated eclipse settings
-
- [ Emmanuel Milou ]
- * Restore adding account - ticket #1172
- * Add liblog4c dependecy - ticket #1179
-
- [ Alexandre Savard ]
- * Double maxAvailByte for frame size in rtp (#1143)
-
- [ Emmanuel Milou ]
- * Add User-Agent SIP header - Ticket #1173
-
- [ Julien Bonjean ]
- * Fixed autoresize issue (#708)
-
- [ Emmanuel Milou ]
- * Remove libcppuint dependency for the debian packages
- * Look for libsexy only if gtk version < 2.16 - Ticket #1116
- * Remove libsexy dependency for jaunty. ticket #1116
-
- [ Julien Bonjean ]
- * Introduced unit tests (#1146)
- * Updated gitignore
- * Fixed Makefile (#1146)
-
- [ Emmanuel Milou ]
- * [TICKET #1112] Add a test on the voice buffer to send through iax
- packets
- * Remove doublon in dependencies
- * Remove warnings from the client test framework
- * Update version number to 0.9.5~beta
- * Update build-package script
- * Add check dependency in build-deps control file field
- * Create debian files for the new sflphone-client-gnome
- * [TICKET #1212] Add Replaces field in control files
- * [TICKET #1212] Fix manpages installation path
- * [TICKET #1212] Add maintainer scripts to create alternatives
- * [#1212] Update the manpages generation - edit preinst maintainer
- script
- * [#1212] Fix reference error in manpage
- * [#1212] Add missing files on the client side
- * [#1212] Fix debian docs files - no TODO file
- * [1212] Fix manpage creation problem
- * [#1220] Generate client-side glue files and marshaller at
- compilation time
- * [#1220] Generate server-side glue files at compilation time
- * [#1212] Change binary name to sflphone-client-gnome
- * [#1212] Update .gitignore to fit the new working tree
- * [#1220] Explicitly generate glue files before building the library
- * [#1220] Compile dbus directory before audio
- * [#1212] Create sflphone-common at the root of the repository
- * [#1212] Re-add pjproject
- * [#1212] Remove Makefile from repo
- * [#1220] Fix Makefile.am
- * [#1212] New working directory functional
- * [#1212] Update .gitignore
- * [#1212] Hack to make pjsip compile..
- * [#1220] Use non-installed binary for dbusxx-xml2cpp
- * [#1212] Add descriptive files, remove unuseful scripts from tools/
-
- [ Alexandre Savard ]
- * Restore speex codecs
- * add frame size for celt (#1143)
- * add framesize to codec, independant from audiolayer (#1143)
- * use codec frame size in rtp (#1143)
- * compute fixed_codec_framesize (#1143)
- * do not resample if not required (#1143)
- * add condition on resampling for decoder (#1143)
- * add a condition on bytesAvail == 0 from mic data
- * no maximum in rtp decode (#1143)
- * compute maximum for decoding (#1143)
-
- [ Emmanuel Milou ]
- * [#1146] Implement unitary tests on the client-side
-
- [ Alexandre Savard ]
- * use float instead of int to compute max nb of sample (#1143)
- * add nbSampleMax for unresampled data (#1143)
- * make thread sleep during 5 ms insead of 20 (#1143)
- * use unix usleep (#1143)
- * 50 usecond thread!!!!! (#1143)
- * try with the smallest compression (#1143)
- * use timer set at framesize (#1143)
-
- [ Emmanuel Milou ]
- * [#1161] Restore changelog version
-
- [ Alexandre Savard ]
- * Remove celt stuff
-
- [ Emmanuel Milou ]
- * [#1161] Update changelog
- * [#1220] Add Conflicts: sflphone in debian control files
- * [#1179] Add liblog4c3 runtime dependency
- * [#1212] FIx typo error in dependency list for itnrepid
- * [#1212] FIx .desktop file to point on the right exec
- * [#1212] Modify changelog replacing tag
-
- [ Sflphone Project ]
- * "[#1262] Updated changelogs for version 0.9.5-0ubuntu1~beta"
-
- [ Emmanuel Milou ]
- * [#1212] restore changelogs
-
- [ Sflphone Project ]
- * [#1262] Updated changelogs for version 0.9.5-0ubuntu1 Snapshot 2009-
- 04-27
-
- [ Emmanuel Milou ]
- * [#1212] restore changelogs
-
- [ Sflphone Project ]
- * [#1262] Updated changelogs for version 0.9.5-0ubuntu1~beta
-
- [ Emmanuel Milou ]
- * [#1212] restore changelogs
-
- [ Sflphone Project ]
-
- -- Sflphone Project <sflphone@mtl.savoirfairelinux.net> Mon, 27 Apr 2009 17:00:03 -0400
-
-sflphone-client-gnome (0.9.4-0ubuntu2) SYSTEM; urgency=low
-
- [ Alexandre Savard ]
- * Restore speex and GSM detection
-
- [ Emmanuel Milou ]
- * Fix bug #1090
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Wed, 8 Apr 2009 11:29:15 -0500
-
-sflphone (0.9.4-0ubuntu1) SYSTEM; urgency=low
-
- [ Emmanuel Milou ]
- * Integrate DBus-c++ and libiax2 in the main build system
- * Clean up in the working repository
- * Reorder hooks configuration panel
- * Protect case when no codecs are active
- * Fix some return values
- * Add unitary tests for the hook manager (premisces)
-
- [Yun Liu]
- * Update chinese translation
-
- [Sven Werlen]
- * Update german translation
-
- [Hussein Abdallah]
- * Update russian translation
-
- [Maxime Chambreuil]
- * Update spanish translation
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Fri, 3 Apr 2009 18:29:15 -0500
-
-
-sflphone (0.9.4-rc1) SYSTEM; urgency=low
-
- [ Emmanuel Milou ]
- * Fix bug while trying to hold/unhold several simultaneous call
- * Improve address book build system
- * Implement SIP url popup on incoming call
- * Improve GTK+ panel configuration
- [ Julien Bonjean ]
- * GTK+ client refactoring
- * GTK+ clean up
- * Address book improvment
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Fri, 27 Mar 2009 18:29:15 -0500
-
-sflphone (0.9.4-0beta1) SYSTEM; urgency=low
-
- [ Alexandre Savard ]
- * Display codec used during conversation on the GUI
- * Enable/disable STUN parameters at runtime
- * Refactor search bar use
- [ Emmanuel Milou ]
- * Build system fixes
- * Implement SIP re-invite
- * Implement IP to IP call
- [ Julien Bonjean ]
- * Integrate GNOME address book based on evolution data server
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Fri, 20 Mar 2009 18:29:15 -0500
-
-
-sflphone (0.9.3-0ubuntu3) SYSTEM; urgency=low
-
- [ Alexandre Savard ]
- * Both playback and record streams in PA_STREAM_CORKED (pulseaudio)
- * Use PLUGHW device for ALSA capture
- * Functional IAX and SIP recording for voicemail
- * Use the less CPU-consuming interpolator algorithm for resampling
- * Display in GTK GUI the codec used in conversation
- * GTK GUI use ASCII instread of utf-8
- * Add record menus in GTK GUI
- * Put on hold when dialing a new number
- * AccountID's are saved in the history
-
- [ Emmanuel Milou ]
- * Integrate DBUS C++, libiax2 in the git repository
- * Update website
- * Use libspeexdsp only if available on the system
- * Updated .gitignore file
-
- [Cyrille Béraud]
- * Account assistant manager improvment
- * Add an email request when creating a new account to receive voicemails
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Sat, 14 Feb 2009 13:29:15 -0500
-
-sflphone (0.9.3-0ubuntu2) SYSTEM; urgency=low
-
- [ Emmanuel Milou ]
- * Add compilation note in README
- * Use default ALSA plugin for capture
- * Fix the ALSA capture problem one more time
- * Clean up debug messages in dbus.c
- * Add libspeexdsp dependency
- * Remove implicit declaration compilation warnings
- * Fix links in the website, add release note
- * Change capture for the website front page
- * Add alsa devel dependency in build-depends control file field
- * Clean up, indentation, try to handle latency problems in iax/pulseaudio
- * Remove pjsip generated files from the repo
- * Use the previous declared curAlias function in accountwindow
- * Fix bug in history call duration when the call fails
- * Remove runtime warning in the GTK+ client
- * Add librsvg2-common dependency to load SVG under KDE
- * Refresh .gitignore
- * Update locales files + french translation
- * Add configuration panel for future noise reduction
- * Add configuration panel for audio record module
- * Daemon less verbose; accounts don't try to access STUn options anymore
- * Fix typo in configwindow
- * Add content in the official website
- * use a GTK_STOCK icon for the record button
- * Complete description text in the assistant manager
- * Add libtool flags in client configure.ac
- * Remove unuseful dependency (snd)
- * Fix SIP transfer problems
- * Remove previous version of PJSIP from the repo
- * Upgrade PJSIP to version 1.0.1
- * Add the new website source in the repository
- * Use libspeexdsp for silence detection only if available
-
- [ Loïc Faure-Lacroix ]
- * Ajout du logo gpl3
- * Ajout des images
- * Ajout de la section screenshot pour le site
- * Ajout du favicon dans le header
- * Modification des cartes
-
- [ Alexandre Savard ]
- * Clean up <speex/libspeexdsp>
- * Small cleanup
- * Save Wave fixed
- * Fix new call button when recording
- * libspeexdsp added
- * Recording: default home folder at startup
- * Minor changes to config window
- * IAX recording fixed
- * Set / get recording path, still need some GTK for client
- * AudioRecord file name format
- * Now recording in HOME folder
-
- [ Cyrille Béraud ]
- * Fix bug in reqaccount.c
-
- [ Maxime Chambreuil ]
- * Update spanish translation
-
- [Yun Liu ]
- * Update chinese translation
-
- [ Hussein Abdallah ]
- * Update russian translation
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Sat, 14 Feb 2009 13:29:15 -0500
-
-sflphone (0.9.3-0ubuntu1) SYSTEM; urgency=low
-
- * Remove debug
- * Join thread before leaving
- * Fix implicit declaration in reqaccount
- * Add REST code to build the request to server
- * Fix GValue initialization warnings
- * Update version number, fix implicit declaration, fix GTK markup
- warnings
- * Apply patch to create custom SIP account from our own server
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Fri, 06 Feb 2009 19:17:32 -0500
-
-sflphone (0.9.2-2ubuntu9) SYSTEM; urgency=low
-
- [ Alexandre Savard ]
- * Speex audio codec preprocessing initialization
- * peer hung up segmentation fault solved
- * Stop recording when transfering
- * Terminate only one call
- * Add isRecording() function
- * Fix call_icon GTK client
- * Fix SIPCallClose() function, recorded file now close properly
- * Function terminateSIPCall added in sipvoiplink and managerimpl
- * Fix thread destructor
- * setRecordingOption function implement in audiorecord
- * Record now implemented in Call class
- * Record interface complete (on hold erase previous recording)
- * Added recButton in client
- * Added: record button related icons
- * Record button added
- * Overload AudioRecord::recData to get mic and speaker data mixed
- * Recording now in audiortp::run() method
- * Audio recording working in AudioRTP: receiveSessionForSpeaker
- * Open/close a wave file when pulse audio stream start/stop
-
- [ Emmanuel Milou ]
- * Fix path for GTK+ icons; clean up
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Thu, 05 Feb 2009 18:27:53 -0500
-
-sflphone (0.9.2-2ubuntu8) SYSTEM; urgency=low
-
- [ Emmanuel Milou ]
- * Update changelogs
- * Fix bug in merge and in Makefile.am
- * Terminate only one call
- * Disable PJsip shutdown when changing STUN parameters
- * Function terminateSIPCall added in sipvoiplink and managerimpl
- * Add a timer to the alsa thread to not jam the CPU load
- * Fix bug in sipvoiplink.cpp
- * Clean shutdown of pulseaudio on quiting
- * Fix DTMF at first start with Pulseaudio
- * Remove zeroconf from the build system
- * Add a library manager + exception handling
- * Clean up in the working directory
- * Better handling of capture XRUNs
- * Restore mic adjust volume on ALSA layer
- * Protect device ALSA operation if not opened
- * Fix the switching layer bug
- * Use dynamic_cast<> to use audiolayer-specific methods
- * Open the audio devices only once at startup
- * Refactoring of the ALSA part
- * Functional plug-in manager
- * Use a C++ thread to handle tones and DTMF in ALSA
- * Restore IAXVoIPLink, restore Mutex
- * Make the plugins registering against the plugin manager
- * Migrate to 1->N relationship between voiplink and accounts
- * API plugin for registration
- * Use C++ thread in SIP, move everything in sipvoiplink
- * Complete singleton pattern for the plugin manager
- * Add -Wno-return-type compilation flag to remove warnings; Update
- version number in configure.ac
- * Add the dynamic loading for the plugin framework; integate unittest
-
- [ Yun Liu ]
- * Update rpm spec file
- * modify build package script and spec file for suse
-
- [ Alexandre Savard ]
- * Add audiorecorder plugin and testaudiorecorder
- * Add audio Recording class, edit global.h
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Wed, 04 Feb 2009 14:00:30 -0500
-
-sflphone (0.9.2-2ubuntu7) SYSTEM; urgency=low
-
- [ Emmanuel Milou ]
- * Update changelog to 0.9.2-6
- * Fix some dbus-glib implementation details on the client side
- * Init history after dbus initialization
- * Add error checking in useragent; Clean sipvoiplink
- * Prevent crash when trying to call an empty number
- * Set the volume of the playback stream to PA_VOLUME_NORM at startup
- * Fix GTK+ generic value double initialization
- * Fix jaunty control file dependency problems
- * Fix jaunty control file dependency problems
-
- [ Yun Liu ]
- * Fix bug ticket # 137
- * Tolerant to gsm library of OpenSuse 11
-
- [ Sven Werlen ]
- * Update german translation
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Fri, 23 Jan 2009 17:48:13 -0500
-
-sflphone (0.9.2-2ubuntu6) SYSTEM; urgency=low
-
- [ Emmanuel Milou ]
- * Migrate STUN configuration to the main config window
- * Update french translation
- * Other tiny memory leaks
- * Fix memory leak in sampleconverter.cpp
- * Generate packages from the release branch
- * update the build package script
- * modify the control files with architecture=any
- * Remove valgring uninitialized value
- * IAX and SIP use the same global variables to set account
- configuration ; fix broken code
-
- [ Maxime Chambreuil ]
- * Update spanish translation
-
- [ Hussein Abdallah ]
- * Update russian translation
-
- [ Yun Liu ]
- * Update translation files
- * Fix the bug when user uncheck the account which fails in the
- previous registration
- * Add stun error status
- * Fix bug ticket #143
- * Script for auto-install dependencies
- * Fix bug ticket #140
- * Fix bug ticket 141
- * Fix the reregister process when user change the details of an
- account
-
- -- Emmanuel Milou <manu@sulfur.inside.savoirfairelinux.net> Fri, 16 Jan 2009 18:19:05 -0500
-
-sflphone (0.9.2-2ubuntu5) SYSTEM; urgency=low
-
- * Fix memory leak in the pulseaudio callback
- * Update debian package generation script
- * Warnings removal in GTK+ client
- * Clean adjust volume method in alsalayer
- * Plug the sflphone playback volume control to the pulseaudio volume
- manager
- * Display the date in history according to the current locale
- * Generate the changelog according to the git commit messages
- * Complete header in chinese translation file
- * Use the right gpg key to sign the packages
- * add debian jaunty jackalope support
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Wed, 14 Jan 2009 21:17:20 -0500
-
-sflphone (0.9.2-2ubuntu4) SYSTEM; urgency=low
-
- [ Emmanuel Milou ]
- * add german translation
-
- [ Yun Liu ]
- * Fix GUI crash in Ubuntu8.10 64bit system
-
- -- Yun Liu <yun.liu@savoirfairelinux.com> Thu, 08 Jan 2009 13:08:51 -0500
-
-sflphone (0.9.2-2ubuntu3) SYSTEM; urgency=low
-
- [ Emmanuel Milou ]
- * The main thread synchronizes the ringtone thread
- * disable custom ringtone for the ALSA layer
- * Fix the Makefile.am in man directory, add a SEE ALSO section
-
- [ Yun Liu ]
- * Fix daemon crash caused by the previous patch ( for bug ticket #129)
-
- -- Yun Liu <yun.liu@savoirfairelinux.com> Tue, 06 Jan 2009 16:18:38 -0500
-
-sflphone (0.9.2-2ubuntu2) SYSTEM; urgency=low
-
- * Fix bug ticket #129
-
- -- Yun Liu <yun.liu@savoirfairelinux.com> Wed, 5 Jan 2009 15:54:53 -0500
-
-sflphone (0.9.2-2ubuntu1) SYSTEM; urgency=low
-
- * Migrate from eXosip library to pjsip
- * Add multiple SIP accounts support
- * Fix ringtones problems
- * Add a pulseaudio support
- * Improve audio quality with ALSA
- * Add chinese translation
- * Improve spanish translation
- * Migrate to a maintained C++ DBus bindings
- * Clean and improve the build system
- * Add build-dependency on Perl because we need pod2man to generate manpages
-
- -- Yun Liu <yun.liu@savoirfairelinux.com> Wed, 26 Nov 2008 09:47:53 -0500
-
-sflphone (0.9.1) unstable; urgency=low
- * Add a search tool in the history
- * Migrate some gtk_entry_new to sexy_icon_entry_new
- * Bug fix (Ticket #78): The voicemail password isn't displayed anymore in
- the history tab
- * Add the SIP registration expire value in the user file.
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Thu, 22 May 2008 11:14:25 -0500
-
-sflphone (0.9.0) unstable; urgency=low
- * Add history features
- * Call date
- * Call duration
- * Mouse events in the history tab
- * Smooth switch from the history tab to the calls tab
- * Remove most of GTK-Critical warnings
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Wed, 13 May 2008 16:58:25 -0500
-
-sflphone (0.9-2008-06-06) unstable; urgency=low
- * Audio bug correction: capture stopped after a few minutes of conversation
- with USB Plantronics sound card
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Tue, 06 May 2008 16:58:25 -0500
-
-sflphone (0.9-2008-05-06) unstable; urgency=low
- * Bug correction: account creation with the assistant
- * GTK+ warnings removal
- * libnotify warnings removal
- * Remove aliasing on the SFLphone logo
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Mon, 05 May 2008 16:58:25 -0500
-
-sflphone (0.9) unstable; urgency=low
- * Clean dependencies ( removal of libboost )
- * Several GTK improvement and updates
- -account window
- -configuration window
- * Migrate from GtkCheckMenuItem to GtkImageMenuItem
- * ALSA standard I/O transfers: MMAP instead of R/W
- * Fix speex audio quality
- * IAX2 protocol
- -Fix hold/unhold situation
- -Add on hold music
- * SIP protocol
- -Ringtone on incoming call
- -Fix transfer situation
- * Add desktop notification ( libnotify )
- * Improve the system tray icon behaviour
- * Improve registration error handling
- * Register/unregister from the account window takes effect without starting back SFLphone
- * Compilation warnings removal
- * Call history
- * Add an account configuration wizard
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Wed, 30 Apr 2008 16:58:25 -0500
-
-sflphone (0.8.2) unstable; urgency=low
- * Internationalization of the GTK GUI
- * English / French
- * STUN support
- * Slight modifications of the graphical interface ( tooltips, dialpad, ...)
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Fri, 21 Mar 2008 11:37:53 -0500
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/compat b/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/compat
deleted file mode 100644
index 7ed6ff82de6bcc2a78243fc9c54d3ef5ac14da69..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/compat
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/control.hardy b/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/control.hardy
deleted file mode 100644
index 95d2f2538cd8be56f006cbd7786f5cfa5827d151..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/control.hardy
+++ /dev/null
@@ -1,20 +0,0 @@
-Source: sflphone-client-gnome
-Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
-Section: gnome
-Priority: optional
-Build-Depends: debhelper (>= 5), libgcc1, autoconf, automake, libtool, libgtk2.0-dev, libsexy-dev, libdbus-glib-1-dev, libnotify-dev, libebook1.2-dev, check, liblog4c-dev
-Standards-Version: 3.7.3
-
-Package: sflphone-client-gnome
-Priority: optional
-Architecture: any
-Depends: sflphone-common (=VERSION), libdbus-glib-1-2 (>= 0.73), libgtk2.0-0 , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0), libdbus-glib-1-2, libnotify1 (>= 0.4), libsexy2 (>= 0.1), librsvg2-common (>=2.22.2), liblog4c3
-Replaces: sflphone
-Conflicts: sflphone
-Homepage: http://www.sflphone.org
-Description: GNOME client for SFLphone
- Provide a GNOME client to SFLphone.
- SFLphone is meant to be a robust enterprise-class desktop phone.
- SFLphone is released under the GNU General Public License.
- SFLphone is being developed by the global community, and maintained by
- Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/control.intrepid b/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/control.intrepid
deleted file mode 100644
index 17532c599e32e945949bab117cfae731a9ee1fe5..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/control.intrepid
+++ /dev/null
@@ -1,20 +0,0 @@
-Source: sflphone-client-gnome
-Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
-Section: gnome
-Priority: optional
-Build-Depends: debhelper (>= 5), libgcc1, autoconf, libtool, libgtk2.0-dev, libsexy-dev, libdbus-glib-1-dev, libnotify-dev, libebook1.2-dev, check, liblog4c-dev
-Standards-Version: 3.8.0
-
-Package: sflphone-client-gnome
-Priority: optional
-Architecture: any
-Depends: sflphone-common (=VERSION), libdbus-glib-1-2 (>= 0.73), libgtk2.0-0 , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0), libdbus-glib-1-2, libnotify1 (>= 0.4), libsexy2 (>= 0.1), librsvg2-common (>= 2.22.2), liblog4c3
-Replaces: sflphone
-Conflicts: sflphone
-Homepage: http://www.sflphone.org
-Description: GNOME client for SFLphone
- Provide a GNOME client to SFLphone.
- SFLphone is meant to be a robust enterprise-class desktop phone.
- SFLphone is released under the GNU General Public License.
- SFLphone is being developed by the global community, and maintained by
- Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/control.jaunty b/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/control.jaunty
deleted file mode 100644
index 9b9c3130e5190b424c6d087f45894faccc4a180e..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/control.jaunty
+++ /dev/null
@@ -1,20 +0,0 @@
-Source: sflphone-client-gnome
-Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
-Section: gnome
-Priority: optional
-Build-Depends: debhelper (>= 5), libgcc1, autoconf, automake, libtool, libgtk2.0-dev (>=2.16), libdbus-glib-1-dev, libnotify-dev, libebook1.2-dev, check, liblog4c-dev, libgnomeui-dev
-Standards-Version: 3.7.3
-
-Package: sflphone-client-gnome
-Priority: optional
-Architecture: any
-Depends: sflphone-common (=VERSION), libdbus-glib-1-2 (>= 0.73), libgtk2.0-0 (>=2.16) , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0) ,libdbus-glib-1-2, libnotify1 (>= 0.4), librsvg2-common (>=2.22.2), liblog4c3
-Replaces: sflphone
-Conflicts: sflphone
-Homepage: http://www.sflphone.org
-Description: GNOME client for SFLphone
- Provide a GNOME client for SFLphone.
- SFLphone is meant to be a robust enterprise-class desktop phone.
- SFLphone is released under the GNU General Public License.
- SFLphone is being developed by the global community, and maintained by
- Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/copyright b/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/copyright
deleted file mode 100644
index fbde2314bef1fb7ee643083e6d27c397213c5ead..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/copyright
+++ /dev/null
@@ -1,28 +0,0 @@
-This package was debianized by Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> on
-Fri, 3 Apr 2009 09:47:53 -0500.
-
-It was downloaded from the git repository of SFLphone: git://sflphone.org/git/sflphone.git
-
-Upstream Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
-
-Copyright:
-
-Savoir-Faire Linux Inc.
-
-License:
-
-This software is copyright (c) 2004-2009 Savoir-Faire Linux inc.
-
-You are free to distribute this software under the terms of
-the GNU General Public License version 3.
-On Debian systems, the complete text of the GNU General Public
-License can be found in the file `/usr/share/common-licenses/GPL'.
-
-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., 51 Franklyn St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/cron.d b/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/cron.d
deleted file mode 100644
index d11e61177739b56bce3aac6de6483b48e797a258..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/cron.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Regular cron jobs for the sflphone package
-#
-0 4 * * * root sflphone_maintenance
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/dirs b/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/dirs
deleted file mode 100644
index e2dc98dcb24907fb5a7ceb0f0651276b702d6030..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/dirs
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/bin
-usr/share/applications
-usr/share/pixmaps
-usr/share/sflphone
-usr/share/locale
-usr/share/doc
-usr/share/man
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/docs b/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/docs
deleted file mode 100644
index 9830da213fdb4baf4d68538e8c8e490248e209e1..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/docs
+++ /dev/null
@@ -1,5 +0,0 @@
-NEWS
-README
-ChangeLog
-AUTHORS
-
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/manpages b/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/manpages
deleted file mode 100644
index 7e7594591214b5e3a4c8134fabe9696c84b04907..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/sflphone-client-gnome/usr/share/man/man1/sflphone-client-gnome.1
-debian/sflphone-client-gnome/usr/share/man/man1/sflphone.1
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/postinst b/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/postinst
deleted file mode 100644
index ebee7fa2bb049bf0e6f826e28569d05cb51d451a..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/postinst
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-update-alternatives --install /usr/bin/sflphone sflphone /usr/bin/sflphone-client-gnome 100 \
- --slave /usr/share/man/man1/sflphone.1.gz sflphone.1.gz \
- /usr/share/man/man1/sflphone-client-gnome.1.gz
-
-exit 0
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/postrm b/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/postrm
deleted file mode 100644
index 70be710bd108ddadbfa790f9ac8795984cc139f8..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/postrm
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-# postrm script for sflphone
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <postrm> `remove'
-# * <postrm> `purge'
-# * <old-postrm> `upgrade' <new-version>
-# * <new-postrm> `failed-upgrade' <old-version>
-# * <new-postrm> `abort-install'
-# * <new-postrm> `abort-install' <old-version>
-# * <new-postrm> `abort-upgrade' <old-version>
-# * <disappearer's-postrm> `disappear' <overwriter>
-# <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-if [ "$1" = "purge" ]
-then
-
- # remove the user config file
- rm -f $HOME/.sflphone/sflphonedrc
-
-fi
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/preinst b/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/preinst
deleted file mode 100644
index ab8a90ca579f3b7038e8262b6fe5bede8a85fed0..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/preinst
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-# postrm script for sflphone
-#
-# see: dh_installdeb(1)
-
-set -e
-
-package=sflphone-client-gnome
-
-case "$1" in
- install|upgrade)
- ## Clean up the previous manpage
- if [ -f /usr/share/man/man1/sflphone-gtk.1 ]; then
- rm /usr/share/man/man1/sflphone-gtk.1
- fi
- ;;
-esac
-
-exit 0
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/prerm b/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/prerm
deleted file mode 100644
index 5e9021706875bb08a56c8c54f35cef96a7ca6055..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/prerm
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-
-if [ "$1" = "remove" ]; then
- # Remove alternatives symlink set in postinst
- update-alternatives --remove sflphone /usr/bin/sflphone
-fi
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/rules b/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/rules
deleted file mode 100755
index 3ff2428272f3b35249ff95daa41673cc04a559b7..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-gnome/rules
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-export DH_OPTIONS
-
-package=sflphone-client-gnome
-
-CXX = g++-4.0
-CFLAGS = -Wall -g
-DEB_INSTALL_MANPAGES_sflphone_client_gnome = sflphone.1 sflphone-client-gnome.1
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
- ./autogen.sh
- ./configure --prefix=/usr
- touch configure-stamp
-
-
-#Architecture
-build: build-arch build-indep
-
-build-arch: build-arch-stamp
-build-arch-stamp: configure-stamp
-
- # Add here commands to compile the arch part of the package.
- $(MAKE)
- touch $@
-
-build-indep: build-indep-stamp
-build-indep-stamp: configure-stamp
-
- # Add here commands to compile the indep part of the package.
- #$(MAKE) doc
- touch $@
-clean:
- dh_testdir
- dh_testroot
- rm -f build-arch-stamp build-indep-stamp configure-stamp
- # Add here commands to clean up after the build process.
- [ ! -f Makefile ] || $(MAKE) distclean
-
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
- dh_clean
-
-install: install-indep install-arch
-install-indep:
- dh_testdir
- dh_testroot
- dh_clean -k -i
- dh_installdirs -i
- # Add here commands to install the package into debian/sflphone.
-
-install-arch:
- dh_testdir
- dh_testroot
- dh_clean -k -s
- dh_installdirs -s
- # Add here commands to install the arch part of the package into
- # debian/tmp.
- $(MAKE) DESTDIR=$(CURDIR)/debian/$(package) install
- dh_install -s
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
-
-binary-common:
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_python
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_perl
- dh_makeshlibs
- dh_installdeb
-# dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
- $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
-
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/changelog b/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/changelog
deleted file mode 100644
index d59275102a6fe917817c2192bb7f50b4875c64d1..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/changelog
+++ /dev/null
@@ -1,1284 +0,0 @@
-sflphone-client-kde (0.9.6-SYSVER) SYSTEM; urgency=low
-
- ** 0.9.6 **
-
- * Documentation on echo test
- * [redmine_down] codec names not displayed in total
- * [redmine_down] crash when hanging up a dialing call because tries to
- add it to history whereas no starttime
- * [#1927] alternate every time screen changed to call history
- * [#1886] clean code
- * [#1886] debug messages when loading history removed
- * [redmine_down] sflphone-kde icons
- * [#1855] Update language files
- * [#1502] Update version number
- * [redmine_down] setHistory at close
- * [#redmine_down] Handle PJ_DECLINE_SC as failure
- * [#1923] Fix segmentation fault when adding a new account
- * [#1923] Check on iterator before setting the config
- * [#1904] Added mnemonic to tabs in sflphone-client-gnome.
- * [#1905] The daemon was not sending the currentSelectedCodec signal
- on dbus when answering a call.
- * [#1922] Default values set to all account details
- * [#1886] Spinbox reg expire enables apply, and address book is not
- visible when disabled
- * [#1905] Bug fix for segmentation fault caused by an empty string,
- * [#1910] Warnings in test directory
- * [#1919] Error fixed
- * [#1855] Update russian translation - Hussein Abdallah
- * [#1910] Remove files
- * [#1919] fixed
- * [#1777] Code indentation
- * [#1918] fixed
- * [#1917] fixed
- * [#1910] Remove warnings compilation in src
- * [#1886] removed AccountListModel in configskeleton
- * [#1914]
- * [#1911] check previous and new port
- * [#1910] Remove compilation warnings in src/dbus and src/history
- * [#1910] Remove compilation warnings in src/audio
- * [1855] Update german translation - Sven Werlen
- * [#1909] removed
- * [#1906] Done
- * [#1904] The registration expire value is now configurable from the
- * Cleaned up debug messages.
- * [#1886] separated initCallItem in two functions
- * [#1886] reversed error in commit
- * [#1886] clean debug
- * [#1886] changed Name of classes and files
- * [#1886] clean
- * [#1870] In call_state_cb (dbus.c:126), _time_stop was overridden by
- the actual time.
- * [#1884] Added some new gpg flags to prevent tty warnings
- * [#1886] Clean audio config dialog
- * [#1886] No more compile warnings. + 1 comm
- * [#1872] Check if the user input is smaller than PJ_MAX_HOSTNAME.
- * [#1886]
- * [#1785] Fixed build when no new commit
- * [#1852] If chosen by the user, the hostname can now be solved and
- used
- * [#1871] * and # inverted back
- * [#1869] Conditional compilation that checks if
- * [#1309] removed test in main
- * [#1425] Put actions in SFLPhone window class instead of ui view,
- made a separate toolbar for screens.
-
- -- SFLphone Automatic Build System <team@sflphone.org> Mon, 27 Jul 2009 09:53:37 -0400
-
-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 **
-
- * spec files for mandriva and opensuse updated with buildrequires
- libqt4-dev >=4.3
- * [#1700] Cannot build on ubuntu 8.10 and a few other distribs
- * [#1502] Update version number where applicable
- * [#1642] Update client icons
- * [#1450] Clean up useless debug and comments in sipvoiplink and
- audiortp
- * [#1450] Remove Semaphore object in AudioRtp thread deletion
- * [#1450] Audio RTP init now synchronized with Sip/SDP
- * [#1693] kde client crashes when changing codecs order/activation
- * [#1450] Deep refactoring of audiortp
- * [#1450] setRtpSessionRemoteIp
- * [#1689] getCallList at start
- * [#1224] Change path in package files
- * [#1450] Audio RTP initialized only once, payload and remote ip set
- at runtime
- * [#1450] Add setRtpSessionMedia and setRtpSessionRemoteIp address
- * [#1642] Make GNOME GUI fresher and younger ;)
- * [#1686] Status bar displaying used account
- * added sflphone-kde icon so that it compiles
- * [#1659] Ending a call causes the daemon to crash
- * corrected introspection XMLs, po files...
- * [#1211] g722 media descriptor in codecDescriptor
- * [#1310] Install sflphoned in $(prefix)/lib/sflphone
- * [#1502] Do not install test binaries and dbus utilitaries
- * [#1224] hack for pjsip build system!
- * [#1224] Remove pjsip binaries from repo
- * [#1224] Upgrade to pjsip 1.0.2
- * [#1658] About SFLphone (bugs)
- * [#1658] About SFLphone
- * [#1660] Displaying all dialed numbers in a call
- * Tested status bar.
- * [#790] Optimize pulse audio streams parameters
- * [#1678] Some usefull debug messages for mutex/semaphore deadlock
- problem
- * [#1669] Add/remove some usefull/unusefull debug
- * [#1665] Fix latency related to pulse audio stream openning/closing
- * [#1457] Make the menus and panels accessible in french
- * [#1457] Improve broken keyboard accessibility in menus and conf
- panels
- * [#961] Instanciate only once the searchbar icons
- * [#961] Restore transfer fonction
- * [#961] Filter on the history type OK
- * [#961] Fix compilation problems on hardy/intrepid
- * [#1157] Commit missing files
- * [#790] Reduce number of start/stop streams call on pulse audio
- * [#1639] kde client crashes when no account registered
- * [#1620] Fix the searchbar
- * [#1620] Get back caltree as it was during gtkcritical area
- * [#1620] Add history filter reinit function
- * [#1335] Add a missing label in address book preferences
- * [#1561] Update russian translation - Hussein Abdallah
- * [#1605] Fix edit menu french translation
- * [#961] Enable to search in the history according to the call type
- * [#1449] Searchbar does not work anymore
- * [#961] Add popup menu on the entry primary icon for history
- * [#1317] Fixed KDE client package dependency
- * [#936] speex 32 khz integration completed
- * [#936] Use 320 frame size
- * [#936] Test using a frame size at 320 smpls
- * [#1214] Enable / Disable history
- * [#1607] Fix compilation problem for ubuntu 8.10 (libsexy)
- * [#1313] Implement processDataEncode processDataDecode in audiortp
- * [#1613] codec list order can't be set
- * Better handling of localisation + added languages + corrected
- warnings + begginning of new config dialog with kconfig + 14px
- account leds
- * [#1214] Save and load history according to the limit timestamp +
- unit tests
- * [1609] Fix call number copy/paste feature
- * [1607] Restore clear action icon in searchbar
- * [#936] Try to decode using 1280 samples
- * [#936] Add some debug
- * [#936] Add .cpp file
- * [#936] Oops Forgot speex 32 khz
- * [#1214] Add configuration panel for history + D-Bus calls
- * [#1313] Test rtp thread function, frame size, nbbytes, resampling
- * [#790] Flush audio data before closing audio streams
- * [#1214] History displays local time
- * [#1214] Skip empty field on display
- * [#1214] Associate an account to an history entry
- * [#1342] Get addressbook options sensitive/non-sensitive
- * [#1211] Clean up and comments
- * [#1211] Get back to 20 ms framesize
- * [#1211] Use sendImmediate instead of putData in RTP
- * [#1211] Fix nb byte available in RTP
- * [#1211] Clear condition on maxNbSamples in RTP
- * [#1211] Fix max byte available in RTP session
- * [#1211] G722: Use 160 samples per frame instead of 320
- * [#1211] Test using a dynamic payload
- * [#1211] Test using a dynamic payload type
- * [#1211] Rename size variable (nb_samples, nb_bytes)
- * [#1211] Test g722 ip-to-ip sending twice the data lenth
- * [#1211] Test g722 ip-to-ip
- * [#1214] Do not select an history item by default at startup
- * [#1214] Remove some compilation warnings
- * [#1214] Handle empty field - remove g_print
- * [#1214] Add each history item only once
- * [#1214] Handle call timestamps properlier
- * [#1214] Do not need timestamp files anymore
- * [#1214] Use the saved date for history entry
- * Clean up
- * [#1214] Client doesn't crash if the D-Bus call fails
- * [#1214] Client is able to save its history - still some glitches
- * [#1211] Forgot 16000 for g722
- * [#1211] G722 initialization
- * [#1214] Save name/number, successfully load the history if no fields
- are empty
- * [#1499] Fixed destination directory bug
- * [#1214] Restore all the functionalities; peer name/number way more
- easy to handle !!
- * [#1214] Add callable_object instead of call_t, refactoring
- * [#1211] Test with polycom soundstation 16000
- * [#1211] Remove C like inline function in g722 codec
- * [#1342] Finalize gnome client preference window formating
- * [#1214] Retrieve the history when the gnome client startsup
- * [#1306] Implement localization for KDE client
- * [#1593] enable accounts apply button when account checked/unchecked
- * [#1214] Implement the dbus calls on server side
- * [#1214] Add serialized/unserialized functions to pass data on DBUS
- * [#1342] Formating gnome client configuration windows
- * [#1214] Save sucessfully a map of history items
- * [#1499] Removed multiple jobs compilation for KDE client (2)
- * [#1214] Load history from file into memory, add unit tests
- * [#1534] Throws a length_error exception in case URL exceeds
- std::string max_size
- * [#1499] Removed multiple jobs compilation for KDE client
- * [#1565] make account leds smaller
- * [1430] Fix dbus debug
- * [#1562] crashes when trying to change item of a call of state "OVER"
- * [#1116] Fix compilation bug
- * [#1317] Added mandriva and opensuse-11 64 bits
- * [#1108] Add messges in main window concerning transfer success
- failure
- * [#1116] Fix compilation problems
- * [#1211] g722 Makefile
- * [#1108] Client side transferFailed/trasferSucceded signals handling
- * [#1211] G722 mostly completed,
- * [#1555] make bigger toolbar (24x24)
- * [#1551] remove default mailbox number in wizard and disable mailbox
- button when first account doesn't have mailbox number
- * [#1342] Re-add sflphone manpages
- * [#1116] Fix compilation on non-jaunty distros
- * [#1317] Fixed opensuse startup sleep
- * [#1108] Add a signal in the client to notify successful or failed
- transfer
- * [#1108] Dbus signals concerning call transfer success/failure
- * [#1317] Added opensuse to automatic build system
- * [#1223] Fix manpages bug
- * [#1060] german translation glitch
- * Clean up some gnome client warnings
- * [#1547] replace ugly account leds by beautiful icons
- * [#1548] add close button that hides windowand just hide on clicking
- the cross
- * [#1549] put introspec XMLs in the client's source
- * [#1312] Implement getCallList D-BUS method
- * [#1116] Clear text in history and contacts
- * [#1499] KDE integration
- * [#1469] Modify header linkers in dbus-c++'s Makefile.am's
- * [#1469] Remove examples folder from dbus-c++
- * [#1214] History integration in build system; unit test squeleton
- * [#1317] Cleaning
- * [#1469] Remove configure stuff in dbus-c++
- * [#1469] Add unofficial mainline dbus-c++
- * [#1469] Remove dbus-c++ from freedesktop
- * [#1430] Bring account changed signal/callback back to normal
- * [#1060] Update german translation - Sven Werlen
- * [#1430] Add marshaller one string define
- * [#1430] Send account change signal broadcast using account id
- * [#1430] Remove condition on setRegistrationState, cause stun to
- crash
- * [#1317] Centralized version handling
- * [#1317] Fixed version number on sfl-git-dch
- * [#1317] Refactoring for new distributions
- * [#1215] Fix account order at startup if latency
- * [#1088] Restore sip dns srv
- * [#1214] Add squeleton for history manager
- * [#1430] Add accout id to accout changed method
- * [#1430] No connectionStatusNotification (account changed) if no
- changes
- * [#1538] Add COPYING file
- * [#1430] Add audio rtp thread tests
- * [#1317] Changed version detection
- * [#1538] Document license in libs/stund
- * [#1317] Added version files
- * [#1538] Apply François patches - debian packages
- * [#1317] Updated spec files
- * add files
- * [#1538] Apply François patches - debian packages
- * [#1535] Change program file structure (directory src...)
- * [#1317] Updated build system scripts
- * [#1317] Cleaning
- * [#1317] Copied introspect files to gnome client
- * [#1317] Added opensuse to build-system : first-shot
- * [#1317] Remove spec files from configure
- * [#1317] Added missing prefix
- * removed debug for daemon account fix
- * [#1430] Add a connection reference which most likely belong to
- libdbus
- * [#1430] Use shared connection instead of private
- * make daemon find the account, added userMatch
- * Clean code, add comments...
- * [#1317] Fixed packaging rules
- * [#1317] Updated autogen
- * Updated autogen.sh for pjsip
- * [#1526] Set accounts order
- * [#1317] Fixed pjsip lib dirs
- * [#1317] Updated debian packaging for new pjsip configuration script
- * [#1317] Switch to autogenerated guess and sub files
- * [#1317] Updated pjsip inclusion in build system
- * [#1317] Replaced pjsip guess and sub files
- * [#1317] Fixed compilation issues on opensuse 11
- * [#1505] account list seem to crash the application when clicking
- Apply very fast...
- * [#1456] Add a flag to be replaced in the control files
- * [#1456] Added version dependancy handling
- * put account alias in AccountWidgetItem rather than in the item with
- " " before.
- * [#1034] The KDE client should start sflphoned if it is not started
- * [#1500] Handle options for notifications and display on incoming
- call.
- * [#1443] Client should not crash when receive an unexpected
- stateChanged signal
- * [#1403] Do not stop the notification anymore
- * [#1456] Added version dependancy handling
- * [#1426] Daemon crashes when get alsa plugin
- * [#1422] Improved error messages
- * commit for merge
- * [#1424] Change logo in tray icon and put a different one when
- incoming call
- * [#1425] first part done, window title...
- * [#1413] add manpages creating and installing in build system
- * [#1417] The client should start the account creation wizard if
- started for the first time (if config file doesn't exist)
- * [#1421] Make volume bars horizontal when dialpad is hidden.
- * Changed main window title and fixed a mistake in sflphone_const.h
- * [#1412] make debian package building work
- * changelog changed.
- * Changed addAccount method in gnome client.
- * Debian and man folders added.
- * [#1388] Change project name from sflphone_kde to sflphone-client-kde
- * Better handle of kabc check.
- * [#1351] Automatic generation of dbus interfaces in makefile
- generated by cmake
- * [#1307] Implement "edit before call" in history and address book.
- * [#1344] change action_call label in call history from "call" to
- "call back".
- * [#1308] Implement Hook feature in kde client
- * Improved build system.
- * #1219 : Add address book configuration page
- * Better handling of registration to the daemon.
- * #1039 : Add tray icon in kde.
- * Issue no 1216 : Double click on item in history or address book
- causes call.
- * display peer name in call list and call history when called from
- address book.
- * Address book functionnal with photo displayed.
- * Help menu kde available but actions disappeared. All fonctions in
- view.
- * Address book functionnal but ugly and making its own sort in the
- complete address book.
- * Account choice on right click, clean out includes, page address
- book, fixed bugs...
- * Wizard, double click, context menu...
- * Removed sflphone_kde.kdevelop.filelist
- * Added account creation wizard and translated interface in english.
- * Transfer functionnal but ugly.
- * transfer not functionnal
- * Bug fixed : unholding (UNHOLD_CURRENT, UNHOLD_RECORD)
- * Commit functional for push. With install.sh
- * Before merge.
- * Problem with enable accounts. Account display increased.
- * Functional with codec order working , playDTMF.
- * Commit functional.
- * sflphone_kde/build added in .gitignore.
- * complete commit for checkout previous.
- * Commit before checkout previous version to check the display
- bug(little font everywhere...)
- * Functionnal client. Rest : history icons, config icons and
- functionalities
- * commit before merge asavard for isRecording.
- * Call and Automate fusion done and seems to work.
- * Commiting before putting Automate class in Call class.
- * Functionnal main window without recording, history, voicemail, kio
- widgets.
- * client kde avec kdevelop.
- * Config Dialog almost finished.
- * Base of QT client
-
- -- SFLphone Automatic Build System <team@sflphone.org> Tue, 23 Jun 2009 11:15:26 -0400
-
-sflphone-client-kde (0.9.5-SYSVER) SYSTEM; urgency=low
-
- ** 0.9.5 release **
-
- * [#1060] FIx bug in chinese translation
- * [#1313] git add rtpTest.cpp rtpTest.h
- * [#1313] Add init/close rtp tests
- * [#1313] Basic instanciation of the rtp layer
- * [#1449] Gtk-Critical concerning history filters and new calls
- * [#1400] Make the match with the hostname instead of username
- * [#1324] Change status bar label for "Using %s (%s)"
- * [#1403] Icon size: 60x60 px
- * [#1403] Do not remove notification, improve icon quality
- * [#1403] Add smaller icon for gnome notifications
- * [#1403] Prevent crash when hangup && no notification
- * [#1403] Remove all actions on notifications; code refactoring
- * [#1451] Use stun.sflphone.org as default STUN server
- * [#1060] New po files - need to be translated
- * [#1060] Update french translation - Rebuild template file
- * [#1456] Add a flag to be replaced in the control files
- * [#1454] Make cppunit optional; remove from build deps in control
- files
- * [#1401] Add libexpat1-dev dependency in control files
- * [#1448] Take off these ugly debug messages
- * [#1448] fixed getTelephoneTone and getTelephoneFile() called
- repeatedly
- * [#1406] add liblog4c-dev in build-depends
- * [#1409] Restore .desktop icon
-
- -- SFLphone Automatic Build System <team@sflphone.org> Mon, 25 May 2009 11:34:48 -0400
-
-sflphone-client-kde (0.9.5-SYSVER~rc2) SYSTEM; urgency=low
-
- ** 0.9.5 rc2 **
-
- * [#1422] Improved error message
- * [#1402] Fix pjsip build
- * [#1404] Clear GTK-Critical Bug at client startup
- * [#1422] Added automatic VM shutdown when building on more than one
- VM
- * [#1422] Fixed some issues with new changelog generation script
- * [#1422] Moved distribution update to specific file
- * [#1422] Dropped git-dch, replace by home made implementation
- * [#1402] Fix pjsip build
- * [#1404] Clear GTK-Critical Bug at client startup
- * Changes for name based dbus connection
- * Clean changelogs
- * [#1343] Gnome: Implement a callback system to handle focus on
- different widgets
- * Debus Session
- * Refactoring Python code, PEP8
- * [#1430] Get back dbus_g_proxy_new_for_name
- * [#1430] Get back DBUS_BUS_SESSION type
- * [#1430] Dbus fixed owner message binding
- * Second test with DBUS owner
- * [#1404] Gnome -> Preferences -> Hooks
- * [#1404] Gnome -> Preferences -> Recordings
- * [#1404] Call History
- * [#1404] Gnome -> Preferences -> Address Book
- * [#1404] IF the first notification option disable the second
- notification
- * Dbus with fixed owner does not automatically start the deamon
- * Add codec debug tests in pysflphone
- * [#1407] Some print info
- * [#1407] Add a scenario to pick_up action
- * Test client dbus connection to a fixed owner
- * Add python dbus test suite
- * [#1161] Modified version handling in build system
- * [#1314] Test pulse audio and audio streams connect and disconnect
- * [#1402] Add info message after configure
- * [#1402] Build the daemon with the local pjsip library (vs the
- installed one)
- * [#1009] Fix Codec Sampling Rate set to zeros
- * [#1314] Add mutex to pulse layer audio streams
- * [#1314] Refactoring pulseaudio stream to test connect disconnect
- * [#1314] Refactoring of pulselayer to test conect/disconnect
- * Add debug messages in debus calls concerning account
- * [#1314] Add some return values to audio init functions
- * [#1406] add liblog4c-dev in build-depends
- * [#1409] Restore .desktop icon
- * Bug #1405: Fix strings as requested.
- * Bug #1404: Fix strings in preferences panel.
-
- -- SFLphone Automatic Build System <team@sflphone.org> Tue, 19 May 2009 12:08:18 -0400
-
-sflphone-client-kde (0.9.5-0ubuntu1~rc1) SYSTEM; urgency=low
-
- [ SFLphone Project ]
- * [#1262] Updated changelogs for version 0.9.5-0ubuntu1 Snapshot 2009-
- 05-05
-
- [ Emmanuel Milou ]
- * Add some python CLI client code; not really functional
- * [#1108] Fix peerHungup method for IP to IP call
-
- [ Alexandre Savard ]
- * [#1108] Correct setting of SIP contact for direct IP call
- * [#1108] SIP user agent handles incoming REFER
-
- [ Emmanuel Milou ]
- * Remove website from repository
- * Update translation
-
- [ Alexandre Savard ]
- * Sflphone icon's tooltip changed for "configured" instead of
- "registered"
-
- [ Emmanuel Milou ]
- * Update translation
-
- [ Sflphone Project ]
-
- -- Sflphone Project <sflphone@mtl.savoirfairelinux.net> Tue, 05 May 2009 19:16:13 -0400
-
-sflphone-client-kde (0.9.5-0ubuntu1~beta) SYSTEM; urgency=low
-
- [ Julien Bonjean ]
- * Updated Eclipse stuff
- * Improved addressbook config window
- * Added sflphone Eclipse stuff
- * Implemented addressbook list server side
- * Moved dbus stuff in dbus directory
- * Updated addressbook configuration
-
- [ Emmanuel Milou ]
- * Remove unuseful installation scripts. Use apt-get build-dep sflphone
- instead
- * fix bug #1090
-
- [ Alexandre Savard ]
- * defining speex 16khz
-
- [ Emmanuel Milou ]
- * Remove unuseful file from build system
- * Start dns srv resolver
-
- [ Alexandre Savard ]
- * Basic ogg/vorbis initialization
-
- [ Emmanuel Milou ]
- * Handle incoming IP-to-IP invite correctly
-
- [ Alexandre Savard ]
- * speex wideband 16000
-
- [ Emmanuel Milou ]
- * Better handling of incoming IP to IP call
- * DNS SRV resolution functional
- * Implement IAX2 incoming URL
- * Allow user to make IP call without any accounts configured
- * Add a contextual menu to edit a number from the contacts tab
- * Add comments, tooltip and new button to the contextual menu
- * add delete event, migrate to GTK 2.16 for sexy icons
- * Resolve ticket #1118
- * Update suse spec file
- * Add phone number cleanup functions, unit tests and panel
- configuration
- * Add pertinent test that fails
- * fix dependencies for suse package
- * Add contextual edit menu in history - #1120
-
- [ Alexandre Savard ]
- * Temporary comit: make speex wideband (16 khz)
- * Temporary: shared object for speex narrow band
- * Temporary: speex narrowband and wideband coexist
-
- [ Julien Bonjean ]
- * Fixed bug when no book selected
- * Fixed addressbook related compilation warnings
- * Fixed GTK client remaining compilation warnings
- * Fixed segfault when book removed since last sflphone run
- * Fixed bug when book is unreachable (ldap error)
-
- [ Alexandre Savard ]
- * Fix codec list in audio config window
- * Active/inactive speex codec by payload
-
- [ Julien Bonjean ]
- * Updated gitignore
- * Added some comments
-
- [ Emmanuel Milou ]
- * Add callto: handler script for browsers and al.
- * Integrate test compilation in the daemon build-system
-
- [ Julien Bonjean ]
- * Fixed g_object_unref warning for pixbuf
- * Cleaned too verbose output
- * Fixed toolbar update warning
- * Added support for asynchornous books open (first shot)
-
- [ Emmanuel Milou ]
- * Add a DBus call to fetch the call details from a call ID - Ticket
- #928
-
- [ Julien Bonjean ]
- * Improved async open books
- * Fixed bug #1139
-
- [ Emmanuel Milou ]
- * Add a way to save account order
- * commit missing files
-
- [ Julien Bonjean ]
- * Introduced log4c (ticket #1162)
-
- [ Emmanuel Milou ]
- * Load/save account order functionnal - ticket #813
-
- [ Alexandre Savard ]
- * Add CELT codec (#1143)
- * Make celt frame size 256 (*1143)
-
- [ Julien Bonjean ]
- * Switched everything to log4c (ticket #1162)
- * Updated eclipse settings
-
- [ Emmanuel Milou ]
- * Restore adding account - ticket #1172
- * Add liblog4c dependecy - ticket #1179
-
- [ Alexandre Savard ]
- * Double maxAvailByte for frame size in rtp (#1143)
-
- [ Emmanuel Milou ]
- * Add User-Agent SIP header - Ticket #1173
-
- [ Julien Bonjean ]
- * Fixed autoresize issue (#708)
-
- [ Emmanuel Milou ]
- * Remove libcppuint dependency for the debian packages
- * Look for libsexy only if gtk version < 2.16 - Ticket #1116
- * Remove libsexy dependency for jaunty. ticket #1116
-
- [ Julien Bonjean ]
- * Introduced unit tests (#1146)
- * Updated gitignore
- * Fixed Makefile (#1146)
-
- [ Emmanuel Milou ]
- * [TICKET #1112] Add a test on the voice buffer to send through iax
- packets
- * Remove doublon in dependencies
- * Remove warnings from the client test framework
- * Update version number to 0.9.5~beta
- * Update build-package script
- * Add check dependency in build-deps control file field
- * Create debian files for the new sflphone-client-gnome
- * [TICKET #1212] Add Replaces field in control files
- * [TICKET #1212] Fix manpages installation path
- * [TICKET #1212] Add maintainer scripts to create alternatives
- * [#1212] Update the manpages generation - edit preinst maintainer
- script
- * [#1212] Fix reference error in manpage
- * [#1212] Add missing files on the client side
- * [#1212] Fix debian docs files - no TODO file
- * [1212] Fix manpage creation problem
- * [#1220] Generate client-side glue files and marshaller at
- compilation time
- * [#1220] Generate server-side glue files at compilation time
- * [#1212] Change binary name to sflphone-client-gnome
- * [#1212] Update .gitignore to fit the new working tree
- * [#1220] Explicitly generate glue files before building the library
- * [#1220] Compile dbus directory before audio
- * [#1212] Create sflphone-common at the root of the repository
- * [#1212] Re-add pjproject
- * [#1212] Remove Makefile from repo
- * [#1220] Fix Makefile.am
- * [#1212] New working directory functional
- * [#1212] Update .gitignore
- * [#1212] Hack to make pjsip compile..
- * [#1220] Use non-installed binary for dbusxx-xml2cpp
- * [#1212] Add descriptive files, remove unuseful scripts from tools/
-
- [ Alexandre Savard ]
- * Restore speex codecs
- * add frame size for celt (#1143)
- * add framesize to codec, independant from audiolayer (#1143)
- * use codec frame size in rtp (#1143)
- * compute fixed_codec_framesize (#1143)
- * do not resample if not required (#1143)
- * add condition on resampling for decoder (#1143)
- * add a condition on bytesAvail == 0 from mic data
- * no maximum in rtp decode (#1143)
- * compute maximum for decoding (#1143)
-
- [ Emmanuel Milou ]
- * [#1146] Implement unitary tests on the client-side
-
- [ Alexandre Savard ]
- * use float instead of int to compute max nb of sample (#1143)
- * add nbSampleMax for unresampled data (#1143)
- * make thread sleep during 5 ms insead of 20 (#1143)
- * use unix usleep (#1143)
- * 50 usecond thread!!!!! (#1143)
- * try with the smallest compression (#1143)
- * use timer set at framesize (#1143)
-
- [ Emmanuel Milou ]
- * [#1161] Restore changelog version
-
- [ Alexandre Savard ]
- * Remove celt stuff
-
- [ Emmanuel Milou ]
- * [#1161] Update changelog
- * [#1220] Add Conflicts: sflphone in debian control files
- * [#1179] Add liblog4c3 runtime dependency
- * [#1212] FIx typo error in dependency list for itnrepid
- * [#1212] FIx .desktop file to point on the right exec
- * [#1212] Modify changelog replacing tag
-
- [ Sflphone Project ]
- * "[#1262] Updated changelogs for version 0.9.5-0ubuntu1~beta"
-
- [ Emmanuel Milou ]
- * [#1212] restore changelogs
-
- [ Sflphone Project ]
- * [#1262] Updated changelogs for version 0.9.5-0ubuntu1 Snapshot 2009-
- 04-27
-
- [ Emmanuel Milou ]
- * [#1212] restore changelogs
-
- [ Sflphone Project ]
- * [#1262] Updated changelogs for version 0.9.5-0ubuntu1~beta
-
- [ Emmanuel Milou ]
- * [#1212] restore changelogs
-
- [ Sflphone Project ]
-
- -- Sflphone Project <sflphone@mtl.savoirfairelinux.net> Mon, 27 Apr 2009 17:00:03 -0400
-
-sflphone-client-kde (0.9.4-0ubuntu2) SYSTEM; urgency=low
-
- [ Alexandre Savard ]
- * Restore speex and GSM detection
-
- [ Emmanuel Milou ]
- * Fix bug #1090
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Wed, 8 Apr 2009 11:29:15 -0500
-
-sflphone (0.9.4-0ubuntu1) SYSTEM; urgency=low
-
- [ Emmanuel Milou ]
- * Integrate DBus-c++ and libiax2 in the main build system
- * Clean up in the working repository
- * Reorder hooks configuration panel
- * Protect case when no codecs are active
- * Fix some return values
- * Add unitary tests for the hook manager (premisces)
-
- [Yun Liu]
- * Update chinese translation
-
- [Sven Werlen]
- * Update german translation
-
- [Hussein Abdallah]
- * Update russian translation
-
- [Maxime Chambreuil]
- * Update spanish translation
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Fri, 3 Apr 2009 18:29:15 -0500
-
-
-sflphone (0.9.4-rc1) SYSTEM; urgency=low
-
- [ Emmanuel Milou ]
- * Fix bug while trying to hold/unhold several simultaneous call
- * Improve address book build system
- * Implement SIP url popup on incoming call
- * Improve GTK+ panel configuration
- [ Julien Bonjean ]
- * GTK+ client refactoring
- * GTK+ clean up
- * Address book improvment
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Fri, 27 Mar 2009 18:29:15 -0500
-
-sflphone (0.9.4-0beta1) SYSTEM; urgency=low
-
- [ Alexandre Savard ]
- * Display codec used during conversation on the GUI
- * Enable/disable STUN parameters at runtime
- * Refactor search bar use
- [ Emmanuel Milou ]
- * Build system fixes
- * Implement SIP re-invite
- * Implement IP to IP call
- [ Julien Bonjean ]
- * Integrate GNOME address book based on evolution data server
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Fri, 20 Mar 2009 18:29:15 -0500
-
-
-sflphone (0.9.3-0ubuntu3) SYSTEM; urgency=low
-
- [ Alexandre Savard ]
- * Both playback and record streams in PA_STREAM_CORKED (pulseaudio)
- * Use PLUGHW device for ALSA capture
- * Functional IAX and SIP recording for voicemail
- * Use the less CPU-consuming interpolator algorithm for resampling
- * Display in GTK GUI the codec used in conversation
- * GTK GUI use ASCII instread of utf-8
- * Add record menus in GTK GUI
- * Put on hold when dialing a new number
- * AccountID's are saved in the history
-
- [ Emmanuel Milou ]
- * Integrate DBUS C++, libiax2 in the git repository
- * Update website
- * Use libspeexdsp only if available on the system
- * Updated .gitignore file
-
- [Cyrille Béraud]
- * Account assistant manager improvment
- * Add an email request when creating a new account to receive voicemails
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Sat, 14 Feb 2009 13:29:15 -0500
-
-sflphone (0.9.3-0ubuntu2) SYSTEM; urgency=low
-
- [ Emmanuel Milou ]
- * Add compilation note in README
- * Use default ALSA plugin for capture
- * Fix the ALSA capture problem one more time
- * Clean up debug messages in dbus.c
- * Add libspeexdsp dependency
- * Remove implicit declaration compilation warnings
- * Fix links in the website, add release note
- * Change capture for the website front page
- * Add alsa devel dependency in build-depends control file field
- * Clean up, indentation, try to handle latency problems in iax/pulseaudio
- * Remove pjsip generated files from the repo
- * Use the previous declared curAlias function in accountwindow
- * Fix bug in history call duration when the call fails
- * Remove runtime warning in the GTK+ client
- * Add librsvg2-common dependency to load SVG under KDE
- * Refresh .gitignore
- * Update locales files + french translation
- * Add configuration panel for future noise reduction
- * Add configuration panel for audio record module
- * Daemon less verbose; accounts don't try to access STUn options anymore
- * Fix typo in configwindow
- * Add content in the official website
- * use a GTK_STOCK icon for the record button
- * Complete description text in the assistant manager
- * Add libtool flags in client configure.ac
- * Remove unuseful dependency (snd)
- * Fix SIP transfer problems
- * Remove previous version of PJSIP from the repo
- * Upgrade PJSIP to version 1.0.1
- * Add the new website source in the repository
- * Use libspeexdsp for silence detection only if available
-
- [ Loïc Faure-Lacroix ]
- * Ajout du logo gpl3
- * Ajout des images
- * Ajout de la section screenshot pour le site
- * Ajout du favicon dans le header
- * Modification des cartes
-
- [ Alexandre Savard ]
- * Clean up <speex/libspeexdsp>
- * Small cleanup
- * Save Wave fixed
- * Fix new call button when recording
- * libspeexdsp added
- * Recording: default home folder at startup
- * Minor changes to config window
- * IAX recording fixed
- * Set / get recording path, still need some GTK for client
- * AudioRecord file name format
- * Now recording in HOME folder
-
- [ Cyrille Béraud ]
- * Fix bug in reqaccount.c
-
- [ Maxime Chambreuil ]
- * Update spanish translation
-
- [Yun Liu ]
- * Update chinese translation
-
- [ Hussein Abdallah ]
- * Update russian translation
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Sat, 14 Feb 2009 13:29:15 -0500
-
-sflphone (0.9.3-0ubuntu1) SYSTEM; urgency=low
-
- * Remove debug
- * Join thread before leaving
- * Fix implicit declaration in reqaccount
- * Add REST code to build the request to server
- * Fix GValue initialization warnings
- * Update version number, fix implicit declaration, fix GTK markup
- warnings
- * Apply patch to create custom SIP account from our own server
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Fri, 06 Feb 2009 19:17:32 -0500
-
-sflphone (0.9.2-2ubuntu9) SYSTEM; urgency=low
-
- [ Alexandre Savard ]
- * Speex audio codec preprocessing initialization
- * peer hung up segmentation fault solved
- * Stop recording when transfering
- * Terminate only one call
- * Add isRecording() function
- * Fix call_icon GTK client
- * Fix SIPCallClose() function, recorded file now close properly
- * Function terminateSIPCall added in sipvoiplink and managerimpl
- * Fix thread destructor
- * setRecordingOption function implement in audiorecord
- * Record now implemented in Call class
- * Record interface complete (on hold erase previous recording)
- * Added recButton in client
- * Added: record button related icons
- * Record button added
- * Overload AudioRecord::recData to get mic and speaker data mixed
- * Recording now in audiortp::run() method
- * Audio recording working in AudioRTP: receiveSessionForSpeaker
- * Open/close a wave file when pulse audio stream start/stop
-
- [ Emmanuel Milou ]
- * Fix path for GTK+ icons; clean up
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Thu, 05 Feb 2009 18:27:53 -0500
-
-sflphone (0.9.2-2ubuntu8) SYSTEM; urgency=low
-
- [ Emmanuel Milou ]
- * Update changelogs
- * Fix bug in merge and in Makefile.am
- * Terminate only one call
- * Disable PJsip shutdown when changing STUN parameters
- * Function terminateSIPCall added in sipvoiplink and managerimpl
- * Add a timer to the alsa thread to not jam the CPU load
- * Fix bug in sipvoiplink.cpp
- * Clean shutdown of pulseaudio on quiting
- * Fix DTMF at first start with Pulseaudio
- * Remove zeroconf from the build system
- * Add a library manager + exception handling
- * Clean up in the working directory
- * Better handling of capture XRUNs
- * Restore mic adjust volume on ALSA layer
- * Protect device ALSA operation if not opened
- * Fix the switching layer bug
- * Use dynamic_cast<> to use audiolayer-specific methods
- * Open the audio devices only once at startup
- * Refactoring of the ALSA part
- * Functional plug-in manager
- * Use a C++ thread to handle tones and DTMF in ALSA
- * Restore IAXVoIPLink, restore Mutex
- * Make the plugins registering against the plugin manager
- * Migrate to 1->N relationship between voiplink and accounts
- * API plugin for registration
- * Use C++ thread in SIP, move everything in sipvoiplink
- * Complete singleton pattern for the plugin manager
- * Add -Wno-return-type compilation flag to remove warnings; Update
- version number in configure.ac
- * Add the dynamic loading for the plugin framework; integate unittest
-
- [ Yun Liu ]
- * Update rpm spec file
- * modify build package script and spec file for suse
-
- [ Alexandre Savard ]
- * Add audiorecorder plugin and testaudiorecorder
- * Add audio Recording class, edit global.h
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Wed, 04 Feb 2009 14:00:30 -0500
-
-sflphone (0.9.2-2ubuntu7) SYSTEM; urgency=low
-
- [ Emmanuel Milou ]
- * Update changelog to 0.9.2-6
- * Fix some dbus-glib implementation details on the client side
- * Init history after dbus initialization
- * Add error checking in useragent; Clean sipvoiplink
- * Prevent crash when trying to call an empty number
- * Set the volume of the playback stream to PA_VOLUME_NORM at startup
- * Fix GTK+ generic value double initialization
- * Fix jaunty control file dependency problems
- * Fix jaunty control file dependency problems
-
- [ Yun Liu ]
- * Fix bug ticket # 137
- * Tolerant to gsm library of OpenSuse 11
-
- [ Sven Werlen ]
- * Update german translation
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Fri, 23 Jan 2009 17:48:13 -0500
-
-sflphone (0.9.2-2ubuntu6) SYSTEM; urgency=low
-
- [ Emmanuel Milou ]
- * Migrate STUN configuration to the main config window
- * Update french translation
- * Other tiny memory leaks
- * Fix memory leak in sampleconverter.cpp
- * Generate packages from the release branch
- * update the build package script
- * modify the control files with architecture=any
- * Remove valgring uninitialized value
- * IAX and SIP use the same global variables to set account
- configuration ; fix broken code
-
- [ Maxime Chambreuil ]
- * Update spanish translation
-
- [ Hussein Abdallah ]
- * Update russian translation
-
- [ Yun Liu ]
- * Update translation files
- * Fix the bug when user uncheck the account which fails in the
- previous registration
- * Add stun error status
- * Fix bug ticket #143
- * Script for auto-install dependencies
- * Fix bug ticket #140
- * Fix bug ticket 141
- * Fix the reregister process when user change the details of an
- account
-
- -- Emmanuel Milou <manu@sulfur.inside.savoirfairelinux.net> Fri, 16 Jan 2009 18:19:05 -0500
-
-sflphone (0.9.2-2ubuntu5) SYSTEM; urgency=low
-
- * Fix memory leak in the pulseaudio callback
- * Update debian package generation script
- * Warnings removal in GTK+ client
- * Clean adjust volume method in alsalayer
- * Plug the sflphone playback volume control to the pulseaudio volume
- manager
- * Display the date in history according to the current locale
- * Generate the changelog according to the git commit messages
- * Complete header in chinese translation file
- * Use the right gpg key to sign the packages
- * add debian jaunty jackalope support
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Wed, 14 Jan 2009 21:17:20 -0500
-
-sflphone (0.9.2-2ubuntu4) SYSTEM; urgency=low
-
- [ Emmanuel Milou ]
- * add german translation
-
- [ Yun Liu ]
- * Fix GUI crash in Ubuntu8.10 64bit system
-
- -- Yun Liu <yun.liu@savoirfairelinux.com> Thu, 08 Jan 2009 13:08:51 -0500
-
-sflphone (0.9.2-2ubuntu3) SYSTEM; urgency=low
-
- [ Emmanuel Milou ]
- * The main thread synchronizes the ringtone thread
- * disable custom ringtone for the ALSA layer
- * Fix the Makefile.am in man directory, add a SEE ALSO section
-
- [ Yun Liu ]
- * Fix daemon crash caused by the previous patch ( for bug ticket #129)
-
- -- Yun Liu <yun.liu@savoirfairelinux.com> Tue, 06 Jan 2009 16:18:38 -0500
-
-sflphone (0.9.2-2ubuntu2) SYSTEM; urgency=low
-
- * Fix bug ticket #129
-
- -- Yun Liu <yun.liu@savoirfairelinux.com> Wed, 5 Jan 2009 15:54:53 -0500
-
-sflphone (0.9.2-2ubuntu1) SYSTEM; urgency=low
-
- * Migrate from eXosip library to pjsip
- * Add multiple SIP accounts support
- * Fix ringtones problems
- * Add a pulseaudio support
- * Improve audio quality with ALSA
- * Add chinese translation
- * Improve spanish translation
- * Migrate to a maintained C++ DBus bindings
- * Clean and improve the build system
- * Add build-dependency on Perl because we need pod2man to generate manpages
-
- -- Yun Liu <yun.liu@savoirfairelinux.com> Wed, 26 Nov 2008 09:47:53 -0500
-
-sflphone (0.9.1) unstable; urgency=low
- * Add a search tool in the history
- * Migrate some gtk_entry_new to sexy_icon_entry_new
- * Bug fix (Ticket #78): The voicemail password isn't displayed anymore in
- the history tab
- * Add the SIP registration expire value in the user file.
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Thu, 22 May 2008 11:14:25 -0500
-
-sflphone (0.9.0) unstable; urgency=low
- * Add history features
- * Call date
- * Call duration
- * Mouse events in the history tab
- * Smooth switch from the history tab to the calls tab
- * Remove most of GTK-Critical warnings
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Wed, 13 May 2008 16:58:25 -0500
-
-sflphone (0.9-2008-06-06) unstable; urgency=low
- * Audio bug correction: capture stopped after a few minutes of conversation
- with USB Plantronics sound card
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Tue, 06 May 2008 16:58:25 -0500
-
-sflphone (0.9-2008-05-06) unstable; urgency=low
- * Bug correction: account creation with the assistant
- * GTK+ warnings removal
- * libnotify warnings removal
- * Remove aliasing on the SFLphone logo
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Mon, 05 May 2008 16:58:25 -0500
-
-sflphone (0.9) unstable; urgency=low
- * Clean dependencies ( removal of libboost )
- * Several GTK improvement and updates
- -account window
- -configuration window
- * Migrate from GtkCheckMenuItem to GtkImageMenuItem
- * ALSA standard I/O transfers: MMAP instead of R/W
- * Fix speex audio quality
- * IAX2 protocol
- -Fix hold/unhold situation
- -Add on hold music
- * SIP protocol
- -Ringtone on incoming call
- -Fix transfer situation
- * Add desktop notification ( libnotify )
- * Improve the system tray icon behaviour
- * Improve registration error handling
- * Register/unregister from the account window takes effect without starting back SFLphone
- * Compilation warnings removal
- * Call history
- * Add an account configuration wizard
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Wed, 30 Apr 2008 16:58:25 -0500
-
-sflphone (0.8.2) unstable; urgency=low
- * Internationalization of the GTK GUI
- * English / French
- * STUN support
- * Slight modifications of the graphical interface ( tooltips, dialpad, ...)
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Fri, 21 Mar 2008 11:37:53 -0500
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/compat b/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/compat
deleted file mode 100644
index 7ed6ff82de6bcc2a78243fc9c54d3ef5ac14da69..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/compat
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/control.intrepid b/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/control.intrepid
deleted file mode 100644
index 98d0dd6ce21e446e03efea046ee8535370bae3bc..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/control.intrepid
+++ /dev/null
@@ -1,20 +0,0 @@
-Source: sflphone-client-kde
-Maintainer: SavoirFaireLinux Inc <jeremy.quentin@savoirfairelinux.com>
-Section: kde
-Priority: optional
-Build-Depends: debhelper (>= 5), cmake (>=2.6), kdepimlibs5-dev (>=4.1.4), libcommoncpp2-dev (>=1.6.2), libqt4-dev (>=4.3)
-Standards-Version: 3.7.3
-
-Package: sflphone-client-kde
-Priority: optional
-Architecture: any
-Depends: sflphone-common (=VERSION), libcommoncpp2-1.6-0, kdepimlibs5 (>=4.1.4), libqt4-dbus (>=4.4.3), libqt4-svg (>=4.4.3), libqtgui4 (>=4.4.3)
-Replaces: sflphone
-Conflicts: sflphone
-Homepage: http://www.sflphone.org
-Description: KDE client for SFLphone
- Provide a KDE client for SFLphone.
- SFLphone is meant to be a robust enterprise-class desktop phone.
- SFLphone is released under the GNU General Public License.
- SFLphone is being developed by the global community, and maintained by
- Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/control.jaunty b/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/control.jaunty
deleted file mode 100644
index 98d0dd6ce21e446e03efea046ee8535370bae3bc..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/control.jaunty
+++ /dev/null
@@ -1,20 +0,0 @@
-Source: sflphone-client-kde
-Maintainer: SavoirFaireLinux Inc <jeremy.quentin@savoirfairelinux.com>
-Section: kde
-Priority: optional
-Build-Depends: debhelper (>= 5), cmake (>=2.6), kdepimlibs5-dev (>=4.1.4), libcommoncpp2-dev (>=1.6.2), libqt4-dev (>=4.3)
-Standards-Version: 3.7.3
-
-Package: sflphone-client-kde
-Priority: optional
-Architecture: any
-Depends: sflphone-common (=VERSION), libcommoncpp2-1.6-0, kdepimlibs5 (>=4.1.4), libqt4-dbus (>=4.4.3), libqt4-svg (>=4.4.3), libqtgui4 (>=4.4.3)
-Replaces: sflphone
-Conflicts: sflphone
-Homepage: http://www.sflphone.org
-Description: KDE client for SFLphone
- Provide a KDE client for SFLphone.
- SFLphone is meant to be a robust enterprise-class desktop phone.
- SFLphone is released under the GNU General Public License.
- SFLphone is being developed by the global community, and maintained by
- Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/copyright b/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/copyright
deleted file mode 100644
index fbde2314bef1fb7ee643083e6d27c397213c5ead..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/copyright
+++ /dev/null
@@ -1,28 +0,0 @@
-This package was debianized by Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> on
-Fri, 3 Apr 2009 09:47:53 -0500.
-
-It was downloaded from the git repository of SFLphone: git://sflphone.org/git/sflphone.git
-
-Upstream Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
-
-Copyright:
-
-Savoir-Faire Linux Inc.
-
-License:
-
-This software is copyright (c) 2004-2009 Savoir-Faire Linux inc.
-
-You are free to distribute this software under the terms of
-the GNU General Public License version 3.
-On Debian systems, the complete text of the GNU General Public
-License can be found in the file `/usr/share/common-licenses/GPL'.
-
-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., 51 Franklyn St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/cron.d b/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/cron.d
deleted file mode 100644
index d11e61177739b56bce3aac6de6483b48e797a258..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/cron.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Regular cron jobs for the sflphone package
-#
-0 4 * * * root sflphone_maintenance
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/dirs b/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/dirs
deleted file mode 100644
index e2dc98dcb24907fb5a7ceb0f0651276b702d6030..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/dirs
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/bin
-usr/share/applications
-usr/share/pixmaps
-usr/share/sflphone
-usr/share/locale
-usr/share/doc
-usr/share/man
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/docs b/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/docs
deleted file mode 100644
index 9830da213fdb4baf4d68538e8c8e490248e209e1..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/docs
+++ /dev/null
@@ -1,5 +0,0 @@
-NEWS
-README
-ChangeLog
-AUTHORS
-
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/manpages b/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/manpages
deleted file mode 100644
index 919cf59a8e71fbc2fda9ea40c7cd1162970babd2..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/sflphone-client-kde/usr/share/man/man1/sflphone.1
-debian/sflphone-client-kde/usr/share/man/man1/sflphone-client-kde.1
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/postinst b/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/postinst
deleted file mode 100644
index 20a15b4f8f7d3b61eb5a3632bfa02d0b44cb6bd0..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/postinst
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh -e
-
-update-alternatives --install /usr/bin/sflphone sflphone /usr/bin/sflphone-client-kde 200 \
- --slave /usr/share/man/man1/sflphone.1.gz sflphone.1.gz \
- /usr/share/man/man1/sflphone-client-kde.1
-
-update-alternatives --set sflphone /usr/bin/sflphone-client-kde
-
-exit 0
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/preinst b/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/preinst
deleted file mode 100644
index fdaa8ab8ec9a4ebe1c93136c5c15dedcb599febc..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/preinst
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-# postrm script for sflphone
-#
-# see: dh_installdeb(1)
-
-set -e
-
-package=sflphone-client-kde
-
-case "$1" in
- install|upgrade)
- ;;
-esac
-
-exit 0
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/prerm b/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/prerm
deleted file mode 100644
index 5e9021706875bb08a56c8c54f35cef96a7ca6055..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/prerm
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-
-if [ "$1" = "remove" ]; then
- # Remove alternatives symlink set in postinst
- update-alternatives --remove sflphone /usr/bin/sflphone
-fi
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/rules b/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/rules
deleted file mode 100755
index f1edaffc9d4b76c42705aafb9c8af9490893c49f..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/rules
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-export DH_OPTIONS
-
-package=sflphone-client-kde
-
-CXX = g++-4.0
-# CFLAGS = -Wall -g
-# DEB_INSTALL_PAGES_sflphone_client_kde = sflphone.1 sflphone-client-kde.1
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
- cmake . -DCMAKE_INSTALL_PREFIX=/usr
- touch configure-stamp
-
-
-#Architecture
-build: build-arch build-indep
-
-build-arch: build-arch-stamp
-build-arch-stamp: configure-stamp
-
- # Add here commands to compile the arch part of the package.
- $(MAKE)
- touch $@
-
-build-indep: build-indep-stamp
-build-indep-stamp: configure-stamp
-
- # Add here commands to compile the indep part of the package.
- #$(MAKE) doc
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-arch-stamp build-indep-stamp configure-stamp
- # Add here commands to clean up after the build process.
- [ ! -f Makefile ] || $(MAKE) distclean
-
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
- dh_clean
-
-install: install-indep install-arch
-install-indep:
- dh_testdir
- dh_testroot
- dh_clean -k -i
- dh_installdirs -i
- # Add here commands to install the package into debian/sflphone.
-
-install-arch:
- dh_testdir
- dh_testroot
- dh_clean -k -s
- dh_installdirs -s
- # Add here commands to install the arch part of the package into
- # debian/tmp.
- $(MAKE) DESTDIR=$(CURDIR)/debian/$(package) install
- dh_install -s
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
-
-binary-common:
- pwd
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_python
-# dh_installinit
-# dh_installcron
-# dh_installinfo
-# dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_perl
- dh_makeshlibs
- dh_installdeb
-# dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
- $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
-
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-common/changelog b/tools/build-system/distributions/ubuntu/debian-sflphone-common/changelog
deleted file mode 100644
index 3d95374e2598dae7692cbf901ef52e4ddb27eed6..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-common/changelog
+++ /dev/null
@@ -1,1284 +0,0 @@
-sflphone-common (0.9.6-SYSVER) SYSTEM; urgency=low
-
- ** 0.9.6 **
-
- * Documentation on echo test
- * [redmine_down] codec names not displayed in total
- * [redmine_down] crash when hanging up a dialing call because tries to
- add it to history whereas no starttime
- * [#1927] alternate every time screen changed to call history
- * [#1886] clean code
- * [#1886] debug messages when loading history removed
- * [redmine_down] sflphone-kde icons
- * [#1855] Update language files
- * [#1502] Update version number
- * [redmine_down] setHistory at close
- * [#redmine_down] Handle PJ_DECLINE_SC as failure
- * [#1923] Fix segmentation fault when adding a new account
- * [#1923] Check on iterator before setting the config
- * [#1904] Added mnemonic to tabs in sflphone-client-gnome.
- * [#1905] The daemon was not sending the currentSelectedCodec signal
- on dbus when answering a call.
- * [#1922] Default values set to all account details
- * [#1886] Spinbox reg expire enables apply, and address book is not
- visible when disabled
- * [#1905] Bug fix for segmentation fault caused by an empty string,
- * [#1910] Warnings in test directory
- * [#1919] Error fixed
- * [#1855] Update russian translation - Hussein Abdallah
- * [#1910] Remove files
- * [#1919] fixed
- * [#1777] Code indentation
- * [#1918] fixed
- * [#1917] fixed
- * [#1910] Remove warnings compilation in src
- * [#1886] removed AccountListModel in configskeleton
- * [#1914]
- * [#1911] check previous and new port
- * [#1910] Remove compilation warnings in src/dbus and src/history
- * [#1910] Remove compilation warnings in src/audio
- * [1855] Update german translation - Sven Werlen
- * [#1909] removed
- * [#1906] Done
- * [#1904] The registration expire value is now configurable from the
- * Cleaned up debug messages.
- * [#1886] separated initCallItem in two functions
- * [#1886] reversed error in commit
- * [#1886] clean debug
- * [#1886] changed Name of classes and files
- * [#1886] clean
- * [#1870] In call_state_cb (dbus.c:126), _time_stop was overridden by
- the actual time.
- * [#1884] Added some new gpg flags to prevent tty warnings
- * [#1886] Clean audio config dialog
- * [#1886] No more compile warnings. + 1 comm
- * [#1872] Check if the user input is smaller than PJ_MAX_HOSTNAME.
- * [#1886]
- * [#1785] Fixed build when no new commit
- * [#1852] If chosen by the user, the hostname can now be solved and
- used
- * [#1871] * and # inverted back
- * [#1869] Conditional compilation that checks if
- * [#1309] removed test in main
- * [#1425] Put actions in SFLPhone window class instead of ui view,
- made a separate toolbar for screens.
-
- -- SFLphone Automatic Build System <team@sflphone.org> Mon, 27 Jul 2009 09:53:00 -0400
-
-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 **
-
- * spec files for mandriva and opensuse updated with buildrequires
- libqt4-dev >=4.3
- * [#1700] Cannot build on ubuntu 8.10 and a few other distribs
- * [#1502] Update version number where applicable
- * [#1642] Update client icons
- * [#1450] Clean up useless debug and comments in sipvoiplink and
- audiortp
- * [#1450] Remove Semaphore object in AudioRtp thread deletion
- * [#1450] Audio RTP init now synchronized with Sip/SDP
- * [#1693] kde client crashes when changing codecs order/activation
- * [#1450] Deep refactoring of audiortp
- * [#1450] setRtpSessionRemoteIp
- * [#1689] getCallList at start
- * [#1224] Change path in package files
- * [#1450] Audio RTP initialized only once, payload and remote ip set
- at runtime
- * [#1450] Add setRtpSessionMedia and setRtpSessionRemoteIp address
- * [#1642] Make GNOME GUI fresher and younger ;)
- * [#1686] Status bar displaying used account
- * added sflphone-kde icon so that it compiles
- * [#1659] Ending a call causes the daemon to crash
- * corrected introspection XMLs, po files...
- * [#1211] g722 media descriptor in codecDescriptor
- * [#1310] Install sflphoned in $(prefix)/lib/sflphone
- * [#1502] Do not install test binaries and dbus utilitaries
- * [#1224] hack for pjsip build system!
- * [#1224] Remove pjsip binaries from repo
- * [#1224] Upgrade to pjsip 1.0.2
- * [#1658] About SFLphone (bugs)
- * [#1658] About SFLphone
- * [#1660] Displaying all dialed numbers in a call
- * Tested status bar.
- * [#790] Optimize pulse audio streams parameters
- * [#1678] Some usefull debug messages for mutex/semaphore deadlock
- problem
- * [#1669] Add/remove some usefull/unusefull debug
- * [#1665] Fix latency related to pulse audio stream openning/closing
- * [#1457] Make the menus and panels accessible in french
- * [#1457] Improve broken keyboard accessibility in menus and conf
- panels
- * [#961] Instanciate only once the searchbar icons
- * [#961] Restore transfer fonction
- * [#961] Filter on the history type OK
- * [#961] Fix compilation problems on hardy/intrepid
- * [#1157] Commit missing files
- * [#790] Reduce number of start/stop streams call on pulse audio
- * [#1639] kde client crashes when no account registered
- * [#1620] Fix the searchbar
- * [#1620] Get back caltree as it was during gtkcritical area
- * [#1620] Add history filter reinit function
- * [#1335] Add a missing label in address book preferences
- * [#1561] Update russian translation - Hussein Abdallah
- * [#1605] Fix edit menu french translation
- * [#961] Enable to search in the history according to the call type
- * [#1449] Searchbar does not work anymore
- * [#961] Add popup menu on the entry primary icon for history
- * [#1317] Fixed KDE client package dependency
- * [#936] speex 32 khz integration completed
- * [#936] Use 320 frame size
- * [#936] Test using a frame size at 320 smpls
- * [#1214] Enable / Disable history
- * [#1607] Fix compilation problem for ubuntu 8.10 (libsexy)
- * [#1313] Implement processDataEncode processDataDecode in audiortp
- * [#1613] codec list order can't be set
- * Better handling of localisation + added languages + corrected
- warnings + begginning of new config dialog with kconfig + 14px
- account leds
- * [#1214] Save and load history according to the limit timestamp +
- unit tests
- * [1609] Fix call number copy/paste feature
- * [1607] Restore clear action icon in searchbar
- * [#936] Try to decode using 1280 samples
- * [#936] Add some debug
- * [#936] Add .cpp file
- * [#936] Oops Forgot speex 32 khz
- * [#1214] Add configuration panel for history + D-Bus calls
- * [#1313] Test rtp thread function, frame size, nbbytes, resampling
- * [#790] Flush audio data before closing audio streams
- * [#1214] History displays local time
- * [#1214] Skip empty field on display
- * [#1214] Associate an account to an history entry
- * [#1342] Get addressbook options sensitive/non-sensitive
- * [#1211] Clean up and comments
- * [#1211] Get back to 20 ms framesize
- * [#1211] Use sendImmediate instead of putData in RTP
- * [#1211] Fix nb byte available in RTP
- * [#1211] Clear condition on maxNbSamples in RTP
- * [#1211] Fix max byte available in RTP session
- * [#1211] G722: Use 160 samples per frame instead of 320
- * [#1211] Test using a dynamic payload
- * [#1211] Test using a dynamic payload type
- * [#1211] Rename size variable (nb_samples, nb_bytes)
- * [#1211] Test g722 ip-to-ip sending twice the data lenth
- * [#1211] Test g722 ip-to-ip
- * [#1214] Do not select an history item by default at startup
- * [#1214] Remove some compilation warnings
- * [#1214] Handle empty field - remove g_print
- * [#1214] Add each history item only once
- * [#1214] Handle call timestamps properlier
- * [#1214] Do not need timestamp files anymore
- * [#1214] Use the saved date for history entry
- * Clean up
- * [#1214] Client doesn't crash if the D-Bus call fails
- * [#1214] Client is able to save its history - still some glitches
- * [#1211] Forgot 16000 for g722
- * [#1211] G722 initialization
- * [#1214] Save name/number, successfully load the history if no fields
- are empty
- * [#1499] Fixed destination directory bug
- * [#1214] Restore all the functionalities; peer name/number way more
- easy to handle !!
- * [#1214] Add callable_object instead of call_t, refactoring
- * [#1211] Test with polycom soundstation 16000
- * [#1211] Remove C like inline function in g722 codec
- * [#1342] Finalize gnome client preference window formating
- * [#1214] Retrieve the history when the gnome client startsup
- * [#1306] Implement localization for KDE client
- * [#1593] enable accounts apply button when account checked/unchecked
- * [#1214] Implement the dbus calls on server side
- * [#1214] Add serialized/unserialized functions to pass data on DBUS
- * [#1342] Formating gnome client configuration windows
- * [#1214] Save sucessfully a map of history items
- * [#1499] Removed multiple jobs compilation for KDE client (2)
- * [#1214] Load history from file into memory, add unit tests
- * [#1534] Throws a length_error exception in case URL exceeds
- std::string max_size
- * [#1499] Removed multiple jobs compilation for KDE client
- * [#1565] make account leds smaller
- * [1430] Fix dbus debug
- * [#1562] crashes when trying to change item of a call of state "OVER"
- * [#1116] Fix compilation bug
- * [#1317] Added mandriva and opensuse-11 64 bits
- * [#1108] Add messges in main window concerning transfer success
- failure
- * [#1116] Fix compilation problems
- * [#1211] g722 Makefile
- * [#1108] Client side transferFailed/trasferSucceded signals handling
- * [#1211] G722 mostly completed,
- * [#1555] make bigger toolbar (24x24)
- * [#1551] remove default mailbox number in wizard and disable mailbox
- button when first account doesn't have mailbox number
- * [#1342] Re-add sflphone manpages
- * [#1116] Fix compilation on non-jaunty distros
- * [#1317] Fixed opensuse startup sleep
- * [#1108] Add a signal in the client to notify successful or failed
- transfer
- * [#1108] Dbus signals concerning call transfer success/failure
- * [#1317] Added opensuse to automatic build system
- * [#1223] Fix manpages bug
- * [#1060] german translation glitch
- * Clean up some gnome client warnings
- * [#1547] replace ugly account leds by beautiful icons
- * [#1548] add close button that hides windowand just hide on clicking
- the cross
- * [#1549] put introspec XMLs in the client's source
- * [#1312] Implement getCallList D-BUS method
- * [#1116] Clear text in history and contacts
- * [#1499] KDE integration
- * [#1469] Modify header linkers in dbus-c++'s Makefile.am's
- * [#1469] Remove examples folder from dbus-c++
- * [#1214] History integration in build system; unit test squeleton
- * [#1317] Cleaning
- * [#1469] Remove configure stuff in dbus-c++
- * [#1469] Add unofficial mainline dbus-c++
- * [#1469] Remove dbus-c++ from freedesktop
- * [#1430] Bring account changed signal/callback back to normal
- * [#1060] Update german translation - Sven Werlen
- * [#1430] Add marshaller one string define
- * [#1430] Send account change signal broadcast using account id
- * [#1430] Remove condition on setRegistrationState, cause stun to
- crash
- * [#1317] Centralized version handling
- * [#1317] Fixed version number on sfl-git-dch
- * [#1317] Refactoring for new distributions
- * [#1215] Fix account order at startup if latency
- * [#1088] Restore sip dns srv
- * [#1214] Add squeleton for history manager
- * [#1430] Add accout id to accout changed method
- * [#1430] No connectionStatusNotification (account changed) if no
- changes
- * [#1538] Add COPYING file
- * [#1430] Add audio rtp thread tests
- * [#1317] Changed version detection
- * [#1538] Document license in libs/stund
- * [#1317] Added version files
- * [#1538] Apply François patches - debian packages
- * [#1317] Updated spec files
- * add files
- * [#1538] Apply François patches - debian packages
- * [#1535] Change program file structure (directory src...)
- * [#1317] Updated build system scripts
- * [#1317] Cleaning
- * [#1317] Copied introspect files to gnome client
- * [#1317] Added opensuse to build-system : first-shot
- * [#1317] Remove spec files from configure
- * [#1317] Added missing prefix
- * removed debug for daemon account fix
- * [#1430] Add a connection reference which most likely belong to
- libdbus
- * [#1430] Use shared connection instead of private
- * make daemon find the account, added userMatch
- * Clean code, add comments...
- * [#1317] Fixed packaging rules
- * [#1317] Updated autogen
- * Updated autogen.sh for pjsip
- * [#1526] Set accounts order
- * [#1317] Fixed pjsip lib dirs
- * [#1317] Updated debian packaging for new pjsip configuration script
- * [#1317] Switch to autogenerated guess and sub files
- * [#1317] Updated pjsip inclusion in build system
- * [#1317] Replaced pjsip guess and sub files
- * [#1317] Fixed compilation issues on opensuse 11
- * [#1505] account list seem to crash the application when clicking
- Apply very fast...
- * [#1456] Add a flag to be replaced in the control files
- * [#1456] Added version dependancy handling
- * put account alias in AccountWidgetItem rather than in the item with
- " " before.
- * [#1034] The KDE client should start sflphoned if it is not started
- * [#1500] Handle options for notifications and display on incoming
- call.
- * [#1443] Client should not crash when receive an unexpected
- stateChanged signal
- * [#1403] Do not stop the notification anymore
- * [#1456] Added version dependancy handling
- * [#1426] Daemon crashes when get alsa plugin
- * [#1422] Improved error messages
- * commit for merge
- * [#1424] Change logo in tray icon and put a different one when
- incoming call
- * [#1425] first part done, window title...
- * [#1413] add manpages creating and installing in build system
- * [#1417] The client should start the account creation wizard if
- started for the first time (if config file doesn't exist)
- * [#1421] Make volume bars horizontal when dialpad is hidden.
- * Changed main window title and fixed a mistake in sflphone_const.h
- * [#1412] make debian package building work
- * changelog changed.
- * Changed addAccount method in gnome client.
- * Debian and man folders added.
- * [#1388] Change project name from sflphone_kde to sflphone-client-kde
- * Better handle of kabc check.
- * [#1351] Automatic generation of dbus interfaces in makefile
- generated by cmake
- * [#1307] Implement "edit before call" in history and address book.
- * [#1344] change action_call label in call history from "call" to
- "call back".
- * [#1308] Implement Hook feature in kde client
- * Improved build system.
- * #1219 : Add address book configuration page
- * Better handling of registration to the daemon.
- * #1039 : Add tray icon in kde.
- * Issue no 1216 : Double click on item in history or address book
- causes call.
- * display peer name in call list and call history when called from
- address book.
- * Address book functionnal with photo displayed.
- * Help menu kde available but actions disappeared. All fonctions in
- view.
- * Address book functionnal but ugly and making its own sort in the
- complete address book.
- * Account choice on right click, clean out includes, page address
- book, fixed bugs...
- * Wizard, double click, context menu...
- * Removed sflphone_kde.kdevelop.filelist
- * Added account creation wizard and translated interface in english.
- * Transfer functionnal but ugly.
- * transfer not functionnal
- * Bug fixed : unholding (UNHOLD_CURRENT, UNHOLD_RECORD)
- * Commit functional for push. With install.sh
- * Before merge.
- * Problem with enable accounts. Account display increased.
- * Functional with codec order working , playDTMF.
- * Commit functional.
- * sflphone_kde/build added in .gitignore.
- * complete commit for checkout previous.
- * Commit before checkout previous version to check the display
- bug(little font everywhere...)
- * Functionnal client. Rest : history icons, config icons and
- functionalities
- * commit before merge asavard for isRecording.
- * Call and Automate fusion done and seems to work.
- * Commiting before putting Automate class in Call class.
- * Functionnal main window without recording, history, voicemail, kio
- widgets.
- * client kde avec kdevelop.
- * Config Dialog almost finished.
- * Base of QT client
-
- -- SFLphone Automatic Build System <team@sflphone.org> Tue, 23 Jun 2009 11:12:06 -0400
-
-sflphone-common (0.9.5-SYSVER) SYSTEM; urgency=low
-
- ** 0.9.5 release **
-
- * [#1060] FIx bug in chinese translation
- * [#1313] git add rtpTest.cpp rtpTest.h
- * [#1313] Add init/close rtp tests
- * [#1313] Basic instanciation of the rtp layer
- * [#1449] Gtk-Critical concerning history filters and new calls
- * [#1400] Make the match with the hostname instead of username
- * [#1324] Change status bar label for "Using %s (%s)"
- * [#1403] Icon size: 60x60 px
- * [#1403] Do not remove notification, improve icon quality
- * [#1403] Add smaller icon for gnome notifications
- * [#1403] Prevent crash when hangup && no notification
- * [#1403] Remove all actions on notifications; code refactoring
- * [#1451] Use stun.sflphone.org as default STUN server
- * [#1060] New po files - need to be translated
- * [#1060] Update french translation - Rebuild template file
- * [#1456] Add a flag to be replaced in the control files
- * [#1454] Make cppunit optional; remove from build deps in control
- files
- * [#1401] Add libexpat1-dev dependency in control files
- * [#1448] Take off these ugly debug messages
- * [#1448] fixed getTelephoneTone and getTelephoneFile() called
- repeatedly
- * [#1406] add liblog4c-dev in build-depends
- * [#1409] Restore .desktop icon
-
- -- SFLphone Automatic Build System <team@sflphone.org> Mon, 25 May 2009 11:34:40 -0400
-
-sflphone-common (0.9.5-SYSVER~rc2) SYSTEM; urgency=low
-
- ** 0.9.5 rc2 **
-
- * [#1422] Improved error message
- * [#1402] Fix pjsip build
- * [#1404] Clear GTK-Critical Bug at client startup
- * [#1422] Added automatic VM shutdown when building on more than one
- VM
- * [#1422] Fixed some issues with new changelog generation script
- * [#1422] Moved distribution update to specific file
- * [#1422] Dropped git-dch, replace by home made implementation
- * [#1402] Fix pjsip build
- * [#1404] Clear GTK-Critical Bug at client startup
- * Changes for name based dbus connection
- * Clean changelogs
- * [#1343] Gnome: Implement a callback system to handle focus on
- different widgets
- * Debus Session
- * Refactoring Python code, PEP8
- * [#1430] Get back dbus_g_proxy_new_for_name
- * [#1430] Get back DBUS_BUS_SESSION type
- * [#1430] Dbus fixed owner message binding
- * Second test with DBUS owner
- * [#1404] Gnome -> Preferences -> Hooks
- * [#1404] Gnome -> Preferences -> Recordings
- * [#1404] Call History
- * [#1404] Gnome -> Preferences -> Address Book
- * [#1404] IF the first notification option disable the second
- notification
- * Dbus with fixed owner does not automatically start the deamon
- * Add codec debug tests in pysflphone
- * [#1407] Some print info
- * [#1407] Add a scenario to pick_up action
- * Test client dbus connection to a fixed owner
- * Add python dbus test suite
- * [#1161] Modified version handling in build system
- * [#1314] Test pulse audio and audio streams connect and disconnect
- * [#1402] Add info message after configure
- * [#1402] Build the daemon with the local pjsip library (vs the
- installed one)
- * [#1009] Fix Codec Sampling Rate set to zeros
- * [#1314] Add mutex to pulse layer audio streams
- * [#1314] Refactoring pulseaudio stream to test connect disconnect
- * [#1314] Refactoring of pulselayer to test conect/disconnect
- * Add debug messages in debus calls concerning account
- * [#1314] Add some return values to audio init functions
- * [#1406] add liblog4c-dev in build-depends
- * [#1409] Restore .desktop icon
- * Bug #1405: Fix strings as requested.
- * Bug #1404: Fix strings in preferences panel.
-
- -- SFLphone Automatic Build System <team@sflphone.org> Tue, 19 May 2009 12:08:03 -0400
-
-sflphone-common (0.9.5-0ubuntu1~rc1) SYSTEM; urgency=low
-
- [ SFLphone Project ]
- * [#1262] Updated changelogs for version 0.9.5-0ubuntu1 Snapshot 2009-
- 05-05
-
- [ Emmanuel Milou ]
- * Add some python CLI client code; not really functional
- * [#1108] Fix peerHungup method for IP to IP call
-
- [ Alexandre Savard ]
- * [#1108] Correct setting of SIP contact for direct IP call
- * [#1108] SIP user agent handles incoming REFER
-
- [ Emmanuel Milou ]
- * Remove website from repository
- * Update translation
-
- [ Alexandre Savard ]
- * Sflphone icon's tooltip changed for "configured" instead of
- "registered"
-
- [ Emmanuel Milou ]
- * Update translation
-
- [ Sflphone Project ]
-
- -- Sflphone Project <sflphone@mtl.savoirfairelinux.net> Tue, 05 May 2009 19:16:09 -0400
-
-sflphone-common (0.9.5-0ubuntu1~beta) SYSTEM; urgency=low
-
- [ Julien Bonjean ]
- * Updated Eclipse stuff
- * Improved addressbook config window
- * Added sflphone Eclipse stuff
- * Implemented addressbook list server side
- * Moved dbus stuff in dbus directory
- * Updated addressbook configuration
-
- [ Emmanuel Milou ]
- * Remove unuseful installation scripts. Use apt-get build-dep sflphone
- instead
- * fix bug #1090
-
- [ Alexandre Savard ]
- * defining speex 16khz
-
- [ Emmanuel Milou ]
- * Remove unuseful file from build system
- * Start dns srv resolver
-
- [ Alexandre Savard ]
- * Basic ogg/vorbis initialization
-
- [ Emmanuel Milou ]
- * Handle incoming IP-to-IP invite correctly
-
- [ Alexandre Savard ]
- * speex wideband 16000
-
- [ Emmanuel Milou ]
- * Better handling of incoming IP to IP call
- * DNS SRV resolution functional
- * Implement IAX2 incoming URL
- * Allow user to make IP call without any accounts configured
- * Add a contextual menu to edit a number from the contacts tab
- * Add comments, tooltip and new button to the contextual menu
- * add delete event, migrate to GTK 2.16 for sexy icons
- * Resolve ticket #1118
- * Update suse spec file
- * Add phone number cleanup functions, unit tests and panel
- configuration
- * Add pertinent test that fails
- * fix dependencies for suse package
- * Add contextual edit menu in history - #1120
-
- [ Alexandre Savard ]
- * Temporary comit: make speex wideband (16 khz)
- * Temporary: shared object for speex narrow band
- * Temporary: speex narrowband and wideband coexist
-
- [ Julien Bonjean ]
- * Fixed bug when no book selected
- * Fixed addressbook related compilation warnings
- * Fixed GTK client remaining compilation warnings
- * Fixed segfault when book removed since last sflphone run
- * Fixed bug when book is unreachable (ldap error)
-
- [ Alexandre Savard ]
- * Fix codec list in audio config window
- * Active/inactive speex codec by payload
-
- [ Julien Bonjean ]
- * Updated gitignore
- * Added some comments
-
- [ Emmanuel Milou ]
- * Add callto: handler script for browsers and al.
- * Integrate test compilation in the daemon build-system
-
- [ Julien Bonjean ]
- * Fixed g_object_unref warning for pixbuf
- * Cleaned too verbose output
- * Fixed toolbar update warning
- * Added support for asynchornous books open (first shot)
-
- [ Emmanuel Milou ]
- * Add a DBus call to fetch the call details from a call ID - Ticket
- #928
-
- [ Julien Bonjean ]
- * Improved async open books
- * Fixed bug #1139
-
- [ Emmanuel Milou ]
- * Add a way to save account order
- * commit missing files
-
- [ Julien Bonjean ]
- * Introduced log4c (ticket #1162)
-
- [ Emmanuel Milou ]
- * Load/save account order functionnal - ticket #813
-
- [ Alexandre Savard ]
- * Add CELT codec (#1143)
- * Make celt frame size 256 (*1143)
-
- [ Julien Bonjean ]
- * Switched everything to log4c (ticket #1162)
- * Updated eclipse settings
-
- [ Emmanuel Milou ]
- * Restore adding account - ticket #1172
- * Add liblog4c dependecy - ticket #1179
-
- [ Alexandre Savard ]
- * Double maxAvailByte for frame size in rtp (#1143)
-
- [ Emmanuel Milou ]
- * Add User-Agent SIP header - Ticket #1173
-
- [ Julien Bonjean ]
- * Fixed autoresize issue (#708)
-
- [ Emmanuel Milou ]
- * Remove libcppuint dependency for the debian packages
- * Look for libsexy only if gtk version < 2.16 - Ticket #1116
- * Remove libsexy dependency for jaunty. ticket #1116
-
- [ Julien Bonjean ]
- * Introduced unit tests (#1146)
- * Updated gitignore
- * Fixed Makefile (#1146)
-
- [ Emmanuel Milou ]
- * [TICKET #1112] Add a test on the voice buffer to send through iax
- packets
- * Remove doublon in dependencies
- * Remove warnings from the client test framework
- * Update version number to 0.9.5~beta
- * Update build-package script
- * Add check dependency in build-deps control file field
- * Create debian files for the new sflphone-client-gnome
- * [TICKET #1212] Add Replaces field in control files
- * [TICKET #1212] Fix manpages installation path
- * [TICKET #1212] Add maintainer scripts to create alternatives
- * [#1212] Update the manpages generation - edit preinst maintainer
- script
- * [#1212] Fix reference error in manpage
- * [#1212] Add missing files on the client side
- * [#1212] Fix debian docs files - no TODO file
- * [1212] Fix manpage creation problem
- * [#1220] Generate client-side glue files and marshaller at
- compilation time
- * [#1220] Generate server-side glue files at compilation time
- * [#1212] Change binary name to sflphone-client-gnome
- * [#1212] Update .gitignore to fit the new working tree
- * [#1220] Explicitly generate glue files before building the library
- * [#1220] Compile dbus directory before audio
- * [#1212] Create sflphone-common at the root of the repository
- * [#1212] Re-add pjproject
- * [#1212] Remove Makefile from repo
- * [#1220] Fix Makefile.am
- * [#1212] New working directory functional
- * [#1212] Update .gitignore
- * [#1212] Hack to make pjsip compile..
- * [#1220] Use non-installed binary for dbusxx-xml2cpp
- * [#1212] Add descriptive files, remove unuseful scripts from tools/
-
- [ Alexandre Savard ]
- * Restore speex codecs
- * add frame size for celt (#1143)
- * add framesize to codec, independant from audiolayer (#1143)
- * use codec frame size in rtp (#1143)
- * compute fixed_codec_framesize (#1143)
- * do not resample if not required (#1143)
- * add condition on resampling for decoder (#1143)
- * add a condition on bytesAvail == 0 from mic data
- * no maximum in rtp decode (#1143)
- * compute maximum for decoding (#1143)
-
- [ Emmanuel Milou ]
- * [#1146] Implement unitary tests on the client-side
-
- [ Alexandre Savard ]
- * use float instead of int to compute max nb of sample (#1143)
- * add nbSampleMax for unresampled data (#1143)
- * make thread sleep during 5 ms insead of 20 (#1143)
- * use unix usleep (#1143)
- * 50 usecond thread!!!!! (#1143)
- * try with the smallest compression (#1143)
- * use timer set at framesize (#1143)
-
- [ Emmanuel Milou ]
- * [#1161] Restore changelog version
-
- [ Alexandre Savard ]
- * Remove celt stuff
-
- [ Emmanuel Milou ]
- * [#1161] Update changelog
- * [#1220] Add Conflicts: sflphone in debian control files
- * [#1179] Add liblog4c3 runtime dependency
- * [#1212] FIx typo error in dependency list for itnrepid
- * [#1212] FIx .desktop file to point on the right exec
- * [#1212] Modify changelog replacing tag
-
- [ Sflphone Project ]
- * "[#1262] Updated changelogs for version 0.9.5-0ubuntu1~beta"
-
- [ Emmanuel Milou ]
- * [#1212] restore changelogs
-
- [ Sflphone Project ]
- * [#1262] Updated changelogs for version 0.9.5-0ubuntu1 Snapshot 2009-
- 04-27
-
- [ Emmanuel Milou ]
- * [#1212] restore changelogs
-
- [ Sflphone Project ]
- * [#1262] Updated changelogs for version 0.9.5-0ubuntu1~beta
-
- [ Emmanuel Milou ]
- * [#1212] restore changelogs
-
- [ Sflphone Project ]
-
- -- Sflphone Project <sflphone@mtl.savoirfairelinux.net> Mon, 27 Apr 2009 16:57:00 -0400
-
-sflphone-common (0.9.4-0ubuntu2) SYSTEM; urgency=low
-
- [ Alexandre Savard ]
- * Restore speex and GSM detection
-
- [ Emmanuel Milou ]
- * Fix bug #1090
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Wed, 8 Apr 2009 11:29:15 -0500
-
-sflphone (0.9.4-0ubuntu1) SYSTEM; urgency=low
-
- [ Emmanuel Milou ]
- * Integrate DBus-c++ and libiax2 in the main build system
- * Clean up in the working repository
- * Reorder hooks configuration panel
- * Protect case when no codecs are active
- * Fix some return values
- * Add unitary tests for the hook manager (premisces)
-
- [Yun Liu]
- * Update chinese translation
-
- [Sven Werlen]
- * Update german translation
-
- [Hussein Abdallah]
- * Update russian translation
-
- [Maxime Chambreuil]
- * Update spanish translation
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Fri, 3 Apr 2009 18:29:15 -0500
-
-
-sflphone (0.9.4-rc1) SYSTEM; urgency=low
-
- [ Emmanuel Milou ]
- * Fix bug while trying to hold/unhold several simultaneous call
- * Improve address book build system
- * Implement SIP url popup on incoming call
- * Improve GTK+ panel configuration
- [ Julien Bonjean ]
- * GTK+ client refactoring
- * GTK+ clean up
- * Address book improvment
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Fri, 27 Mar 2009 18:29:15 -0500
-
-sflphone (0.9.4-0beta1) SYSTEM; urgency=low
-
- [ Alexandre Savard ]
- * Display codec used during conversation on the GUI
- * Enable/disable STUN parameters at runtime
- * Refactor search bar use
- [ Emmanuel Milou ]
- * Build system fixes
- * Implement SIP re-invite
- * Implement IP to IP call
- [ Julien Bonjean ]
- * Integrate GNOME address book based on evolution data server
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Fri, 20 Mar 2009 18:29:15 -0500
-
-
-sflphone (0.9.3-0ubuntu3) SYSTEM; urgency=low
-
- [ Alexandre Savard ]
- * Both playback and record streams in PA_STREAM_CORKED (pulseaudio)
- * Use PLUGHW device for ALSA capture
- * Functional IAX and SIP recording for voicemail
- * Use the less CPU-consuming interpolator algorithm for resampling
- * Display in GTK GUI the codec used in conversation
- * GTK GUI use ASCII instread of utf-8
- * Add record menus in GTK GUI
- * Put on hold when dialing a new number
- * AccountID's are saved in the history
-
- [ Emmanuel Milou ]
- * Integrate DBUS C++, libiax2 in the git repository
- * Update website
- * Use libspeexdsp only if available on the system
- * Updated .gitignore file
-
- [Cyrille Béraud]
- * Account assistant manager improvment
- * Add an email request when creating a new account to receive voicemails
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Sat, 14 Feb 2009 13:29:15 -0500
-
-sflphone (0.9.3-0ubuntu2) SYSTEM; urgency=low
-
- [ Emmanuel Milou ]
- * Add compilation note in README
- * Use default ALSA plugin for capture
- * Fix the ALSA capture problem one more time
- * Clean up debug messages in dbus.c
- * Add libspeexdsp dependency
- * Remove implicit declaration compilation warnings
- * Fix links in the website, add release note
- * Change capture for the website front page
- * Add alsa devel dependency in build-depends control file field
- * Clean up, indentation, try to handle latency problems in iax/pulseaudio
- * Remove pjsip generated files from the repo
- * Use the previous declared curAlias function in accountwindow
- * Fix bug in history call duration when the call fails
- * Remove runtime warning in the GTK+ client
- * Add librsvg2-common dependency to load SVG under KDE
- * Refresh .gitignore
- * Update locales files + french translation
- * Add configuration panel for future noise reduction
- * Add configuration panel for audio record module
- * Daemon less verbose; accounts don't try to access STUn options anymore
- * Fix typo in configwindow
- * Add content in the official website
- * use a GTK_STOCK icon for the record button
- * Complete description text in the assistant manager
- * Add libtool flags in client configure.ac
- * Remove unuseful dependency (snd)
- * Fix SIP transfer problems
- * Remove previous version of PJSIP from the repo
- * Upgrade PJSIP to version 1.0.1
- * Add the new website source in the repository
- * Use libspeexdsp for silence detection only if available
-
- [ Loïc Faure-Lacroix ]
- * Ajout du logo gpl3
- * Ajout des images
- * Ajout de la section screenshot pour le site
- * Ajout du favicon dans le header
- * Modification des cartes
-
- [ Alexandre Savard ]
- * Clean up <speex/libspeexdsp>
- * Small cleanup
- * Save Wave fixed
- * Fix new call button when recording
- * libspeexdsp added
- * Recording: default home folder at startup
- * Minor changes to config window
- * IAX recording fixed
- * Set / get recording path, still need some GTK for client
- * AudioRecord file name format
- * Now recording in HOME folder
-
- [ Cyrille Béraud ]
- * Fix bug in reqaccount.c
-
- [ Maxime Chambreuil ]
- * Update spanish translation
-
- [Yun Liu ]
- * Update chinese translation
-
- [ Hussein Abdallah ]
- * Update russian translation
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Sat, 14 Feb 2009 13:29:15 -0500
-
-sflphone (0.9.3-0ubuntu1) SYSTEM; urgency=low
-
- * Remove debug
- * Join thread before leaving
- * Fix implicit declaration in reqaccount
- * Add REST code to build the request to server
- * Fix GValue initialization warnings
- * Update version number, fix implicit declaration, fix GTK markup
- warnings
- * Apply patch to create custom SIP account from our own server
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Fri, 06 Feb 2009 19:17:32 -0500
-
-sflphone (0.9.2-2ubuntu9) SYSTEM; urgency=low
-
- [ Alexandre Savard ]
- * Speex audio codec preprocessing initialization
- * peer hung up segmentation fault solved
- * Stop recording when transfering
- * Terminate only one call
- * Add isRecording() function
- * Fix call_icon GTK client
- * Fix SIPCallClose() function, recorded file now close properly
- * Function terminateSIPCall added in sipvoiplink and managerimpl
- * Fix thread destructor
- * setRecordingOption function implement in audiorecord
- * Record now implemented in Call class
- * Record interface complete (on hold erase previous recording)
- * Added recButton in client
- * Added: record button related icons
- * Record button added
- * Overload AudioRecord::recData to get mic and speaker data mixed
- * Recording now in audiortp::run() method
- * Audio recording working in AudioRTP: receiveSessionForSpeaker
- * Open/close a wave file when pulse audio stream start/stop
-
- [ Emmanuel Milou ]
- * Fix path for GTK+ icons; clean up
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Thu, 05 Feb 2009 18:27:53 -0500
-
-sflphone (0.9.2-2ubuntu8) SYSTEM; urgency=low
-
- [ Emmanuel Milou ]
- * Update changelogs
- * Fix bug in merge and in Makefile.am
- * Terminate only one call
- * Disable PJsip shutdown when changing STUN parameters
- * Function terminateSIPCall added in sipvoiplink and managerimpl
- * Add a timer to the alsa thread to not jam the CPU load
- * Fix bug in sipvoiplink.cpp
- * Clean shutdown of pulseaudio on quiting
- * Fix DTMF at first start with Pulseaudio
- * Remove zeroconf from the build system
- * Add a library manager + exception handling
- * Clean up in the working directory
- * Better handling of capture XRUNs
- * Restore mic adjust volume on ALSA layer
- * Protect device ALSA operation if not opened
- * Fix the switching layer bug
- * Use dynamic_cast<> to use audiolayer-specific methods
- * Open the audio devices only once at startup
- * Refactoring of the ALSA part
- * Functional plug-in manager
- * Use a C++ thread to handle tones and DTMF in ALSA
- * Restore IAXVoIPLink, restore Mutex
- * Make the plugins registering against the plugin manager
- * Migrate to 1->N relationship between voiplink and accounts
- * API plugin for registration
- * Use C++ thread in SIP, move everything in sipvoiplink
- * Complete singleton pattern for the plugin manager
- * Add -Wno-return-type compilation flag to remove warnings; Update
- version number in configure.ac
- * Add the dynamic loading for the plugin framework; integate unittest
-
- [ Yun Liu ]
- * Update rpm spec file
- * modify build package script and spec file for suse
-
- [ Alexandre Savard ]
- * Add audiorecorder plugin and testaudiorecorder
- * Add audio Recording class, edit global.h
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Wed, 04 Feb 2009 14:00:30 -0500
-
-sflphone (0.9.2-2ubuntu7) SYSTEM; urgency=low
-
- [ Emmanuel Milou ]
- * Update changelog to 0.9.2-6
- * Fix some dbus-glib implementation details on the client side
- * Init history after dbus initialization
- * Add error checking in useragent; Clean sipvoiplink
- * Prevent crash when trying to call an empty number
- * Set the volume of the playback stream to PA_VOLUME_NORM at startup
- * Fix GTK+ generic value double initialization
- * Fix jaunty control file dependency problems
- * Fix jaunty control file dependency problems
-
- [ Yun Liu ]
- * Fix bug ticket # 137
- * Tolerant to gsm library of OpenSuse 11
-
- [ Sven Werlen ]
- * Update german translation
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Fri, 23 Jan 2009 17:48:13 -0500
-
-sflphone (0.9.2-2ubuntu6) SYSTEM; urgency=low
-
- [ Emmanuel Milou ]
- * Migrate STUN configuration to the main config window
- * Update french translation
- * Other tiny memory leaks
- * Fix memory leak in sampleconverter.cpp
- * Generate packages from the release branch
- * update the build package script
- * modify the control files with architecture=any
- * Remove valgring uninitialized value
- * IAX and SIP use the same global variables to set account
- configuration ; fix broken code
-
- [ Maxime Chambreuil ]
- * Update spanish translation
-
- [ Hussein Abdallah ]
- * Update russian translation
-
- [ Yun Liu ]
- * Update translation files
- * Fix the bug when user uncheck the account which fails in the
- previous registration
- * Add stun error status
- * Fix bug ticket #143
- * Script for auto-install dependencies
- * Fix bug ticket #140
- * Fix bug ticket 141
- * Fix the reregister process when user change the details of an
- account
-
- -- Emmanuel Milou <manu@sulfur.inside.savoirfairelinux.net> Fri, 16 Jan 2009 18:19:05 -0500
-
-sflphone (0.9.2-2ubuntu5) SYSTEM; urgency=low
-
- * Fix memory leak in the pulseaudio callback
- * Update debian package generation script
- * Warnings removal in GTK+ client
- * Clean adjust volume method in alsalayer
- * Plug the sflphone playback volume control to the pulseaudio volume
- manager
- * Display the date in history according to the current locale
- * Generate the changelog according to the git commit messages
- * Complete header in chinese translation file
- * Use the right gpg key to sign the packages
- * add debian jaunty jackalope support
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Wed, 14 Jan 2009 21:17:20 -0500
-
-sflphone (0.9.2-2ubuntu4) SYSTEM; urgency=low
-
- [ Emmanuel Milou ]
- * add german translation
-
- [ Yun Liu ]
- * Fix GUI crash in Ubuntu8.10 64bit system
-
- -- Yun Liu <yun.liu@savoirfairelinux.com> Thu, 08 Jan 2009 13:08:51 -0500
-
-sflphone (0.9.2-2ubuntu3) SYSTEM; urgency=low
-
- [ Emmanuel Milou ]
- * The main thread synchronizes the ringtone thread
- * disable custom ringtone for the ALSA layer
- * Fix the Makefile.am in man directory, add a SEE ALSO section
-
- [ Yun Liu ]
- * Fix daemon crash caused by the previous patch ( for bug ticket #129)
-
- -- Yun Liu <yun.liu@savoirfairelinux.com> Tue, 06 Jan 2009 16:18:38 -0500
-
-sflphone (0.9.2-2ubuntu2) SYSTEM; urgency=low
-
- * Fix bug ticket #129
-
- -- Yun Liu <yun.liu@savoirfairelinux.com> Wed, 5 Jan 2009 15:54:53 -0500
-
-sflphone (0.9.2-2ubuntu1) SYSTEM; urgency=low
-
- * Migrate from eXosip library to pjsip
- * Add multiple SIP accounts support
- * Fix ringtones problems
- * Add a pulseaudio support
- * Improve audio quality with ALSA
- * Add chinese translation
- * Improve spanish translation
- * Migrate to a maintained C++ DBus bindings
- * Clean and improve the build system
- * Add build-dependency on Perl because we need pod2man to generate manpages
-
- -- Yun Liu <yun.liu@savoirfairelinux.com> Wed, 26 Nov 2008 09:47:53 -0500
-
-sflphone (0.9.1) unstable; urgency=low
- * Add a search tool in the history
- * Migrate some gtk_entry_new to sexy_icon_entry_new
- * Bug fix (Ticket #78): The voicemail password isn't displayed anymore in
- the history tab
- * Add the SIP registration expire value in the user file.
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Thu, 22 May 2008 11:14:25 -0500
-
-sflphone (0.9.0) unstable; urgency=low
- * Add history features
- * Call date
- * Call duration
- * Mouse events in the history tab
- * Smooth switch from the history tab to the calls tab
- * Remove most of GTK-Critical warnings
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Wed, 13 May 2008 16:58:25 -0500
-
-sflphone (0.9-2008-06-06) unstable; urgency=low
- * Audio bug correction: capture stopped after a few minutes of conversation
- with USB Plantronics sound card
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Tue, 06 May 2008 16:58:25 -0500
-
-sflphone (0.9-2008-05-06) unstable; urgency=low
- * Bug correction: account creation with the assistant
- * GTK+ warnings removal
- * libnotify warnings removal
- * Remove aliasing on the SFLphone logo
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Mon, 05 May 2008 16:58:25 -0500
-
-sflphone (0.9) unstable; urgency=low
- * Clean dependencies ( removal of libboost )
- * Several GTK improvement and updates
- -account window
- -configuration window
- * Migrate from GtkCheckMenuItem to GtkImageMenuItem
- * ALSA standard I/O transfers: MMAP instead of R/W
- * Fix speex audio quality
- * IAX2 protocol
- -Fix hold/unhold situation
- -Add on hold music
- * SIP protocol
- -Ringtone on incoming call
- -Fix transfer situation
- * Add desktop notification ( libnotify )
- * Improve the system tray icon behaviour
- * Improve registration error handling
- * Register/unregister from the account window takes effect without starting back SFLphone
- * Compilation warnings removal
- * Call history
- * Add an account configuration wizard
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Wed, 30 Apr 2008 16:58:25 -0500
-
-sflphone (0.8.2) unstable; urgency=low
- * Internationalization of the GTK GUI
- * English / French
- * STUN support
- * Slight modifications of the graphical interface ( tooltips, dialpad, ...)
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Fri, 21 Mar 2008 11:37:53 -0500
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-common/compat b/tools/build-system/distributions/ubuntu/debian-sflphone-common/compat
deleted file mode 100644
index 7ed6ff82de6bcc2a78243fc9c54d3ef5ac14da69..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-common/compat
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-common/control.hardy b/tools/build-system/distributions/ubuntu/debian-sflphone-common/control.hardy
deleted file mode 100644
index e14674d170b6caa6f4bac6d1118e5d1a336a88f6..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-common/control.hardy
+++ /dev/null
@@ -1,20 +0,0 @@
-Source: sflphone-common
-Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
-Section: gnome
-Priority: optional
-Build-Depends: debhelper (>= 5), libgcc1, autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libgsm1-dev, libspeex-dev, libtool, libdbus-1-dev, libasound2-dev, uuid-dev, libexpat1-dev
-Standards-Version: 3.7.3
-
-Package: sflphone-common
-Priority: optional
-Architecture: any
-Depends: libsamplerate0 (>=0.1.2) , libdbus-glib-1-2 (>= 0.73), libexpat1, libc6 (>= 2.3.6-6) , libcommoncpp2-1.6-0 ,libgsm1 (>=1.0.10) , libspeex1 (>=1.1.12) , libdbus-1-3, libasound2 (>= 1.0), libpulse0 (>= 0.9.6), libccrtp1-1.6-0
-Replaces: sflphone
-Conflicts: sflphone
-Homepage: http://www.sflphone.org
-Description: SIP and IAX2 compatible softphone - Core
- This package provides SFLphone daemon, that is the core of the application.
- SFLphone is meant to be a robust enterprise-class desktop phone.
- SFLphone is released under the GNU General Public License.
- SFLphone is being developed by the global community, and maintained by
- Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-common/control.intrepid b/tools/build-system/distributions/ubuntu/debian-sflphone-common/control.intrepid
deleted file mode 100644
index 270e67811229719df9e000fd3a0871e30b9c675a..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-common/control.intrepid
+++ /dev/null
@@ -1,20 +0,0 @@
-Source: sflphone-common
-Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
-Section: gnome
-Priority: optional
-Build-Depends: debhelper (>= 5), libgcc1 , autoconf, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libgsm1-dev, libspeex-dev, libtool, libdbus-1-dev, libasound2-dev, libspeexdsp-dev, uuid-dev, libexpat1-dev
-Standards-Version: 3.8.0
-
-Package: sflphone-common
-Priority: optional
-Architecture: any
-Depends: libsamplerate0 (>=0.1.2) , libexpat1 , libc6 (>= 2.3.6-6) , libcommoncpp2-1.6-0 , libgsm1 (>=1.0.10) , libspeex1 (>=1.1.12) , libdbus-1-3, libasound2 (>= 1.0), libpulse0 (>= 0.9.6), libccrtp1-1.6-1, libspeexdsp1
-Replaces: sflphone
-Conflicts: sflphone
-Homepage: http://www.sflphone.org
-Description: SIP and IAX2 compatible softphone - Core
- This package provides SFLphone daemon, that is the core of the application.
- SFLphone is meant to be a robust enterprise-class desktop phone.
- SFLphone is released under the GNU General Public License.
- SFLphone is being developed by the global community, and maintained by
- Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-common/control.jaunty b/tools/build-system/distributions/ubuntu/debian-sflphone-common/control.jaunty
deleted file mode 100644
index 8a99d639228a21b5a866741665775868f03fa341..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-common/control.jaunty
+++ /dev/null
@@ -1,19 +0,0 @@
-Source: sflphone-common
-Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
-Section: gnome
-Priority: optional
-Build-Depends: debhelper (>= 5), libgcc1 , autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libgsm1-dev, libspeex-dev, libtool, libdbus-1-dev, libasound2-dev, libspeexdsp-dev, uuid-dev, libexpat1-dev, libzrtpcpp-dev, libssl-dev
-Standards-Version: 3.7.3
-
-Package: sflphone-common
-Priority: optional
-Architecture: any
-Depends: libsamplerate0 (>=0.1.2) , libexpat1 , libc6 (>= 2.3.6-6) , libcommoncpp2-1.6-0 , libgsm1 (>=1.0.10) , libspeex1 (>=1.1.12) , libdbus-1-3, libasound2 (>= 1.0), libpulse0 (>= 0.9.6), libccrtp1-1.6-1, libspeexdsp1
-Replaces: sflphone
-Conflicts: sflphone
-Homepage: http://www.sflphone.org
-Description: SIP and IAX2 compatible softphone - Core
- SFLphone is meant to be a robust enterprise-class desktop phone.
- SFLphone is released under the GNU General Public License.
- SFLphone is being developed by the global community, and maintained by
- Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-common/copyright b/tools/build-system/distributions/ubuntu/debian-sflphone-common/copyright
deleted file mode 100644
index fbde2314bef1fb7ee643083e6d27c397213c5ead..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-common/copyright
+++ /dev/null
@@ -1,28 +0,0 @@
-This package was debianized by Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> on
-Fri, 3 Apr 2009 09:47:53 -0500.
-
-It was downloaded from the git repository of SFLphone: git://sflphone.org/git/sflphone.git
-
-Upstream Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
-
-Copyright:
-
-Savoir-Faire Linux Inc.
-
-License:
-
-This software is copyright (c) 2004-2009 Savoir-Faire Linux inc.
-
-You are free to distribute this software under the terms of
-the GNU General Public License version 3.
-On Debian systems, the complete text of the GNU General Public
-License can be found in the file `/usr/share/common-licenses/GPL'.
-
-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., 51 Franklyn St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-common/cron.d b/tools/build-system/distributions/ubuntu/debian-sflphone-common/cron.d
deleted file mode 100644
index d11e61177739b56bce3aac6de6483b48e797a258..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-common/cron.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Regular cron jobs for the sflphone package
-#
-0 4 * * * root sflphone_maintenance
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-common/dirs b/tools/build-system/distributions/ubuntu/debian-sflphone-common/dirs
deleted file mode 100644
index ab04d899ac9c1b4bb9f78803cdc51edf38fcb524..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-common/dirs
+++ /dev/null
@@ -1,8 +0,0 @@
-usr/bin
-usr/lib
-usr/share/applications
-usr/share/dbus-1/services
-usr/share/sflphone/ringtones
-usr/share/locale
-usr/share/doc
-usr/share/man
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-common/docs b/tools/build-system/distributions/ubuntu/debian-sflphone-common/docs
deleted file mode 100644
index f1dd08af0258ad3bbadc728c41f5d3cc680a7ef4..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-common/docs
+++ /dev/null
@@ -1,6 +0,0 @@
-NEWS
-README
-TODO
-ChangeLog
-AUTHORS
-
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-common/manpages b/tools/build-system/distributions/ubuntu/debian-sflphone-common/manpages
deleted file mode 100644
index 18f8b41d0854310d2016407ab7c041aa5a5330f6..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-common/manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/sflphone-common/usr/share/man/man1/sflphoned.1
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-common/postinst b/tools/build-system/distributions/ubuntu/debian-sflphone-common/postinst
deleted file mode 100644
index ff29eda3335c59c5451f8b5bc9366ec73505965d..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-common/postinst
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-# postinst script for sflphone-common
-#
-# see: dh_installdeb(1)
-
-# Script to copy and move, if exists, configuration file sflphonedrc and history in the XDG directory
-# Freedesktop specifications: http://standards.freedesktop.org/basedir-spec/latest/
-
-set -e
-
-INST_CONFIG="$HOME/.sflphone/sflphonedrc";
-INST_DATA="$HOME/.sflphone/history";
-INST_CACHE="$HOME/.sflphone/sfl.pid";
-
-NEW_INST_CONFIG=
-NEW_INST_DATA=
-NEW_INST_CACHE=
-
-# Set the XDG CONFIG directory to the default one or to the path set in the environment variable
-if [ -z $XDG_CONFIG_HOME ]; then
- NEW_INST_CONFIG=$HOME"/.config/sflphone/"; # This is the standard path
-else
- NEW_INST_CONFIG=$XDG_CONFIG_HOME;
-fi;
-
-# Set the XDG DATA directory to the default one or to the path set in the environment variable
-if [ -z $XDG_DATA_HOME ]; then
- NEW_INST_DATA=$HOME"/.local/share/sflphone/"; # This is the standard path
-else
- NEW_INST_DATA=$XDG_DATA_HOME;
-fi;
-
-# Move the configuration file
-if [ -f $INST_CONFIG ] ; then
- echo "Moving the configuration file into $NEW_INST_CONFIG directory";
- if [ ! -d $NEW_INST_CONFIG ]; then
- mkdir $NEW_INST_CONFIG;
- fi
- mv $INST_CONFIG $NEW_INST_CONFIG;
-fi
-
-# Move the history
-if [ -f $INST_DATA ] ; then
- echo "Moving the history file into $NEW_INST_DATA directory";
- if [ ! -d $NEW_INST_DATA ]; then
- mkdir $NEW_INST_DATA;
- fi
- mv $INST_DATA $NEW_INST_DATA;
-fi
-
-# Remove the directory
-# rmdir $HOME"/.sflphone";
-
-echo "You may remove the $HOME/.sflphone, the application won't use it anymore, but the XDG directories instead. Thank you.";
-
-exit 0
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-common/postrm b/tools/build-system/distributions/ubuntu/debian-sflphone-common/postrm
deleted file mode 100644
index 70be710bd108ddadbfa790f9ac8795984cc139f8..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-common/postrm
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-# postrm script for sflphone
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <postrm> `remove'
-# * <postrm> `purge'
-# * <old-postrm> `upgrade' <new-version>
-# * <new-postrm> `failed-upgrade' <old-version>
-# * <new-postrm> `abort-install'
-# * <new-postrm> `abort-install' <old-version>
-# * <new-postrm> `abort-upgrade' <old-version>
-# * <disappearer's-postrm> `disappear' <overwriter>
-# <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-if [ "$1" = "purge" ]
-then
-
- # remove the user config file
- rm -f $HOME/.sflphone/sflphonedrc
-
-fi
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-common/preinst b/tools/build-system/distributions/ubuntu/debian-sflphone-common/preinst
deleted file mode 100644
index 6d04e97b452606720e35f07523b60c32ad7f9d6b..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-common/preinst
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# postrm script for sflphone
-#
-# see: dh_installdeb(1)
-
-set -e
-
-package=sflphone
-
-case "$1" in
- install|upgrade)
- # Clear the old dbus-c++ and iax2 if presents
- ;;
-esac
-
-exit 0
diff --git a/tools/build-system/distributions/ubuntu/debian-sflphone-common/rules b/tools/build-system/distributions/ubuntu/debian-sflphone-common/rules
deleted file mode 100755
index 5624b56e3ed62723a48d62888e64a8353eb29e05..0000000000000000000000000000000000000000
--- a/tools/build-system/distributions/ubuntu/debian-sflphone-common/rules
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-export DH_OPTIONS
-
-package=sflphone-common
-
-CXX = g++-4.0
-CFLAGS = -Wall -g
-DEB_INSTALL_MANPAGES_sflphone_common = sflphoned.1
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
- ./autogen.sh
- ./configure --prefix=/usr
- cd libs/pjproject; ./autogen.sh; ./configure --prefix=/usr
- touch configure-stamp
-
-#Architecture
-build: build-arch build-indep
-
-build-arch: build-arch-stamp
-build-arch-stamp: configure-stamp
-
- # Add here commands to compile the arch part of the package.
- cd libs/pjproject; $(MAKE) dep; $(MAKE) clean; $(MAKE)
- cd -; $(MAKE)
- touch $@
-
-build-indep: build-indep-stamp
-build-indep-stamp: configure-stamp
-
- # Add here commands to compile the indep part of the package.
- #$(MAKE) doc
- touch $@
-clean:
- dh_testdir
- dh_testroot
- rm -f build-arch-stamp build-indep-stamp configure-stamp
- # Add here commands to clean up after the build process.
- [ ! -f Makefile ] || $(MAKE) distclean
-
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
- dh_clean
-
-install: install-indep install-arch
-install-indep:
- dh_testdir
- dh_testroot
- dh_clean -k -i
- dh_installdirs -i
- # Add here commands to install the package into debian/sflphone.
-
-install-arch:
- dh_testdir
- dh_testroot
- dh_clean -k -s
- dh_installdirs -s
- # Add here commands to install the arch part of the package into
- # debian/tmp.
- $(MAKE) DESTDIR=$(CURDIR)/debian/$(package) install
- cd libs/pjproject; $(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
-# binary-arch/binary-indep
-# in another 'make' thread.
-
-binary-common:
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_python
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_perl
- dh_makeshlibs
- dh_installdeb
-# dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
- $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
-
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
diff --git a/tools/build-system/gpg/setup-gpg.sh b/tools/build-system/gpg/setup-gpg.sh
deleted file mode 100755
index 1a12793003d9f521f582e4535b7e97df1ee47179..0000000000000000000000000000000000000000
--- a/tools/build-system/gpg/setup-gpg.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-#####################################################
-# File Name: setup-gpg.sh
-#
-# Purpose :
-#
-# Author: Julien Bonjean (julien@bonjean.info)
-#
-# Creation Date: 2009-04-20
-# Last Modified:
-#####################################################
-
-# pkill gpg-agent
-
-export LANG=en_CA.UTF-8
-export LC_ALL=en_CA.UTF-8
-
-echo "Check if GPG key is present"
-gpg --list-secret-keys | grep "Savoir-Faire Linux Inc." >/dev/null
-
-if [ "$?" -ne "0" ]; then
- echo "!! GPG private key is not present"
- exit -1
-fi
-
-echo "Check GPG agent"
-pgrep -u "sflphone-package-manager" gpg-agent > /dev/null
-if [ "$?" -ne "0" ]; then
- echo "Not running, launching it"
- EVAL=`/usr/bin/gpg-agent --daemon --write-env-file $HOME/.gpg-agent-info --default-cache-ttl 2000000000 --max-cache-ttl 2000000000 --pinentry-program /usr/bin/pinentry`
- eval ${EVAL}
-fi
-
-if [ "$?" -ne "0" ]; then
- echo "!! Error with GPG agent"
- exit -1
-fi
-
-GPG_AGENT_INFO=`cat $HOME/.gpg-agent-info 2> /dev/null`
-export ${GPG_AGENT_INFO}
-
-if [ "${GPG_AGENT_INFO}" == "" ]; then
- echo "!! Cannot get GPG agent info"
- exit -1
-fi
-
-GPG_TTY=`tty`
-export GPG_TTY
-
-touch ./test-gpg
-gpg -v --clearsign --use-agent ./test-gpg
-rm -f ./test-gpg
-rm -f ./test-gpg.asc
-
-exit 0
-
diff --git a/tools/build-system/launch-build-machine-2.sh b/tools/build-system/launch-build-machine-2.sh
index 46246540a089f1de84f40e24e810d3622bb70566..12f8760e79c1de83f177606a64127b320fba516a 100755
--- a/tools/build-system/launch-build-machine-2.sh
+++ b/tools/build-system/launch-build-machine-2.sh
@@ -7,16 +7,12 @@
# Author: Julien Bonjean (julien@bonjean.info)
#
# Creation Date: 2009-10-20
-# Last Modified: 2009-10-21 18:18:07 -0400
+# Last Modified: 2009-12-15 18:16:50 -0500
#####################################################
#set -x
-# home directory
-ROOT_DIR=${HOME}
-
-# gpg passphrase file
-GPG_FILE="${ROOT_DIR}/.gpg-sflphone"
+. `dirname $0`/setenv.sh
IS_RELEASE=
VERSION_INDEX="1"
@@ -25,14 +21,6 @@ DO_LOGGING=1
DO_UPLOAD=1
SNAPSHOT_TAG=`date +%Y%m%d`
-EDITOR=echo
-export EDITOR
-
-REFERENCE_REPOSITORY="${ROOT_DIR}/sflphone-source-repository"
-
-WORKING_DIR="${ROOT_DIR}/sflphone-build-repository/tools/build-system"
-LAUNCHPAD_DIR="${WORKING_DIR}/launchpad"
-LAUNCHPAD_DISTRIBUTIONS=( "jaunty" "karmic" )
LAUNCHPAD_PACKAGES=( "sflphone-client-gnome" "sflphone-common" )
echo
@@ -217,6 +205,7 @@ END
fi
done
+ cp ${DEBIAN_DIR}/changelog.generic ${DEBIAN_DIR}/changelog
done
# if push is activated
diff --git a/tools/build-system/launch-build-machine.sh b/tools/build-system/launch-build-machine.sh
deleted file mode 100755
index f4c02460494c688b1c1f84467a91c9e3780f2cea..0000000000000000000000000000000000000000
--- a/tools/build-system/launch-build-machine.sh
+++ /dev/null
@@ -1,431 +0,0 @@
-#!/bin/bash
-#####################################################
-# File Name: launch-build-machine.sh
-#
-# Purpose :
-#
-# Author: Julien Bonjean (julien@bonjean.info)
-#
-# Creation Date: 2009-04-20
-# Last Modified: 2009-08-07 17:01:32 -0400
-#####################################################
-
-#
-# Not working with git 1.5.4.3
-#
-
-TAG=`date +%Y-%m-%d`
-
-# wait delay after startup and shutdown of VMs
-STARTUP_WAIT=40
-SHUTDOWN_WAIT=30
-
-# ssh stuff
-SSH_OPTIONS="-o LogLevel=ERROR -o CheckHostIP=no -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
-SSH_HOST="sflphone@127.0.0.1"
-SSH_REPOSITORY_HOST="sflphone-package-manager@dev.savoirfairelinux.net"
-SSH_BASE="ssh ${SSH_OPTIONS} -p 50001 ${SSH_HOST}"
-SCP_BASE="scp ${SSH_OPTIONS} -r -P 50001"
-
-# home directory
-ROOT_DIR="/home/projects/sflphone"
-
-# local hidden repository (only for changelog commit)
-LOCAL_REPOSITORY=${ROOT_DIR}/.sflphone-repository
-
-# gpg passphrase file
-GPG_FILE="${ROOT_DIR}/.gpg-sflphone"
-
-# vbox config directory
-export VBOX_USER_HOME="${ROOT_DIR}/vbox"
-
-# remote home directory
-REMOTE_ROOT_DIR="/home/sflphone"
-
-# scripts
-SCRIPTS_DIR="${ROOT_DIR}/build-system"
-PACKAGING_SCRIPTS_DIR="${SCRIPTS_DIR}/remote"
-DISTRIBUTION_SCRIPTS_DIR="${SCRIPTS_DIR}/distributions"
-
-# directory that will be deployed to remote machine
-TODEPLOY_DIR="${ROOT_DIR}/sflphone-packaging"
-TODEPLOY_BUILD_DIR="${TODEPLOY_DIR}/build"
-
-# remote deployment dir
-REMOTE_DEPLOY_DIR="/home/sflphone/sflphone-packaging"
-
-# cloned repository and archive
-REPOSITORY_DIR="${TODEPLOY_BUILD_DIR}/sflphone"
-REPOSITORY_ARCHIVE="`dirname ${REPOSITORY_DIR}`/sflphone.tar.gz"
-REPOSITORY_SFLPHONE_COMMON_DIR="${REPOSITORY_DIR}/sflphone-common"
-REPOSITORY_SFLPHONE_CLIENT_KDE_DIR="${REPOSITORY_DIR}/sflphone-client-kde"
-REPOSITORY_SFLPHONE_CLIENT_GNOME_DIR="${REPOSITORY_DIR}/sflphone-client-gnome"
-
-# where results go
-PACKAGING_RESULT_DIR=${ROOT_DIR}/packages-${TAG}
-
-USER="sflphone"
-
-RELEASE_MODE=
-
-SNAPSHOT_TAG=`date +%Y%m%d`
-
-DO_CLEAN=1
-DO_PREPARE=1
-DO_PUSH=1
-DO_MAIN_LOOP=1
-DO_SIGNATURES=1
-DO_UPLOAD=1
-DO_LOGGING=1
-DO_SEND_EMAIL=1
-
-EDITOR=echo
-export EDITOR
-
-NON_FATAL_ERRORS=0
-
-MACHINES=( "ubuntu-8.04" "ubuntu-8.04-64" "ubuntu-8.10" "ubuntu-8.10-64" "ubuntu-9.04" "ubuntu-9.04-64" "opensuse-11" "opensuse-11-64" "mandriva-2009.1" )
-
-#########################
-# BEGIN
-#########################
-
-echo
-echo " /***********************\\"
-echo " | SFLPhone build system |"
-echo " \\***********************/"
-echo
-
-for PARAMETER in $*
-do
- case ${PARAMETER} in
- --help)
- echo
- echo "Options :"
- echo " --skip-clean"
- echo " --skip-prepare"
- echo " --skip-push"
- echo " --skip-main-loop"
- echo " --skip-signatures"
- echo " --skip-upload"
- echo " --no-logging"
- echo " --machine=MACHINE"
- echo " --release-mode=[beta|rc|release]"
- echo " --list-machines"
- echo
- exit 0;;
- --skip-clean)
- unset DO_CLEAN;;
- --skip-prepare)
- unset DO_PREPARE;;
- --skip-push)
- unset DO_PUSH;;
- --skip-main-loop)
- unset DO_MAIN_LOOP;;
- --skip-signatures)
- unset DO_SIGNATURES;;
- --skip-upload)
- unset DO_UPLOAD;;
- --no-logging)
- unset DO_LOGGING;;
- --machine=*)
- MACHINES=(${PARAMETER##*=});;
- --release-mode=*)
- RELEASE_MODE=(${PARAMETER##*=});;
- --list-machines)
- echo "Available machines :"
- for MACHINE in ${MACHINES[@]}; do
- echo " "${MACHINE}
- done
- exit 0;;
- *)
- echo "Unknown parameter : ${PARAMETER}"
- exit -1;;
- esac
-done
-
-# if more than one VM will be launched, automatically stop running VMs
-if [ "${#MACHINES[@]}" -gt "1" ]; then
- VBoxManage list runningvms | tail -n +5 | awk '{print $1}' | xargs -i VBoxManage controlvm {} poweroff
-fi
-
-# change to working directory
-cd ${SCRIPTS_DIR}
-
-if [ "$?" -ne "0" ]; then
- echo " !! Cannot cd to working directory"
- exit -1
-fi
-
-WHO=`whoami`
-
-if [ "${WHO}" != "${USER}" ]; then
- echo "!! Please use user ${USER} to run this script"
- exit -1;
-fi
-
-# logging
-if [ ${DO_CLEAN} ]; then
- rm -rf ${PACKAGING_RESULT_DIR} 2>/dev/null
-fi
-mkdir ${PACKAGING_RESULT_DIR} 2>/dev/null
-if [ ${DO_LOGGING} ]; then
-
- # open file descriptor
- rm -f ${PACKAGING_RESULT_DIR}/packaging.log
- exec 3<> ${PACKAGING_RESULT_DIR}/packaging.log
-
- # redirect outputs (stdout & stderr)
- exec 1>&3
- exec 2>&3
-fi
-
-# check release
-if [ ${RELEASE_MODE} ]; then
- case ${RELEASE_MODE} in
- beta);;
- rc[1-9]);;
- release);;
- *)
- echo "Bad release mode"
- exit -1;;
- esac
-fi
-
-# check machines list
-if [ -z "${MACHINES}" ]; then
- echo "Need at least a machine name to launch"
- exit -1
-fi
-
-echo
-echo "Launching build system with the following machines :"
-for MACHINE in ${MACHINES[*]}
-do
- echo " "${MACHINE}
-done
-echo
-
-if [ ${RELEASE_MODE} ]; then
- echo "Release mode : ${RELEASE_MODE}"
-else
- echo "Snapshot mode : ${SNAPSHOT_TAG}"
-fi
-
-#########################
-# COMMON PART
-#########################
-
-if [ ${DO_PREPARE} ]; then
-
- echo
- echo "Cleaning old deploy dir"
- rm -rf ${TODEPLOY_DIR}
- mkdir ${TODEPLOY_DIR}
- mkdir ${TODEPLOY_BUILD_DIR}
-
- echo "Clone repository"
- git clone ssh://repos-sflphone-git@git.sflphone.org/~/sflphone.git ${REPOSITORY_DIR} >/dev/null 2>&1
-
- if [ "$?" -ne "0" ]; then
- echo " !! Cannot clone repository"
- exit -1
- fi
-
- VERSION=`cd ${REPOSITORY_DIR} && git describe --tag HEAD | cut -d "." -f1-3`
-
- if [ ${RELEASE_MODE} ]; then
- if [ "${RELEASE_MODE}" != "release" ];then
- VERSION="${VERSION}~${RELEASE_MODE}"
- fi
- else
- VERSION="${VERSION}~snapshot${SNAPSHOT_TAG}"
- fi
- echo "Version is : ${VERSION}"
-
- # generate the changelog, according to the distribution and the git commit messages
- echo "Update debian changelogs"
- cd ${REPOSITORY_DIR}
- ${SCRIPTS_DIR}/sfl-git-dch.sh ${VERSION} ${RELEASE_MODE}
-
- if [ "$?" -ne "0" ]; then
- echo "!! Cannot update debian changelogs"
- exit -1
- fi
-
- # if push is activated
- if [[ ${DO_PUSH} && ${RELEASE_MODE} ]];then
-
- echo " Doing commit"
-
- cd ${LOCAL_REPOSITORY}
- git commit -m "[#1262] Updated debian changelogs (${VERSION})" .
-
- echo " Pushing commit"
- git push origin master
-
- cd -
- fi
-
- # change current branch if needed
- if [ ${RELEASE_MODE} ]; then
- cd ${REPOSITORY_DIR}
- git checkout origin/release -b release
- else
- echo "Using master branch"
- fi
-
- echo "Write version numbers for following processes"
- echo "${VERSION}" > ${REPOSITORY_DIR}/sflphone-common/VERSION
- echo "${VERSION}" > ${REPOSITORY_DIR}/sflphone-client-gnome/VERSION
- echo "${VERSION}" > ${REPOSITORY_DIR}/sflphone-client-kde/VERSION
- echo "${VERSION}" > ${TODEPLOY_BUILD_DIR}/VERSION
-
- echo "Archiving repository"
- tar czf ${REPOSITORY_ARCHIVE} --exclude .git -C `dirname ${REPOSITORY_DIR}` sflphone
-
- if [ "$?" -ne "0" ]; then
- echo " !! Cannot archive repository"
- exit -1
- fi
-
- echo "Removing repository"
- rm -rf ${REPOSITORY_DIR}
-
- echo "Finish preparing deploy directory"
- cp -r ${DISTRIBUTION_SCRIPTS_DIR}/* ${TODEPLOY_DIR}
-
- if [ "$?" -ne "0" ]; then
- echo " !! Cannot prepare scripts for deployment"
- exit -1
- fi
-fi
-
-#########################
-# MAIN LOOP
-#########################
-
-if [ ${DO_MAIN_LOOP} ]; then
-
- echo
- echo "Entering main loop"
- echo
-
- rm -f ${PACKAGING_RESULT_DIR}/stats.log
- for MACHINE in ${MACHINES[*]}
- do
-
- echo "Launch machine ${MACHINE}"
- VM_STATE=`VBoxManage showvminfo ${MACHINE} | grep State | awk '{print $2}'`
- if [ "${VM_STATE}" = "running" ]; then
- echo "Not needed, already running"
- else
- cd ${VBOX_USER_HOME} && VBoxHeadless -startvm "${MACHINE}" -p 50000 &
- if [[ ${MACHINE} =~ "opensuse" || ${MACHINE} =~ "mandriva" ]]; then
- STARTUP_WAIT=200
- fi
- echo "Wait ${STARTUP_WAIT} s"
- sleep ${STARTUP_WAIT}
- fi
-
- echo "Clean remote directory"
- ${SSH_BASE} "rm -rf ${REMOTE_DEPLOY_DIR} 2>/dev/null"
-
- echo "Deploy packaging system"
- ${SCP_BASE} ${TODEPLOY_DIR} ${SSH_HOST}:
-
- if [ "$?" -ne "0" ]; then
- echo " !! Cannot deploy packaging system"
- echo "${MACHINE} : Cannot deploy packaging system" >> ${PACKAGING_RESULT_DIR}/stats.log
- NON_FATAL_ERRORS=1
- else
-
- echo "Launch remote build"
- ${SSH_BASE} "cd ${REMOTE_DEPLOY_DIR} && ./build-packages.sh ${RELEASE_MODE}"
-
- if [ "$?" -ne "0" ]; then
- echo " !! Error during remote packaging process"
- echo "${MACHINE} : Error during remote packaging process" >> ${PACKAGING_RESULT_DIR}/stats.log
- NON_FATAL_ERRORS=1
- else
-
- echo "Retrieve dists files"
- ${SCP_BASE} ${SSH_HOST}:${REMOTE_DEPLOY_DIR}/deb ${PACKAGING_RESULT_DIR}/ >/dev/null 2>&1
- ${SCP_BASE} ${SSH_HOST}:${REMOTE_DEPLOY_DIR}/rpm ${PACKAGING_RESULT_DIR}/ >/dev/null 2>&1
-
- echo "${MACHINE} : OK" >> ${PACKAGING_RESULT_DIR}/stats.log
- fi
-
- echo "Retrieve log files"
- ${SCP_BASE} ${SSH_HOST}:${REMOTE_DEPLOY_DIR}"/*.log" ${PACKAGING_RESULT_DIR}/
- fi
-
- if [ "${VM_STATE}" = "running" ]; then
- echo "Leave machine running"
- else
- echo "Shut down machine ${MACHINE}"
- ${SSH_BASE} 'sudo /sbin/shutdown -h now'
- echo "Wait ${SHUTDOWN_WAIT} s"
- sleep ${SHUTDOWN_WAIT}
- # hard shut down (just to be sure)
- cd "${VBOX_USER_HOME}" && VBoxManage controlvm ${MACHINE} poweroff >/dev/null 2>&1
- fi
- done
-fi
-
-#########################
-# SIGNATURES
-#########################
-
-if [ ${DO_SIGNATURES} ]; then
-
- echo "Sign packages"
- find ${PACKAGING_RESULT_DIR}/deb/dists -name "*.deb" -exec dpkg-sig -g '--yes --batch --no-tty -q --passphrase `cat '${GPG_FILE}'`' -k 'Savoir-Faire Linux Inc.' --sign builder --sign-changes full {} \;
- find ${PACKAGING_RESULT_DIR}/deb/dists -name "*.changes" -exec gpg --yes --batch --no-tty --local-user 'Savoir-Faire Linux Inc.' --passphrase `cat ${GPG_FILE}` --clearsign --list-options no-show-policy-urls --armor --textmode --output {}.asc {} \;
-fi
-
-#########################
-# UPLOAD FILES
-#########################
-
-if [ ${DO_UPLOAD} ]; then
-
- echo
- echo "Upload packages"
- echo
-
- echo "Prepare packages upload"
- scp ${SSH_OPTIONS} ${PACKAGING_SCRIPTS_DIR}/update-repository.sh ${SSH_REPOSITORY_HOST}:debian/
-
- if [ "$?" -ne "0" ]; then
- echo " !! Cannot deploy repository scripts"
- fi
-
- echo "Upload packages"
- echo "Install dists files to repository"
- scp -r ${SSH_OPTIONS} ${PACKAGING_RESULT_DIR}/rpm/* ${SSH_REPOSITORY_HOST}:rpm/
- scp -r ${SSH_OPTIONS} ${PACKAGING_RESULT_DIR}/deb/dists ${SSH_REPOSITORY_HOST}:debian/
-
- if [ "$?" -ne "0" ]; then
- echo " !! Cannot upload packages"
- exit -1
- fi
-
- echo "Update repository"
- ssh ${SSH_OPTIONS} ${SSH_REPOSITORY_HOST} "cd debian && ./update-repository.sh"
-
- if [ "$?" -ne "0" ]; then
- echo " !! Cannot update repository"
- exit -1
- fi
-fi
-
-if [ "${NON_FATAL_ERRORS}" -eq "1" ]; then
- exit -1
-fi
-
-# close file descriptor
-exec 3>&-
-
-exit 0
-
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/changelog b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/changelog
new file mode 100644
index 0000000000000000000000000000000000000000..e368436b93aa5b42f1181e9c9e4022ec9e0f929f
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/changelog
@@ -0,0 +1,6 @@
+mozilla-telify-sflphone (0.4.7.3) unstable; urgency=low
+
+ [ Julien Bonjean ]
+ * Package creation
+
+ -- Julien Bonjean <julien.bonjean@savoirfairelinux.com> Fri, 20 Nov 2009 19:51:54 +0100
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/compat b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/compat
new file mode 100644
index 0000000000000000000000000000000000000000..7f8f011eb73d6043d2e6db9d2c101195ae2801f2
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/control b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/control
new file mode 100644
index 0000000000000000000000000000000000000000..01e98ce8031fcb3b5edf0ddbb7027936f529ce6c
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/control
@@ -0,0 +1,19 @@
+Source: mozilla-telify-sflphone
+Section: web
+Priority: optional
+Maintainer: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
+Uploaders: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
+Build-Depends: debhelper (>= 7), unzip
+Homepage: http://www.sflphone.org
+Standards-Version: 3.8.3
+DM-Upload-Allowed: yes
+
+Package: mozilla-telify-sflphone
+Depends: firefox-gnome-support, sflphone-client-gnome
+Architecture: all
+Description: This package provides telify firefox plugin and handler for SFLphone.
+ Telify recognizes phone numbers on web pages and converts them to clickable links.
+ Additionally, any text can be selected and handled as a phone number (including
+ vanity number conversion) by selecting the corresponding context menu item.
+ http://www.codepad.de/en/software/firefox-add-ons/telify.html
+
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/control.debian b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/control.debian
new file mode 100644
index 0000000000000000000000000000000000000000..36a90b1f2ddcd78cadc00ede03d8649537f8c54f
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/control.debian
@@ -0,0 +1,19 @@
+Source: mozilla-telify-sflphone
+Section: web
+Priority: optional
+Maintainer: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
+Uploaders: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
+Build-Depends: debhelper (>= 7), unzip
+Homepage: http://www.sflphone.org
+Standards-Version: 3.8.3
+DM-Upload-Allowed: yes
+
+Package: mozilla-telify-sflphone
+Depends: iceweasel-gnome-support, sflphone-client-gnome
+Architecture: all
+Description: This package provides telify firefox plugin and handler for SFLphone.
+ Telify recognizes phone numbers on web pages and converts them to clickable links.
+ Additionally, any text can be selected and handled as a phone number (including
+ vanity number conversion) by selecting the corresponding context menu item.
+ http://www.codepad.de/en/software/firefox-add-ons/telify.html
+
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/control.ubuntu b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/control.ubuntu
new file mode 100644
index 0000000000000000000000000000000000000000..01e98ce8031fcb3b5edf0ddbb7027936f529ce6c
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/control.ubuntu
@@ -0,0 +1,19 @@
+Source: mozilla-telify-sflphone
+Section: web
+Priority: optional
+Maintainer: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
+Uploaders: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
+Build-Depends: debhelper (>= 7), unzip
+Homepage: http://www.sflphone.org
+Standards-Version: 3.8.3
+DM-Upload-Allowed: yes
+
+Package: mozilla-telify-sflphone
+Depends: firefox-gnome-support, sflphone-client-gnome
+Architecture: all
+Description: This package provides telify firefox plugin and handler for SFLphone.
+ Telify recognizes phone numbers on web pages and converts them to clickable links.
+ Additionally, any text can be selected and handled as a phone number (including
+ vanity number conversion) by selecting the corresponding context menu item.
+ http://www.codepad.de/en/software/firefox-add-ons/telify.html
+
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/copyright b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/copyright
new file mode 100644
index 0000000000000000000000000000000000000000..a0990367ef8b03c70c29d285e22ef85907e1d0b7
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/copyright
@@ -0,0 +1 @@
+TBD
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/files b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/files
new file mode 100644
index 0000000000000000000000000000000000000000..8ebe49a9909755509943dd3161a8cb96e3acf7ec
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/files
@@ -0,0 +1 @@
+mozilla-telify-sflphone_0.4.7.3_all.deb web optional
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone.debhelper.log b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone.debhelper.log
new file mode 100644
index 0000000000000000000000000000000000000000..89ec40ebaf21fd29fbf68d5f444d2332c792b359
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone.debhelper.log
@@ -0,0 +1,11 @@
+dh_prep
+dh_installdirs
+dh_install
+dh_installchangelogs
+dh_link
+dh_compress
+dh_fixperms
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone.install b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone.install
new file mode 100644
index 0000000000000000000000000000000000000000..937e53876e144e58b5c23f555deec380159f457b
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone.install
@@ -0,0 +1,2 @@
+tmp/telify usr/share/
+sflphone-handler usr/bin/
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone.links b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone.links
new file mode 100644
index 0000000000000000000000000000000000000000..f234168dd005f777b71662153559dbe689f1aebf
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone.links
@@ -0,0 +1 @@
+usr/share/telify usr/lib/firefox-addons/extensions/{6c5f349a-ddda-49ad-bdf0-326d3fe1f938}
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone.links.debian b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone.links.debian
new file mode 100644
index 0000000000000000000000000000000000000000..f8f52cec904e91fe248e874af8edaf64b6ff04cb
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone.links.debian
@@ -0,0 +1 @@
+usr/share/telify usr/lib/iceweasel/extensions/{6c5f349a-ddda-49ad-bdf0-326d3fe1f938}
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone.links.ubuntu b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone.links.ubuntu
new file mode 100644
index 0000000000000000000000000000000000000000..f234168dd005f777b71662153559dbe689f1aebf
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone.links.ubuntu
@@ -0,0 +1 @@
+usr/share/telify usr/lib/firefox-addons/extensions/{6c5f349a-ddda-49ad-bdf0-326d3fe1f938}
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone.substvars b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone.substvars
new file mode 100644
index 0000000000000000000000000000000000000000..abd3ebebc30de133ecc51d80b32908bd4a077b9a
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone.substvars
@@ -0,0 +1 @@
+misc:Depends=
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/DEBIAN/control b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/DEBIAN/control
new file mode 100644
index 0000000000000000000000000000000000000000..2c8faf4345a72c5b6b32e28adee8a26335d006d3
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/DEBIAN/control
@@ -0,0 +1,14 @@
+Package: mozilla-telify-sflphone
+Version: 0.4.7.3
+Architecture: all
+Maintainer: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
+Installed-Size: 1296
+Depends: firefox-gnome-support, sflphone-client-gnome
+Section: web
+Priority: optional
+Homepage: http://www.sflphone.org
+Description: This package provides telify firefox plugin and handler for SFLphone.
+ Telify recognizes phone numbers on web pages and converts them to clickable links.
+ Additionally, any text can be selected and handled as a phone number (including
+ vanity number conversion) by selecting the corresponding context menu item.
+ http://www.codepad.de/en/software/firefox-add-ons/telify.html
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/DEBIAN/md5sums b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/DEBIAN/md5sums
new file mode 100644
index 0000000000000000000000000000000000000000..20effcb346c717f0a35c8187eeff044efe8baf5f
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/DEBIAN/md5sums
@@ -0,0 +1,282 @@
+65ce74599376d092487f618de1e986fb usr/bin/sflphone-handler
+1dfa9e4bdb5667ed2452cb1842598638 usr/share/telify/chrome/content/jshashtable.js
+09146002421216f18e238dc9914df02a usr/share/telify/chrome/content/icon32.png
+3efa199f5dc17af1806daf44c9c389be usr/share/telify/chrome/content/icon96.png
+5897f6aab0803b91883a6235223c4c36 usr/share/telify/chrome/content/config.js
+add45890afad2c0a4e7ae2ae7602662a usr/share/telify/chrome/content/warn32.png
+d070239a3728cafad19bb8aef31739aa usr/share/telify/chrome/content/messagebox.js
+5624cf500dd7c023075672d3fad866d6 usr/share/telify/chrome/content/config.xul
+f6ea223fbe6e7f85e00e2164546b9bd4 usr/share/telify/chrome/content/messagebox.xul
+e802bc3ff17f1ea2e68ccdb263dea3fd usr/share/telify/chrome/content/ask32.png
+f4de0420b7dd240b29d42e2af3bbf50c usr/share/telify/chrome/content/util.js
+1bb2b945ab6f911fd32f9b046bf735b0 usr/share/telify/chrome/content/flag/52.png
+90576da5f20865375ea4719f1310000d usr/share/telify/chrome/content/flag/212.png
+affd04a67faccde8d9539fb3b5ca0589 usr/share/telify/chrome/content/flag/685.png
+f493cea29615a02b9a917bee58ac3af3 usr/share/telify/chrome/content/flag/228.png
+d27ffb0f000c36985df32eb1b34de31d usr/share/telify/chrome/content/flag/250.png
+6dd70c9752d8b50ea152f5c3f228312c usr/share/telify/chrome/content/flag/43.png
+20edbfd5b61a01f2e619f22333635118 usr/share/telify/chrome/content/flag/61.png
+573caf2b526203b5e27614e6cc9a655a usr/share/telify/chrome/content/flag/261.png
+276bf37cf19ed4fdc5e9e92796b4878d usr/share/telify/chrome/content/flag/597.png
+31b9f8c69f07fdfe837ea0bd470ce9bd usr/share/telify/chrome/content/flag/1809.png
+1330db2111f10ec94e67aed37af92109 usr/share/telify/chrome/content/flag/31.png
+22cfbf44cf2bb7559e07e3209c285c42 usr/share/telify/chrome/content/flag/7-kazakhstan.png
+31675a29209b26b05bf2aed571b024c3 usr/share/telify/chrome/content/flag/39-vatican.png
+4a7b9e35f3941cef8f31b7631337b513 usr/share/telify/chrome/content/flag/678.png
+63bfbc37a0bba342ba7d409cba9df880 usr/share/telify/chrome/content/flag/594.png
+f58e02ceba6a9d56b0fdace52f809575 usr/share/telify/chrome/content/flag/56.png
+b684077e750479668a6b5471422aa009 usr/share/telify/chrome/content/flag/682.png
+552223b24a21cfcae7a9dd24ca010ef4 usr/share/telify/chrome/content/flag/244.png
+193393c898442920b2f2e6becf939b57 usr/share/telify/chrome/content/flag/673.png
+fd3a4f77c790e3e0ca7c7a1936924d7c usr/share/telify/chrome/content/flag/996.png
+bffee9389293cc9516811ca88039bbff usr/share/telify/chrome/content/flag/65.png
+9323fd337065d66b3407bf19fdee3412 usr/share/telify/chrome/content/flag/1649.png
+0966afaa93eee08c08672c762424654d usr/share/telify/chrome/content/flag/44.png
+35c688e6e0fbaeede3d71a0d9970c8a9 usr/share/telify/chrome/content/flag/374.png
+572dc608ba807fcfbe4f23083a529da3 usr/share/telify/chrome/content/flag/853.png
+56a19c85de7d530c9b24b906d4ef1d78 usr/share/telify/chrome/content/flag/1284.png
+12d703c057fe3a9d22b960df954259a1 usr/share/telify/chrome/content/flag/55.png
+156d00760316249b723e65c4535f6a3a usr/share/telify/chrome/content/flag/502.png
+63bfbc37a0bba342ba7d409cba9df880 usr/share/telify/chrome/content/flag/262.png
+b469e92e74363294932063045ba5773b usr/share/telify/chrome/content/flag/852.png
+b549b2c866e19bbaf05a71b142c8e277 usr/share/telify/chrome/content/flag/222.png
+f0c6ad269ca79fd0a636c0f7e55ecd8f usr/share/telify/chrome/content/flag/63.png
+9917632bbfeb986871fc2f0a9a0ef323 usr/share/telify/chrome/content/flag/54.png
+cc0ef42fdf091b3cc7d79689f5d90d48 usr/share/telify/chrome/content/flag/873.png
+0edfcb7932381257b781a33fdac17cba usr/share/telify/chrome/content/flag/37497.png
+e57cb5d9b42417834781028e79c6ad80 usr/share/telify/chrome/content/flag/229.png
+f38d97d28c2db81694c8d23bea8a544e usr/share/telify/chrome/content/flag/299.png
+b9d35240a94c486c39ae66784cd4bb7c usr/share/telify/chrome/content/flag/1664.png
+31b9f8c69f07fdfe837ea0bd470ce9bd usr/share/telify/chrome/content/flag/1829.png
+cc0ef42fdf091b3cc7d79689f5d90d48 usr/share/telify/chrome/content/flag/874.png
+63bfbc37a0bba342ba7d409cba9df880 usr/share/telify/chrome/content/flag/596.png
+cf6d436e35c00502149621c9d2419633 usr/share/telify/chrome/content/flag/1473.png
+cc0ef42fdf091b3cc7d79689f5d90d48 usr/share/telify/chrome/content/flag/871.png
+59feda46a504c73c5de936e6cc463b91 usr/share/telify/chrome/content/flag/598.png
+65637850eca375f5343b51772b2789e3 usr/share/telify/chrome/content/flag/34.png
+63bfbc37a0bba342ba7d409cba9df880 usr/share/telify/chrome/content/flag/508.png
+07be2870ef618a4d3b69d24b3b0523bf usr/share/telify/chrome/content/flag/92.png
+bd75acef3588961ef3e1d8c1beea2ba1 usr/share/telify/chrome/content/flag/242.png
+9416a0c7d9c580619faec6a6bff30cc9 usr/share/telify/chrome/content/flag/297.png
+465c38736ae791e89917a99467567e44 usr/share/telify/chrome/content/flag/258.png
+06a21021e5dce13dce475beb26697c69 usr/share/telify/chrome/content/flag/992.png
+7efb0536329c0ec081b08f288a175d4c usr/share/telify/chrome/content/flag/94.png
+ec7c4ad00ede6aebe170377b8b830b3e usr/share/telify/chrome/content/flag/680.png
+4e6a1e93bcf98acb4a828bedb3b39bc5 usr/share/telify/chrome/content/flag/501.png
+dae53d80a2dde3c0fca76ed93422eeb2 usr/share/telify/chrome/content/flag/223.png
+8b5a3f217aa96af3a0e9c799db2d930b usr/share/telify/chrome/content/flag/599.png
+88d8c448f7e85ceda0eff805b081fcff usr/share/telify/chrome/content/flag/420.png
+0fc6b4583f851e874e64a68f2f365e96 usr/share/telify/chrome/content/flag/976.png
+125aac84de4da114aef44a9a4282ac06 usr/share/telify/chrome/content/flag/994.png
+36da0872dac993c2750a5a371903bb6e usr/share/telify/chrome/content/flag/373.png
+4bef1704acdc80636c68dffee9c01b51 usr/share/telify/chrome/content/flag/265.png
+ace80316bb7bfd2058e4bd8e281f93e3 usr/share/telify/chrome/content/flag/57.png
+a879b03b7cca0d49600c24c7c2f335cc usr/share/telify/chrome/content/flag/254.png
+f9733cf00793532e858c718c60488bd7 usr/share/telify/chrome/content/flag/49.png
+6350bfec1685c569dcc6d52b5b5096f3 usr/share/telify/chrome/content/flag/30.png
+abddcd041761748a1462bcf509f167ce usr/share/telify/chrome/content/flag/961.png
+df3279055e7e07f46705c151ffa4b188 usr/share/telify/chrome/content/flag/995.png
+9cf9ac77cf4c6d5504eb5cce3d9aeb4d usr/share/telify/chrome/content/flag/504.png
+efc6524bcb70ef812b2725032e0b8cb9 usr/share/telify/chrome/content/flag/1787.png
+42c9adf5c32e8574701c582dd970563c usr/share/telify/chrome/content/flag/220.png
+06a1651c9d58610744de5edb29a60e58 usr/share/telify/chrome/content/flag/993.png
+8f7b466990cbc4b0e6e31269cbc60ea8 usr/share/telify/chrome/content/flag/37744.png
+d3f29ad4504d6360d19ef706f494d7da usr/share/telify/chrome/content/flag/298.png
+aa57863f7e2c49d33d3a2a0a9fe6da64 usr/share/telify/chrome/content/flag/41.png
+485ad10e06bd25ef65270af20dfc996b usr/share/telify/chrome/content/flag/84.png
+929bd3c144dbcfc51d7d6836b6363cbe usr/share/telify/chrome/content/flag/232.png
+3f9c4b8b9f8ee08e4e9f5135cb034657 usr/share/telify/chrome/content/flag/235.png
+0f92d3e3a3e1e547af05567c2510ddf0 usr/share/telify/chrome/content/flag/593.png
+77857f1400221cb796eebbb029a52617 usr/share/telify/chrome/content/flag/500.png
+4304ebdaa34ab1885b1ab8e5a3e45303 usr/share/telify/chrome/content/flag/239.png
+98bbf43c599a38d8eb6b5421fd7bacd0 usr/share/telify/chrome/content/flag/240.png
+b6c5a45e5ce80d2b527d893b279caad8 usr/share/telify/chrome/content/flag/36.png
+b5f4336bf7b5a30061b9eb3be8bdb71e usr/share/telify/chrome/content/flag/291.png
+94c34b050a9d0860b91a96bddcbd2650 usr/share/telify/chrome/content/flag/850.png
+63bfbc37a0bba342ba7d409cba9df880 usr/share/telify/chrome/content/flag/33.png
+63bfbc37a0bba342ba7d409cba9df880 usr/share/telify/chrome/content/flag/590.png
+0966afaa93eee08c08672c762424654d usr/share/telify/chrome/content/flag/247.png
+74deccf3b9279029b092b0359088f955 usr/share/telify/chrome/content/flag/1.png
+5c4b81590c1291ed24b6f2e0fb1db51b usr/share/telify/chrome/content/flag/1868.png
+09aa245b094c7ebd785eb2d6651560b8 usr/share/telify/chrome/content/flag/1340.png
+9fd5fd3d5ec1c59a5de2b2cd4a83d3ba usr/share/telify/chrome/content/flag/505.png
+f6481f07b520e5494ccf4fd7f2130510 usr/share/telify/chrome/content/flag/40.png
+2abd1722a95d7af6e316f906cde54e6d usr/share/telify/chrome/content/flag/507.png
+66266f09754869056db176a7a99c999c usr/share/telify/chrome/content/flag/855.png
+08d8941a6a94447cf6838bde5a2ec48c usr/share/telify/chrome/content/flag/45.png
+a938868b993bbdc98caf18e1b022f5f8 usr/share/telify/chrome/content/flag/689.png
+92cacebf8596b267f69b7b99bb2f5588 usr/share/telify/chrome/content/flag/974.png
+5672868ef79592374bf990f652607a6e usr/share/telify/chrome/content/flag/387.png
+8de229a968922437036b9731a376d12e usr/share/telify/chrome/content/flag/963.png
+1bad50fdbd079efb01c9996dd3db9f39 usr/share/telify/chrome/content/flag/234.png
+258acc3c84ef093985f20f0c4cc3e8bb usr/share/telify/chrome/content/flag/886.png
+2a555ebb43f963161fa1046442d5bee8 usr/share/telify/chrome/content/flag/385.png
+5b811ac6ef5af15e3a4fd75679814f01 usr/share/telify/chrome/content/flag/253.png
+2748dfe6daeebefc78dc9e7e5261e2a7 usr/share/telify/chrome/content/flag/378.png
+f4b5c9d9e2025a5cfa95652852aa0707 usr/share/telify/chrome/content/flag/688.png
+f2ba52be3d5071a0fbf5ed58df529f14 usr/share/telify/chrome/content/flag/3883.png
+d39cf563c53fd10e3f4e4d95f98b0035 usr/share/telify/chrome/content/flag/375.png
+3bd363fac16b74cb23adbd7704ade65d usr/share/telify/chrome/content/flag/47.png
+f7f4151604e5860cf696e7409ef173b2 usr/share/telify/chrome/content/flag/880.png
+c964a9a106e3c9b76d3559c2cfcba90d usr/share/telify/chrome/content/flag/968.png
+addd908670d7012818061979c7bace02 usr/share/telify/chrome/content/flag/221.png
+90226addfca8c9861a770f15e94b78d2 usr/share/telify/chrome/content/flag/354.png
+31675a29209b26b05bf2aed571b024c3 usr/share/telify/chrome/content/flag/379.png
+63bfbc37a0bba342ba7d409cba9df880 usr/share/telify/chrome/content/flag/681.png
+b5208534081b162fe790e854408b6dac usr/share/telify/chrome/content/flag/51.png
+8f7b466990cbc4b0e6e31269cbc60ea8 usr/share/telify/chrome/content/flag/38649.png
+168dc53ba860577f659345846d59cb45 usr/share/telify/chrome/content/flag/965.png
+6e76764835f5db75d13b2498ba7e3efb usr/share/telify/chrome/content/flag/260.png
+8678e140cb0965400a842595e8034e6e usr/share/telify/chrome/content/flag/670.png
+07fcf184129db2d17310bed269bd032f usr/share/telify/chrome/content/flag/677.png
+e8d950cb0f9b047987cfed72903a61b2 usr/share/telify/chrome/content/flag/82.png
+2530d73e10540607d8c453f10030ccd3 usr/share/telify/chrome/content/flag/243.png
+844f10c7a922da19a99fe6a9b7eb27dd usr/share/telify/chrome/content/flag/371.png
+0fa3206cde59782c9998153683bff8d3 usr/share/telify/chrome/content/flag/238.png
+26f26cccb7b432d4dde1a1eb394c0ceb usr/share/telify/chrome/content/flag/231.png
+8bdeaa2a3bc46f876e7dff744fc47659 usr/share/telify/chrome/content/flag/90.png
+0da3d2cf7c99fb9dfe238bfcb4ab11cf usr/share/telify/chrome/content/flag/251.png
+4f9e0d2c82662f5b9b56acf472610c70 usr/share/telify/chrome/content/flag/998.png
+46019464edfa1be7666087620fe7142b usr/share/telify/chrome/content/flag/382.png
+eb0d4e938edac3bee751b17ca72849df usr/share/telify/chrome/content/flag/95.png
+e9cdf4484d0646e09464a28350be4df2 usr/share/telify/chrome/content/flag/263.png
+aa046c5e44c961089dbc6f45d8873122 usr/share/telify/chrome/content/flag/592.png
+45e940da2982616d3cc99822128e6cae usr/share/telify/chrome/content/flag/267.png
+e4d9d483a531c7a16436b09a8a4cf104 usr/share/telify/chrome/content/flag/20.png
+7e6b762105a6b1679c1abd0280da2f73 usr/share/telify/chrome/content/flag/227.png
+9fd0b3d477d8651a16241d130ee353ad usr/share/telify/chrome/content/flag/1758.png
+d1e4b9739c6eff4f6beadc8eb4ab8650 usr/share/telify/chrome/content/flag/595.png
+fb0490472ceed9b31b19dbe0a1d8f872 usr/share/telify/chrome/content/flag/236.png
+390bf4371cc50c51c50d1d15d7e63e3f usr/share/telify/chrome/content/flag/7.png
+bc4f5cc6c03cdd13217d6d32e6425989 usr/share/telify/chrome/content/flag/1246.png
+757c67bf50c916597a5088829140286b usr/share/telify/chrome/content/flag/1767.png
+f301e493e1c0271865c115a25f3f8680 usr/share/telify/chrome/content/flag/359.png
+278b835433b00b47589b3d7cf28d52a7 usr/share/telify/chrome/content/flag/377.png
+8f7b466990cbc4b0e6e31269cbc60ea8 usr/share/telify/chrome/content/flag/381-kosovo.png
+50185d74128455cb2c16c0903a03ca0d usr/share/telify/chrome/content/flag/1684.png
+ce84e48ba306877dd6112a8470bfdfb0 usr/share/telify/chrome/content/flag/248.png
+0397fc499dce824e378c758682774440 usr/share/telify/chrome/content/flag/246.png
+9bd332abc26865f07ebae01383b8494d usr/share/telify/chrome/content/flag/224.png
+464067a945638f51c7d3ee7ed4dda81d usr/share/telify/chrome/content/flag/370.png
+2c030899839f02c2954cda800e4c41db usr/share/telify/chrome/content/flag/266.png
+f405c1ae5ff791f8f6c8ff31bfd98e91 usr/share/telify/chrome/content/flag/216.png
+8b5f8aff9a34065f16db660509b6476b usr/share/telify/chrome/content/flag/1345.png
+a3d9074daaf4b13a1c475469acb1ef40 usr/share/telify/chrome/content/flag/213.png
+9b475b0988eff85c2e6758f3629d3e3a usr/share/telify/chrome/content/flag/1876.png
+a4d03f19872b3a11d3c8c9f55477caac usr/share/telify/chrome/content/flag/355.png
+ef1a2c9fc984d6e21c2543bac5d56b89 usr/share/telify/chrome/content/flag/53.png
+7d71f58c22b314c64f304070cd4dcb4f usr/share/telify/chrome/content/flag/226.png
+87d57818a5ad32dad3c512ebc93a80d6 usr/share/telify/chrome/content/flag/91.png
+33f848b2031ff858cd7db75404640a6b usr/share/telify/chrome/content/flag/591.png
+0dc574a3de142aecc3e996206371294a usr/share/telify/chrome/content/flag/225.png
+c72a9c63d4d41272ea672a1c402ee189 usr/share/telify/chrome/content/flag/973.png
+efe435a51af6d9c7e97c7c8a050d6efb usr/share/telify/chrome/content/flag/1264.png
+0c3c91808881101dff1635101e02aa2b usr/share/telify/chrome/content/flag/269.png
+4a6d3eee131acf89897c0b24689b82c3 usr/share/telify/chrome/content/flag/503.png
+019ff6b8cd322dfa5663c511d07b0d5d usr/share/telify/chrome/content/flag/1671.png
+4220598be43707f399cf5b62aec26a4e usr/share/telify/chrome/content/flag/27.png
+cc0ef42fdf091b3cc7d79689f5d90d48 usr/share/telify/chrome/content/flag/872.png
+94a4f42d77b298471b01e31068a4993c usr/share/telify/chrome/content/flag/421.png
+6488bf155022194a4b9b419e5b411fdf usr/share/telify/chrome/content/flag/90392.png
+0edfcb7932381257b781a33fdac17cba usr/share/telify/chrome/content/flag/37447.png
+abac2bdc6ee86fed6f2a83b0bbc5af1b usr/share/telify/chrome/content/flag/218.png
+9c120774fad7fae663c0c41e101410e9 usr/share/telify/chrome/content/flag/674.png
+fb53ec0d0245f2e4ebb8361d8ff85f8f usr/share/telify/chrome/content/flag/690.png
+5dcba80a818cf6b07c5b7ccd0297a65f usr/share/telify/chrome/content/flag/252.png
+48967bc438e5a7bb69cca0f7732396eb usr/share/telify/chrome/content/flag/98.png
+03453359634eecec412c8e467f67af76 usr/share/telify/chrome/content/flag/290.png
+1cad1e69d782f42a29a1fcc532daf243 usr/share/telify/chrome/content/flag/48.png
+4628248388e53df337b39730f8aefbfd usr/share/telify/chrome/content/flag/256.png
+9a758bb3b0392ee2c6d814dbaeea01b4 usr/share/telify/chrome/content/flag/376.png
+53ef3d82ba706db1e5dfdd5b0bf14c81 usr/share/telify/chrome/content/flag/972.png
+acdae2b0851d5fec6c4b16ab884bbd9d usr/share/telify/chrome/content/flag/86.png
+35a5b51d0e37656c93cca43686c7ce62 usr/share/telify/chrome/content/flag/233.png
+c24a1dc23535660e8f013d7f4b15eba0 usr/share/telify/chrome/content/flag/60.png
+9b0517891ee2538397a7140697bde925 usr/share/telify/chrome/content/flag/241.png
+1f40c7e3f9513ea1a31d5b1efd2adae6 usr/share/telify/chrome/content/flag/249.png
+6a190cf5b40502186d7a335a8e10dcfd usr/share/telify/chrome/content/flag/64.png
+714928715307e35c9d96f82baa9e5658 usr/share/telify/chrome/content/flag/856.png
+de204480ea7585fa2ab331b7c4b856af usr/share/telify/chrome/content/flag/257.png
+fd92a03c9c1fbf78fea7e50b1e4085f9 usr/share/telify/chrome/content/flag/353.png
+d9a1931187b34b91d8a0becbfcc8d92d usr/share/telify/chrome/content/flag/672.png
+8f1c20cc56e3b0388c37fa9f300cdc80 usr/share/telify/chrome/content/flag/356.png
+610a156d74efa1227e732319c0bddcdc usr/share/telify/chrome/content/flag/692.png
+b44c818df281cad4bf13f54dcf67b151 usr/share/telify/chrome/content/flag/66.png
+0399c70c9efba4caefd028ad5028bc25 usr/share/telify/chrome/content/flag/960.png
+72f33ab0fff112755d90d65fc71042fd usr/share/telify/chrome/content/flag/423.png
+a99812c389c8a521a9b7495e7d7318d7 usr/share/telify/chrome/content/flag/230.png
+40796e5560f2fa63f523de45bfd20f07 usr/share/telify/chrome/content/flag/964.png
+c5ba8166e7165bef7247b674faafa83a usr/share/telify/chrome/content/flag/32.png
+44d65230c16730cc9b74ab0cf0f3a31d usr/share/telify/chrome/content/flag/962.png
+328daac04aee3d4a868673667b29f561 usr/share/telify/chrome/content/flag/1268.png
+a9123178222f6940496eeed41e4f7932 usr/share/telify/chrome/content/flag/245.png
+7dd4f0a5d9fc3201cb03f90c5b9dd98d usr/share/telify/chrome/content/flag/509.png
+5ac9bbaab7ef6edaf285a92655ad3100 usr/share/telify/chrome/content/flag/372.png
+0215b1c78f1983ff93d4a71d994429b3 usr/share/telify/chrome/content/flag/967.png
+bc2b7b1fea6191cadfe5563c4ec4f482 usr/share/telify/chrome/content/flag/1670.png
+ad5a8bf6203aaa390432c164b7f98097 usr/share/telify/chrome/content/flag/1784.png
+6cda8970ef0d1ac14ebda52fe7be9d50 usr/share/telify/chrome/content/flag/352.png
+cf9a0a8e33c14011ca720d5c4308d145 usr/share/telify/chrome/content/flag/386.png
+722cb977a10c1a2a8412fc5ee87d4fc4 usr/share/telify/chrome/content/flag/675.png
+0641850973fa5605d26add1e6c859da4 usr/share/telify/chrome/content/flag/676.png
+2e017a5dd612390255848dca5afb330d usr/share/telify/chrome/content/flag/255.png
+01d51ff805bef4ce44d75fbbd93b28d9 usr/share/telify/chrome/content/flag/966.png
+e81fd902853e1d3abfc59a8aa1ae6832 usr/share/telify/chrome/content/flag/1242.png
+a71af7b8b48922f614b499239c8a51b8 usr/share/telify/chrome/content/flag/977.png
+bea37d045f7026995838fcfc8b9b45ca usr/share/telify/chrome/content/flag/268.png
+b24fbefbb7e51f8c68c3df2c74891878 usr/share/telify/chrome/content/flag/62.png
+0c50a0a1bf667ae3271ffff33e2b9372 usr/share/telify/chrome/content/flag/380.png
+8c0085810a9528c2bf6e3f5b6e43e281 usr/share/telify/chrome/content/flag/672-norfolk_island.png
+b4e46a8d8576a1a717f8e1f2c5de85a9 usr/share/telify/chrome/content/flag/350.png
+d45dfb7a968e89b66db04ddf446ffe09 usr/share/telify/chrome/content/flag/1869.png
+8f797a746ef2192e4cfa5fb7fb1fb272 usr/share/telify/chrome/content/flag/58.png
+949942100b8504bc91da99d9c237633b usr/share/telify/chrome/content/flag/683.png
+cd560dd865ccea58212db45956248115 usr/share/telify/chrome/content/flag/975.png
+3275d2a698a6fc4497c3628d681b5d12 usr/share/telify/chrome/content/flag/358.png
+61c1ecffc039239ee6411394921aa241 usr/share/telify/chrome/content/flag/506.png
+4a89ee4cf5fe72c332e90527e12c07cf usr/share/telify/chrome/content/flag/93.png
+458b2d7875fc143704f636e7454e598d usr/share/telify/chrome/content/flag/971.png
+111a19121adf21f6010aa43992cd5675 usr/share/telify/chrome/content/flag/389.png
+63bfbc37a0bba342ba7d409cba9df880 usr/share/telify/chrome/content/flag/687.png
+2d2714d2e0de8465ac12d65a5e52d82d usr/share/telify/chrome/content/flag/381.png
+af283fcaf3f288709548bae1c4750031 usr/share/telify/chrome/content/flag/264.png
+91c372b5e4167ab59eb858e442a8f91f usr/share/telify/chrome/content/flag/679.png
+449f5fa5b87314615a7ea3aa501a78fd usr/share/telify/chrome/content/flag/691.png
+a63f50a8081b441b48989267a6fb329c usr/share/telify/chrome/content/flag/39.png
+bf17a973466b976ddefdcdf52503e6fa usr/share/telify/chrome/content/flag/46.png
+efc6524bcb70ef812b2725032e0b8cb9 usr/share/telify/chrome/content/flag/1939.png
+4b30c9135a576a61668ce14129c60ac7 usr/share/telify/chrome/content/flag/81.png
+ec10eee9610f5ac6bc74311ae481fad7 usr/share/telify/chrome/content/flag/1441.png
+300e025eca7079783221fcd86ea1942a usr/share/telify/chrome/content/flag/237.png
+c9088d972106719cce7c9a226f2b1667 usr/share/telify/chrome/content/flag/1-canada.png
+a676e93449fc74703d5f12636593b699 usr/share/telify/chrome/content/flag/686.png
+63faf9dbefe527ed55e0d9170fb5fba2 usr/share/telify/chrome/content/flag/357.png
+219a52448b0df4e66905086301b03b10 usr/share/telify/chrome/content/flag/351.png
+cc0ef42fdf091b3cc7d79689f5d90d48 usr/share/telify/chrome/content/flag/870.png
+dd8c6aa4b172928bc49969b80a0926a3 usr/share/telify/chrome/content/editNumber.js
+8b49826c5b4ebfbb95c513be63a79b41 usr/share/telify/chrome/content/pref.js
+cacb7d13f9781f1d71b6338f62df55e0 usr/share/telify/chrome/content/edit22x15.png
+4d0fec589b212e8fd004abe97cae9884 usr/share/telify/chrome/content/telify.js
+380345f5e1888667b412a9cc6d622ffb usr/share/telify/chrome/content/dialog.css
+0c48e0a5c919244e39da008905bf3704 usr/share/telify/chrome/content/info32.png
+b1b6854306f4547a0f17fa88e5bbfc2a usr/share/telify/chrome/content/browser.xul
+b59d8264612fa19986333ce3f20c978a usr/share/telify/chrome/content/editNumber.xul
+259e7299cf9c56c466e62b6d2e7a09be usr/share/telify/chrome/content/icon18_active.png
+df8e1ad83cb3ee6cfb8073be99c9334d usr/share/telify/chrome/content/country_data.js
+d11c921428d126525024f0269c289366 usr/share/telify/chrome/content/icon18_inactive.png
+961bc17c9aab761902b5e755424c50f0 usr/share/telify/chrome/content/icon_menu.png
+c192d0d65c0ee5093a9f520cbb203cde usr/share/telify/chrome/content/error32.png
+081a39ee35f6fd034d47a52d18161e38 usr/share/telify/chrome/locale/en-US/custom_preset.js
+f93c88f9730ab952c1607f01284c953b usr/share/telify/chrome/locale/en-US/lang.dtd
+b05b084a52248112936f234f70afa445 usr/share/telify/chrome/locale/en-US/country_locale.js
+d0568dafab9a1206113235173cc58c85 usr/share/telify/chrome/locale/en-US/lang.properties
+878ffe167a481f93b26302871868618a usr/share/telify/chrome/locale/en-US/locale.js
+24604d65d67874073ad9b3df7060e221 usr/share/telify/chrome/locale/de-DE/custom_preset.js
+8ea28f7144c3da1b13824c751ed045d7 usr/share/telify/chrome/locale/de-DE/lang.dtd
+ded79ce41ea89b117534c1af4e95d5b5 usr/share/telify/chrome/locale/de-DE/country_locale.js
+f8c99d4e0ea6514f2d4f6ad71db85ae2 usr/share/telify/chrome/locale/de-DE/lang.properties
+816dac9e3dc748bc9f7e6a46dd57e029 usr/share/telify/chrome/locale/de-DE/locale.js
+4200a5c7a588e6aadbd6d56dc0f72ee7 usr/share/telify/defaults/preferences/preferences.js
+8bed4b9918d4f36b8c3db1f0322e31bf usr/share/telify/chrome.manifest
+7a164502d511ecbe38c3ad860e833579 usr/share/telify/install.rdf
+a5a82bcdce14f9439cad46169b5bc354 usr/share/doc/mozilla-telify-sflphone/changelog.gz
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/DEBIAN/postinst b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/DEBIAN/postinst
new file mode 100755
index 0000000000000000000000000000000000000000..1039df3268eae8fca20a728add6c4939f7494360
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/DEBIAN/postinst
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+gconftool-2 --direct --config-source xml::/etc/gconf/gconf.xml.defaults -t string -s /desktop/gnome/url-handlers/tel/command "/usr/bin/sflphone-handler %s"
+gconftool-2 --direct --config-source xml::/etc/gconf/gconf.xml.defaults -s /desktop/gnome/url-handlers/tel/needs_terminal false -t bool
+gconftool-2 --direct --config-source xml::/etc/gconf/gconf.xml.defaults -t bool -s /desktop/gnome/url-handlers/tel/enabled true
+
+gconftool-2 --direct --config-source xml::/etc/gconf/gconf.xml.defaults -t string -s /desktop/gnome/url-handlers/callto/command "/usr/bin/sflphone-handler %s"
+gconftool-2 --direct --config-source xml::/etc/gconf/gconf.xml.defaults -s /desktop/gnome/url-handlers/callto/needs_terminal false -t bool
+gconftool-2 --direct --config-source xml::/etc/gconf/gconf.xml.defaults -t bool -s /desktop/gnome/url-handlers/callto/enabled true
+
+gconftool-2 --direct --config-source xml::/etc/gconf/gconf.xml.defaults -t string -s /desktop/gnome/url-handlers/sip/command "/usr/bin/sflphone-handler %s"
+gconftool-2 --direct --config-source xml::/etc/gconf/gconf.xml.defaults -s /desktop/gnome/url-handlers/sip/needs_terminal false -t bool
+gconftool-2 --direct --config-source xml::/etc/gconf/gconf.xml.defaults -t bool -s /desktop/gnome/url-handlers/sip/enabled true
+
+exit 0
+
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/bin/sflphone-handler b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/bin/sflphone-handler
new file mode 100755
index 0000000000000000000000000000000000000000..727ef0f93c26927ed962654154418cd59ca2983a
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/bin/sflphone-handler
@@ -0,0 +1,52 @@
+#!/bin/sh
+#
+# This script can be used as a callto: (or other) protocol handler in
+# Mozilla Firefox-based browser.
+# In Firefox use Preferences > Applications and set the callto handler
+# to this script.
+
+# The sflphone daemon config file
+RESFILE=~/.config/sflphone/sflphonedrc
+
+# Parse sflphonedrc and get default account id string
+if [ -f "$RESFILE" ]; then
+
+ # Use first ID
+ ACCOUNTID=`grep Accounts.order $RESFILE | sed -e 's/Accounts.order=//' -e 's/\/.*//'`
+
+ # Accounts.order is not set
+ if [ -z $ACCOUNTID ]; then
+
+ # Use first account declared in sflphone config
+ ACCOUNTID="`grep -m 1 Account: $RESFILE | sed -e 's/\[//' -e 's/\]//'`"
+ fi
+
+else
+ echo Fatal: Cant find sflphonedrc config file.
+ exit 1
+fi
+
+# Check 1st argument (phone number)
+if [ -z $1 ]; then
+ echo "Error: argument 1 (phone number) not provided."
+ exit 1
+fi
+
+# Cleanup destination, keeping numbers only
+TO="`echo $1 | sed -e 's/[^0123456789]//g'`"
+
+# Generate call id.
+CALLID=${RANDOM}$$
+
+dbus-send \
+ --type="method_call" \
+ --dest="org.sflphone.SFLphone" \
+ "/org/sflphone/SFLphone/CallManager" \
+ "org.sflphone.SFLphone.CallManager.placeCall" \
+ string:"$ACCOUNTID" \
+ string:"$CALLID" \
+ string:"$TO"
+
+exit 0
+
+# EOF
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/lib/firefox-addons/extensions/{6c5f349a-ddda-49ad-bdf0-326d3fe1f938} b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/lib/firefox-addons/extensions/{6c5f349a-ddda-49ad-bdf0-326d3fe1f938}
new file mode 120000
index 0000000000000000000000000000000000000000..7d660382bdd5b719ba0430a579f079381b3d1cac
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/lib/firefox-addons/extensions/{6c5f349a-ddda-49ad-bdf0-326d3fe1f938}
@@ -0,0 +1 @@
+../../../share/telify
\ No newline at end of file
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/doc/mozilla-telify-sflphone/changelog.gz b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/doc/mozilla-telify-sflphone/changelog.gz
new file mode 100644
index 0000000000000000000000000000000000000000..186ab5d35fe47e1e0590fbfa544a38e8604cbdfd
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/doc/mozilla-telify-sflphone/changelog.gz differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome.manifest b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome.manifest
new file mode 100644
index 0000000000000000000000000000000000000000..bc9507c8816097cc6790ce6b16406987793c0971
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome.manifest
@@ -0,0 +1,5 @@
+content telify chrome/content/
+locale telify en-US chrome/locale/en-US/
+locale telify de-DE chrome/locale/de-DE/
+
+overlay chrome://browser/content/browser.xul chrome://telify/content/browser.xul
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/ask32.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/ask32.png
new file mode 100644
index 0000000000000000000000000000000000000000..d56ba2c2449cb156979af2896e82be831f258d93
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/ask32.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/browser.xul b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/browser.xul
new file mode 100644
index 0000000000000000000000000000000000000000..68f72fbff72784512e9051b78473baaf39b76643
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/browser.xul
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
+<?xml-stylesheet href="chrome://telify/content/dialog.css" type="text/css"?>
+
+<!DOCTYPE overlay SYSTEM "chrome://telify/locale/lang.dtd">
+<overlay xmlns='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'>
+
+ <stringbundleset id="stringbundleset">
+ <stringbundle id="idTelifyStringBundle" src="chrome://telify/locale/lang.properties"/>
+ </stringbundleset>
+
+ <script type='application/x-javascript' src='chrome://telify/content/jshashtable.js'></script>
+ <script type='application/x-javascript' src='chrome://telify/content/util.js'></script>
+ <script type='application/x-javascript' src='chrome://telify/content/pref.js'></script>
+ <script type='application/x-javascript' src='chrome://telify/locale/country_locale.js'></script>
+ <script type='application/x-javascript' src='chrome://telify/content/country_data.js'></script>
+ <script type='application/x-javascript' src='chrome://telify/locale/locale.js'></script>
+ <script type='application/x-javascript' src='chrome://telify/content/telify.js'></script>
+
+ <statusbar id="status-bar">
+ <statusbarpanel id="idTelify_status" collapsed="true">
+ <popup id="idTelify_status_popup" onpopupshowing="objTelify.modifyPopup(event)">
+ <menuitem id="idTelify_status_activity" oncommand="objTelify.toggleActive()" />
+ <menuitem id="idTelify_status_blacklist" oncommand="objTelify.toggleBlacklist()" />
+ </popup>
+ <hbox id="idTelify_statusicon" context="idTelify_status_popup" class="statusbarpanel-menu-iconic" src="chrome://telify/content/icon18_active.png" />
+ </statusbarpanel>
+ </statusbar>
+
+ <menupopup id="contentAreaContextMenu">
+ <menu id="idTelify_menu_context" label="&menu.selection;" collapsed="true" insertbefore="context-sep-stop"
+ class="menu-iconic" image="chrome://telify/content/icon_menu.png">
+ <menupopup id="idTelify_popup_context">
+ <menuitem id="idTelify_context" class="menuitem-iconic"/>
+ <menuseparator id="idTelify_sep_context"/>
+ <menuitem id="idTelify_tld_context" class="menuitem-iconic"/>
+ <menuitem id="idTelify_context0" class="menuitem-iconic"/>
+ <menuitem id="idTelify_context1" class="menuitem-iconic"/>
+ <menuitem id="idTelify_context2" class="menuitem-iconic"/>
+ <menuitem id="idTelify_context3" class="menuitem-iconic"/>
+ <menuitem id="idTelify_context4" class="menuitem-iconic"/>
+ <menuitem id="idTelify_context5" class="menuitem-iconic"/>
+ <menuitem id="idTelify_context6" class="menuitem-iconic"/>
+ <menuitem id="idTelify_context7" class="menuitem-iconic"/>
+ <menuitem id="idTelify_context8" class="menuitem-iconic"/>
+ <menuitem id="idTelify_context9" class="menuitem-iconic"/>
+ <menuseparator />
+ <menuitem id="idTelify_edit_context" class="menuitem-iconic" label="&menu.edit_number;" image="chrome://telify/content/edit22x15.png"/>
+ </menupopup>
+ </menu>
+ </menupopup>
+
+ <popupset>
+ <menupopup id="idTelify_popup_dial">
+ <menuitem id="idTelify_dial" class="menuitem-iconic"/>
+ <menuseparator id="idTelify_sep_dial"/>
+ <menuitem id="idTelify_tld_dial" class="menuitem-iconic"/>
+ <menuitem id="idTelify_dial0" class="menuitem-iconic"/>
+ <menuitem id="idTelify_dial1" class="menuitem-iconic"/>
+ <menuitem id="idTelify_dial2" class="menuitem-iconic"/>
+ <menuitem id="idTelify_dial3" class="menuitem-iconic"/>
+ <menuitem id="idTelify_dial4" class="menuitem-iconic"/>
+ <menuitem id="idTelify_dial5" class="menuitem-iconic"/>
+ <menuitem id="idTelify_dial6" class="menuitem-iconic"/>
+ <menuitem id="idTelify_dial7" class="menuitem-iconic"/>
+ <menuitem id="idTelify_dial8" class="menuitem-iconic"/>
+ <menuitem id="idTelify_dial9" class="menuitem-iconic"/>
+ <menuseparator />
+ <menuitem id="idTelify_edit_dial" class="menuitem-iconic" label="&menu.edit_number;" image="chrome://telify/content/edit22x15.png"/>
+ </menupopup>
+ </popupset>
+
+ <menupopup id="menu_ToolsPopup">
+ <menu id="idTelify_menu" label="Telify" insertafter="devToolsSeparator">
+ <menupopup onpopupshowing="objTelify.modifyPopup(event)">
+ <menuitem id="idTelify_menu_activity" oncommand="objTelify.toggleActive()"/>
+ <menuitem id="idTelify_menu_blacklist" oncommand="objTelify.toggleBlacklist()"/>
+ <menuseparator />
+ <menuitem id="idTelify_menu_config" label="&menu.onlinehelp;" oncommand="objTelifyLocale.openOnlineHelp()"/>
+ <menuseparator />
+ <menuitem id="idTelify_menu_config" label="&menu.config;" oncommand="objTelifyPrefs.showConfigDialog()"/>
+ </menupopup>
+ </menu>
+ </menupopup>
+
+</overlay>
+
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/config.js b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/config.js
new file mode 100644
index 0000000000000000000000000000000000000000..25e529121ac47f94550cb2413dbf33e93e3f8360
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/config.js
@@ -0,0 +1,196 @@
+/*
+Creative Commons License: Attribution-No Derivative Works 3.0 Unported
+http://creativecommons.org/licenses/by-nd/3.0/
+(c)2009 Michael Koch
+*/
+
+var objTelifyConfig = {
+
+tmplIndex: 0,
+customLabelDefault: "",
+
+setConfigValues: function()
+{
+ objTelifyPrefs.telPrefs.setCharPref(objTelifyPrefs.PREF_IDD_PREFIX, document.getElementById("idTelifyPref_idd_prefix").value);
+ objTelifyPrefs.telPrefs.setIntPref(objTelifyPrefs.PREF_HREFTYPE, document.getElementById("idTelifyPref_hreftype").value);
+ objTelifyPrefs.telPrefs.setIntPref(objTelifyPrefs.PREF_HIGHLIGHT, document.getElementById("idTelifyPref_highlight").value);
+ objTelifyPrefs.telPrefs.setIntPref(objTelifyPrefs.PREF_NUMHISTORY, document.getElementById("idTelifyPref_num_history").value);
+ objTelifyPrefs.telPrefs.setBoolPref(objTelifyPrefs.PREF_STATUSICON, document.getElementById("idTelifyPref_statusicon").value == 1);
+ objTelifyPrefs.telPrefs.setBoolPref(objTelifyPrefs.PREF_DIAL_CC_DIRECT, document.getElementById("idTelifyPref_dialcc").value == 1);
+
+ objTelifyPrefs.telPrefs.setCharPref(objTelifyPrefs.PREF_CUSTOM_URL, document.getElementById("idTelifyPref_url_input").value);
+ objTelifyPrefs.telPrefs.setIntPref(objTelifyPrefs.PREF_CUSTOM_TMPL, this.tmplIndex);
+ for (var i=1; i<objTelifyPrefs.NUM_CUSTOM_PARAMS+1; i++) {
+ objTelifyPrefs.telPrefs.setCharPref(objTelifyPrefs.PREF_CUSTOM_PARAM+i, document.getElementById("idTelifyPref_param"+i+"_value").value);
+ }
+ objTelifyPrefs.telPrefs.setIntPref(objTelifyPrefs.PREF_CUSTOM_OPENTYPE, document.getElementById("idTelifyPref_opentype").value);
+},
+
+onAccept: function()
+{
+ this.setConfigValues();
+ return true;
+},
+
+onHelp: function()
+{
+ objTelifyLocale.openOnlineHelp();
+ return true;
+},
+
+initConfig: function()
+{
+ objTelifyPrefs.initTelifyPrefs();
+ document.getElementById("idTelifyPref_idd_prefix").value = objTelifyPrefs.idd_prefix;
+ document.getElementById("idTelifyPref_hreftype").value = objTelifyPrefs.hrefType;
+ this.hrefTypeChanged(objTelifyPrefs.hrefType);
+ document.getElementById("idTelifyPref_highlight").value = objTelifyPrefs.highlight;
+ document.getElementById("idTelifyPref_num_history").value = objTelifyPrefs.numHistory;
+ document.getElementById("idTelifyPref_statusicon").value = (objTelifyPrefs.fStatusIcon ? 1 : 0);
+ document.getElementById("idTelifyPref_dialcc").value = (objTelifyPrefs.fDialCCDirect ? 1 : 0);
+
+ document.getElementById("idTelifyPref_url_input").value = objTelifyPrefs.custom_url;
+ this.tmplIndex = objTelifyPrefs.custom_tmpl;
+ for (var i=1; i<objTelifyPrefs.NUM_CUSTOM_PARAMS+1; i++) {
+ document.getElementById("idTelifyPref_param"+i+"_value").value = objTelifyPrefs.custom_param[i];
+ }
+ document.getElementById("idTelifyPref_opentype").value = objTelifyPrefs.custom_opentype;
+
+ this.customLabelDefault = document.getElementById("idTelifyPref_custom_caption").label
+
+ var popup = document.getElementById("idTelifyPref_url_popup");
+ for (var i=0; i<telify_custom_preset.length; i++) {
+ var item = document.createElement("menuitem");
+ item.setAttribute("label", telify_custom_preset[i][0]);
+ popup.appendChild(item);
+ }
+
+ this.setTemplate(this.tmplIndex, true);
+
+ document.getElementById("idTelifyPref_version_label").value = "Telify v"+objTelifyUtil.getAddonVersion();
+},
+
+getTemplateParam: function(nr)
+{
+ if (nr == 0) return objTelifyPrefs.telStrings.getString("phonenr_tmpl");
+ var param = document.getElementById("idTelifyPref_param"+nr+"_value").value;
+ var label = document.getElementById("idTelifyPref_param"+nr+"_caption").value;
+ if (label.value == "") param = "";
+ return param;
+},
+
+createResultDOM: function(node)
+{
+ if (node == null) return 0; // safety
+ if (node.nodeType == Node.TEXT_NODE) {
+ var text = node.data;
+ var len = text.length;
+ var escape = 0;
+ for (var i=0; i<len-1; i++) {
+ if (escape == 1) {escape = 0; continue;}
+ var c = text.charAt(i);
+ if (c == '\\') {escape = 1; continue}
+ if (c != '$') continue;
+ c = text.charAt(i+1);
+ var nr = "0123456789".indexOf(c);
+ if (nr < 0 || nr > objTelifyPrefs.NUM_CUSTOM_PARAMS) continue;
+ var prev_node = document.createTextNode(text.substr(0, i));
+ var next_node = document.createTextNode(text.substr(i+2));
+ var hilite_node = document.createElement("span");
+ hilite_node.setAttribute("class", (nr == 0 ? "tmpl_number" : "tmpl_param"));
+ var param_node = document.createTextNode(this.getTemplateParam(nr));
+ hilite_node.appendChild(param_node);
+ var parentNode = node.parentNode;
+ parentNode.replaceChild(next_node, node);
+ parentNode.insertBefore(hilite_node, next_node);
+ parentNode.insertBefore(prev_node, hilite_node);
+ break;
+ }
+ } else {
+ for (var i=0; i<node.childNodes.length; i++) {
+ this.createResultDOM(node.childNodes[i]);
+ }
+ }
+},
+
+urlChanged: function()
+{
+ var url = document.getElementById("idTelifyPref_url_input").value;
+ var result = document.getElementById("idTelifyPref_url_result");
+ while (result.childNodes[0]) result.removeChild(result.childNodes[0]);
+ if (url == "") {
+ var item = document.createElement("span");
+ var empty_url = objTelifyPrefs.telStrings.getString("empty_url")
+ item.appendChild(document.createTextNode(empty_url));
+ item.setAttribute("class", "tmpl_empty");
+ result.appendChild(item);
+ } else {
+ var item = document.createTextNode(url);
+ result.appendChild(item);
+ this.createResultDOM(result);
+ }
+},
+
+setTemplate: function(nr, init)
+{
+ var caption = document.getElementById("idTelifyPref_custom_caption");
+ caption.label = this.customLabelDefault;
+ if (telify_custom_preset[nr][0].length) caption.label += " ("+telify_custom_preset[nr][0]+")";
+ if (!init) document.getElementById("idTelifyPref_url_input").value = telify_custom_preset[nr][1];
+ for (var j=0; j<objTelifyPrefs.NUM_CUSTOM_PARAMS; j++) {
+ var label = document.getElementById("idTelifyPref_param"+(j+1)+"_caption");
+ var param = document.getElementById("idTelifyPref_param"+(j+1)+"_value");
+ var row = document.getElementById("idTelifyPref_param"+(j+1)+"_row");
+ label.value = telify_custom_preset[nr][2+j];
+ if (label.value != "") label.value += ":";
+ if (label.value == "") param.setAttribute("disabled", true); else param.removeAttribute("disabled");
+ }
+ this.urlChanged();
+},
+
+tmplChanged: function()
+{
+ var obj = document.getElementById("idTelifyPref_url_input");
+ for (var i=0; i<telify_custom_preset.length; i++) {
+ if (obj.value == telify_custom_preset[i][0]) {
+ this.tmplIndex = i;
+ this.setTemplate(i, false);
+ break;
+ }
+ }
+},
+
+paramChanged: function(nr, value)
+{
+ this.urlChanged();
+},
+
+enableDOMTree: function(node, enable)
+{
+ if (node == null) return;
+ if (enable) {
+ if (node.removeAttribute) node.removeAttribute("disabled");
+ } else {
+ if (node.setAttribute) node.setAttribute("disabled", true);
+ }
+ for (var i=0; i<node.childNodes.length; i++) {
+ this.enableDOMTree(node.childNodes[i], enable);
+ }
+},
+
+hrefTypeChanged: function(nr)
+{
+ var group = document.getElementById("idTelifyPref_custom_group");
+ if (nr == objTelifyPrefs.HREFTYPE_CUSTOM) {
+ group.removeAttribute("collapsed");
+ window.sizeToContent();
+ } else {
+ //alert(group.clientHeight);
+ group.setAttribute("collapsed", true);
+ //window.resizeTo(500, 500);
+ window.resizeBy(0, -200);
+ window.sizeToContent();
+ }
+}
+
+};
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/config.xul b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/config.xul
new file mode 100644
index 0000000000000000000000000000000000000000..967d4db7227e48bde4587aa0b59a409aedd6aa33
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/config.xul
@@ -0,0 +1,180 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
+<?xml-stylesheet href="chrome://telify/content/dialog.css" type="text/css"?>
+
+<!DOCTYPE dialog SYSTEM "chrome://telify/locale/lang.dtd">
+
+<dialog id="dlgTelifyConfig"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+ buttons="accept,cancel,help"
+ onload="objTelifyConfig.initConfig()"
+ ondialogaccept="objTelifyConfig.onAccept()"
+ ondialogcancel=""
+ ondialoghelp="objTelifyConfig.onHelp()"
+ title="&dialog.config.title;">
+
+ <stringbundleset id="stringbundleset">
+ <stringbundle id="idTelifyStringBundle" src="chrome://telify/locale/lang.properties"/>
+ </stringbundleset>
+
+ <script type='application/x-javascript' src='chrome://telify/content/util.js'></script>
+ <script type='application/x-javascript' src='chrome://telify/content/pref.js'></script>
+ <script type='application/x-javascript' src='chrome://telify/content/config.js'></script>
+ <script type='application/x-javascript' src='chrome://telify/locale/locale.js'></script>
+ <script type='application/x-javascript' src='chrome://telify/locale/custom_preset.js'></script>
+
+ <hbox>
+
+ <groupbox style="padding-bottom:8px;">
+ <caption label="&dialog.config.general;"/>
+ <grid>
+ <columns>
+ <column flex="1"/>
+ <column flex="2"/>
+ </columns>
+ <rows>
+ <row align="center">
+ <label value="&dialog.config.hreftype;:"/>
+ <menulist id="idTelifyPref_hreftype" onselect="objTelifyConfig.hrefTypeChanged(this.value)">
+ <menupopup>
+ <menuitem label="&dialog.config.hreftype0;" value="0"/>
+ <menuitem label="&dialog.config.hreftype1;" value="1"/>
+ <menuitem label="&dialog.config.hreftype2;" value="2"/>
+ <menuitem label="&dialog.config.hreftype3;" value="3"/>
+ <menuitem label="&dialog.config.hreftype_custom;" value="9"/>
+ </menupopup>
+ </menulist>
+ </row>
+
+ <row align="center">
+ <label value="&dialog.config.dialcc;:"/>
+ <menulist id="idTelifyPref_dialcc">
+ <menupopup>
+ <menuitem label="&dialog.config.dialcc_menu;" value="0"/>
+ <menuitem label="&dialog.config.dialcc_direct;" value="1"/>
+ </menupopup>
+ </menulist>
+ </row>
+
+ <row align="center">
+ <label value="&dialog.config.highlight;:"/>
+ <menulist id="idTelifyPref_highlight">
+ <menupopup>
+ <menuitem label="&dialog.config.highlight0;" value="0"/>
+ <menuitem label="&dialog.config.highlight1;" value="25"/>
+ <menuitem label="&dialog.config.highlight2;" value="50"/>
+ <menuitem label="&dialog.config.highlight3;" value="100"/>
+ </menupopup>
+ </menulist>
+ </row>
+ <row align="center">
+ <label value="&dialog.config.num_history;:"/>
+ <menulist id="idTelifyPref_num_history">
+ <menupopup>
+ <menuitem label="3" value="3"/>
+ <menuitem label="4" value="4"/>
+ <menuitem label="5" value="5"/>
+ <menuitem label="6" value="6"/>
+ <menuitem label="7" value="7"/>
+ <menuitem label="8" value="8"/>
+ <menuitem label="9" value="9"/>
+ <menuitem label="10" value="10"/>
+ </menupopup>
+ </menulist>
+ </row>
+ <row align="center">
+ <label value="&dialog.config.statusicon;:"/>
+ <menulist id="idTelifyPref_statusicon">
+ <menupopup>
+ <menuitem label="&dialog.config.statusicon0;" value="0" />
+ <menuitem label="&dialog.config.statusicon1;" value="1" />
+ </menupopup>
+ </menulist>
+ </row>
+ <row align="center">
+ <label value="&dialog.config.idd_prefix;"/>
+ <menulist id="idTelifyPref_idd_prefix" editable="true">
+ <menupopup>
+ <menuitem label="" value=""/>
+ <menuitem label="00" value="00"/>
+ <menuitem label="001" value="001"/>
+ <menuitem label="011" value="011"/>
+ <menuitem label="0011" value="0011"/>
+ </menupopup>
+ </menulist>
+ </row>
+ </rows>
+ </grid>
+ </groupbox>
+
+ <groupbox style="padding-bottom:8px;">
+ <caption label="&dialog.config.about;"/>
+ <vbox style="width:96px;">
+ <spacer style="height:0px;"/>
+ <hbox>
+ <image src="chrome://telify/content/icon96.png" style="width:96px;height:96px;margin-left:0px;"/>
+ <spacer/>
+ </hbox>
+ <spacer style="height:4px;"/>
+ <label id="idTelifyPref_version_label" value="" style="font-weight:bold;"/>
+ <label value="www.codepad.de" href="http://www.codepad.de" class="text-link"/>
+ <spacer flex="1"/>
+ </vbox>
+ </groupbox>
+
+ </hbox>
+
+ <groupbox id="idTelifyPref_custom_group" style="padding-bottom:8px;">
+ <caption id="idTelifyPref_custom_caption" label="&dialog.config.custom;"/>
+ <vbox>
+ <description id="idTelifyPref_url_result" class="urlresult">
+ </description>
+
+ <menulist id="idTelifyPref_url_input" editable="true"
+ oninput="objTelifyConfig.urlChanged(this.value)" onselect="objTelifyConfig.tmplChanged(this.value)">
+ <menupopup id="idTelifyPref_url_popup">
+ </menupopup>
+ </menulist>
+
+ <grid>
+ <columns>
+ <column flex="0"/>
+ <column flex="2"/>
+ <column flex="3"/>
+ </columns>
+ <rows>
+ <row align="center" id="idTelifyPref_param1_row" style="margin-top:4px;">
+ <label id="idTelifyPref_param1_caption"/>
+ <textbox id="idTelifyPref_param1_value" emptytext="&dialog.config.replaces; $1 &dialog.config.in_template;"
+ oninput="objTelifyConfig.paramChanged(1, this.value)"/>
+ <spacer flex="2"/>
+ </row>
+ <row align="center" id="idTelifyPref_param2_row">
+ <label id="idTelifyPref_param2_caption"/>
+ <textbox id="idTelifyPref_param2_value" emptytext="&dialog.config.replaces; $2 &dialog.config.in_template;"
+ oninput="objTelifyConfig.paramChanged(2, this.value)"/>
+ </row>
+ <row align="center" id="idTelifyPref_param3_row">
+ <label id="idTelifyPref_param3_caption"/>
+ <textbox id="idTelifyPref_param3_value" emptytext="&dialog.config.replaces; $3 &dialog.config.in_template;"
+ oninput="objTelifyConfig.paramChanged(3, this.value)"/>
+ </row>
+ <row align="center" style="margin-top:4px;">
+ <label value="&dialog.config.opentype;:"/>
+ <menulist id="idTelifyPref_opentype">
+ <menupopup>
+ <menuitem label="&dialog.config.opentype0;" value="0"/>
+ <menuitem label="&dialog.config.opentype1;" value="1"/>
+ <menuitem label="&dialog.config.opentype2;" value="2"/>
+ <menuitem label="&dialog.config.opentype3;" value="3"/>
+ </menupopup>
+ </menulist>
+ </row>
+ </rows>
+ </grid>
+
+
+ </vbox>
+ </groupbox>
+
+</dialog>
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/country_data.js b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/country_data.js
new file mode 100644
index 0000000000000000000000000000000000000000..63acf6089a1a45b873005a49f7933cb9b7790743
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/country_data.js
@@ -0,0 +1,258 @@
+/*
+Creative Commons License: Attribution-No Derivative Works 3.0 Unported
+http://creativecommons.org/licenses/by-nd/3.0/
+(c)2009 Michael Koch
+*/
+// must be saved as UTF-8
+var telify_country_data = [
+["", "", "", ""],
+["+1", "USA", "us,mil,gov,edu", "1"],
+["+1340", "U.S. Virgin Islands", "vi", "1"],
+["+1670", "Northern Mariana Islands", "mp", "1"],
+["+1671", "Guam", "gu", "1"],
+["+1684", "American Samoa", "as", "1"],
+["+1787", "Puerto Rico", "pr", "1"],
+["+1939", "Puerto Rico", "", "1"],
+["+1", "Canada", "ca", "1"],
+["+1264", "Anguilla", "ai", "1"],
+["+1268", "Antigua and Barbuda", "ag", "1"],
+["+1242", "Bahamas", "bs", "1"],
+["+1246", "Barbados", "bb", "1"],
+["+1441", "Bermuda", "bm", "1"],
+["+1284", "British Virgin Islands", "vg", "1"],
+["+1345", "Cayman Islands", "ky", "1"],
+["+1767", "Dominica", "dm", "1"],
+["+1808", "Midway Island", "", "1"],
+["+1809", "Dominican Republic", "do", "1"],
+["+1829", "Dominican Republic", "", "1"],
+["+1849", "Dominican Republic", "", "1"],
+["+1473", "Grenada", "gd", "1"],
+["+1876", "Jamaica", "jm", "1"],
+["+1664", "Montserrat", "ms", "1"],
+["+1869", "Saint Kitts and Nevis", "kn", "1"],
+["+1758", "Saint Lucia", "lc", "1"],
+["+1784", "Saint Vincent and the Grenadines", "vc", "1"],
+["+1868", "Trinidad and Tobago", "tt", "1"],
+["+1649", "Turks and Caicos Islands", "tc", "1"],
+["+20", "Egypt", "eg", "0"],
+["+212", "Morocco", "ma", ""],
+["+213", "Algeria", "dz", "7"],
+["+216", "Tunisia", "tn", "0"],
+["+218", "Libya", "ly", "0"],
+["+220", "Gambia", "gm", ""],
+["+221", "Senegal", "sn", "0"],
+["+222", "Mauritania", "mr", "0"],
+["+223", "Mali", "ml", "0"],
+["+224", "Guinea", "gn", "0"],
+["+225", "Ivory Coast", "ci", "0"],
+["+226", "Burkina Faso", "bf", ""],
+["+227", "Niger", "ne", "0"],
+["+228", "Togo", "tg", ""],
+["+229", "Benin", "bj", ""],
+["+230", "Mauritius", "mu", "0"],
+["+231", "Liberia", "lr", "22"],
+["+232", "Sierra Leone", "sl", "0"],
+["+233", "Ghana", "gh", ""],
+["+234", "Nigeria", "ng", "0"],
+["+235", "Chad", "td", ""],
+["+236", "Central African Republic", "cf", ""],
+["+237", "Cameroon", "cm", ""],
+["+238", "Cape Verde", "cv", ""],
+["+239", "São Tomé and Príncipe", "st", "0"],
+["+240", "Equatorial Guinea", "gq", ""],
+["+241", "Gabon", "ga", ""],
+["+242", "Congo (Republic)", "cg", ""],
+["+243", "Congo (Democratic Republic)", "cd", ""],
+["+244", "Angola", "ao", "0"],
+["+245", "Guinea-Bissau", "gw", ""],
+["+246", "Diego Garcia", "", ""],
+["+247", "Ascension Island", "ac", ""],
+["+248", "Seychelles", "sc", "0"],
+["+249", "Sudan", "sd", "0"],
+["+250", "Rwanda", "rw", "0"],
+["+251", "Ethiopia", "et", "0"],
+["+252", "Somalia", "so", ""],
+["+253", "Djibouti", "dj", ""],
+["+254", "Kenya", "ke", "0"],
+["+255", "Tanzania", "tz", "0"],
+["+256", "Uganda", "ug", "0"],
+["+257", "Burundi", "bi", ""],
+["+258", "Mozambique", "mz", "0"],
+["+260", "Zambia", "zm", "0"],
+["+261", "Madagascar", "mg", "0"],
+["+262", "Réunion", "re", "0"],
+["+262", "Mayotte", "yt", "0"],
+["+263", "Zimbabwe", "zw", "0"],
+["+264", "Namibia", "na", "0"],
+["+265", "Malawi", "mw", ""],
+["+266", "Lesotho", "ls", "0"],
+["+267", "Botswana", "bw", ""],
+["+268", "Swaziland", "sz", ""],
+["+269", "Comoros", "km", ""],
+["+27", "South Africa", "za", "0"],
+["+290", "Saint Helena", "sh", ""],
+["+290", "Tristan da Cunha", "", "0"],
+["+291", "Eritrea", "er", "0"],
+["+297", "Aruba", "aw", ""],
+["+298", "Faroe Islands", "fo", ""],
+["+299", "Greenland", "gl", ""],
+["+30", "Greece", "gr", ""],
+["+31", "Netherlands", "nl", "0"],
+["+32", "Belgium", "be", "0"],
+["+33", "France", "fr", "0"],
+["+34", "Spain", "es", "0"],
+["+350", "Gibraltar", "gi", ""],
+["+351", "Portugal", "pt", ""],
+["+352", "Luxembourg", "lu", ""],
+["+353", "Ireland", "ie", "0"],
+["+354", "Iceland", "is", "0"],
+["+355", "Albania", "al", "0"],
+["+356", "Malta", "mt", "0"],
+["+357", "Cyprus (South)", "cy", ""],
+["+358", "Finland", "fi", "0"],
+["+359", "Bulgaria", "bg", "0"],
+["+36", "Hungary", "hu", "06"],
+["+370", "Lithuania", "lt", "8"],
+["+371", "Latvia", "lv", "8"],
+["+372", "Estonia", "ee", ""],
+["+373", "Moldova", "md", "0"],
+["+374", "Armenia", "am", "8"],
+["+37447", "Nagorno-Karabakh", "", "0"],
+["+37497", "Nagorno-Karabakh (Mobile)", "", "0"],
+["+375", "Belarus", "by", "8"],
+["+376", "Andorra", "ad", ""],
+["+377", "Monaco", "mc", "0"],
+["+37744", "Kosovo (Mobile)", "", "0"],
+["+378", "San Marino", "sm", "0"],
+["+379", "Vatican City", "va", ""],
+["+380", "Ukraine", "ua", "8"],
+["+381", "Serbia", "rs", "0"],
+["+381", "Kosovo", "", "0"],
+["+382", "Montenegro", "me", "0"],
+["+385", "Croatia", "hr", "0"],
+["+386", "Slovenia", "si", "0"],
+["+38649", "Kosovo (Mobile)", "", "0"],
+["+387", "Bosnia and Herzegovina", "ba", "0"],
+["+389", "Macedonia", "mk", "0"],
+["+39", "Italy and Vatican City", "it", ""],
+["+40", "Romania", "ro", "0"],
+["+41", "Switzerland", "ch", "0"],
+["+420", "Czech Republic", "cz", ""],
+["+421", "Slovakia", "sk", "0"],
+["+423", "Liechtenstein", "li", ""],
+["+43", "Austria", "at", "0"],
+["+44", "United Kingdom", "uk,gb", "0"],
+["+45", "Denmark", "dk", ""],
+["+46", "Sweden", "se", "0"],
+["+47", "Norway", "no", ""],
+["+48", "Poland", "pl", "0"],
+["+49", "Germany", "de", "0"],
+["+500", "Falkland Islands", "fk", ""],
+["+501", "Belize", "bz", "0"],
+["+502", "Guatemala", "gt", ""],
+["+503", "El Salvador", "sv", ""],
+["+504", "Honduras", "hn", "0"],
+["+505", "Nicaragua", "ni", "0"],
+["+506", "Costa Rica", "cr", ""],
+["+507", "Panama", "pa", "0"],
+["+508", "Saint-Pierre and Miquelon", "pm", "0"],
+["+509", "Haiti", "ht", "0"],
+["+51", "Peru", "pe", "0"],
+["+52", "Mexico", "mx", "01"],
+["+53", "Cuba", "cu", "0"],
+["+5399", "Guantanamo Bay", "", "0"],
+["+54", "Argentina", "ar", "0"],
+["+55", "Brazil", "br", "0"],
+["+56", "Chile", "cl", "0"],
+["+57", "Colombia", "co", "0"],
+["+58", "Venezuela", "ve", "0"],
+["+590", "Guadeloupe", "gp", ""],
+["+591", "Bolivia", "bo", "0"],
+["+592", "Guyana", "gy", "0"],
+["+593", "Ecuador", "ec", "0"],
+["+594", "French Guiana", "gf", ""],
+["+595", "Paraguay", "py", "0"],
+["+596", "Martinique", "mq", ""],
+["+597", "Suriname", "sr", ""],
+["+598", "Uruguay", "uy", "0"],
+["+599", "Netherlands Antilles", "an", ""],
+["+60", "Malaysia", "my", "0"],
+["+61", "Australia", "au", "0"],
+["+62", "Indonesia", "id", "0"],
+["+63", "Philippines", "ph", "0"],
+["+64", "New Zealand", "nz", ""],
+["+65", "Singapore", "sg", ""],
+["+66", "Thailand", "th", "0"],
+["+670", "East Timor", "tp,tl", ""],
+["+672", "Australian external territories", "", ""],
+["+673", "Brunei", "bn", "0"],
+["+674", "Nauru", "nr", "0"],
+["+675", "Papua New Guinea", "pg", ""],
+["+676", "Tonga", "to", ""],
+["+677", "Solomon Islands", "sb", ""],
+["+678", "Vanuatu", "vu", ""],
+["+679", "Fiji", "fj", ""],
+["+680", "Palau", "pw", ""],
+["+681", "Wallis and Futuna", "wf", ""],
+["+682", "Cook Islands", "ck", "00"],
+["+683", "Niue Island", "nu", "0"],
+["+685", "Samoa", "ws", ""],
+["+686", "Kiribati", "ki", "0"],
+["+687", "New Caledonia", "nc", "0"],
+["+688", "Tuvalu", "tv", ""],
+["+689", "French Polynesia", "pf", ""],
+["+690", "Tokelau", "tk", ""],
+["+691", "Micronesia", "fm", "1"],
+["+692", "Marshall Islands", "mh", "1"],
+["+7", "Russia", "ru,su", "8"],
+["+7", "Kazakhstan", "kz", "8"],
+["+81", "Japan", "jp", "0"],
+["+82", "South Korea", "kr", "0"],
+["+84", "Vietnam", "vn", "0"],
+["+850", "North Korea", "", "0"],
+["+852", "Hong Kong", "hk", ""],
+["+853", "Macao", "mo", "0"],
+["+855", "Cambodia", "kh", "0"],
+["+856", "Laos", "la", "0"],
+["+86", "China", "cn", "0"],
+["+870", "Inmarsat SNAC", "", ""],
+["+871", "Inmarsat (Atlantic East)", "", ""],
+["+872", "Inmarsat (Pacific)", "", ""],
+["+873", "Inmarsat (Indian)", "", ""],
+["+874", "Inmarsat (Atlantic West)", "", ""],
+["+880", "Bangladesh", "bd", "0"],
+["+881", "Global Mobile Satellite System", "", ""],
+["+882", "International Networks", "", ""],
+["+883", "International Networks", "", ""],
+["+886", "Taiwan", "tw", ""],
+["+90", "Turkey", "tr", "0"],
+["+90392", "Cyprus (North)", "", "0"],
+["+91", "India", "in", "0"],
+["+92", "Pakistan", "pk", "0"],
+["+93", "Afghanistan", "af", "0"],
+["+94", "Sri Lanka", "lk", "0"],
+["+95", "Burma", "mm", ""],
+["+960", "Maldives", "mv", "0"],
+["+961", "Lebanon", "lb", "0"],
+["+962", "Jordan", "jo", "0"],
+["+963", "Syria", "sy", "0"],
+["+964", "Iraq", "iq", "0"],
+["+965", "Kuwait", "kw", "0"],
+["+966", "Saudi Arabia", "sa", "0"],
+["+967", "Yemen", "ye", "0"],
+["+968", "Oman", "om", "0"],
+["+971", "United Arab Emirates", "ae", ""],
+["+972", "Israel", "il", "0"],
+["+973", "Bahrain", "bh", ""],
+["+974", "Qatar", "qa", "0"],
+["+975", "Bhutan", "bt", ""],
+["+976", "Mongolia", "mn", "0"],
+["+977", "Nepal", "np", "0"],
+["+98", "Iran", "ir", "0"],
+["+992", "Tajikistan", "tj", "8"],
+["+993", "Turkmenistan", "tm", "8"],
+["+994", "Azerbaijan", "az", "8"],
+["+995", "Georgia", "ge", "8"],
+["+996", "Kyrgyzstan", "kg", "0"],
+["+998", "Uzbekistan", "uz", "8"],
+];
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/dialog.css b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/dialog.css
new file mode 100644
index 0000000000000000000000000000000000000000..c154c5200629e37a8cfab53bd5366c9baecacd56
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/dialog.css
@@ -0,0 +1,33 @@
+.telInputCC {
+ width: 6em;
+}
+
+#idTelify_popup_dial .menu-iconic-icon {
+ width: 22px;
+ height: 15px;
+}
+
+#idTelify_popup_context .menu-iconic-icon {
+ width: 22px;
+ height: 15px;
+}
+
+.tmpl_empty {
+ color: #a0a0a0;
+}
+
+.tmpl_number {
+ color: #008000;
+}
+
+.tmpl_param {
+ color: #000080;
+}
+
+.urlresult {
+ height:4.2em;
+ padding:2px 3px;
+ border:1px solid #e0e0e0;
+ background-color:#f0f0f0;
+ margin-left:4px;
+}
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/edit22x15.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/edit22x15.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb4c614f0b8250a5424018630cc4663962591633
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/edit22x15.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/editNumber.js b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/editNumber.js
new file mode 100644
index 0000000000000000000000000000000000000000..64896ad5c87f04ff0cf1581be739da27fb571215
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/editNumber.js
@@ -0,0 +1,180 @@
+/*
+Creative Commons License: Attribution-No Derivative Works 3.0 Unported
+http://creativecommons.org/licenses/by-nd/3.0/
+(c)2009 Michael Koch
+*/
+
+var objTelifyEditNumber = {
+
+checkKey: function(event, allowed)
+{
+ if (event.which < 32) return
+ var key = String.fromCharCode(event.which)
+ if (allowed.indexOf(key) >= 0) return;
+ event.preventDefault();
+},
+
+
+createListItem: function()
+{
+ var item = document.createElement('listitem');
+ for (var i=0; i<arguments.length; i++) {
+ var cell = document.createElement('listcell');
+ cell.setAttribute("label", arguments[i]);
+ item.appendChild(cell);
+ }
+ return item;
+},
+
+
+updateCountrySelection: function()
+{
+ var list = document.getElementById("idTelifyCountryCodeList");
+ var editcc = document.getElementById("idTelifyInputCC");
+ if (editcc.value == "" || editcc.value == "+" || editcc.value.charAt(0) != '+') {
+ list.scrollToIndex(0);
+ list.selectedIndex = 0;
+ editcc.style.color = "#ff0000";
+ return;
+ }
+ var index = 0;
+ var maxlen = 1;
+ for (var i=0; i<telify_country_data.length; i++) {
+ if (editcc.value == telify_country_data[i][0]) {
+ index = i;
+ break;
+ }
+ for (var j=1; j<editcc.value.length; j++) {
+ if (editcc.value.charAt(j) == telify_country_data[i][0].charAt(j)) {
+ if (j+1 > maxlen) {
+ maxlen = j+1;
+ index = i;
+ }
+ } else {
+ break;
+ }
+ }
+ }
+ if (index >= 0) {
+ list.scrollToIndex(index);
+ if (editcc.value == telify_country_data[index][0]) {
+ list.selectedIndex = index;
+ editcc.style.color = "#000000";
+ } else {
+ list.clearSelection();
+ editcc.style.color = "#ff0000";
+ }
+ } else {
+ list.scrollToIndex(0);
+ list.clearSelection();
+ editcc.style.color = "#ff0000";
+ }
+},
+
+
+ccChanged: function()
+{
+ var editcc = document.getElementById("idTelifyInputCC");
+ if (editcc.value.length == 1 && editcc.value.charAt(0) != '+') {
+ editcc.value = "+" + editcc.value;
+ }
+ this.updateCountrySelection();
+},
+
+
+updateNumberEdit: function()
+{
+ var list = document.getElementById("idTelifyCountryCodeList");
+ var fClear = false;
+ if (list.getRowCount() != telify_country_data.length) {
+ while (list.getRowCount() > 0) list.removeItemAt(0);
+ fClear = true;
+ }
+ for (var i=0; i<telify_country_data.length; i++) {
+ var item = this.createListItem(telify_country_data[i][0], telify_country_data[i][1]);
+ if (fClear) {
+ list.appendChild(item);
+ } else {
+ list.replaceChild(item, list.getItemAtIndex(i));
+ }
+ }
+ this.updateCountrySelection();
+},
+
+
+updateListSelection: function()
+{
+ var list = document.getElementById("idTelifyCountryCodeList");
+ var editcc = document.getElementById("idTelifyInputCC");
+ if (list.selectedCount > 0) {
+ editcc.value = telify_country_data[list.selectedIndex][0];
+ editcc.style.color = "#000000";
+ }
+},
+
+
+compareCol1: function(a, b)
+{
+ var v = a[0].localeCompare(b[0]);
+ if (v == 0) return a[1].localeCompare(b[1]);
+ return v;
+},
+
+
+compareCol2: function(a, b)
+{
+ var v = a[1].localeCompare(b[1]);
+ if (v == 0) return a[0].localeCompare(b[0]);
+ return v;
+},
+
+
+last_sorted_column: -1,
+
+sortCountryCodeList: function(column)
+{
+ var telPrefs = objTelifyPrefs.getPrefObj();
+ if (column < 0) {
+ column = telPrefs.getIntPref(objTelifyPrefs.PREF_COLSORTCC);
+ } else {
+ telPrefs.setIntPref(objTelifyPrefs.PREF_COLSORTCC, column);
+ }
+ if (column == this.last_sorted_column) return;
+ if (column == 0) {
+ telify_country_data.sort(this.compareCol1);
+ document.getElementById("idTelifyColCode").setAttribute("sortDirection", "descending");
+ document.getElementById("idTelifyColCountry").setAttribute("sortDirection", "natural");
+ }
+ if (column == 1) {
+ telify_country_data.sort(this.compareCol2);
+ document.getElementById("idTelifyColCode").setAttribute("sortDirection", "natural");
+ document.getElementById("idTelifyColCountry").setAttribute("sortDirection", "descending");
+ }
+ this.last_sorted_column = column;
+ this.updateNumberEdit();
+},
+
+
+setNumberEditReturnValue: function(fOK)
+{
+ window.arguments[0].cc = document.getElementById("idTelifyInputCC").value;
+ window.arguments[0].nr = document.getElementById("idTelifyInputNr").value;
+ window.arguments[0].fOK = fOK;
+},
+
+
+initNumberEdit: function()
+{
+ var cc = window.arguments[0].cc;
+ var nr = window.arguments[0].nr;
+ var index = -1;
+ var maxlen = 0;
+
+ objTelifyUtil.localizeCountryData();
+ document.getElementById("idTelifyInputCC").value = (cc ? cc : "");
+ document.getElementById("idTelifyInputNr").value = nr;
+ this.sortCountryCodeList(-1);
+}
+
+};
+
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/editNumber.xul b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/editNumber.xul
new file mode 100644
index 0000000000000000000000000000000000000000..251fbc0198542f60424265bec1b80426e10c519f
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/editNumber.xul
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
+<?xml-stylesheet href="chrome://telify/content/dialog.css" type="text/css"?>
+
+<!DOCTYPE dialog SYSTEM "chrome://telify/locale/lang.dtd">
+
+<dialog id="dlgTelifyEditNumber"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+ buttons="accept,cancel"
+ buttonlabelaccept="&dialog.edit.dial;"
+ onload="objTelifyEditNumber.initNumberEdit()"
+ ondialogaccept="objTelifyEditNumber.setNumberEditReturnValue(true)"
+ ondialogcancel="objTelifyEditNumber.setNumberEditReturnValue(false)"
+ title="&dialog.edit.title;">
+
+ <stringbundleset id="stringbundleset">
+ <stringbundle id="idTelifyStringBundle" src="chrome://telify/locale/lang.properties"/>
+ </stringbundleset>
+
+ <script type='application/x-javascript' src='chrome://telify/content/jshashtable.js'></script>
+ <script type='application/x-javascript' src='chrome://telify/content/util.js'></script>
+ <script type='application/x-javascript' src='chrome://telify/content/pref.js'></script>
+ <script type='application/x-javascript' src='chrome://telify/content/country_data.js'></script>
+ <script type='application/x-javascript' src='chrome://telify/locale/country_locale.js'></script>
+ <script type='application/x-javascript' src='chrome://telify/content/editNumber.js'></script>
+
+ <vbox>
+ <hbox align="center">
+ <textbox id="idTelifyInputCC" class="telInputCC" oninput="objTelifyEditNumber.ccChanged()" onkeypress="objTelifyEditNumber.checkKey(event,'+0123456789')"/>
+ <label value="–"/>
+ <textbox id="idTelifyInputNr" flex="1" onkeypress="objTelifyEditNumber.checkKey(event,'0123456789')"/>
+ </hbox>
+ <listbox id="idTelifyCountryCodeList" flex="1" width="280" height="250" onselect="objTelifyEditNumber.updateListSelection()">
+ <listhead>
+ <listheader id="idTelifyColCode" class="telInputCC" label="&dialog.edit.code;" onclick="objTelifyEditNumber.sortCountryCodeList(0)"/>
+ <listheader id="idTelifyColCountry" label="&dialog.edit.country;" onclick="objTelifyEditNumber.sortCountryCodeList(1)"/>
+ </listhead>
+ <listcols>
+ <listcol flex="0"/>
+ <listcol flex="1"/>
+ </listcols>
+ </listbox>
+ </vbox>
+
+</dialog>
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/error32.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/error32.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d5e260a5f21585e0a76c81a0a66b6dbf5be60e6
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/error32.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1-canada.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1-canada.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd226fef001e55ec8e0ede8fdf897babf89c2ed3
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1-canada.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..34bd21fd5cdfa2525a224ac596e07713d87de6af
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1242.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1242.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb72ea2c0f48e6935ee8bad01b77b11d8108855a
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1242.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1246.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1246.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6db2cd4a7aa6a3c71375bcaa8181440de130884
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1246.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1264.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1264.png
new file mode 100644
index 0000000000000000000000000000000000000000..45b6ec574ecf6afe62656e876878e1ed0b2fa253
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1264.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1268.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1268.png
new file mode 100644
index 0000000000000000000000000000000000000000..d618aeb5f3d0490a063bde2f04aa11aa7e316038
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1268.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1284.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1284.png
new file mode 100644
index 0000000000000000000000000000000000000000..93c6f1125582c3c4ed2ad91b13f94a4d225b297a
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1284.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1340.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1340.png
new file mode 100644
index 0000000000000000000000000000000000000000..0949b5fa6d5194dc591ac483794fd0d3ab2f740c
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1340.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1345.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1345.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ade1ca9be95a1952190fafbfc153ffb3c35827f
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1345.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1441.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1441.png
new file mode 100644
index 0000000000000000000000000000000000000000..775a6b67b56424fc2e5c950c88f902a5aa78c627
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1441.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1473.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1473.png
new file mode 100644
index 0000000000000000000000000000000000000000..19612cf7a73a7be8c0ffb1f405c025c30a2ad305
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1473.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1649.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1649.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8f0e6ec7e98e80146665ad258cd7603285ff461
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1649.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1664.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1664.png
new file mode 100644
index 0000000000000000000000000000000000000000..35d8f052b93c5208e3d430bc5213c6c984f47423
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1664.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1670.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1670.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5c8609a24821b02da585b50bef280f9cc23d65e
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1670.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1671.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1671.png
new file mode 100644
index 0000000000000000000000000000000000000000..5189a550be437d825ec88b09ec090bfd8138ac5c
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1671.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1684.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1684.png
new file mode 100644
index 0000000000000000000000000000000000000000..553b350cd38f66a8304aef45ca4c879f7559d5ff
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1684.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1758.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1758.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e92314b7bd0ae2c79a532e0359a57edc262e506
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1758.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1767.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1767.png
new file mode 100644
index 0000000000000000000000000000000000000000..472d05c29aa90043c2992380c7f924a6c7ebbbd8
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1767.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1784.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1784.png
new file mode 100644
index 0000000000000000000000000000000000000000..ceb8103b06c6bc457c5263c5adf2e454281dac20
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1784.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1787.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1787.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e25408dc26822567bdf78e54e4ded5eaadb3775
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1787.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1809.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1809.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1caf4f21030542284ed53c3c88e2aca2a061a69
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1809.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1829.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1829.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1caf4f21030542284ed53c3c88e2aca2a061a69
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1829.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1868.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1868.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1e2ea500745872e6060bf58f0e125ee9f762e95
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1868.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1869.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1869.png
new file mode 100644
index 0000000000000000000000000000000000000000..45e13d35c7d3ef278ca8beaf967eab7b00348854
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1869.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1876.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1876.png
new file mode 100644
index 0000000000000000000000000000000000000000..6398ed535192024ccf662d56747b8268d9e9d4a0
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1876.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1939.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1939.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e25408dc26822567bdf78e54e4ded5eaadb3775
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/1939.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/20.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/20.png
new file mode 100644
index 0000000000000000000000000000000000000000..0bb0d4e877dfc90324faa34953da79e04d145f8b
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/20.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/212.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/212.png
new file mode 100644
index 0000000000000000000000000000000000000000..3319fa7f6f16eedf976ebabc0c88b1e2058cf39d
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/212.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/213.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/213.png
new file mode 100644
index 0000000000000000000000000000000000000000..92b1190e3dca8bb2caac257ccc69b840192b34fe
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/213.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/216.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/216.png
new file mode 100644
index 0000000000000000000000000000000000000000..f00450b7afc3e22cddcdeca9c540747dba82969e
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/216.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/218.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/218.png
new file mode 100644
index 0000000000000000000000000000000000000000..52530626a429d202624f72c4309f1f106a8c87a4
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/218.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/220.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/220.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5964b2715b6fb4fd993384843aac0973395360d
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/220.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/221.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/221.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff6071bad1d33253fb04d625b496cdb36bbddb3b
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/221.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/222.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/222.png
new file mode 100644
index 0000000000000000000000000000000000000000..08d9e225999a18374839a2cc754aee51df360ecd
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/222.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/223.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/223.png
new file mode 100644
index 0000000000000000000000000000000000000000..27da235bc70c04011749e7d5a0e3ee29be40662e
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/223.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/224.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/224.png
new file mode 100644
index 0000000000000000000000000000000000000000..fba8996037e0cf45309c313628d775604cfff23b
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/224.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/225.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/225.png
new file mode 100644
index 0000000000000000000000000000000000000000..acc23943de8d5712d09ac176b9edbf2534bb001a
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/225.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/226.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/226.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f43316c680dd169ae90a297722331a65befdd80
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/226.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/227.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/227.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d2a6556f0796c412ae9498ede3c5dd5982beaa5
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/227.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/228.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/228.png
new file mode 100644
index 0000000000000000000000000000000000000000..efc38d4c716f41f2b207a4f6cc940983173be58e
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/228.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/229.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/229.png
new file mode 100644
index 0000000000000000000000000000000000000000..c433ed9e6da4ed1090acb54335e1d9b6fcad4ed0
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/229.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/230.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/230.png
new file mode 100644
index 0000000000000000000000000000000000000000..3fe55dc10a1a738e059c6064485f43949a94d183
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/230.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/231.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/231.png
new file mode 100644
index 0000000000000000000000000000000000000000..82ba43a3af028eea86b9fd02443953c638a90bc8
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/231.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/232.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/232.png
new file mode 100644
index 0000000000000000000000000000000000000000..8577c25bd3c8b085a12c25030b81e5b304ddadae
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/232.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/233.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/233.png
new file mode 100644
index 0000000000000000000000000000000000000000..33066499d0a6623939dd1e9a83c8c5525558c77d
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/233.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/234.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/234.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2fb61dbd0ea7f746536b65020019c1fa17e069d
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/234.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/235.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/235.png
new file mode 100644
index 0000000000000000000000000000000000000000..de17bf8393dd9fc3c7b601d0e7f49553f76d1438
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/235.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/236.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/236.png
new file mode 100644
index 0000000000000000000000000000000000000000..4babeeb7ca2bd4af882bdaf462a6074499cfa9c0
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/236.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/237.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/237.png
new file mode 100644
index 0000000000000000000000000000000000000000..85a0664c5ce94f045586951d41c38a96faf8a1ee
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/237.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/238.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/238.png
new file mode 100644
index 0000000000000000000000000000000000000000..a587e353b2ed434f04c7ea3e24441ba2831f3e7b
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/238.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/239.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/239.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b2c63a54e4604533710f926fc89ddac2e9df95a
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/239.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/240.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/240.png
new file mode 100644
index 0000000000000000000000000000000000000000..097a4dab5681fab5316683991a997572d216e1eb
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/240.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/241.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/241.png
new file mode 100644
index 0000000000000000000000000000000000000000..0080a167553681c5698549cf53da57cc3874e076
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/241.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/242.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/242.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b775eb9a6204a8b6373c3486a2b6287d74363bd
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/242.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/243.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/243.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0673c0e4e2786360e76bcd6ff6d65f8b29b7184
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/243.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/244.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/244.png
new file mode 100644
index 0000000000000000000000000000000000000000..923e1368ef2a83749ad67facd7ce688a2409615a
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/244.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/245.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/245.png
new file mode 100644
index 0000000000000000000000000000000000000000..bcd4652e3b0874a14963db07e7b68276a62be233
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/245.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/246.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/246.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8ad19709be8b5d8177f14a5ecd177bb39b10b60
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/246.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/247.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/247.png
new file mode 100644
index 0000000000000000000000000000000000000000..9318eb8fe70febc98c026e9a4ffd1afa3d3208d2
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/247.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/248.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/248.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2cb6d37d7b7957319f3398bdb7ddf50789007dd
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/248.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/249.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/249.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d785b7516a7e614ab9928437b520a57d6c700e3
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/249.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/250.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/250.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a68f35de952e90fac0b33b40674f3fb9c870c29
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/250.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/251.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/251.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4fe22ffc7676114a7787ed83693d5b87dc35f50
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/251.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/252.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/252.png
new file mode 100644
index 0000000000000000000000000000000000000000..01c5ab21dab57f18048130d4eb87de81642bf814
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/252.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/253.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/253.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfd4a6c385127dc422fc54075be8d370df532663
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/253.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/254.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/254.png
new file mode 100644
index 0000000000000000000000000000000000000000..caed18859343cb4313b1df209d525e8c8f5b461c
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/254.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/255.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/255.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f43c74c1468360f70dc74e03494ba15ea334421
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/255.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/256.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/256.png
new file mode 100644
index 0000000000000000000000000000000000000000..89967cbd6b9def6deb79e9c11451af80277453cb
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/256.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/257.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/257.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff347ae1bfe101580f9914e57207b7ff7cbc2558
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/257.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/258.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/258.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f6c7665207e2a4162f4766f34938ea87539d478
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/258.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/260.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/260.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd801209b2883c1cd8c4f0dfe0c6c437d0f668a5
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/260.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/261.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/261.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9b1bdf47de6952e73435c96e09cce2f2f916ad7
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/261.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/262.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/262.png
new file mode 100644
index 0000000000000000000000000000000000000000..24b6a4bca6540e3c9f2bfb13dbf91cd37186842a
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/262.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/263.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/263.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f3008748d97f1c338c201757243c40b0673ecf5
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/263.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/264.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/264.png
new file mode 100644
index 0000000000000000000000000000000000000000..d349a7da20100f79192ffe6d564a9c378aba88f3
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/264.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/265.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/265.png
new file mode 100644
index 0000000000000000000000000000000000000000..daf195c20648708591b3f508db4b32c8fbf221ba
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/265.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/266.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/266.png
new file mode 100644
index 0000000000000000000000000000000000000000..2cb51a16dd4ca57a012b5ac250a5ad66a6179a4a
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/266.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/267.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/267.png
new file mode 100644
index 0000000000000000000000000000000000000000..046aa3a6d090196eaed6a48e5960efde008e34cb
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/267.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/268.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/268.png
new file mode 100644
index 0000000000000000000000000000000000000000..068b38ef54a682cc4659f052a7666f74776f982e
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/268.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/269.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/269.png
new file mode 100644
index 0000000000000000000000000000000000000000..67e1e9aac9bbf52bb14080ed3a16899955473786
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/269.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/27.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/27.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ddf0c22c9600cb1243f11131e9a660ceab65fb4
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/27.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/290.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/290.png
new file mode 100644
index 0000000000000000000000000000000000000000..38484c45c1ad4cf584589633c91b1604ea9fe3b2
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/290.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/291.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/291.png
new file mode 100644
index 0000000000000000000000000000000000000000..46564ddbb54c11f0424a8fa359f9437d383c60e7
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/291.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/297.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/297.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b9bf9de6991ac980dd189bea4cb6d03bb2a07d8
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/297.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/298.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/298.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d9ee26cb801accac4a0c0ccb028e04f857f8511
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/298.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/299.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/299.png
new file mode 100644
index 0000000000000000000000000000000000000000..f77fe6f8ac31cd597e7892b55e6bc3f30b48ec36
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/299.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/30.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/30.png
new file mode 100644
index 0000000000000000000000000000000000000000..c288eda81631852ee988e604ddb3b9ac117dd29f
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/30.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/31.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/31.png
new file mode 100644
index 0000000000000000000000000000000000000000..33bb87b3ac9b40b8a07c0ad694042bd878a9c654
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/31.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/32.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/32.png
new file mode 100644
index 0000000000000000000000000000000000000000..51ece017cec4f19ee0f2a8dcc7ee0410ef9a11c4
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/32.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/33.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/33.png
new file mode 100644
index 0000000000000000000000000000000000000000..24b6a4bca6540e3c9f2bfb13dbf91cd37186842a
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/33.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/34.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/34.png
new file mode 100644
index 0000000000000000000000000000000000000000..823535c5fc0a584c9090ed7ca540dd28174dcc04
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/34.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/350.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/350.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef227ecfcbd29b8ff2bd7d542db526dc3b4761ae
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/350.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/351.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/351.png
new file mode 100644
index 0000000000000000000000000000000000000000..856c4266e2e9c7b9843a00a6b4b615d4f23bf6a3
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/351.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/352.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/352.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ab3e5925ebbfa5a0ba2636b0b62c8eb43f84818
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/352.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/353.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/353.png
new file mode 100644
index 0000000000000000000000000000000000000000..54c9b405a3ea025e4a9bee8df9df97dc59c05c33
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/353.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/354.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/354.png
new file mode 100644
index 0000000000000000000000000000000000000000..48a016944efd9057ffaa04b1a070217e905928a6
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/354.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/355.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/355.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce8467aea1f081d9676e2f6e05aaec14a9ad1171
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/355.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/356.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/356.png
new file mode 100644
index 0000000000000000000000000000000000000000..69e7525933dcfe35998584580c79dec3a855402c
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/356.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/357.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/357.png
new file mode 100644
index 0000000000000000000000000000000000000000..1689fcbf67274bedecbd967d0df7d45ac3c6b5d5
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/357.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/358.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/358.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f8476dc7de76b11b85911bda3e0f52c54291899
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/358.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/359.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/359.png
new file mode 100644
index 0000000000000000000000000000000000000000..34bb5e4877b780057f169bceb38178c681a7e320
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/359.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/36.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/36.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7bef807073e241bbd0de46148259990229fd363
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/36.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/370.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/370.png
new file mode 100644
index 0000000000000000000000000000000000000000..01ca64fc001b753cd4541defbdafb3fff8997e24
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/370.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/371.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/371.png
new file mode 100644
index 0000000000000000000000000000000000000000..324c5ce6b23ec72dfd7c12b797826f6f90d47d9b
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/371.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/372.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/372.png
new file mode 100644
index 0000000000000000000000000000000000000000..2417be67f663f4bccc4c65df2385ca1d19a879bb
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/372.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/373.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/373.png
new file mode 100644
index 0000000000000000000000000000000000000000..af1fcbf4b86432e28db96347fde091e9f5d2c544
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/373.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/374.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/374.png
new file mode 100644
index 0000000000000000000000000000000000000000..fbf4cd84eee773fd3293d125ce07ac69d9bbcba2
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/374.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/37447.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/37447.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bd0a8fa986ccf03ab61b7126c5a67854a8720c5
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/37447.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/37497.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/37497.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bd0a8fa986ccf03ab61b7126c5a67854a8720c5
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/37497.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/375.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/375.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff3603ea87997cae8f55bbad844a3a22eb349278
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/375.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/376.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/376.png
new file mode 100644
index 0000000000000000000000000000000000000000..a28055171420ec44cf9344c4e71bedc51f1f34b6
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/376.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/377.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/377.png
new file mode 100644
index 0000000000000000000000000000000000000000..c680a315bf8a78ee30ce2826418e571d03d1159c
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/377.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/37744.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/37744.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5ec034a6f5b9fbcb4fb4fba7f8c9859fe3c23fb
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/37744.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/378.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/378.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0bb8102e6c7612401aa52b3ca1c6e8896e7fac2
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/378.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/379.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/379.png
new file mode 100644
index 0000000000000000000000000000000000000000..68e637378ed913fc4077c9d4391aca4eefa5f9b1
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/379.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/380.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/380.png
new file mode 100644
index 0000000000000000000000000000000000000000..15b68969955bb0629f7bc467f92c787c76ed09d7
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/380.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/381-kosovo.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/381-kosovo.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5ec034a6f5b9fbcb4fb4fba7f8c9859fe3c23fb
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/381-kosovo.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/381.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/381.png
new file mode 100644
index 0000000000000000000000000000000000000000..c900d994fbd85684a22dbbc50238703fa17b5aa6
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/381.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/382.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/382.png
new file mode 100644
index 0000000000000000000000000000000000000000..00f247911a40dd9ca96c84aa47b8bcc22685ad0b
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/382.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/385.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/385.png
new file mode 100644
index 0000000000000000000000000000000000000000..dadf7b2f397f9c3fb5d987934929f88562e9f92a
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/385.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/386.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/386.png
new file mode 100644
index 0000000000000000000000000000000000000000..3600748d60e07aed4cd4e436e4838013e6225355
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/386.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/38649.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/38649.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5ec034a6f5b9fbcb4fb4fba7f8c9859fe3c23fb
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/38649.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/387.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/387.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7ea660b758bd41cb82c54d010aca9c0bb671413
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/387.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/3883.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/3883.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9cdd7b04dac4bcc565266746535e1cd9f83fb85
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/3883.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/389.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/389.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f3ba712423b81de3c838f375d374b0dacf68c42
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/389.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/39-vatican.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/39-vatican.png
new file mode 100644
index 0000000000000000000000000000000000000000..68e637378ed913fc4077c9d4391aca4eefa5f9b1
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/39-vatican.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/39.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/39.png
new file mode 100644
index 0000000000000000000000000000000000000000..4fa1169543b3645a2cd29eb4d4472a042dc1678e
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/39.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/40.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/40.png
new file mode 100644
index 0000000000000000000000000000000000000000..4787d77bcba76196842d46952c278280dee94326
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/40.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/41.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/41.png
new file mode 100644
index 0000000000000000000000000000000000000000..737149fd040f764ca255204e8fb3209d03de0ac5
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/41.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/420.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/420.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b01670a952df71a8a685c8bff47bdb9a9fc37cb
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/420.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/421.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/421.png
new file mode 100644
index 0000000000000000000000000000000000000000..2fef0e26e14e3eaecac16189cf9377efdb8f593f
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/421.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/423.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/423.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a7db9fa5a614ddf75c9125b76c048f74c94db28
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/423.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/43.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/43.png
new file mode 100644
index 0000000000000000000000000000000000000000..40e0b1a0ea35572fc9d87bbf7c5a061b16103a69
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/43.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/44.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/44.png
new file mode 100644
index 0000000000000000000000000000000000000000..9318eb8fe70febc98c026e9a4ffd1afa3d3208d2
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/44.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/45.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/45.png
new file mode 100644
index 0000000000000000000000000000000000000000..969748551ec2684350e526cb03bdad0f30181c7e
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/45.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/46.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/46.png
new file mode 100644
index 0000000000000000000000000000000000000000..143799009caa4c49364369cc7cb1ea1d5cb641e0
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/46.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/47.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/47.png
new file mode 100644
index 0000000000000000000000000000000000000000..1afaeccf0977d2aa0f1e98d2117b0b9ac73a1773
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/47.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/48.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/48.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a8fe27ba9d1c24b3b5a5a888d4f8f7f406b6b90
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/48.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/49.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/49.png
new file mode 100644
index 0000000000000000000000000000000000000000..72f0868642f812b89768f6dd45b984ba90239b5a
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/49.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/500.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/500.png
new file mode 100644
index 0000000000000000000000000000000000000000..55137c4ae14ab41c4b4f6fa1e89899c1ee636aa8
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/500.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/501.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/501.png
new file mode 100644
index 0000000000000000000000000000000000000000..57eb05c951a0e39f4c9706cba6dc6c7783d30cb6
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/501.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/502.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/502.png
new file mode 100644
index 0000000000000000000000000000000000000000..5163b833e9a1094e9b04e61556033e2d40c11f7b
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/502.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/503.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/503.png
new file mode 100644
index 0000000000000000000000000000000000000000..efa15872dc3e335a1ac64dedfae871866b245e0e
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/503.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/504.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/504.png
new file mode 100644
index 0000000000000000000000000000000000000000..f362afaf493b9a84b7b24ce5585ec4c2a35a6c0b
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/504.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/505.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/505.png
new file mode 100644
index 0000000000000000000000000000000000000000..083033e12dba965ace9af837e41b61d1266d89b0
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/505.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/506.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/506.png
new file mode 100644
index 0000000000000000000000000000000000000000..59e1f37393f51e88566824926c42fd96f2e31cd0
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/506.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/507.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/507.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6b852c9785475de9af4a24f47ed57c2b71602b4
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/507.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/508.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/508.png
new file mode 100644
index 0000000000000000000000000000000000000000..24b6a4bca6540e3c9f2bfb13dbf91cd37186842a
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/508.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/509.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/509.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9269b395de1c66ee46e911586a72a9d70427edc
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/509.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/51.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/51.png
new file mode 100644
index 0000000000000000000000000000000000000000..afb3e6ea871c39fb1992fbabf6e5a0abaf549f9f
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/51.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/52.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/52.png
new file mode 100644
index 0000000000000000000000000000000000000000..8fc90266fb3a34a700b3239baa97eda842033df7
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/52.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/53.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/53.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd7ce15da4cc7c4786515401ef10172f9ed307ed
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/53.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/54.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/54.png
new file mode 100644
index 0000000000000000000000000000000000000000..64a961aa762f80fe60b3c6c8fbe9be0bbd432ca3
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/54.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/55.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/55.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2b4c2231efa14dcf4afd6b9eecc13fd2d859a8b
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/55.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/56.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/56.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1ebcdc4d00eeacf068fc738b36d8b69a9221b26
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/56.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/57.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/57.png
new file mode 100644
index 0000000000000000000000000000000000000000..56d1d716f022f124ec49e28da33229243e9a912f
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/57.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/58.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/58.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c259dd70208631cbefd34936fee59117071cd47
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/58.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/590.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/590.png
new file mode 100644
index 0000000000000000000000000000000000000000..24b6a4bca6540e3c9f2bfb13dbf91cd37186842a
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/590.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/591.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/591.png
new file mode 100644
index 0000000000000000000000000000000000000000..397b63958533972636df624646a2576e7084a0b7
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/591.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/592.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/592.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ee71fd7e9258889a32fad74e618b029a2cba9ce
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/592.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/593.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/593.png
new file mode 100644
index 0000000000000000000000000000000000000000..371dfcba928413beb06ac80e337be95964646c1c
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/593.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/594.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/594.png
new file mode 100644
index 0000000000000000000000000000000000000000..24b6a4bca6540e3c9f2bfb13dbf91cd37186842a
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/594.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/595.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/595.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5b17e7b71e05fd6f430d05a054a03c2101c953f
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/595.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/596.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/596.png
new file mode 100644
index 0000000000000000000000000000000000000000..24b6a4bca6540e3c9f2bfb13dbf91cd37186842a
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/596.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/597.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/597.png
new file mode 100644
index 0000000000000000000000000000000000000000..546ed104b93f776f2f85af1a4081f827357607c0
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/597.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/598.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/598.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f28450d7fdda086e88991fc30dcfa8d0a67ceb0
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/598.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/599.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/599.png
new file mode 100644
index 0000000000000000000000000000000000000000..677c952bde158de0418c70b96b809be7833e66ea
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/599.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/60.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/60.png
new file mode 100644
index 0000000000000000000000000000000000000000..20cf467e4d985b3db724d9e649965c553e61aa2b
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/60.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/61.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/61.png
new file mode 100644
index 0000000000000000000000000000000000000000..59f8fbabf96de683340ee0d8b331ff9ffc8b260c
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/61.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/62.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/62.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e2480649711fcffd5ec7c3a378f893d1d7d25e6
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/62.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/63.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/63.png
new file mode 100644
index 0000000000000000000000000000000000000000..e240964121dd1a00f3a60af77260e83c43c1069d
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/63.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/64.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/64.png
new file mode 100644
index 0000000000000000000000000000000000000000..44955986fe3f7bd9705a5d55bd70f41bb4ef28f7
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/64.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/65.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/65.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f4d09771500007dd65c4790d8627d52a50205a1
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/65.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/66.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/66.png
new file mode 100644
index 0000000000000000000000000000000000000000..eee0b35558823195dc7f86f2366625962d142c9d
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/66.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/670.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/670.png
new file mode 100644
index 0000000000000000000000000000000000000000..abfd2b8b5ba9f9cb0a3626f75bac7a33ca24c2e6
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/670.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/672-norfolk_island.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/672-norfolk_island.png
new file mode 100644
index 0000000000000000000000000000000000000000..dbe675de43b003a20ecea8ebeea485f3a11f48a2
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/672-norfolk_island.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/672.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/672.png
new file mode 100644
index 0000000000000000000000000000000000000000..706fb7c9b8e36a30ff3a7e5841bbd4400c3e68bc
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/672.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/673.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/673.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c574d3e592b52c178fd54a4f1e50217832b5376
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/673.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/674.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/674.png
new file mode 100644
index 0000000000000000000000000000000000000000..15c514149847b9c08038a1ee1f8907449da9b1a7
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/674.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/675.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/675.png
new file mode 100644
index 0000000000000000000000000000000000000000..257f7c27c828b843f207c94b5f3b497654414351
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/675.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/676.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/676.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1ea1a14f13d13640e04b490b672fa4b761b57ce
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/676.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/677.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/677.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e49ea6356a3affc9fea64f9f44b0739fc105b69
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/677.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/678.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/678.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5e36f5d4b40164d483b825538a93b54e2ae3c2c
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/678.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/679.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/679.png
new file mode 100644
index 0000000000000000000000000000000000000000..fec582b952687b2570b97151402c621c3991d2c7
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/679.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/680.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/680.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3320c7fd398e7f0bf3d19556b4434fe9a4284f8
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/680.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/681.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/681.png
new file mode 100644
index 0000000000000000000000000000000000000000..24b6a4bca6540e3c9f2bfb13dbf91cd37186842a
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/681.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/682.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/682.png
new file mode 100644
index 0000000000000000000000000000000000000000..fda0828867c02e6116e14e1dc556b0a1d818b37c
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/682.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/683.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/683.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9eb7f285bb11c2ac876c72346da032bafd76deb
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/683.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/685.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/685.png
new file mode 100644
index 0000000000000000000000000000000000000000..d20e142173432ffd762fcf58fce6e3e8ee72d12b
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/685.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/686.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/686.png
new file mode 100644
index 0000000000000000000000000000000000000000..e6814ccf3b2e6ff0034423046c5eccf405fc7e56
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/686.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/687.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/687.png
new file mode 100644
index 0000000000000000000000000000000000000000..24b6a4bca6540e3c9f2bfb13dbf91cd37186842a
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/687.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/688.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/688.png
new file mode 100644
index 0000000000000000000000000000000000000000..96e1da3c2a5dde8b84d556b92e99e0acec56c77d
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/688.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/689.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/689.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a325063fd1a942cc902987cb7b1cbe99d8b576c
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/689.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/690.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/690.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3513fc62b1eddf991e13412a016a98764f72498
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/690.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/691.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/691.png
new file mode 100644
index 0000000000000000000000000000000000000000..6bf6ea1352624b0e9ba957537d8cb705e96d09a4
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/691.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/692.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/692.png
new file mode 100644
index 0000000000000000000000000000000000000000..c94bac9dcb889445ebefd423dec160af5a2ce8d2
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/692.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/7-kazakhstan.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/7-kazakhstan.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec69dd0e2e9301a2da7330df8de3be4a25a839e3
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/7-kazakhstan.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/7.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/7.png
new file mode 100644
index 0000000000000000000000000000000000000000..53261c06fcd02a8f850a5fd8d7e66a1c7f568e21
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/7.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/81.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/81.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c029f42c208ef2f5df6713ccdffbc3ef82821c6
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/81.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/82.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/82.png
new file mode 100644
index 0000000000000000000000000000000000000000..30d01ec01717a12d50b7da648ec57a881d42ffa1
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/82.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/84.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/84.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a101f13622a34fdff0e3389a4d53fb7bc7c23f8
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/84.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/850.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/850.png
new file mode 100644
index 0000000000000000000000000000000000000000..efecdb6b018af952ebd1340c6c4244608e306f68
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/850.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/852.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/852.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc443392e955cac72568952bf0f8d7d9b080abd9
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/852.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/853.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/853.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1b63fc10a547025a8b9421fffc936b9e2ffead5
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/853.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/855.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/855.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ddee31654d7f75c59c720120ca6dc1efb15e394
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/855.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/856.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/856.png
new file mode 100644
index 0000000000000000000000000000000000000000..1461d62e71ee0e1d11dbb283267c9f473c7e1201
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/856.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/86.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/86.png
new file mode 100644
index 0000000000000000000000000000000000000000..8cc127bc3f115545663b659913f684524c4264cd
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/86.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/870.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/870.png
new file mode 100644
index 0000000000000000000000000000000000000000..c68fefef31d27d0b28ef370ba9b0e278d772a5b2
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/870.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/871.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/871.png
new file mode 100644
index 0000000000000000000000000000000000000000..c68fefef31d27d0b28ef370ba9b0e278d772a5b2
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/871.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/872.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/872.png
new file mode 100644
index 0000000000000000000000000000000000000000..c68fefef31d27d0b28ef370ba9b0e278d772a5b2
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/872.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/873.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/873.png
new file mode 100644
index 0000000000000000000000000000000000000000..c68fefef31d27d0b28ef370ba9b0e278d772a5b2
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/873.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/874.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/874.png
new file mode 100644
index 0000000000000000000000000000000000000000..c68fefef31d27d0b28ef370ba9b0e278d772a5b2
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/874.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/880.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/880.png
new file mode 100644
index 0000000000000000000000000000000000000000..56500cb283c9ccea8f49643692b9b5713f794903
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/880.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/886.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/886.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e08a99299eefd264f6597c3933130b23a9e46c8
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/886.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/90.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/90.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0baa01617e063f2375cd96af633cf1b8fd0781f
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/90.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/90392.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/90392.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba425f0f787d1e1bfa8d116481a1b6c95930564f
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/90392.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/91.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/91.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e8ce1fa92f59c27cdfd7133008f057fb72f6458
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/91.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/92.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/92.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e105a14409b87ebba7c0c7dfdbd8aac53614843
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/92.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/93.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/93.png
new file mode 100644
index 0000000000000000000000000000000000000000..45e31c8fdde0c1653225b4015f5c350290cf7428
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/93.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/94.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/94.png
new file mode 100644
index 0000000000000000000000000000000000000000..b102a002100b583ce99176321556c6c0e16958a8
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/94.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/95.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/95.png
new file mode 100644
index 0000000000000000000000000000000000000000..c840e3835685b9ca18ed5316cbdd9075da369f63
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/95.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/960.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/960.png
new file mode 100644
index 0000000000000000000000000000000000000000..97a58b98d2c76159ef4068d57120b1c215bb7773
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/960.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/961.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/961.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7001fb90c622dd11fbac14d7932b8d371ab91cb
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/961.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/962.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/962.png
new file mode 100644
index 0000000000000000000000000000000000000000..240d0f52ca1787e3cd77a141ad6b763e19fa1d5b
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/962.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/963.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/963.png
new file mode 100644
index 0000000000000000000000000000000000000000..32f0122ab71a70c0b16940f5f0ac53b1fcef8269
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/963.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/964.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/964.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e3371f0029bcfacc903ac1b4b1f4d035b46450f
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/964.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/965.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/965.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec3f620292c2bd0423608470e1cffcef7021722a
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/965.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/966.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/966.png
new file mode 100644
index 0000000000000000000000000000000000000000..811fbe23dbc1c42e844a9b914f5687235a386637
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/966.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/967.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/967.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf4fc8a339cc5d53d0aa0dc9a1a528fe84b211d5
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/967.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/968.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/968.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d7b6102e7d09105d30bbaa621f428f9a32f3771
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/968.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/971.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/971.png
new file mode 100644
index 0000000000000000000000000000000000000000..db976ea171d47f8e2155be63cfde307e4ef16a4b
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/971.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/972.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/972.png
new file mode 100644
index 0000000000000000000000000000000000000000..560752617fed5108121fa882a025beb7442d4f26
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/972.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/973.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/973.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb803fd859294e979f25ea7ef7ae76f4e954f739
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/973.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/974.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/974.png
new file mode 100644
index 0000000000000000000000000000000000000000..88f902a36b9d7d3a954f4f337a4015f866941512
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/974.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/975.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/975.png
new file mode 100644
index 0000000000000000000000000000000000000000..acf16d9ff145df0ea71f052ac835eaebb878251f
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/975.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/976.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/976.png
new file mode 100644
index 0000000000000000000000000000000000000000..21114e73be7e073336806f993c469c1022d8e302
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/976.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/977.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/977.png
new file mode 100644
index 0000000000000000000000000000000000000000..03ca19284acf9aad8812ac67720d2986f22e652a
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/977.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/98.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/98.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8c7d6749636bcffd74fbb3963cb97464643ace1
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/98.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/992.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/992.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b571f6d8502a7671ba1592785a5140568f185c0
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/992.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/993.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/993.png
new file mode 100644
index 0000000000000000000000000000000000000000..be6df0d155f2c9f1618c18d89d4cf08bac55daa6
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/993.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/994.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/994.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd0fb1adc861300c81c2dd5ad461a265ba0bd011
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/994.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/995.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/995.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca25b95487020021ee6f3d6aabafc8f86d15b107
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/995.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/996.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/996.png
new file mode 100644
index 0000000000000000000000000000000000000000..f64723f6ffc304e27cb3a1dc49ad612aafe692d2
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/996.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/998.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/998.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0d8338ed7cb3ed23f5510bb364101224b1935c1
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/flag/998.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/icon18_active.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/icon18_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..4daf42d88e83cd92acd59008c986abc7bab51cfb
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/icon18_active.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/icon18_inactive.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/icon18_inactive.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec52c3ef7b742bd46939a10b8ed10deb76dbc199
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/icon18_inactive.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/icon32.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/icon32.png
new file mode 100644
index 0000000000000000000000000000000000000000..38949785768fa37e6490cd89025e35f38518997b
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/icon32.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/icon96.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/icon96.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c0ea89ad2356ba6a6253bc2b545cf6584ed0298
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/icon96.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/icon_menu.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/icon_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..62dd257f7e86daefb4f01088da641f90a2a9e6be
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/icon_menu.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/info32.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/info32.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8197d61a38f508651d3ce759bcd60d620226bbb
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/info32.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/jshashtable.js b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/jshashtable.js
new file mode 100644
index 0000000000000000000000000000000000000000..3806f818f98bc13a75438ad1b976ab74b5f08862
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/jshashtable.js
@@ -0,0 +1,380 @@
+/**
+ * Copyright 2009 Tim Down.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * jshashtable
+ *
+ * jshashtable is a JavaScript implementation of a hash table. It creates a
+ * single constructor function called Hashtable in the global scope.
+ *
+ * Author: Tim Down <tim@timdown.co.uk>
+ * Version: 1.0
+ * Build date: 5 February 2009
+ * Website: http://www.timdown.co.uk/jshashtable
+ */
+
+var Hashtable = (function() {
+ function isUndefined(obj) {
+ return (typeof obj === "undefined");
+ }
+
+ function isFunction(obj) {
+ return (typeof obj === "function");
+ }
+
+ function isString(obj) {
+ return (typeof obj === "string");
+ }
+
+ function hasMethod(obj, methodName) {
+ if (obj[methodName]) {
+ return isFunction(obj[methodName]);
+ } else {
+ return false;
+ }
+ }
+
+ function hasEquals(obj) {
+ return hasMethod(obj, "equals");
+ }
+
+ function hasHashCode(obj) {
+ return hasMethod(obj, "hashCode");
+ }
+
+ function keyForObject(obj) {
+ if (isString(obj)) {
+ return obj;
+ } else if (hasHashCode(obj)) {
+ // Check the hashCode method really has returned a string
+ var hashCode = obj.hashCode();
+ if (!isString(hashCode)) {
+ return keyForObject(hashCode);
+ }
+ return hashCode;
+ } else if (hasMethod(obj, "toString")) {
+ return obj.toString();
+ } else {
+ return String(obj);
+ }
+ }
+
+ function equals_fixedValueHasEquals(fixedValue, variableValue) {
+ return fixedValue.equals(variableValue);
+ }
+
+ function equals_fixedValueNoEquals(fixedValue, variableValue) {
+ if (hasEquals(variableValue)) {
+ return variableValue.equals(fixedValue);
+ } else {
+ return fixedValue === variableValue;
+ }
+ }
+
+ function equals_equivalence(o1, o2) {
+ return o1 === o2;
+ }
+
+ function arraySearch(arr, value, arrayValueFunction, returnFoundItem, equalityFunction) {
+ var currentValue;
+ for (var i = 0, len = arr.length; i < len; i++) {
+ currentValue = arr[i];
+ if (equalityFunction(value, arrayValueFunction(currentValue))) {
+ return returnFoundItem ? [i, currentValue] : true;
+ }
+ }
+ return false;
+ }
+
+ function arrayRemoveAt(arr, idx) {
+ if (hasMethod(arr, "splice")) {
+ arr.splice(idx, 1);
+ } else {
+ if (idx === arr.length - 1) {
+ arr.length = idx;
+ } else {
+ var itemsAfterDeleted = arr.slice(idx + 1);
+ arr.length = idx;
+ for (var i = 0, len = itemsAfterDeleted.length; i < len; i++) {
+ arr[idx + i] = itemsAfterDeleted[i];
+ }
+ }
+ }
+ }
+
+ function checkKeyOrValue(kv, kvStr) {
+ if (kv === null) {
+ throw new Error("null is not a valid " + kvStr);
+ } else if (isUndefined(kv)) {
+ throw new Error(kvStr + " must not be undefined");
+ }
+ }
+
+ var keyStr = "key", valueStr = "value";
+
+ function checkKey(key) {
+ checkKeyOrValue(key, keyStr);
+ }
+
+ function checkValue(value) {
+ checkKeyOrValue(value, valueStr);
+ }
+
+ /*------------------------------------------------------------------------*/
+
+ function Bucket(firstKey, firstValue, equalityFunction) {
+ this.entries = [];
+ this.addEntry(firstKey, firstValue);
+
+ if (equalityFunction !== null) {
+ this.getEqualityFunction = function() {
+ return equalityFunction;
+ };
+ }
+ }
+
+ function getBucketEntryKey(entry) {
+ return entry[0];
+ }
+
+ function getBucketEntryValue(entry) {
+ return entry[1];
+ }
+
+ Bucket.prototype = {
+ getEqualityFunction: function(searchValue) {
+ if (hasEquals(searchValue)) {
+ return equals_fixedValueHasEquals;
+ } else {
+ return equals_fixedValueNoEquals;
+ }
+ },
+
+ searchForEntry: function(key) {
+ return arraySearch(this.entries, key, getBucketEntryKey, true, this.getEqualityFunction(key));
+ },
+
+ getEntryForKey: function(key) {
+ return this.searchForEntry(key)[1];
+ },
+
+ getEntryIndexForKey: function(key) {
+ return this.searchForEntry(key)[0];
+ },
+
+ removeEntryForKey: function(key) {
+ var result = this.searchForEntry(key);
+ if (result) {
+ arrayRemoveAt(this.entries, result[0]);
+ return true;
+ }
+ return false;
+ },
+
+ addEntry: function(key, value) {
+ this.entries[this.entries.length] = [key, value];
+ },
+
+ size: function() {
+ return this.entries.length;
+ },
+
+ keys: function(keys) {
+ var startIndex = keys.length;
+ for (var i = 0, len = this.entries.length; i < len; i++) {
+ keys[startIndex + i] = this.entries[i][0];
+ }
+ },
+
+ values: function(values) {
+ var startIndex = values.length;
+ for (var i = 0, len = this.entries.length; i < len; i++) {
+ values[startIndex + i] = this.entries[i][1];
+ }
+ },
+
+ containsKey: function(key) {
+ return arraySearch(this.entries, key, getBucketEntryKey, false, this.getEqualityFunction(key));
+ },
+
+ containsValue: function(value) {
+ return arraySearch(this.entries, value, getBucketEntryValue, false, equals_equivalence);
+ }
+ };
+
+ /*------------------------------------------------------------------------*/
+
+ function BucketItem() {}
+ BucketItem.prototype = [];
+
+ // Supporting functions for searching hashtable bucket items
+
+ function getBucketKeyFromBucketItem(bucketItem) {
+ return bucketItem[0];
+ }
+
+ function searchBucketItems(bucketItems, bucketKey, equalityFunction) {
+ return arraySearch(bucketItems, bucketKey, getBucketKeyFromBucketItem, true, equalityFunction);
+ }
+
+ function getBucketForBucketKey(bucketItemsByBucketKey, bucketKey) {
+ var bucketItem = bucketItemsByBucketKey[bucketKey];
+
+ // Check that this is a genuine bucket item and not something
+ // inherited from prototype
+ if (bucketItem && (bucketItem instanceof BucketItem)) {
+ return bucketItem[1];
+ }
+ return null;
+ }
+
+ /*------------------------------------------------------------------------*/
+
+ function Hashtable(hashingFunction, equalityFunction) {
+ var bucketItems = [];
+ var bucketItemsByBucketKey = {};
+
+ hashingFunction = isFunction(hashingFunction) ? hashingFunction : keyForObject;
+ equalityFunction = isFunction(equalityFunction) ? equalityFunction : null;
+
+ this.put = function(key, value) {
+ checkKey(key);
+ checkValue(value);
+ var bucketKey = hashingFunction(key);
+
+ // Check if a bucket exists for the bucket key
+ var bucket = getBucketForBucketKey(bucketItemsByBucketKey, bucketKey);
+ if (bucket) {
+ // Check this bucket to see if it already contains this key
+ var bucketEntry = bucket.getEntryForKey(key);
+ if (bucketEntry) {
+ // This bucket entry is the current mapping of key to value, so replace
+ // old value and we're done.
+ bucketEntry[1] = value;
+ } else {
+ // The bucket does not contain an entry for this key, so add one
+ bucket.addEntry(key, value);
+ }
+ } else {
+ // No bucket, so create one and put our key/value mapping in
+ var bucketItem = new BucketItem();
+ bucketItem[0] = bucketKey;
+ bucketItem[1] = new Bucket(key, value, equalityFunction);
+ bucketItems[bucketItems.length] = bucketItem;
+ bucketItemsByBucketKey[bucketKey] = bucketItem;
+ }
+ };
+
+ this.get = function(key) {
+ if (key == null) return null;
+ checkKey(key);
+ var bucketKey = hashingFunction(key);
+ // Check if a bucket exists for the bucket key
+ var bucket = getBucketForBucketKey(bucketItemsByBucketKey, bucketKey);
+ if (bucket) {
+ // Check this bucket to see if it contains this key
+ var bucketEntry = bucket.getEntryForKey(key);
+ if (bucketEntry) {
+ // This bucket entry is the current mapping of key to value, so return
+ // the value.
+ return bucketEntry[1];
+ }
+ }
+ return null;
+ };
+
+ this.containsKey = function(key) {
+ checkKey(key);
+
+ var bucketKey = hashingFunction(key);
+
+ // Check if a bucket exists for the bucket key
+ var bucket = getBucketForBucketKey(bucketItemsByBucketKey, bucketKey);
+ if (bucket) {
+ return bucket.containsKey(key);
+ }
+
+ return false;
+ };
+
+ this.containsValue = function(value) {
+ checkValue(value);
+ for (var i = 0, len = bucketItems.length; i < len; i++) {
+ if (bucketItems[i][1].containsValue(value)) {
+ return true;
+ }
+ }
+ return false;
+ };
+
+ this.clear = function() {
+ bucketItems.length = 0;
+ bucketItemsByBucketKey = {};
+ };
+
+ this.isEmpty = function() {
+ return bucketItems.length === 0;
+ };
+
+ this.keys = function() {
+ var keys = [];
+ for (var i = 0, len = bucketItems.length; i < len; i++) {
+ bucketItems[i][1].keys(keys);
+ }
+ return keys;
+ };
+
+ this.values = function() {
+ var values = [];
+ for (var i = 0, len = bucketItems.length; i < len; i++) {
+ bucketItems[i][1].values(values);
+ }
+ return values;
+ };
+
+ this.remove = function(key) {
+ checkKey(key);
+
+ var bucketKey = hashingFunction(key);
+
+ // Check if a bucket exists for the bucket key
+ var bucket = getBucketForBucketKey(bucketItemsByBucketKey, bucketKey);
+
+ if (bucket) {
+ // Remove entry from this bucket for this key
+ if (bucket.removeEntryForKey(key)) {
+ // Entry was removed, so check if bucket is empty
+ if (bucket.size() === 0) {
+ // Bucket is empty, so remove it
+ var result = searchBucketItems(bucketItems, bucketKey, bucket.getEqualityFunction(key));
+ arrayRemoveAt(bucketItems, result[0]);
+ delete bucketItemsByBucketKey[bucketKey];
+ }
+ }
+ }
+ };
+
+ this.size = function() {
+ var total = 0;
+ for (var i = 0, len = bucketItems.length; i < len; i++) {
+ total += bucketItems[i][1].size();
+ }
+ return total;
+ };
+ }
+
+ return Hashtable;
+})();
\ No newline at end of file
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/messagebox.js b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/messagebox.js
new file mode 100644
index 0000000000000000000000000000000000000000..8be1b9828521bb3aa4b62cd7139dcb5e5e647d9c
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/messagebox.js
@@ -0,0 +1,43 @@
+/*
+Creative Commons License: Attribution-No Derivative Works 3.0 Unported
+http://creativecommons.org/licenses/by-nd/3.0/
+(c)2009 Michael Koch
+*/
+
+var objTelifyMessageBox = {
+
+init: function()
+{
+ var title = window.arguments[0].title;
+ if (title == null || title == "") title =" Telify";
+ document.getElementById("dlgTelifyMessageBox").setAttribute("title", title);
+ var msg_node = document.createTextNode(window.arguments[0].msg);
+ document.getElementById("idTelify_mb_msg").appendChild(msg_node);
+ var flags = window.arguments[0].flags;
+ if ((flags & objTelifyUtil.MB_MASK) == 0) flags |= objTelifyUtil.MB_OK; // default button
+ if ((flags & objTelifyUtil.MB_OK) == 0) document.documentElement.getButton("accept").collapsed = true;
+ if ((flags & objTelifyUtil.MB_CANCEL) == 0) document.documentElement.getButton("cancel").collapsed = true;
+ var icon = "info32.png";
+ switch (flags & objTelifyUtil.MB_ICON_MASK) {
+ case objTelifyUtil.MB_ICON_ERROR: icon = "error32.png"; break;
+ case objTelifyUtil.MB_ICON_WARNING: icon = "warn32.png"; break;
+ case objTelifyUtil.MB_ICON_ASK: icon = "ask32.png"; break;
+ case objTelifyUtil.MB_ICON_INFO: icon = "info32.png"; break;
+ }
+ document.getElementById("idTelify_mb_icon").setAttribute("src", "chrome://telify/content/"+icon);
+},
+
+onAccept: function()
+{
+ window.arguments[0].fResult = true;
+ return true;
+},
+
+onCancel: function()
+{
+ window.arguments[0].fResult = false;
+ return true;
+}
+
+};
+
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/messagebox.xul b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/messagebox.xul
new file mode 100644
index 0000000000000000000000000000000000000000..1be8d587f4dc776d2454b566d79f910df780ac51
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/messagebox.xul
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
+<?xml-stylesheet href="chrome://telify/content/dialog.css" type="text/css"?>
+
+<!DOCTYPE dialog SYSTEM "chrome://telify/locale/lang.dtd">
+
+<dialog id="dlgTelifyMessageBox"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+ buttons="accept, cancel"
+ onload="objTelifyMessageBox.init()"
+ ondialogaccept="objTelifyMessageBox.onAccept()"
+ ondialogcancel="objTelifyMessageBox.onCancel()"
+ title="">
+
+ <stringbundleset id="stringbundleset">
+ <stringbundle id="idTelifyStringBundle" src="chrome://telify/locale/lang.properties"/>
+ </stringbundleset>
+
+ <script type='application/x-javascript' src='chrome://telify/content/pref.js'></script>
+ <script type='application/x-javascript' src='chrome://telify/content/util.js'></script>
+ <script type='application/x-javascript' src='chrome://telify/content/messagebox.js'></script>
+
+
+ <groupbox style="background-color:white;padding:8px;">
+ <hbox>
+ <vbox>
+ <image id="idTelify_mb_icon" src="chrome://telify/content/info32.png" style="width:32px;height:32px;margin-right:4px;"/>
+ <spacer flex="1"/>
+ </vbox>
+ <description id="idTelify_mb_msg" style="width:240px;text-align:justify;"/>
+ </hbox>
+ </groupbox>
+
+</dialog>
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/pref.js b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/pref.js
new file mode 100644
index 0000000000000000000000000000000000000000..2d3b635917caa5e8b8d7361020bd7a2e2c819339
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/pref.js
@@ -0,0 +1,164 @@
+/*
+Creative Commons License: Attribution-No Derivative Works 3.0 Unported
+http://creativecommons.org/licenses/by-nd/3.0/
+(c)2009 Michael Koch
+*/
+
+var objTelifyPrefs = {
+
+PREF_BLACKLIST: "blacklist",
+PREF_HIGHLIGHT: "highlight",
+PREF_EXCLUDE: "exclude",
+PREF_DEBUG: "debug",
+PREF_ACTIVE: "active",
+PREF_STATUSICON: "statusicon",
+PREF_HREFTYPE: "linktype",
+PREF_COLSORTCC: "colsortcc",
+PREF_NUMHISTORY: "num_history",
+PREF_IDD_PREFIX: "idd_prefix",
+PREF_DONT_ESCAPE_PLUS: "dont_escape_plus",
+PREF_DIAL_CC_DIRECT: "dial_cc_direct",
+
+NUM_CUSTOM_PARAMS: 3,
+
+PREF_CUSTOM_URL: "custom_url",
+PREF_CUSTOM_TMPL: "custom_tmpl",
+PREF_CUSTOM_PARAM: "custom_param",
+PREF_CUSTOM_OPENTYPE: "custom_opentype",
+
+maxHistory: 10,
+
+telPrefs: null,
+telStrings: null,
+
+blacklist: null,
+excludedHosts: null,
+highlight: null,
+excludedTags: null,
+hrefType: null,
+numHistory: null,
+idd_prefix: null,
+fStatusIcon: null,
+fActive: null,
+fDebug: null,
+fDontEscapePlus: null,
+fDialCCDirect: null,
+
+custom_url: null,
+custom_tmpl: null,
+custom_param: [],
+custom_opentype: null,
+
+HREFTYPE_CUSTOM: 9,
+
+protoList: new Array("tel", "callto", "skype", "sip"),
+
+
+showConfigDialog: function()
+{
+ while (true) {
+ window.openDialog("chrome://telify/content/config.xul", "dlgTelifyConfig", "centerscreen,chrome,modal").focus;
+ if (this.hrefType == this.HREFTYPE_CUSTOM && this.custom_url.indexOf("$0") < 0) {
+ var result = objTelifyUtil.showMessageBox("", objTelifyLocale.msgNumberTemplateMissing(),
+ objTelifyUtil.MB_OK|objTelifyUtil.MB_CANCEL|objTelifyUtil.MB_ICON_WARNING);
+ if (result == false) continue;
+ }
+ break;
+ }
+},
+
+
+getPrefObj: function()
+{
+ var obj = Components.classes["@mozilla.org/preferences-service;1"];
+ obj = obj.getService(Components.interfaces.nsIPrefService);
+ obj = obj.getBranch("telify.settings.");
+ obj.QueryInterface(Components.interfaces.nsIPrefBranch2);
+ return obj;
+},
+
+
+getCharPref: function(name)
+{
+ try {
+ return this.telPrefs.getCharPref(name);
+ } catch (e) {
+ alert(e);
+ return "";
+ }
+},
+
+
+getIntPref: function(name)
+{
+ try {
+ return this.telPrefs.getIntPref(name);
+ } catch (e) {
+ return 0;
+ }
+},
+
+
+getBoolPref: function(name)
+{
+ try {
+ return this.telPrefs.getBoolPref(name);
+ } catch (e) {
+ return false;
+ }
+},
+
+
+getPrefs: function()
+{
+ this.blacklist = this.telPrefs.getCharPref(this.PREF_BLACKLIST);
+ if (this.blacklist.length > 0) {
+ this.excludedHosts = this.blacklist.toLowerCase().split(",");
+ } else {
+ this.excludedHosts = new Array();
+ }
+ this.highlight = this.telPrefs.getIntPref(this.PREF_HIGHLIGHT);
+ this.highlight = objTelifyUtil.trimInt(this.highlight, 0, 100);
+ this.numHistory = this.telPrefs.getIntPref(this.PREF_NUMHISTORY);
+ this.numHistory = objTelifyUtil.trimInt(this.numHistory, 1, 10);
+ this.idd_prefix = this.telPrefs.getCharPref(this.PREF_IDD_PREFIX);
+ var exclude = this.telPrefs.getCharPref(this.PREF_EXCLUDE);
+ this.excludedTags = exclude.toLowerCase().split(",");
+ this.hrefType = this.telPrefs.getIntPref(this.PREF_HREFTYPE);
+ if ((this.hrefType < 0 || this.hrefType >= this.protoList.length) && this.hrefType != this.HREFTYPE_CUSTOM) this.hrefType = 0;
+ this.fStatusIcon = this.telPrefs.getBoolPref(this.PREF_STATUSICON);
+ var status = document.getElementById("idTelify_status");
+ if (status) status.setAttribute("collapsed", !this.fStatusIcon);
+ this.fDebug = this.telPrefs.getBoolPref(this.PREF_DEBUG);
+ this.fActive = this.telPrefs.getBoolPref(this.PREF_ACTIVE);
+ this.fDontEscapePlus = this.telPrefs.getBoolPref(this.PREF_DONT_ESCAPE_PLUS);
+ this.fDialCCDirect = this.telPrefs.getBoolPref(this.PREF_DIAL_CC_DIRECT);
+ // custom url
+ this.custom_url = this.getCharPref(this.PREF_CUSTOM_URL);
+ this.custom_tmpl = this.getIntPref(this.PREF_CUSTOM_TMPL);
+ for (var i=1; i<this.NUM_CUSTOM_PARAMS+1; i++) {
+ this.custom_param[i] = this.getCharPref(this.PREF_CUSTOM_PARAM+i);
+ }
+ this.custom_opentype = this.getIntPref(this.PREF_CUSTOM_OPENTYPE);
+},
+
+
+prefObserver: {
+ observe: function(subject, topic, data) {
+ if (topic != "nsPref:changed") return;
+ objTelifyPrefs.getPrefs();
+ }
+},
+
+
+initTelifyPrefs: function()
+{
+ objTelifyPrefs.telPrefs = objTelifyPrefs.getPrefObj();
+ objTelifyPrefs.telPrefs.addObserver("", objTelifyPrefs.prefObserver, false);
+ objTelifyPrefs.telStrings = document.getElementById("idTelifyStringBundle");
+ objTelifyPrefs.getPrefs();
+}
+
+};
+
+
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/telify.js b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/telify.js
new file mode 100644
index 0000000000000000000000000000000000000000..58a615ec060bbb4bfeba41cb99ff550fab6b5f9f
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/telify.js
@@ -0,0 +1,715 @@
+/*
+Creative Commons License: Attribution-No Derivative Works 3.0 Unported
+http://creativecommons.org/licenses/by-nd/3.0/
+(c)2009 Michael Koch
+*/
+
+var objTelify = {
+
+digits_min: 7,
+digits_max: 16,
+
+hilite_color: new Array(0,0,255),
+hilite_bgcolor: new Array(255,255,0),
+
+// special chars
+sc_nbsp: String.fromCharCode(0xa0),
+
+// chars which look like dashes
+token_dash:
+ String.fromCharCode(0x2013) +
+ String.fromCharCode(0x2014) +
+ String.fromCharCode(0x2212),
+
+exclPatternList: [
+ /^\d{2}\.\d{2} ?(-|–) ?\d{2}\.\d{2}$/, // time range e.g. 08.00 - 17.00
+ /^\d{2}\/\d{2}\/\d{2}$/, // date e.g. 09/03/09
+ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/, // ip address
+ /^[0-3]?[0-9]\.[0-3]?[0-9]\.(19|20)\d{2} - \d{2}\.\d{2}$/, // date and time e.g. 09.03.2009 - 17.59
+ /^[0-3]?[0-9][\/\.-][0-3]?[0-9][\/\.-](19|20)\d{2}$/, // date e.g. 09/03/2009, 09.03.2009, 09-03-2009
+ /^[0-3]?[0-9][\/\.-][0-3]?[0-9][\/\.-]\d{2} ?(-|–) ?[0-3]?[0-9][\/\.-][0-3]?[0-9][\/\.-]\d{2}$/, // date range short
+ /^[0-3]?[0-9][\/\.-][0-3]?[0-9][\/\.-] ?(-|–) ?[0-3]?[0-9][\/\.-][0-3]?[0-9][\/\.-](19|20)\d{2}$/, // date range medium
+ /^[0-3]?[0-9][\/\.-][0-3]?[0-9][\/\.-](19|20)\d{2} ?(-|–) ?[0-3]?[0-9][\/\.-][0-3]?[0-9][\/\.-](19|20)\d{2}$/, // date range long
+ /^0\.\d+$/, // e.g. 0.12345678
+],
+
+inclLocalList: [
+ [/^[1-9]\d{2}[\.-]\d{3}[\.-]\d{4}$/, "+1"], // US
+],
+
+token_trigger: "+(0123456789",
+token_part: " -/()[].\r\n"
+ + String.fromCharCode(0xa0) // sc_nbsp
+ + String.fromCharCode(0x2013) + String.fromCharCode(0x2014) + String.fromCharCode(0x2212), // token_dash
+token_start: "+(0",
+token_sep: " -/(.",
+token_disallowed_post: ":-",
+token_disallowed_prev: "-,.",
+
+dialHistory: new Array(objTelifyPrefs.maxHistory),
+
+
+getDialHistory: function()
+{
+ for (var i=0; i<objTelifyPrefs.maxHistory; i++) {
+ try {
+ this.dialHistory[i] = objTelifyPrefs.telPrefs.getCharPref("history"+i);
+ } catch (e) {
+ this.dialHistory[i] = "";
+ }
+ }
+},
+
+
+saveDialHistory: function()
+{
+ for (var i=0; i<objTelifyPrefs.maxHistory; i++) {
+ if (this.dialHistory[i] == null) this.dialHistory[i] = "";
+ objTelifyPrefs.telPrefs.setCharPref("history"+i, this.dialHistory[i]);
+ }
+},
+
+
+updateDialHistory: function(prefix)
+{
+ //logmsg("updateDialHistory("+prefix+")");
+ var newList = new Array(objTelifyPrefs.maxHistory);
+ newList[0] = prefix;
+ for (var i=0, j=1; i<objTelifyPrefs.maxHistory && j<objTelifyPrefs.maxHistory; i++) {
+ if (this.dialHistory[i] == null || this.dialHistory[i] == "" || this.dialHistory[i] == prefix) continue;
+ newList[j++] = this.dialHistory[i];
+ }
+ this.dialHistory = newList;
+ this.saveDialHistory();
+},
+
+
+setStatus: function()
+{
+ var statusicon = document.getElementById("idTelify_statusicon");
+ if (objTelifyPrefs.fActive) {
+ statusicon.setAttribute("src", "chrome://telify/content/icon18_active.png");
+ var text = objTelifyPrefs.telStrings.getString("telify_active");
+ statusicon.setAttribute("tooltiptext", text);
+ } else {
+ statusicon.setAttribute("src", "chrome://telify/content/icon18_inactive.png");
+ var text = objTelifyPrefs.telStrings.getString("telify_inactive");
+ statusicon.setAttribute("tooltiptext", text);
+ }
+},
+
+
+toggleBlacklist: function()
+{
+ var host = objTelifyUtil.getHost();
+ if (host == null) return;
+ if (objTelifyPrefs.excludedHosts.indexOf(host) >= 0) {
+ objTelifyUtil.arrayRemove(objTelifyPrefs.excludedHosts, host);
+ } else {
+ objTelifyPrefs.excludedHosts.push(host);
+ }
+ objTelifyPrefs.blacklist = objTelifyPrefs.excludedHosts.join(",");
+ objTelifyPrefs.telPrefs.setCharPref(objTelifyPrefs.PREF_BLACKLIST, objTelifyPrefs.blacklist);
+},
+
+
+toggleActive: function()
+{
+ objTelifyPrefs.telPrefs.setBoolPref(objTelifyPrefs.PREF_ACTIVE, !objTelifyPrefs.fActive);
+ this.setStatus();
+},
+
+
+getSelectionNumber: function()
+{
+ //var sel = content.window.getSelection().toString();
+ var sel = document.commandDispatcher.focusedWindow.getSelection().toString();
+ sel = this.convertVanityNr(sel);
+ sel = objTelifyUtil.stripNumber(sel);
+ return sel;
+},
+
+
+dialNumber: function(nr)
+{
+ var requ = new XMLHttpRequest();
+ var url = objTelifyUtil.createDialURL(nr);
+
+ if (objTelifyPrefs.hrefType == objTelifyPrefs.HREFTYPE_CUSTOM) {
+ if (objTelifyPrefs.custom_opentype == 1) {
+ window.open(url, "_blank");
+ return;
+ }
+ if (objTelifyPrefs.custom_opentype == 2) {
+ var browser = top.document.getElementById("content");
+ var tab = browser.addTab(url);
+ return;
+ }
+ if (objTelifyPrefs.custom_opentype == 3) {
+ var browser = top.document.getElementById("content");
+ var tab = browser.addTab(url);
+ browser.selectedTab = tab;
+ return;
+ }
+ }
+
+ try {
+ requ.open("GET", url, true);
+ requ.send(null);
+ } catch(e) {
+ // throws exception because answer is empty (or protocol is unknown)
+ if (e.name == "NS_ERROR_UNKNOWN_PROTOCOL") {
+ objTelifyUtil.showMessageBox("", objTelifyLocale.msgUnknownProtocol(), objTelifyUtil.MB_ICON_ERROR);
+ }
+ }
+},
+
+
+modifyPopup: function(event)
+{
+ var label, key;
+
+ //var selText = content.window.getSelection().toString();
+ var selText = document.commandDispatcher.focusedWindow.getSelection().toString();
+
+ if (document.popupNode && document.popupNode.getAttribute("class") == "telified") {
+ var nr = document.popupNode.getAttribute("nr");
+ var nr_parts = objTelifyUtil.splitPhoneNr(nr);
+ objTelify.modifyDialPopup(nr_parts[0], nr_parts[1], "context");
+ objTelifyUtil.setIdAttr("collapsed", false, "idTelify_menu_context");
+ } else if (objTelifyPrefs.fActive && selText.length > 0 && objTelifyUtil.countDigits(selText) > 1) {
+ var nr = objTelify.getSelectionNumber();
+ var nr_parts = objTelifyUtil.splitPhoneNr(nr);
+ objTelify.modifyDialPopup(nr_parts[0], nr_parts[1], "context");
+ objTelifyUtil.setIdAttr("collapsed", false, "idTelify_menu_context");
+ } else {
+ objTelifyUtil.setIdAttr("collapsed", true, "idTelify_menu_context");
+ }
+
+ if (objTelifyPrefs.fActive) {
+ label = objTelifyPrefs.telStrings.getString("telify_deactivate");
+ } else {
+ label = objTelifyPrefs.telStrings.getString("telify_activate");
+ }
+ objTelifyUtil.setIdAttr("label", label, "idTelify_menu_activity", "idTelify_status_activity");
+
+ var host = objTelifyUtil.getHost();
+ if (host) {
+ objTelifyUtil.setIdAttr("disabled", !objTelifyPrefs.fActive, "idTelify_menu_blacklist", "idTelify_status_blacklist");
+ if (objTelifyPrefs.excludedHosts.indexOf(host) >= 0) key = "host_active_arg"; else key = "host_inactive_arg";
+ label = objTelifyUtil.substArgs(objTelifyPrefs.telStrings.getString(key), host);
+ objTelifyUtil.setIdAttr("label", label, "idTelify_menu_blacklist", "idTelify_status_blacklist");
+ } else {
+ objTelifyUtil.setIdAttr("label", "Kein Host aktiv", "idTelify_menu_blacklist", "idTelify_status_blacklist");
+ objTelifyUtil.setIdAttr("disabled", true, "idTelify_menu_blacklist", "idTelify_status_blacklist");
+ }
+},
+
+
+showEditNumberDialog: function(cc, nr)
+{
+ var argObj = {cc: cc, nr: nr, fOK: false};
+ window.openDialog("chrome://telify/content/editNumber.xul", "dlgTelifyEditNumber", "centerscreen,chrome,modal", argObj);
+ if (argObj.fOK) {
+ this.updateDialHistory(argObj.cc);
+ var dial = objTelifyUtil.prefixNumber(argObj.cc, argObj.nr, "");
+ objTelify.dialNumber(dial);
+ }
+},
+
+
+dialMenuSelection: function(cc, nr)
+{
+ this.updateDialHistory(cc);
+ var dial = objTelifyUtil.prefixNumber(cc, nr, "");
+ objTelify.dialNumber(dial);
+},
+
+
+createTargetCountryInfo: function(prefix)
+{
+ var cstring = objTelifyUtil.getCountryListString(prefix);
+ if (cstring) return "\n" + objTelifyPrefs.telStrings.getString('country_code') + ": " + cstring;
+ return "";
+},
+
+
+setDialMenuItem: function(item, code, nr)
+{
+ var label = objTelifyUtil.prefixNumber(code, nr, "-");
+ item.setAttribute("label", label);
+ var cmd = "objTelify.dialMenuSelection('"+code+"','"+nr+"');";
+ item.setAttribute("oncommand", cmd);
+ label = objTelifyUtil.substArgs(objTelifyPrefs.telStrings.getString('call_arg'), label);
+ label += objTelify.createTargetCountryInfo(code);
+ item.setAttribute("tooltiptext", label);
+ item.setAttribute("image", "chrome://telify/content/flag/"+code.substr(1)+".png");
+},
+
+
+modifyDialPopup: function(cc, nr, id)
+{
+ var item = document.getElementById("idTelify_"+id);
+ var sep = document.getElementById("idTelify_sep_"+id);
+ var numShown = 0;
+
+ if (cc) {
+ this.setDialMenuItem(item, cc, nr);
+ } else {
+ item.setAttribute("label", nr);
+ var label = objTelifyUtil.substArgs(objTelifyPrefs.telStrings.getString('call_arg'), nr);
+ item.setAttribute("tooltiptext", label);
+ item.removeAttribute("image");
+ item.setAttribute("oncommand", "objTelify.dialNumber('"+nr+"')");
+ }
+
+ item = document.getElementById("idTelify_edit_"+id);
+ if (cc) {
+ item.setAttribute("oncommand", "objTelify.showEditNumberDialog('"+cc+"','"+nr+"')");
+ } else {
+ item.setAttribute("oncommand", "objTelify.showEditNumberDialog(null,'"+nr+"')");
+ }
+
+ var tldcc = objTelifyUtil.tld2cc(objTelifyUtil.getHostTLD());
+ item = document.getElementById("idTelify_tld_"+id);
+ if (!cc && tldcc) {
+ item.setAttribute("collapsed", false);
+ this.setDialMenuItem(item, tldcc, nr);
+ numShown = 1;
+ } else {
+ item.setAttribute("collapsed", true);
+ tldcc = null;
+ }
+
+ this.getDialHistory();
+
+ if (!cc && nr.charAt(0) != '+') {
+ var numLeft = objTelifyPrefs.numHistory;
+ if (tldcc) numLeft--;
+ for (var i=0; i<objTelifyPrefs.maxHistory; i++) {
+ item = document.getElementById("idTelify_"+id+i);
+ if (numLeft == 0 || this.dialHistory[i] == null || this.dialHistory[i].length == 0 || this.dialHistory[i] == cc || this.dialHistory[i] == tldcc) {
+ item.setAttribute("collapsed", true);
+ } else {
+ item.setAttribute("collapsed", false);
+ this.setDialMenuItem(item, this.dialHistory[i], nr);
+ numLeft--;
+ numShown++;
+ }
+ }
+ } else {
+ for (var i=0; i<objTelifyPrefs.maxHistory; i++) {
+ item = document.getElementById("idTelify_"+id+i);
+ item.setAttribute("collapsed", true);
+ }
+ }
+ sep.setAttribute("collapsed", numShown == 0);
+},
+
+
+showDialPopup: function(target, cc, nr)
+{
+ var menu = document.getElementById("idTelify_popup_dial");
+ var nr_parts = objTelifyUtil.splitPhoneNr(nr);
+ this.modifyDialPopup(cc, nr, "dial");
+ menu.openPopup(target, "after_start", 0, 0, true, false);
+},
+
+
+onClick: function(event)
+{
+ if (event.button != 0) return;
+ var class = event.target.getAttribute("class");
+ if (class != "telified") return;
+ event.preventDefault();
+ var nr = event.target.getAttribute("nr");
+ var nr_parts = objTelifyUtil.splitPhoneNr(nr);
+ if (event.button == 0) {
+ if (nr_parts[0] && objTelifyPrefs.fDialCCDirect) {
+ objTelify.dialNumber(nr);
+ } else {
+ objTelify.showDialPopup(event.target, nr_parts[0], nr_parts[1]);
+ }
+ }
+ if (event.button == 2) {
+ objTelify.showDialPopup(event.target, nr_parts[0], nr_parts[1]);
+ }
+},
+
+
+getNodeBackgroundColor: function(node)
+{
+ node = node.parentNode;
+ if (node == null) return null;
+ if (node.nodeType == Node.ELEMENT_NODE) {
+ var style = content.document.defaultView.getComputedStyle(node, "");
+ var image = style.getPropertyValue("background-image");
+ if (image && image != "none") return null;
+ var color = style.getPropertyValue("background-color");
+ if (color && color != "transparent") return color;
+ }
+ return this.getNodeBackgroundColor(node);
+},
+
+
+getNodeColor: function(node)
+{
+ node = node.parentNode;
+ if (node == null) return null;
+ if (node.nodeType == Node.ELEMENT_NODE) {
+ var style = content.document.defaultView.getComputedStyle(node, "");
+ var color = style.getPropertyValue("color");
+ if (color && color != "transparent") return color;
+ }
+ return this.getNodeColor(node);
+},
+
+
+formatPhoneNr: function(phonenr)
+{
+ var substList = [
+ [" ", " "], // double spaces to single space
+ [this.sc_nbsp, " "], // non-breaking space to plain old space
+ ["+ ", "+"], // remove space after +
+ ["--", "-"], // double dashes to single dash
+ ["(0)", " "], // remove optional area code prefix
+ ["[0]", " "], // remove optional area code prefix
+ ["-/", "/"],
+ ["/-", "/"],
+ ["( ", "("],
+ [" )", ")"],
+ ["\r", " "],
+ ["\n", " "],
+ ];
+
+ // replace dash-like chars with dashes
+ for (var i=0; i<phonenr.length; i++) {
+ var c = phonenr.charAt(i);
+ if (this.token_dash.indexOf(c) >= 0) {
+ phonenr = phonenr.substr(0, i) + "-" + phonenr.substr(i+1);
+ }
+ }
+
+ const MAXLOOP = 100; // safety bailout
+ var nChanged;
+
+ nChanged = 1;
+ for (var j=0; nChanged > 0 && j < MAXLOOP; j++) {
+ nChanged = 0;
+ for (var i=0; i<substList.length; i++) {
+ var index;
+ while ((index = phonenr.indexOf(substList[i][0])) >= 0) {
+ phonenr = phonenr.substr(0, index) + substList[i][1] + phonenr.substr(index+substList[i][0].length);
+ nChanged++;
+ }
+ }
+ }
+
+ return phonenr;
+},
+
+
+convertVanityNr: function(phonenr)
+{
+ const tab_alpha = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+ const tab_digit = "22233344455566677778889999";
+ var newnr = "";
+ for (var i=0; i<phonenr.length; i++) {
+ var c = phonenr.charAt(i);
+ var index = tab_alpha.indexOf(c);
+ if (index >= 0) c = tab_digit.substr(index, 1);
+ newnr += c;
+ }
+ return newnr;
+},
+
+
+reject: function(str, reason)
+{
+ if (objTelifyPrefs.fDebug == false) return;
+ var msg = "Telify: reject '"+str+"' reason: "+reason;
+ objTelifyUtil.logmsg(msg);
+},
+
+
+basechar_tab: [
+ String.fromCharCode(0xa0) +
+ String.fromCharCode(0x2013) +
+ String.fromCharCode(0x2014) +
+ String.fromCharCode(0x2212),
+ " ---"
+],
+
+
+basechar: function(c)
+{
+ var index = this.basechar_tab[0].indexOf(c);
+ if (index >= 0) c = this.basechar_tab[1].charAt(index);
+ return c;
+},
+
+
+telifyTextNode: function(node)
+{
+ if (node == null) return 0;
+ var text = node.data;
+ var len = text.length;
+ if (len < this.digits_min) return 0;
+ var hlFactor = objTelifyPrefs.highlight/200.0;
+
+ for (var i=0; i<len; i++) {
+ var c = text.charAt(i);
+
+ if (this.token_trigger.indexOf(c) < 0) continue;
+
+ c = this.basechar(c);
+
+ var str = "" + c;
+ var strlen = 1;
+ var last_c = c;
+ var ndigits = (objTelifyUtil.isdigit(c) ? 1 : 0);
+ var index;
+ var fStartsWithCountryCode = false;
+ var CCfromPattern = null;
+
+ // gather allowed chars
+ while (strlen < len-i) {
+ c = text.charAt(i+strlen);
+ c = this.basechar(c);
+ if ((c == '+' && ndigits == 0) || (this.token_part.indexOf(c) >= 0)) {
+ if (c == last_c && c!=' ') break;
+ } else {
+ if (!objTelifyUtil.isdigit(c)) break;
+ ndigits++;
+ }
+ str += c;
+ strlen++;
+ last_c = c;
+ }
+
+ // check against digit count min value
+ if (ndigits < this.digits_min) {
+ this.reject(str, "less than "+this.digits_min+" digits");
+ i += strlen - 1; continue;
+ }
+
+ // check allowed prev token
+ if (i > 0) {
+ var prev_c = text.charAt(i-1);
+ if (this.token_disallowed_prev.indexOf(prev_c) >= 0) {
+ this.reject(str, "unallowed previous token (reject list)");
+ i += strlen - 1; continue;
+ }
+ if ((prev_c >= 'a' && prev_c <= "z") || (prev_c >= 'A' && prev_c <= "Z")) {
+ this.reject(str, "unallowed previous token (letter)");
+ i += strlen - 1; continue;
+ }
+ }
+
+ // check if phone number starts with country code
+ for (var j=0; j<telify_country_data.length; j++) {
+ var cclen = telify_country_data[j][0].length;
+ if (cclen < 2 || cclen > 4) continue;
+ var pattern = telify_country_data[j][0].substr(1);
+ var plen = pattern.length;
+ if (str.substr(0, plen) != pattern) continue;
+ var c = str.charAt(plen);
+ if (this.token_sep.indexOf(c) < 0) continue;
+ fStartsWithCountryCode = true;
+ break;
+ }
+
+ // check against special local patterns
+ for (var j=0; j<this.inclLocalList.length; j++) {
+ var res = this.inclLocalList[j][0].exec(str);
+ if (res) {CCfromPattern = this.inclLocalList[j][1]; break;}
+ }
+
+ // check if phone number starts with allowed token
+ if (CCfromPattern == null && fStartsWithCountryCode == false && this.token_start.indexOf(str.charAt(0)) < 0) {
+ this.reject(str, "unallowed start token (reject list)");
+ i += strlen - 1; continue;
+ }
+
+ // trim chars at end of string up to an unmatched opening bracket
+ index = -1;
+ for (var j=strlen-1; j>=0; j--) {
+ c = str.charAt(j);
+ if (c == ')') break;
+ if (c == '(') {index = j; break;}
+ }
+ if (index == 0) continue;
+ if (index > 0) {
+ str = str.substr(0, index);
+ strlen = str.length;
+ }
+
+ // check against digit count max value (after we have removed unnecessary digits)
+ if (objTelifyUtil.countDigits(str) > this.digits_max) {
+ this.reject(str, "more than "+this.digits_max+" digits");
+ i += strlen - 1; continue;
+ }
+
+ // trim non-digit chars at end of string
+ while (str.length > 0) {
+ c = str.charAt(str.length-1);
+ if (!objTelifyUtil.isdigit(c)) {
+ str = str.substr(0, str.length-1);
+ strlen--;
+ } else break;
+ }
+
+ // check allowed post token
+ var post_c = text.charAt(i+strlen);
+ if (post_c) {
+ if (this.token_disallowed_post.indexOf(post_c) >= 0) {
+ this.reject(str, "unallowed post token (reject list)");
+ i += strlen - 1; continue;
+ }
+ if ((post_c >= 'a' && post_c <= "z") || (post_c >= 'A' && post_c <= "Z")) {
+ this.reject(str, "unallowed post token (letter)");
+ i += strlen - 1; continue;
+ }
+ }
+
+ // check if this is just a number in braces
+ // first check for unnecessary opening braces
+ if (str.substr(0, 1) == "(" && str.indexOf(")") < 0) {
+ str = str.substr(1);
+ i++;
+ strlen--;
+ // now check if it still starts with allowed token
+ if (this.token_start.indexOf(str.charAt(0)) < 0) {
+ this.reject(str, "unallowed start token (after brace removal)");
+ i += strlen - 1;
+ continue;
+ }
+ }
+
+ // check against blacklist patterns (date, time ranges etc.)
+ index = -1;
+ for (var j=0; j<this.exclPatternList.length; j++) {
+ var res = this.exclPatternList[j].exec(str);
+ if (res) {index = j; break;}
+ }
+ if (index >= 0) {this.reject(str, "blacklisted pattern #"+index); i += strlen - 1; continue;}
+
+
+ // ----------------------------------------------------------------
+
+ var display = this.formatPhoneNr(str);
+ var href = objTelifyUtil.stripNumber(display);
+ if (fStartsWithCountryCode) href = "+"+href;
+ //if (CCfromPattern) href = CCfromPattern + href;
+
+ // insert link into DOM
+
+ var node_prev = content.document.createTextNode(text.substr(0, i));
+ var node_after = content.document.createTextNode(text.substr(i+strlen));
+
+ //alert("match="+str);
+
+ var node_anchor = content.document.createElement("a");
+
+ if (hlFactor > 0.0) {
+ var color = objTelifyUtil.parseColor(this.getNodeColor(node));
+ if (color == null) color = new Array(0,0,0);
+ var bgcolor = objTelifyUtil.parseColor(this.getNodeBackgroundColor(node));
+ if (bgcolor == null) bgcolor = new Array(255,255,255);
+ for (var i=0; i<3; i++) {
+ color[i] = color[i] + hlFactor * (this.hilite_color[i] - color[i]);
+ bgcolor[i] = bgcolor[i] + hlFactor * (this.hilite_bgcolor[i] - bgcolor[i]);
+ }
+ var style = "color:#"+objTelifyUtil.color2hex(color)+";background-color:#"+objTelifyUtil.color2hex(bgcolor)+";-moz-border-radius:3px";
+ node_anchor.setAttribute("style", style);
+ }
+
+ node_anchor.setAttribute("title", objTelifyPrefs.telStrings.getString('link_title'));
+ node_anchor.setAttribute("class", "telified");
+ node_anchor.setAttribute("nr", href);
+ node_anchor.setAttribute("href", objTelifyUtil.createDialURL(href));
+
+ var node_text = content.document.createTextNode(str);
+ node_anchor.appendChild(node_text);
+
+ var parentNode = node.parentNode;
+ parentNode.replaceChild(node_after, node);
+ parentNode.insertBefore(node_anchor, node_after);
+ parentNode.insertBefore(node_prev, node_anchor);
+
+ return 1;
+ }
+
+ return 0;
+},
+
+
+recurseNode: function(node)
+{
+ if (node == null) return 0; // safety
+ if (node.nodeType == Node.TEXT_NODE) {
+ return this.telifyTextNode(node);
+ } else {
+ var nChanged = 0;
+ //objTelifyUtil.logmsg("node type="+node.nodeType+" "+node.tagName+" (childs:"+node.childNodes.length+")");
+ if (node.nodeType == Node.ELEMENT_NODE) {
+ var tagName = node.tagName.toLowerCase();
+ if (objTelifyPrefs.excludedTags.indexOf(tagName) >= 0) return 0;
+ }
+ for (var i=0; i<node.childNodes.length; i++) {
+ nChanged += this.recurseNode(node.childNodes[i]);
+ }
+ if (node.contentDocument) {
+ nChanged += this.recurseNode(node.contentDocument.body);
+ node.contentDocument.addEventListener("click", objTelify.onClick, false);
+ }
+ }
+ return nChanged;
+},
+
+
+parsePage: function(event)
+{
+ if (!objTelifyPrefs.fActive) return;
+ //objTelifyUtil.logmsg("eventPhase: "+event.eventPhase+"\n"+content.document.URL);
+ if (content.document.body == null) return;
+ if (event && event.eventPhase != 1) return;
+
+ var host = objTelifyUtil.getHost();
+ if (host && objTelifyPrefs.excludedHosts.indexOf(host) >= 0) return;
+
+ //if (content.document.body.getAttribute('telified') == 1) return;
+ //content.document.body.setAttribute('telified', 1);
+
+/*
+ var nChanged = 0;
+ var duration = (new Date()).getTime();
+ nChanged = objTelify.recurseNode(content.document.body);
+ duration = (new Date()).getTime() - duration;
+ var label = "Telify\n" + objTelifyPrefs.telStrings.getString('converted') + ": " + nChanged + " (" + duration + " ms)";
+ document.getElementById("idTelify_statusicon").setAttribute("tooltiptext", label);
+*/
+
+ window.setTimeout("objTelify.recurseNode(content.document.body)", 0);
+
+ content.document.addEventListener("click", objTelify.onClick, false);
+},
+
+
+init: function(event)
+{
+ window.addEventListener('load', objTelify.init, false);
+ objTelifyPrefs.initTelifyPrefs();
+ objTelify.setStatus();
+ getBrowser().addEventListener("load", objTelify.parsePage, true);
+ document.getElementById("contentAreaContextMenu").addEventListener("popupshowing", objTelify.modifyPopup, false);
+ objTelifyUtil.addScheme("tel");
+ objTelifyUtil.localizeCountryData();
+ objTelifyUtil.getAddonVersion();
+}
+
+};
+
+
+window.addEventListener('load', objTelify.init, false);
+
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/util.js b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/util.js
new file mode 100644
index 0000000000000000000000000000000000000000..838cd91afba39fcc34f151f1ed42c521603171c9
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/util.js
@@ -0,0 +1,516 @@
+/*
+Creative Commons License: Attribution-No Derivative Works 3.0 Unported
+http://creativecommons.org/licenses/by-nd/3.0/
+(c)2009 Michael Koch
+*/
+
+var objTelifyUtil = {
+
+getBrowser: function()
+{
+ var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"].getService(Components.interfaces.nsIWindowMediator);
+ var mainWindow = wm.getMostRecentWindow("navigator:browser");
+ var browser = mainWindow.getBrowser();
+ return browser;
+},
+
+
+getAddonVersion: function()
+{
+ var gExtensionManager = Components.classes["@mozilla.org/extensions/manager;1"]
+ .getService(Components.interfaces.nsIExtensionManager);
+ return gExtensionManager.getItemForID("{6c5f349a-ddda-49ad-bdf0-326d3fe1f938}").version;
+},
+
+
+createDialURL: function(nr)
+{
+ var url;
+ if (nr.charAt(0) == '+') {
+ if (objTelifyPrefs.idd_prefix.length > 0) {
+ nr = objTelifyPrefs.idd_prefix + nr.substr(1);
+ } else if (objTelifyPrefs.hrefType == objTelifyPrefs.HREFTYPE_CUSTOM && !objTelifyPrefs.fDontEscapePlus) {
+ nr = "%2B" + nr.substr(1);
+ }
+ }
+ if (objTelifyPrefs.hrefType == objTelifyPrefs.HREFTYPE_CUSTOM) {
+ url = objTelifyPrefs.custom_url;
+ url = objTelifyUtil.replaceRefs(url, 0, nr);
+ for (var i=1; i<objTelifyPrefs.NUM_CUSTOM_PARAMS+1; i++) {
+ url = objTelifyUtil.replaceRefs(url, i, objTelifyPrefs.custom_param[i]);
+ }
+ } else {
+ url = objTelifyPrefs.protoList[objTelifyPrefs.hrefType]+":"+nr;
+ }
+ return url;
+},
+
+
+token_href: "+0123456789",
+
+stripNumber: function(phonenr)
+{
+ var newnr = "";
+ for (var i=0; i<phonenr.length; i++) {
+ var c = phonenr.charAt(i);
+ if (this.token_href.indexOf(c) >= 0) newnr += c;
+ }
+ return newnr.substr(0, objTelify.digits_max);
+},
+
+
+code2ndd_hashtable: null,
+
+create_code2ndd_hashtable: function()
+{
+ this.code2ndd_hashtable = new Hashtable();
+ for (var i=0; i<telify_country_data.length; i++) {
+ if (telify_country_data[i][0] == "") continue;
+ this.code2ndd_hashtable.put(telify_country_data[i][0], telify_country_data[i][3]);
+ }
+},
+
+
+prefixNumber: function(prefix, nr, sep)
+{
+ if (prefix == null || prefix == "") return this.stripNumber(nr);
+ if (this.code2ndd_hashtable == null) this.create_code2ndd_hashtable();
+ var ndd = this.code2ndd_hashtable.get(prefix);
+ if ((ndd.length > 0) && (nr.substr(0, ndd.length) == ndd)) nr = nr.substr(ndd.length);
+ return this.stripNumber(prefix) + sep + this.stripNumber(nr);
+},
+
+
+trim: function(s)
+{
+ s = s.replace(/^\s*(.*)/, "$1");
+ s = s.replace(/(.*?)\s*$/, "$1");
+ return s;
+},
+
+
+localizeCountryData: function()
+{
+/*
+ for (var i=0; i < telify_country_data.length; i++) {
+ for (var j=0; j<telify_country_locale.length; j++) {
+ if (telify_country_data[i][1] == telify_country_locale[j][0]) {
+ telify_country_data[i][1] = telify_country_locale[j][1];
+ break;
+ }
+ }
+ }
+*/
+ var hashtable = new Hashtable();
+ for (var i=0; i<telify_country_locale.length; i++) {
+ hashtable.put(telify_country_locale[i][0], telify_country_locale[i][1]);
+ }
+ for (var i=0; i<telify_country_data.length; i++) {
+ var value = hashtable.get(telify_country_data[i][1]);
+ if (value) telify_country_data[i][1] = value;
+ }
+},
+
+
+tld_hashtable: null,
+
+create_tld_hashtable: function()
+{
+ this.tld_hashtable = new Hashtable();
+ for (var i=0; i<telify_country_data.length; i++) {
+ if (telify_country_data[i][2] == "") continue;
+ var tld_list = telify_country_data[i][2].toLowerCase().split(",");
+ for (var j=0; j<tld_list.length; j++) {
+ tld_list[j] = this.trim(tld_list[j]);
+ this.tld_hashtable.put(tld_list[j], telify_country_data[i][0]);
+ }
+ }
+},
+
+
+tld2cc: function(tld)
+{
+ if (this.tld_hashtable == null) this.create_tld_hashtable();
+ return this.tld_hashtable.get(tld);
+},
+
+
+splitPhoneNr: function(nr)
+{
+ var index = -1;
+ var maxlen = 0;
+ var idd_list = ["00", "011"];
+ var oldnr = nr;
+
+ if (nr.charAt(0) != '+') {
+ for (var i=0; i<idd_list.length; i++) {
+ if (nr.substr(0, idd_list[i].length) == idd_list[i]) {
+ nr = "+" + nr.substr(idd_list[i].length);
+ break;
+ }
+ }
+ }
+ if (nr.charAt(0) != '+') return [null, oldnr];
+ for (var i=0; i<telify_country_data.length; i++) {
+ if (nr.substr(0, telify_country_data[i][0].length) == telify_country_data[i][0]) {
+ if (telify_country_data[i][0].length > maxlen) {
+ index = i;
+ maxlen = telify_country_data[i][0].length;
+ }
+ }
+ }
+ if (index >= 0) {
+ var cc = telify_country_data[index][0];
+ return [cc, nr.substr(cc.length)];
+ }
+ return [null, oldnr];
+},
+
+
+code2name_hashtable: null,
+
+create_code2name_hashtable: function()
+{
+ this.code2name_hashtable = new Hashtable();
+ for (var i=0; i<telify_country_data.length; i++) {
+ if (telify_country_data[i][0] == "") continue;
+ var name = telify_country_data[i][1];
+ var prev = this.code2name_hashtable.get(telify_country_data[i][0]);
+ if (prev) name = prev + ", " + name;
+ this.code2name_hashtable.put(telify_country_data[i][0], name);
+ }
+},
+
+
+getCountryListString: function(prefix)
+{
+ if (this.code2name_hashtable == null) this.create_code2name_hashtable();
+ return this.code2name_hashtable.get(prefix);
+},
+
+
+getHost: function()
+{
+ try {
+ return content.document.location.host.toLowerCase();
+ } catch (e) {
+ return null;
+ }
+},
+
+
+getHostTLD: function()
+{
+ var host = this.getHost();
+ if (host) {
+ var index = host.lastIndexOf('.');
+ if (index >= 0) {
+ var tld = host.substr(index+1);
+ if (tld.length) return tld;
+ }
+ }
+ return null;
+},
+
+
+MB_MASK: 0xff, MB_OK: 1, MB_CANCEL: 2,
+MB_ICON_MASK: 0xff00, MB_ICON_INFO: 0, MB_ICON_WARNING: 0x0100, MB_ICON_ERROR: 0x0200, MB_ICON_ASK: 0x0300,
+
+showMessageBox: function(title, msg, flags)
+{
+ var argObj = {title: title, msg: msg, flags: flags, fResult: true};
+ window.openDialog("chrome://telify/content/messagebox.xul", "dlgTelifyMessageBox", "centerscreen,chrome,modal", argObj).focus();
+ return argObj.fResult;
+},
+
+
+consoleService: null,
+
+logmsg: function(msg) {
+ if (this.consoleService == null) {
+ this.consoleService = Components.classes["@mozilla.org/consoleservice;1"];
+ this.consoleService = this.consoleService.getService(Components.interfaces.nsIConsoleService);
+ }
+ this.consoleService.logStringMessage(msg);
+},
+
+
+logerror: function(msg) {
+ Components.utils.reportError(msg);
+},
+
+
+arrayRemove: function(a, v)
+{
+ for (var i=0; i<a.length; i++) {
+ if (a[i] == v) {
+ a.splice(i, 1);
+ i--;
+ }
+ }
+},
+
+
+replaceRefs: function(string, nr, param)
+{
+ var index;
+ while ((index = string.indexOf("$"+nr)) >= 0 && string.charAt(index-1) != '\\') {
+ string = string.substr(0, index) + param + string.substr(index+2);
+ }
+ return string;
+},
+
+
+substArgs: function(text)
+{
+ var newText = "";
+ for (var i=1; i<arguments.length && i<10; i++) {
+ for (var j=0; j<text.length; j++) {
+ var c = text.charAt(j);
+ if (c == '$') {
+ c = text.charAt(j+1);
+ if (c >= '1' && c <= '9') {
+ var index = c - '0';
+ if (index < arguments.length) {
+ newText += arguments[index];
+ } else {
+ this.logerror("substArgs("+text+"): argument for $"+index+" missing");
+ }
+ j++;
+ } else {
+ newText += c;
+ }
+ } else {
+ newText += c;
+ }
+ }
+ }
+ return newText;
+},
+
+
+setIdAttr: function(name, value)
+{
+ for (var i=2; i<arguments.length; i++) {
+ var e = document.getElementById(arguments[i]);
+ if (e) {
+ e.setAttribute(name, value);
+ } else {
+ this.logerror("unknown element '"+arguments[i]+"'");
+ }
+ }
+},
+
+
+countDigits: function(text)
+{
+ var count = 0;
+ for (var i=0; i<text.length; i++) {
+ var c = text.charAt(i);
+ if (c >= '0' && c <= '9') count++;
+ }
+ return count;
+},
+
+
+isdigit: function(c)
+{
+ return ("0123456789".indexOf(c) >= 0);
+},
+
+
+trimInt: function(value, min, max)
+{
+ if (value < min) return min;
+ if (value > max) return max;
+ return value;
+},
+
+
+parseColor: function(text)
+{
+ var exp, res, color;
+
+ if (text == null) return null;
+
+ exp = /^rgb *\( *(\d{1,3}) *, *(\d{1,3}) *, *(\d{1,3}) *\)$/;
+ res = exp.exec(text);
+ if (res) {
+ color = new Array(parseInt(res[1]), parseInt(res[2]), parseInt(res[3]));
+ for (var i=0; i<3; i++) {
+ if (color[i] < 0) color[i] = 0;
+ if (color[i] > 255) color[i] = 255;
+ }
+ return color;
+ }
+
+ exp = /^#?([\da-f]{2})([\da-f]{2})([\da-f]{2})$/i;
+ res = exp.exec(text);
+ if (res) {
+ color = new Array(parseInt(res[1], 16), parseInt(res[2], 16), parseInt(res[3], 16));
+ return color;
+ }
+
+ exp = /^#?([\da-f])([\da-f])([\da-f])$/i;
+ res = exp.exec(text);
+ if (res) {
+ color = new Array(parseInt(res[1], 16), parseInt(res[2], 16), parseInt(res[3], 16));
+ for (var i=0; i<3; i++) color[i] = color[i]*16+color[i];
+ return color;
+ }
+
+ return null;
+},
+
+
+color2hex: function(color)
+{
+ var hex;
+
+ if (color == null || color.length != 3) return "";
+ for (var i=0, hex=""; i<3; i++) {
+ var d = "0"+Math.floor(color[i]).toString(16);
+ hex += d.substr(d.length - 2, 2);
+ }
+ return hex;
+},
+
+
+esc2xml: function(string)
+{
+ var substList = [
+ ["&", "&"], // here be dragons: must be first element in list
+ ["<", "<"],
+ [">", ">"],
+ ["\'", "'"],
+ ["\"", """],
+ ["Ä", "Ä"],
+ ["Ö", "Ö"],
+ ["Ü", "Ü"],
+ ["ä", "ä"],
+ ["ö", "ö"],
+ ["ü", "ü"],
+ ["ß", "ß"],
+ ];
+
+ for (var i=0; i<substList.length; i++) {
+ var index;
+ while ((index = string.indexOf(substList[i][0])) >= 0) {
+ string = string.substr(0, index) + substList[i][1] + string.substr(index+substList[i][0].length);
+ }
+ }
+
+ return string;
+},
+
+
+iso2utf8: function(s)
+{
+ s = s.split("");
+ for (var i=0; i<s.length; i++) {
+ var c = s[i].charCodeAt(0);
+ if (c > 127) s[i] = String.fromCharCode(0xc0 | ((c >> 6) & 3)) + String.fromCharCode(0x80 | (c & 0x3f));
+ }
+ return s.join("");
+},
+
+addScheme: function(scheme)
+{
+ var createNC = function(aProperty) {return "http://home.netscape.com/NC-rdf#" + aProperty;};
+
+ var RDF = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService();
+ var IRDFService = RDF.QueryInterface(Components.interfaces.nsIRDFService);
+
+ var ContainerUtils = Components.classes["@mozilla.org/rdf/container-utils;1"].getService();
+ var IRDFContainerUtils = ContainerUtils.QueryInterface(Components.interfaces.nsIRDFContainerUtils);
+
+ var Container = Components.classes["@mozilla.org/rdf/container;1"].createInstance();
+ var IRDFContainer = Container.QueryInterface(Components.interfaces.nsIRDFContainer);
+
+ const mimeTypes = "UMimTyp";
+ var fileLocator = Components.classes["@mozilla.org/file/directory_service;1"].getService(Components.interfaces.nsIProperties);
+ var file = fileLocator.get(mimeTypes, Components.interfaces.nsIFile);
+ var ioService = Components.classes["@mozilla.org/network/io-service;1"].getService(Components.interfaces.nsIIOService);
+ var fileHandler = ioService.getProtocolHandler("file").QueryInterface(Components.interfaces.nsIFileProtocolHandler);
+ var datasource = IRDFService.GetDataSource(fileHandler.getURLSpecFromFile(file));
+ var irds = datasource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
+
+ var about, property, value;
+
+ about = IRDFService.GetResource("urn:schemes");
+ property = IRDFService.GetResource(createNC("Protocol-Schemes"));
+ value = IRDFService.GetResource("urn:schemes:root");
+ datasource.Assert(about, property, value, true);
+
+ about = IRDFService.GetResource("urn:schemes:root");
+ if (IRDFContainerUtils.IsSeq(datasource, about) == false) {
+ datasource.Assert(about, null, null, true);
+ IRDFContainerUtils.MakeSeq(datasource, about);
+ }
+ IRDFContainer.Init(datasource, about);
+ var element = IRDFService.GetResource("urn:scheme:"+scheme);
+ if (IRDFContainer.IndexOf(element) < 0) {
+ IRDFContainer.AppendElement(element);
+ }
+
+ about = IRDFService.GetResource("urn:scheme:"+scheme);
+ property = IRDFService.GetResource(createNC("value"));
+ value = IRDFService.GetLiteral(scheme);
+ datasource.Assert(about, property, value, true);
+ property = IRDFService.GetResource(createNC("handlerProp"));
+ value = IRDFService.GetResource("urn:scheme:handler:"+scheme)
+ datasource.Assert(about, property, value, true);
+
+ about = IRDFService.GetResource("urn:scheme:handler:"+scheme);
+ property = IRDFService.GetResource(createNC("alwaysAsk"));
+ value = IRDFService.GetLiteral("true");
+ datasource.Assert(about, property, value, true);
+ property = IRDFService.GetResource(createNC("useSystemDefault"));
+ value = IRDFService.GetLiteral("false");
+ datasource.Assert(about, property, value, true);
+/*
+ property = IRDFService.GetResource(createNC("possibleApplication"));
+ value = IRDFService.GetResource("urn:scheme:possibleApplication:tel");
+ datasource.Assert(about, property, value, true);
+
+ about = IRDFService.GetResource("urn:scheme:possibleApplication:tel");
+ property = IRDFService.GetResource(createNC("prettyName"));
+ value = IRDFService.GetLiteral("Nicht konfiguriert");
+ datasource.Assert(about, property, value, true);
+ property = IRDFService.GetResource(createNC("uriTemplate"));
+ value = IRDFService.GetLiteral("urn:handler:web:http://www.mike-koch.de");
+ datasource.Assert(about, property, value, true);
+*/
+ irds.Flush();
+}
+
+
+/*
+ <RDF:Description RDF:about="urn:schemes">
+ <NC:Protocol-Schemes RDF:resource="urn:schemes:root"/>
+ </RDF:Description>
+
+ <RDF:Seq RDF:about="urn:schemes:root">
+ <RDF:li RDF:resource="urn:scheme:webcal"/>
+ <RDF:li RDF:resource="urn:scheme:mailto"/>
+ <RDF:li RDF:resource="urn:scheme:callto"/>
+ <RDF:li RDF:resource="urn:scheme:tel"/>
+ </RDF:Seq>
+
+ <RDF:Description RDF:about="urn:scheme:tel" NC:value="tel">
+ <NC:handlerProp RDF:resource="urn:scheme:handler:tel"/>
+ </RDF:Description>
+
+ <RDF:Description RDF:about="urn:scheme:handler:tel" NC:alwaysAsk="true">
+ <NC:externalApplication RDF:resource="urn:scheme:externalApplication:tel"/>
+ </RDF:Description>
+
+ <RDF:Description RDF:about="urn:scheme:externalApplication:tel"
+ NC:prettyName="3GP_Converter.exe"
+ NC:path="C:\Programme\3GP_Converter033\3GP_Converter.exe" />
+
+*/
+
+
+};
+
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/warn32.png b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/warn32.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5f6551d940eb76b48597f3f9bf09e2a3395b090
Binary files /dev/null and b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/content/warn32.png differ
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/locale/de-DE/country_locale.js b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/locale/de-DE/country_locale.js
new file mode 100644
index 0000000000000000000000000000000000000000..57e1c7035d4edb12e9b82fdeace05f9f351833e8
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/locale/de-DE/country_locale.js
@@ -0,0 +1,158 @@
+// caveat: save as UTF-8
+var telify_country_locale = [
+['U.S. Virgin Islands', 'Amerikanische Jungferninseln'],
+['Northern Mariana Islands', 'Nördliche Marianen'],
+['American Samoa', 'Amerikanisch-Samoa'],
+['Canada', 'Kanada'],
+['Antigua and Barbuda', 'Antigua und Barbuda'],
+['British Virgin Islands', 'Britische Junferninseln'],
+['Cayman Islands', 'Kaimaninseln'],
+['Dominican Republic', 'Dominikanische Republik'],
+['Jamaica', 'Jamaika'],
+['Saint Kitts and Nevis', 'Saint Kitts und Nevis'],
+['Saint Lucia', 'St. Lucia'],
+['Saint Vincent and the Grenadines', 'St. Vincent und die Grenadinen'],
+['Trinidad and Tobago', 'Trinidad und Tobago'],
+['Turks and Caicos Islands', 'Turks- und Caicosinseln'],
+['Egypt', 'Ägypten'],
+['Morocco', 'Marokko'],
+['Algeria', 'Algerien'],
+['Tunisia', 'Tunesien'],
+['Libya', 'Libyen'],
+['Mauritania', 'Mauretanien'],
+['Ivory Coast', 'Elfenbeinküste'],
+['Ghana', 'Gana'],
+['Chad', 'Tschad'],
+['Central African Republic', 'Zentralafrikanische Republik'],
+['Cameroon', 'Kamerun'],
+['Cape Verde', 'Kap Verde'],
+['São Tomé and Príncipe', 'São Tomé und Príncipe'],
+['Equatorial Guinea', 'Äquatorialguinea'],
+['Gabon', 'Gabun'],
+['Congo (Republic)', 'Kongo (Republik)'],
+['Congo (Democratic Republic)', 'Kongo (Demokratische Republik)'],
+['Ascension Island', 'Ascension'],
+['Seychelles', 'Seychellen'],
+['Rwanda', 'Ruanda'],
+['Ethiopia', 'Äthiopien'],
+['Djibouti', 'Dschibuti'],
+['Kenya', 'Kenia'],
+['Tanzania', 'Tansania'],
+['Mozambique', 'Mosambik'],
+['Zambia', 'Sambia'],
+['Madagascar', 'Madagaskar'],
+['Zimbabwe', 'Simbabwe'],
+['Botswana', 'Botsuana'],
+['Swaziland', 'Swasiland'],
+['Comoros', 'Komoren'],
+['South Africa', 'Südafrika'],
+['Saint Helena', 'St.Helena'],
+['Faroe Islands', 'Färöer'],
+['Greenland', 'Grönland'],
+['Greece', 'Griechenland'],
+['Netherlands', 'Niederlande'],
+['Belgium', 'Belgien'],
+['France', 'Frankreich'],
+['Spain', 'Spanien'],
+['Luxembourg', 'Luxemburg'],
+['Ireland', 'Irland'],
+['Iceland', 'Island'],
+['Albania', 'Albanien'],
+['Cyprus (South)', 'Zypern (Süden)'],
+['Finland', 'Finnland'],
+['Bulgaria', 'Bulgarien'],
+['Hungary', 'Ungarn'],
+['Lithuania', 'Litauen'],
+['Latvia', 'Lettland'],
+['Estonia', 'Estland'],
+['Moldova', 'Moldawien'],
+['Armenia', 'Armenien'],
+['Nagorno-Karabakh', 'Bergkarabach'],
+['Nagorno-Karabakh (Mobile)', 'Bergkarabach (Handynetz)'],
+['Belarus', 'Weißrussland'],
+['Kosovo (Mobile)', 'Kosovo (Handynetz)'],
+['Serbia', 'Serbien'],
+['Croatia', 'Kroatien'],
+['Slovenia', 'Slowenien'],
+['Kosovo (Mobile)', 'Kosovo (Handynetz)'],
+['Bosnia and Herzegovina', 'Bosnien und Herzegowina'],
+['Macedonia', 'Mazedonien'],
+['Italy and Vatican City', 'Italien und Vatikanstadt'],
+['Romania', 'Rumänien'],
+['Switzerland', 'Schweiz'],
+['Czech Republic', 'Tschechien'],
+['Slovakia', 'Slowakei'],
+['Austria', 'Österreich'],
+['United Kingdom', 'Großbritannien'],
+['Denmark', 'Dänemark'],
+['Sweden', 'Schweden'],
+['Norway', 'Norwegen'],
+['Poland', 'Polen'],
+['Germany', 'Deutschland'],
+['Falkland Islands', 'Falklandinseln'],
+['Saint-Pierre and Miquelon', 'Saint-Pierre und Miquelon'],
+['Mexico', 'Mexiko'],
+['Cuba', 'Kuba'],
+['Argentina', 'Argentinien'],
+['Brazil', 'Brasilien'],
+['Colombia', 'Kolumbien'],
+['Bolivia', 'Bolivien'],
+['French Guiana', 'Französisch-Guayana'],
+['Suriname', 'Surinam'],
+['Netherlands Antilles', 'Niederländische Antillen'],
+['Malaysia', 'Malaisia'],
+['Australia', 'Australien'],
+['Indonesia', 'Indonesien'],
+['Philippines', 'Philippinen'],
+['New Zealand', 'Neuseeland'],
+['Singapore', 'Singapur'],
+['East Timor', 'Ost-Timor'],
+['Australian external territories', 'Australische Außengebiete'],
+['Papua New Guinea', 'Papua-Neuguinea'],
+['Solomon Islands', 'Salomonen'],
+['Fiji', 'Fidschi'],
+['Wallis and Futuna', 'Wallis und Futuna'],
+['Cook Islands', 'Cook-Inseln'],
+['Niue Island', 'Niue'],
+['New Caledonia', 'Neukaledonien'],
+['French Polynesia', 'Französisch-Polynesien'],
+['Micronesia', 'Mikronesien'],
+['Marshall Islands', 'Marshallinseln'],
+['Russia', 'Russland'],
+['Kazakhstan', 'Kasachstan'],
+['South Korea', 'Südkorea'],
+['North Korea', 'Nordkorea'],
+['Hong Kong', 'Hongkong'],
+['Macau', 'Macao'],
+['Cambodia', 'Kambodscha'],
+['Inmarsat (Atlantic East)', 'Inmarsat (Ostatlantik)'],
+['Inmarsat (Pacific)', 'Inmarsat (Pazifik)'],
+['Inmarsat (Indian)', 'Inmarsat (Indien)'],
+['Inmarsat (Atlantic West)', 'Inmarsat (Westatlantik)'],
+['Bangladesh', 'Bangladesch'],
+['Global Mobile Satellite System', 'Globales mobiles Satellitensystem'],
+['International Networks', 'Internationale Netzwerke'],
+['Turkey', 'Türkei'],
+['Cyprus (North)', 'Zypern (Nord)'],
+['India', 'Indien'],
+['Maldives', 'Malediven'],
+['Lebanon', 'Libanon'],
+['Jordan', 'Jordanien'],
+['Syria', 'Syrien'],
+['Iraq', 'Irak'],
+['Saudi Arabia', 'Saudi Arabien'],
+['Yemen', 'Jemen'],
+['United Arab Emirates', 'Vereinigte Arabische Emirate'],
+['Bahrain', 'Barain'],
+['Qatar', 'Katar'],
+['Bhutan', 'Butan'],
+['Mongolia', 'Mongolei'],
+['Tajikistan', 'Tadschikistan'],
+['Azerbaijan', 'Aserbaidschan'],
+['Georgia', 'Georgien'],
+['Kyrgyzstan', 'Kirgisistan'],
+['Uzbekistan', 'Usbekistan'],
+['Guantanamo Bay', 'Guantanamo'],
+['Midway Island', 'Midway Inseln'],
+['Vatican City', 'Vatikanstadt'],
+];
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/locale/de-DE/custom_preset.js b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/locale/de-DE/custom_preset.js
new file mode 100644
index 0000000000000000000000000000000000000000..7f248be61dd3df535a0d4d0d23404feb3d520058
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/locale/de-DE/custom_preset.js
@@ -0,0 +1,8 @@
+/* (c)2009 Michael Koch
+*/
+
+/* name, url, parameter #1, parameter #2, parameter #3 */
+var telify_custom_preset = [
+ ["", "", "Parameter #1", "Parameter #2", "Parameter #3"],
+ ["Vorlage für snom-Telefone", "http://$1/command.htm?number=$0&outgoing_uri=$2", "Telefon-IP", "Ausgehende URI", ""],
+];
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/locale/de-DE/lang.dtd b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/locale/de-DE/lang.dtd
new file mode 100644
index 0000000000000000000000000000000000000000..797fd04dcf40dce7fb7f609244f43e7e6fe84b61
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/locale/de-DE/lang.dtd
@@ -0,0 +1,39 @@
+<!ENTITY menu.edit_number "Telefonnummer bearbeiten">
+<!ENTITY menu.selection "Rufnummernauswahl">
+<!ENTITY menu.config "Einstellungen">
+<!ENTITY menu.onlinehelp "Online-Hilfe">
+<!ENTITY dialog.edit.title "Telefonnummer bearbeiten">
+<!ENTITY dialog.edit.code "Vorwahl">
+<!ENTITY dialog.edit.country "Land">
+<!ENTITY dialog.edit.dial "Wählen">
+<!ENTITY dialog.config.title "Telify-Einstellungen">
+<!ENTITY dialog.config.general "Allgemeine Einstellungen">
+<!ENTITY dialog.config.custom "Eigene URL">
+<!ENTITY dialog.config.about "Info">
+<!ENTITY dialog.config.replaces "Ersetzt">
+<!ENTITY dialog.config.in_template "in der Vorlage">
+<!ENTITY dialog.config.empty_url "Vorlage unten eingeben oder aus der Liste auswählen">
+<!ENTITY dialog.config.idd_prefix "Ersetze '+' durch">
+<!ENTITY dialog.config.hreftype "Verwendetes Protokoll">
+<!ENTITY dialog.config.hreftype0 "tel:">
+<!ENTITY dialog.config.hreftype1 "callto:">
+<!ENTITY dialog.config.hreftype2 "skype:">
+<!ENTITY dialog.config.hreftype3 "sip:">
+<!ENTITY dialog.config.hreftype_custom "Eigene URL">
+<!ENTITY dialog.config.dialcc "Bei vorhandener Landesvorwahl">
+<!ENTITY dialog.config.dialcc_menu "Öffne Menu">
+<!ENTITY dialog.config.dialcc_direct "Wähle direkt">
+<!ENTITY dialog.config.highlight "Texthervorhebung">
+<!ENTITY dialog.config.highlight0 "Keine">
+<!ENTITY dialog.config.highlight1 "Leicht">
+<!ENTITY dialog.config.highlight2 "Mittel">
+<!ENTITY dialog.config.highlight3 "Stark">
+<!ENTITY dialog.config.num_history "Anzahl der Nummerneinträge">
+<!ENTITY dialog.config.statusicon "Status-Icon anzeigen">
+<!ENTITY dialog.config.statusicon0 "Nein">
+<!ENTITY dialog.config.statusicon1 "Ja">
+<!ENTITY dialog.config.opentype "Öffne Link">
+<!ENTITY dialog.config.opentype0 "im Hintergrund">
+<!ENTITY dialog.config.opentype1 "in einem neuen Fenster">
+<!ENTITY dialog.config.opentype2 "in einem neuen Tab ohne Fokus">
+<!ENTITY dialog.config.opentype3 "in einem neuen Tab mit Fokus">
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/locale/de-DE/lang.properties b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/locale/de-DE/lang.properties
new file mode 100644
index 0000000000000000000000000000000000000000..52c37336e6fbfb04829831cb42b8bf9929c824d3
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/locale/de-DE/lang.properties
@@ -0,0 +1,13 @@
+leave_blank=
+converted=Konvertiert
+telify_active=Telify ist aktiv
+telify_inactive=Telify ist inaktiv
+telify_activate=Telify aktivieren
+telify_deactivate=Telify deaktivieren
+call_arg=$1 anrufen
+host_active_arg=Auf $1 aktivieren
+host_inactive_arg=Auf $1 deaktivieren
+link_title=Wählbare Rufnummer
+country_code=Landesvorwahl
+empty_url=Vorlage unten eingeben oder aus der Liste auswählen
+phonenr_tmpl=[TelNr]
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/locale/de-DE/locale.js b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/locale/de-DE/locale.js
new file mode 100644
index 0000000000000000000000000000000000000000..539c6126e6c459e0acecc121155d405ea03a6b0a
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/locale/de-DE/locale.js
@@ -0,0 +1,25 @@
+/* (c)2009 Michael Koch
+*/
+
+var objTelifyLocale = {
+
+openOnlineHelp: function()
+{
+ var browser = objTelifyUtil.getBrowser();
+ var tab = browser.addTab("http://www.codepad.de/de/download/firefox-add-ons/telify.html");
+ browser.selectedTab = tab;
+},
+
+msgNumberTemplateMissing: function()
+{
+ return "Ihre Vorlage enthält keinen Platzhalter für die Telefonnummer (d.h. '$0') und wird deshalb keine Telefonnummer übermitteln. "
+ + "Wollen Sie das wirklich?";
+},
+
+msgUnknownProtocol: function()
+{
+ return "Im diesem System ist keine Anwendung installiert, die sich für das verwendete Protokoll registriert hat. "
+ + "Bitte stellen Sie in der Telify-Konfiguration ein geeignetes Protokoll ein oder installieren Sie eine geeignete Anwendung.";
+}
+
+}
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/locale/en-US/country_locale.js b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/locale/en-US/country_locale.js
new file mode 100644
index 0000000000000000000000000000000000000000..8d0143c5c15e061727e83655aa800824acfe78f5
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/locale/en-US/country_locale.js
@@ -0,0 +1,3 @@
+var telify_country_locale = [
+/* for en-US this is empty */
+];
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/locale/en-US/custom_preset.js b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/locale/en-US/custom_preset.js
new file mode 100644
index 0000000000000000000000000000000000000000..e8d3b6be973d7adba081867a9ca0b0fadb2265ea
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/locale/en-US/custom_preset.js
@@ -0,0 +1,8 @@
+/* (c)2009 Michael Koch
+*/
+
+/* name, url, parameter #1, parameter #2, parameter #3 */
+var telify_custom_preset = [
+ ["", "", "Parameter #1", "Parameter #2", "Parameter #3"],
+ ["snom phones template", "http://$1/command.htm?number=$0&outgoing_uri=$2", "Telefon-IP", "Ausgehende URI", ""],
+];
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/locale/en-US/lang.dtd b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/locale/en-US/lang.dtd
new file mode 100644
index 0000000000000000000000000000000000000000..7dd845151d32971ad402b73a451fb68d9e2b1cf4
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/locale/en-US/lang.dtd
@@ -0,0 +1,39 @@
+<!ENTITY menu.edit_number "Edit phone number">
+<!ENTITY menu.selection "Phone number selection">
+<!ENTITY menu.config "Preferences">
+<!ENTITY menu.onlinehelp "Online Help">
+<!ENTITY dialog.edit.title "Edit phone number">
+<!ENTITY dialog.edit.code "Code">
+<!ENTITY dialog.edit.country "Country">
+<!ENTITY dialog.edit.dial "Dial">
+<!ENTITY dialog.config.title "Telify Preferences">
+<!ENTITY dialog.config.general "General Settings">
+<!ENTITY dialog.config.custom "Custom URL">
+<!ENTITY dialog.config.about "About">
+<!ENTITY dialog.config.replaces "Replaces">
+<!ENTITY dialog.config.in_template "in template string">
+<!ENTITY dialog.config.idd_prefix "Replace '+' with">
+<!ENTITY dialog.config.hreftype "Used protocol">
+<!ENTITY dialog.config.hreftype0 "tel:">
+<!ENTITY dialog.config.hreftype1 "callto:">
+<!ENTITY dialog.config.hreftype2 "skype:">
+<!ENTITY dialog.config.hreftype3 "sip:">
+<!ENTITY dialog.config.hreftype_custom "Custom URL">
+<!ENTITY dialog.config.dialcc "When number has country code">
+<!ENTITY dialog.config.dialcc_menu "open menu">
+<!ENTITY dialog.config.dialcc_direct "dial directly">
+<!ENTITY dialog.config.highlight "Text highlighting">
+<!ENTITY dialog.config.highlight0 "None">
+<!ENTITY dialog.config.highlight1 "Light">
+<!ENTITY dialog.config.highlight2 "Medium">
+<!ENTITY dialog.config.highlight3 "Strong">
+<!ENTITY dialog.config.num_history "Number of recent country codes">
+<!ENTITY dialog.config.statusicon "Status icon">
+<!ENTITY dialog.config.statusicon0 "Hide">
+<!ENTITY dialog.config.statusicon1 "Show">
+<!ENTITY dialog.config.opentype "Open link">
+<!ENTITY dialog.config.opentype0 "silently in the background">
+<!ENTITY dialog.config.opentype1 "in a new window">
+<!ENTITY dialog.config.opentype2 "in a new tab without focus">
+<!ENTITY dialog.config.opentype3 "in a new tab with focus">
+
\ No newline at end of file
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/locale/en-US/lang.properties b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/locale/en-US/lang.properties
new file mode 100644
index 0000000000000000000000000000000000000000..ce7ed93d4997f6b269a4da7a70a15ffec20e8425
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/locale/en-US/lang.properties
@@ -0,0 +1,13 @@
+leave_blank=
+converted=Converted
+telify_active=Telify is active
+telify_inactive=Telify is inactive
+telify_activate=Activate Telify
+telify_deactivate=Deactivate Telify
+call_arg=Call $1
+host_active_arg=Activate on $1
+host_inactive_arg=Deactivate on $1
+link_title=phone number
+country_code=Country Code
+empty_url=Enter template below or choose from the list
+phonenr_tmpl=[phonenr]
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/locale/en-US/locale.js b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/locale/en-US/locale.js
new file mode 100644
index 0000000000000000000000000000000000000000..5240f8585d315d5a39fa0e7bac4a807f99d3d7a5
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/chrome/locale/en-US/locale.js
@@ -0,0 +1,25 @@
+/* (c)2009 Michael Koch
+*/
+
+var objTelifyLocale = {
+
+openOnlineHelp: function()
+{
+ var browser = objTelifyUtil.getBrowser();
+ var tab = browser.addTab("http://www.codepad.de/en/download/firefox-add-ons/telify.html");
+ browser.selectedTab = tab;
+},
+
+msgNumberTemplateMissing: function()
+{
+ return "Your template does not contain a placeholder for the phone number (i.e. '$0') and will therefore not transmit a phone number. "
+ + "Do you really want to continue?";
+},
+
+msgUnknownProtocol: function()
+{
+ return "No application is installed which registered itself for the used protocol. "
+ + "Please configure a suitable protocol in the Telify preferences or install a suitable application.";
+}
+
+}
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/defaults/preferences/preferences.js b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/defaults/preferences/preferences.js
new file mode 100644
index 0000000000000000000000000000000000000000..b0bb58542d7bf77b8af405187f0174a00a620341
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/defaults/preferences/preferences.js
@@ -0,0 +1,18 @@
+pref("telify.settings.blacklist", "");
+pref("telify.settings.highlight", 25);
+pref("telify.settings.debug", false);
+pref("telify.settings.active", true);
+pref("telify.settings.exclude", "a,applet,map,select,script,textarea");
+pref("telify.settings.statusicon", true);
+pref("telify.settings.linktype", 0);
+pref("telify.settings.colsortcc", 1);
+pref("telify.settings.num_history", 5);
+pref("telify.settings.idd_prefix", "");
+pref("telify.settings.custom_url", "");
+pref("telify.settings.custom_tmpl", 0);
+pref("telify.settings.custom_param1", "");
+pref("telify.settings.custom_param2", "");
+pref("telify.settings.custom_param3", "");
+pref("telify.settings.custom_opentype", 3);
+pref("telify.settings.dont_escape_plus", false);
+pref("telify.settings.dial_cc_direct", false);
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/install.rdf b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/install.rdf
new file mode 100644
index 0000000000000000000000000000000000000000..5128cb4f705a03d9e13df17e06a9472d8e09cc73
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/mozilla-telify-sflphone/usr/share/telify/install.rdf
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+ <Description about="urn:mozilla:install-manifest">
+ <em:id>{6c5f349a-ddda-49ad-bdf0-326d3fe1f938}</em:id>
+ <em:extension>true</em:extension>
+ <em:iconURL>chrome://telify/content/icon32.png</em:iconURL>
+ <em:version>0.4.7.3</em:version>
+ <em:creator>Michael Koch</em:creator>
+ <em:homepageURL>http://www.codepad.de/</em:homepageURL>
+ <em:optionsURL>chrome://telify/content/config.xul</em:optionsURL>
+
+ <em:localized>
+ <Description>
+ <em:locale>de-DE</em:locale>
+ <em:name>Telify</em:name>
+ <em:description>Erzeugt klickbare Links aus Telefonnummern</em:description>
+ </Description>
+ </em:localized>
+
+ <em:localized>
+ <Description>
+ <em:locale>en-US</em:locale>
+ <em:name>Telify</em:name>
+ <em:description>Converts telephone numbers into clickable links</em:description>
+ </Description>
+ </em:localized>
+
+ <!-- Firefox -->
+ <em:targetApplication>
+ <Description>
+ <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
+ <em:minVersion>3.0</em:minVersion>
+ <em:maxVersion>3.6.*</em:maxVersion>
+ </Description>
+ </em:targetApplication>
+ </Description>
+</RDF>
\ No newline at end of file
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/postinst b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/postinst
new file mode 100755
index 0000000000000000000000000000000000000000..1039df3268eae8fca20a728add6c4939f7494360
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/postinst
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+gconftool-2 --direct --config-source xml::/etc/gconf/gconf.xml.defaults -t string -s /desktop/gnome/url-handlers/tel/command "/usr/bin/sflphone-handler %s"
+gconftool-2 --direct --config-source xml::/etc/gconf/gconf.xml.defaults -s /desktop/gnome/url-handlers/tel/needs_terminal false -t bool
+gconftool-2 --direct --config-source xml::/etc/gconf/gconf.xml.defaults -t bool -s /desktop/gnome/url-handlers/tel/enabled true
+
+gconftool-2 --direct --config-source xml::/etc/gconf/gconf.xml.defaults -t string -s /desktop/gnome/url-handlers/callto/command "/usr/bin/sflphone-handler %s"
+gconftool-2 --direct --config-source xml::/etc/gconf/gconf.xml.defaults -s /desktop/gnome/url-handlers/callto/needs_terminal false -t bool
+gconftool-2 --direct --config-source xml::/etc/gconf/gconf.xml.defaults -t bool -s /desktop/gnome/url-handlers/callto/enabled true
+
+gconftool-2 --direct --config-source xml::/etc/gconf/gconf.xml.defaults -t string -s /desktop/gnome/url-handlers/sip/command "/usr/bin/sflphone-handler %s"
+gconftool-2 --direct --config-source xml::/etc/gconf/gconf.xml.defaults -s /desktop/gnome/url-handlers/sip/needs_terminal false -t bool
+gconftool-2 --direct --config-source xml::/etc/gconf/gconf.xml.defaults -t bool -s /desktop/gnome/url-handlers/sip/enabled true
+
+exit 0
+
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/rules b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/rules
new file mode 100755
index 0000000000000000000000000000000000000000..0e8b875eb41ef0f3b085984d5b6f7cdde67c6181
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/rules
@@ -0,0 +1,56 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+
+VERSION="0.4.7.3"
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+ touch configure-stamp
+
+build: configure-stamp build-stamp
+build-stamp:
+ dh_testdir
+
+ echo ${DIR}
+ umask 0022
+ mkdir -p tmp/telify
+ unzip telify-${VERSION}-fx.xpi -d tmp/telify
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+ dh_clean
+
+ rm -rf tmp
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_prep
+ dh_installdirs
+ dh_install
+
+# Build architecture-independent files here.
+binary-indep: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs -i
+ dh_link -i
+ dh_compress -XMPL -i
+ dh_fixperms -i
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch: build install
+# We have nothing to do by default.
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/tools/build-system/launchpad/mozilla-telify-sflphone/debian/watch b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/watch
new file mode 100644
index 0000000000000000000000000000000000000000..74d5ff27773e694ea8f295be016733cf2ab260ed
--- /dev/null
+++ b/tools/build-system/launchpad/mozilla-telify-sflphone/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://www.codepad.de/en/telify.html /download/telify-(.*)-fx.xpi
diff --git a/tools/build-system/launchpad/sflphone-client-gnome/debian/changelog b/tools/build-system/launchpad/sflphone-client-gnome/debian/changelog
index c6bec4586d4b6391b32588c2eb5265f2bdbce8c6..8021fb0d7d0b35eb2d8330c906baee884e297e43 100644
--- a/tools/build-system/launchpad/sflphone-client-gnome/debian/changelog
+++ b/tools/build-system/launchpad/sflphone-client-gnome/debian/changelog
@@ -1,6 +1,165 @@
-sflphone-client-gnome (0.9.7~beta~ppa1~karmic) karmic; urgency=low
+sflphone-client-gnome (0.9.7~rc1~ppa1~SYSTEM) SYSTEM; urgency=low
+
+ ** 0.9.7~rc1~ppa1~SYSTEM **
+
+ * [#2462] Set explicitly the transport on incoming call too
+ * [#2462] fix typo
+ * [#2462] Use different address for SDP and call IP
+ * [#2462] Use published address in SIP-SDP
+ * [#2181] Fixed changelog files
+ * [#2181] Updated spec file
+ * [#2402] Fix pointer to int conversion warning (atoi)
+ * [#2402] Remove daemon warnings, make indent
+ * [#2459] Make sure the stream is opened when the call is answered
+ * [#2402] Add conference related picture in documentation
+ * [#2443] Not much ...
+ * [#2399] Fix dialing display problem
+ * [#2450] Fix incoming call already in conference crash
+ * [#2399] Display peer name on the first line and peer number on the
+ second
+ * [#2450] Handle 403 FORBIDDEN when refused
+ * [#2447] Bind offHold/onHold actions to button in gtk client
+ * [#2447] Bind hangup action to button for conference
+ * [#2447] Add conference action in gtk client's ToolBar
+ * [#2381] Disable the password hashing in config file
+ * [#2402] Cleanup
+ * [#2366] Set callback to null when deleting Pulseaudio streams
+ * [#1313] Fix main buffer unit test
+ * [#1313] Fix audio layer unit test
+ * [#2315] Hide pw in security tab, display when editing, sync with
+ basic tab
+ * [#1313] UnitTest change AudioRtpSession for AudioSymetricRtpSession
+ instance
+ * [#2402] Code cleanup
+ * [#2444] Add debug to catch occasional crash when loading client's
+ config
+ * [#2444] Add debug info to catch occasional crash when loading config
+ dialog
+ * [#2402] Restore Call menu translations
+ * [#2403] Use the published address if checked in GUI
+ * [#2442] Add protection test in sdp
+ * [#1841] Reapply pjsip patch concerning DNS SRV resolution
+ * [#2384] Tags incoming call as direct SIP call, if applicable
+ * [#2402] Change the monkey face
+ * [#2315] Enable user to display password in clear text
+ * [#2434] Force optimization level at 2
+ * [#2284] Fix dbus_get_all_ip_interface compilation warnings
+ * [#2431] Popup main window on incoming if applicable
+ * [$2402] Fix simple warnings
+ * [#2402] Fix implicit variable init order in LibraryManagerException
+ * [#2402] Fixing implicit variable initialization warnings in
+ AudioRtpSession
+ * [#2402] Revert atoi change, fixing codec list doubled entries
+ * [#2402] Fix gpointer to gint conversion
+ * [#2402] Fix pointer casting to integer different size warning in
+ codec list
+ * [#2402] Fix warning discarting qualifiers from pointer target
+ * [#2402] Fix gtk tree view assignement from incompatible type warning
+ * [#1669] Fix audio recording folder utf-8 non compatibility issue
+ * [#2414] Clean up debugs
+ * [#2414] Use transport set in iptoip Account and update it frm
+ preference
+ * [#2348] Use macro N_() to mark ui.xml strings as translatable
+ * [#2414] Rename getSipAddress/setSipAddress functions
+ * [#2407] Fix volume controls display
+ * [#2407] Fixes dialpad
+ * [#2383] Set ip to ip config when clicking apply button
+ * [#2404] Update call-to script - Maxime Chambreuil
+ * [#2405] Client handles unknown call in current state as well
+ * [#2383] Add DBUS signal to send IPtoIP local address and port as
+ string
+ * [#2383] Add Ip to IP config change apply call back
+ * Clonflict
+ * [#2402] Code cleanup
+ * [#2383] Do the same for IPtoIP (init localn ip with first in the
+ list)
+ * [#2383] Use first interface in the list if local addresss is not
+ defined
+ * [#2403] Clean up unuseful addresses/ports
+ * [#2403] Use the IP profile SIP port as global SIP port
+ * [#2383] Fix dbus_get_all_ip_interface warnings
+ * [#2383] Take into account sameAsLocal when loading published address
+ * [#2383] Tsake into account sameAsLocal option when saving published
+ address
+ * [#2383] Update local ip address in ip to ip config
+ * [#2383] Save ip 2 ip local port in config
+ * [#2406] Update toolbar at startup
+ * [#2284] Remove redefinition warnings + speex warnings
+ * [#2383] Fix security table in account config
+ * [#2383] Save ip 2 ip network interface parameters in config
+ * [#2403] Restore sip transport selector
+ * [#2383] Fix filling the Localt IP Address on account creation
+ * [#2383] Fix Gtk-Critical when checking STUN
+ * [#2383] Fix reopening account configuration display issue
+ * [#2383] Load IPtoIP local address and port in preference iptoiptab
+ * [#2383] Add LocalAddress and Localport in Preference IpToIp tab
+ * [#2403] Use the address and port associated to the account as often
+ as possible
+ * [#1753] Removed pjsip generated files
+ * [#1753] Removed remaining milenage lib references
+ * [#2383] Add _publishedSameasLocal variable in sipaccount
+ * [#2383] Add PUBLISHED_SAMEAS_LOCAL variable in config
+ * [#2383] Fix stun set active or not when opening config
+ * [#2181] Added RPM 64bits dbus patch
+ * [#2402] Code indentation
+ * [#2313] Force $(HOME).cache directory creation at startup
+ * [#2383] Separate network interface and published address in account
+ config
+ * [#2400] Change dbus service installation path to libdir
+ * [#2382] Move TLS related published address options in security tab
+ * [#2382] Indent accountconfigdialog.c
+ * [#2181] Install libdbus-c++ in $pkglib instead of $lib
+ * [#1753] Remove ILBC code and disable it by default in the configure
+ * [#1753] Remove milenage directory
+ * [#2382] Fix switching interaface instabilities
+ * [#2396] Save local ip in account creation wizard
+ * [#2284] Remove warning on hold
+ * [#2387] Fixes history searching and filtering
+ * [#1215] Add samplerate display in the GUI
+ * [#1663] Voicemail icon reflects voice messages
+ * [#2395] Fix account registration ( specifically with callcentric)
+ * [#2386] Strip "sip:" on incoming call, fixing history call back
+ * [#2181] Updated spec files
+ * [#1215] Display codec name in calltree instead of status bar
+ * [#2390] Move back nbCalls and stopStream higher in refuseCall
+ * [#2392] Fix ringtone during call in IAX
+ * [#2391] Stop audio streams when there is 0 calls only
+ * [#2391] Add debug when call state is not valid
+ * [#2390] Clear returns in IAXvoipLink::sendAudioFromMic() method
+ * [#2380] Fixing IncomingCallNotification not regular
+ * [#2339] Query conference at client startup
+ * [#2339] Working conference querying at startup
+ * [#2339] Add conference in call tree
+ * [#2339] Primitives to query conferences at client startup
+ * [#2320] Add account selection in history
+ * [#2355] Temporary solution: do not delete pointer when removing
+ account
+ * [#2380] Change algorithm in AudioRtp to trigger an
+ IncomingCallNotification
+ * [#2274] Comment sdebug in MainBuffer flush method
+ * [#2274] Add flushMain() in ManagerImpl::addStream
+ * [#2274] Add getBufferID() method in ring buffer
+ * [#2274] Fix warning, comment debug in ringbuffer's flush method
+ * [#2274] Use AudioLayer flushMain() and flushUrgent() in ALSA
+ * [#2274] Clean up unused variable warning
+ * [#2274] Protect minbudffer pointer on flushing
+ * [#2274] Fix playATone method which writing empty buffer in urgent
+ ringbuffer
+ * [#2274] Use audio layer flushUrgent and flushMain in createStreams
+ * [#2274] Use flush audio calls from audiolayer
+ * [#2274] Flush when peer answered call
+ * [#2375] Flush main buffer in iax when answering a call
+ * [#2274] Parse displayname using c++ string method
+ * [#2375] Flush main buffer when off holding calls
+ * [#2375] Flush main buffer mon RTP startup
+ * [#2376] Use now Pulseaudio module-cork-music-on-phone
+ * Updated OSC packaging
+
+ -- Julien Bonjean <julien.bonjean@savoirfairelinux.com> Fri, 20 Nov 2009 13:59:02 -0500
+
+sflphone-client-gnome (0.9.7~beta~ppa1~SYSTEM) SYSTEM; urgency=low
- ** 0.9.7~beta~ppa1~karmic **
+ ** 0.9.7~beta~ppa1~SYSTEM **
* [#1933] Cleanup debug
* [#1933] Clean up debug
@@ -567,7 +726,7 @@ sflphone-client-gnome (0.9.7~beta~ppa1~karmic) karmic; urgency=low
-- Julien Bonjean <julien.bonjean@savoirfairelinux.com> Fri, 06 Nov 2009 11:20:01 -0500
-sflphone-client-gnome (0.9.6-SYSVER) karmic; urgency=low
+sflphone-client-gnome (0.9.6-SYSTEM) SYSTEM; urgency=low
** 0.9.6 **
@@ -634,7 +793,7 @@ sflphone-client-gnome (0.9.6-SYSVER) karmic; urgency=low
-- SFLphone Automatic Build System <team@sflphone.org> Mon, 27 Jul 2009 09:53:19 -0400
-sflphone-client-gnome (0.9.6~rc2-SYSVER) karmic; urgency=low
+sflphone-client-gnome (0.9.6~rc2-SYSTEM) SYSTEM; urgency=low
** 0.9.6~rc2 **
@@ -689,7 +848,7 @@ sflphone-client-gnome (0.9.6~rc2-SYSVER) karmic; urgency=low
-- SFLphone Automatic Build System <team@sflphone.org> Fri, 17 Jul 2009 19:12:58 -0400
-sflphone-client-gnome (0.9.6~rc1-SYSVER) karmic; urgency=low
+sflphone-client-gnome (0.9.6~rc1-SYSTEM) SYSTEM; urgency=low
** 0.9.6~rc1 **
@@ -797,7 +956,7 @@ sflphone-client-gnome (0.9.6~rc1-SYSVER) karmic; urgency=low
-- SFLphone Automatic Build System <team@sflphone.org> Fri, 10 Jul 2009 15:50:26 -0400
-sflphone-client-gnome (0.9.6~beta-SYSVER) karmic; urgency=low
+sflphone-client-gnome (0.9.6~beta-SYSTEM) SYSTEM; urgency=low
** 0.9.6~beta **
@@ -1092,7 +1251,7 @@ sflphone-client-gnome (0.9.6~beta-SYSVER) karmic; urgency=low
-- SFLphone Automatic Build System <team@sflphone.org> Tue, 23 Jun 2009 11:13:42 -0400
-sflphone-client-gnome (0.9.5-SYSVER) karmic; urgency=low
+sflphone-client-gnome (0.9.5-SYSTEM) SYSTEM; urgency=low
** 0.9.5 release **
@@ -1123,7 +1282,7 @@ sflphone-client-gnome (0.9.5-SYSVER) karmic; urgency=low
-- SFLphone Automatic Build System <team@sflphone.org> Mon, 25 May 2009 11:34:48 -0400
-sflphone-client-gnome (0.9.5-SYSVER~rc2) karmic; urgency=low
+sflphone-client-gnome (0.9.5-SYSTEM~rc2) SYSTEM; urgency=low
** 0.9.5 rc2 **
@@ -1177,7 +1336,7 @@ sflphone-client-gnome (0.9.5-SYSVER~rc2) karmic; urgency=low
-- SFLphone Automatic Build System <team@sflphone.org> Tue, 19 May 2009 12:08:18 -0400
-sflphone-client-gnome (0.9.5-0ubuntu1~rc1) karmic; urgency=low
+sflphone-client-gnome (0.9.5-0ubuntu1~rc1) SYSTEM; urgency=low
[ SFLphone Project ]
* [#1262] Updated changelogs for version 0.9.5-0ubuntu1 Snapshot 2009-
@@ -1206,7 +1365,7 @@ sflphone-client-gnome (0.9.5-0ubuntu1~rc1) karmic; urgency=low
-- Sflphone Project <sflphone@mtl.savoirfairelinux.net> Tue, 05 May 2009 19:16:13 -0400
-sflphone-client-gnome (0.9.5-0ubuntu1~beta) karmic; urgency=low
+sflphone-client-gnome (0.9.5-0ubuntu1~beta) SYSTEM; urgency=low
[ Julien Bonjean ]
* Updated Eclipse stuff
@@ -1428,7 +1587,7 @@ sflphone-client-gnome (0.9.5-0ubuntu1~beta) karmic; urgency=low
-- Sflphone Project <sflphone@mtl.savoirfairelinux.net> Mon, 27 Apr 2009 17:00:03 -0400
-sflphone-client-gnome (0.9.4-0ubuntu2) karmic; urgency=low
+sflphone-client-gnome (0.9.4-0ubuntu2) SYSTEM; urgency=low
[ Alexandre Savard ]
* Restore speex and GSM detection
@@ -1438,7 +1597,7 @@ sflphone-client-gnome (0.9.4-0ubuntu2) karmic; urgency=low
-- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Wed, 8 Apr 2009 11:29:15 -0500
-sflphone (0.9.4-0ubuntu1) karmic; urgency=low
+sflphone (0.9.4-0ubuntu1) SYSTEM; urgency=low
[ Emmanuel Milou ]
* Integrate DBus-c++ and libiax2 in the main build system
@@ -1463,7 +1622,7 @@ sflphone (0.9.4-0ubuntu1) karmic; urgency=low
-- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Fri, 3 Apr 2009 18:29:15 -0500
-sflphone (0.9.4-rc1) karmic; urgency=low
+sflphone (0.9.4-rc1) SYSTEM; urgency=low
[ Emmanuel Milou ]
* Fix bug while trying to hold/unhold several simultaneous call
@@ -1477,7 +1636,7 @@ sflphone (0.9.4-rc1) karmic; urgency=low
-- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Fri, 27 Mar 2009 18:29:15 -0500
-sflphone (0.9.4-0beta1) karmic; urgency=low
+sflphone (0.9.4-0beta1) SYSTEM; urgency=low
[ Alexandre Savard ]
* Display codec used during conversation on the GUI
@@ -1493,7 +1652,7 @@ sflphone (0.9.4-0beta1) karmic; urgency=low
-- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Fri, 20 Mar 2009 18:29:15 -0500
-sflphone (0.9.3-0ubuntu3) karmic; urgency=low
+sflphone (0.9.3-0ubuntu3) SYSTEM; urgency=low
[ Alexandre Savard ]
* Both playback and record streams in PA_STREAM_CORKED (pulseaudio)
@@ -1518,7 +1677,7 @@ sflphone (0.9.3-0ubuntu3) karmic; urgency=low
-- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Sat, 14 Feb 2009 13:29:15 -0500
-sflphone (0.9.3-0ubuntu2) karmic; urgency=low
+sflphone (0.9.3-0ubuntu2) SYSTEM; urgency=low
[ Emmanuel Milou ]
* Add compilation note in README
@@ -1587,7 +1746,7 @@ sflphone (0.9.3-0ubuntu2) karmic; urgency=low
-- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Sat, 14 Feb 2009 13:29:15 -0500
-sflphone (0.9.3-0ubuntu1) karmic; urgency=low
+sflphone (0.9.3-0ubuntu1) SYSTEM; urgency=low
* Remove debug
* Join thread before leaving
@@ -1600,7 +1759,7 @@ sflphone (0.9.3-0ubuntu1) karmic; urgency=low
-- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Fri, 06 Feb 2009 19:17:32 -0500
-sflphone (0.9.2-2ubuntu9) karmic; urgency=low
+sflphone (0.9.2-2ubuntu9) SYSTEM; urgency=low
[ Alexandre Savard ]
* Speex audio codec preprocessing initialization
@@ -1628,7 +1787,7 @@ sflphone (0.9.2-2ubuntu9) karmic; urgency=low
-- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Thu, 05 Feb 2009 18:27:53 -0500
-sflphone (0.9.2-2ubuntu8) karmic; urgency=low
+sflphone (0.9.2-2ubuntu8) SYSTEM; urgency=low
[ Emmanuel Milou ]
* Update changelogs
@@ -1672,7 +1831,7 @@ sflphone (0.9.2-2ubuntu8) karmic; urgency=low
-- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Wed, 04 Feb 2009 14:00:30 -0500
-sflphone (0.9.2-2ubuntu7) karmic; urgency=low
+sflphone (0.9.2-2ubuntu7) SYSTEM; urgency=low
[ Emmanuel Milou ]
* Update changelog to 0.9.2-6
@@ -1694,7 +1853,7 @@ sflphone (0.9.2-2ubuntu7) karmic; urgency=low
-- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Fri, 23 Jan 2009 17:48:13 -0500
-sflphone (0.9.2-2ubuntu6) karmic; urgency=low
+sflphone (0.9.2-2ubuntu6) SYSTEM; urgency=low
[ Emmanuel Milou ]
* Migrate STUN configuration to the main config window
@@ -1728,7 +1887,7 @@ sflphone (0.9.2-2ubuntu6) karmic; urgency=low
-- Emmanuel Milou <manu@sulfur.inside.savoirfairelinux.net> Fri, 16 Jan 2009 18:19:05 -0500
-sflphone (0.9.2-2ubuntu5) karmic; urgency=low
+sflphone (0.9.2-2ubuntu5) SYSTEM; urgency=low
* Fix memory leak in the pulseaudio callback
* Update debian package generation script
@@ -1744,7 +1903,7 @@ sflphone (0.9.2-2ubuntu5) karmic; urgency=low
-- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Wed, 14 Jan 2009 21:17:20 -0500
-sflphone (0.9.2-2ubuntu4) karmic; urgency=low
+sflphone (0.9.2-2ubuntu4) SYSTEM; urgency=low
[ Emmanuel Milou ]
* add german translation
@@ -1754,7 +1913,7 @@ sflphone (0.9.2-2ubuntu4) karmic; urgency=low
-- Yun Liu <yun.liu@savoirfairelinux.com> Thu, 08 Jan 2009 13:08:51 -0500
-sflphone (0.9.2-2ubuntu3) karmic; urgency=low
+sflphone (0.9.2-2ubuntu3) SYSTEM; urgency=low
[ Emmanuel Milou ]
* The main thread synchronizes the ringtone thread
@@ -1766,13 +1925,13 @@ sflphone (0.9.2-2ubuntu3) karmic; urgency=low
-- Yun Liu <yun.liu@savoirfairelinux.com> Tue, 06 Jan 2009 16:18:38 -0500
-sflphone (0.9.2-2ubuntu2) karmic; urgency=low
+sflphone (0.9.2-2ubuntu2) SYSTEM; urgency=low
* Fix bug ticket #129
-- Yun Liu <yun.liu@savoirfairelinux.com> Wed, 5 Jan 2009 15:54:53 -0500
-sflphone (0.9.2-2ubuntu1) karmic; urgency=low
+sflphone (0.9.2-2ubuntu1) SYSTEM; urgency=low
* Migrate from eXosip library to pjsip
* Add multiple SIP accounts support
diff --git a/tools/build-system/launchpad/sflphone-common/debian/changelog b/tools/build-system/launchpad/sflphone-common/debian/changelog
index 98e662737c05b07b4651f4ba6d0edfd830ead1f5..7d5b2fb58422eb4d0d07c06f97e5c612bb380a7e 100644
--- a/tools/build-system/launchpad/sflphone-common/debian/changelog
+++ b/tools/build-system/launchpad/sflphone-common/debian/changelog
@@ -1,6 +1,165 @@
-sflphone-common (0.9.7~beta~ppa1~karmic) karmic; urgency=low
+sflphone-common (0.9.7~rc1~ppa1~SYSTEM) SYSTEM; urgency=low
+
+ ** 0.9.7~rc1~ppa1~SYSTEM **
+
+ * [#2462] Set explicitly the transport on incoming call too
+ * [#2462] fix typo
+ * [#2462] Use different address for SDP and call IP
+ * [#2462] Use published address in SIP-SDP
+ * [#2181] Fixed changelog files
+ * [#2181] Updated spec file
+ * [#2402] Fix pointer to int conversion warning (atoi)
+ * [#2402] Remove daemon warnings, make indent
+ * [#2459] Make sure the stream is opened when the call is answered
+ * [#2402] Add conference related picture in documentation
+ * [#2443] Not much ...
+ * [#2399] Fix dialing display problem
+ * [#2450] Fix incoming call already in conference crash
+ * [#2399] Display peer name on the first line and peer number on the
+ second
+ * [#2450] Handle 403 FORBIDDEN when refused
+ * [#2447] Bind offHold/onHold actions to button in gtk client
+ * [#2447] Bind hangup action to button for conference
+ * [#2447] Add conference action in gtk client's ToolBar
+ * [#2381] Disable the password hashing in config file
+ * [#2402] Cleanup
+ * [#2366] Set callback to null when deleting Pulseaudio streams
+ * [#1313] Fix main buffer unit test
+ * [#1313] Fix audio layer unit test
+ * [#2315] Hide pw in security tab, display when editing, sync with
+ basic tab
+ * [#1313] UnitTest change AudioRtpSession for AudioSymetricRtpSession
+ instance
+ * [#2402] Code cleanup
+ * [#2444] Add debug to catch occasional crash when loading client's
+ config
+ * [#2444] Add debug info to catch occasional crash when loading config
+ dialog
+ * [#2402] Restore Call menu translations
+ * [#2403] Use the published address if checked in GUI
+ * [#2442] Add protection test in sdp
+ * [#1841] Reapply pjsip patch concerning DNS SRV resolution
+ * [#2384] Tags incoming call as direct SIP call, if applicable
+ * [#2402] Change the monkey face
+ * [#2315] Enable user to display password in clear text
+ * [#2434] Force optimization level at 2
+ * [#2284] Fix dbus_get_all_ip_interface compilation warnings
+ * [#2431] Popup main window on incoming if applicable
+ * [$2402] Fix simple warnings
+ * [#2402] Fix implicit variable init order in LibraryManagerException
+ * [#2402] Fixing implicit variable initialization warnings in
+ AudioRtpSession
+ * [#2402] Revert atoi change, fixing codec list doubled entries
+ * [#2402] Fix gpointer to gint conversion
+ * [#2402] Fix pointer casting to integer different size warning in
+ codec list
+ * [#2402] Fix warning discarting qualifiers from pointer target
+ * [#2402] Fix gtk tree view assignement from incompatible type warning
+ * [#1669] Fix audio recording folder utf-8 non compatibility issue
+ * [#2414] Clean up debugs
+ * [#2414] Use transport set in iptoip Account and update it frm
+ preference
+ * [#2348] Use macro N_() to mark ui.xml strings as translatable
+ * [#2414] Rename getSipAddress/setSipAddress functions
+ * [#2407] Fix volume controls display
+ * [#2407] Fixes dialpad
+ * [#2383] Set ip to ip config when clicking apply button
+ * [#2404] Update call-to script - Maxime Chambreuil
+ * [#2405] Client handles unknown call in current state as well
+ * [#2383] Add DBUS signal to send IPtoIP local address and port as
+ string
+ * [#2383] Add Ip to IP config change apply call back
+ * Clonflict
+ * [#2402] Code cleanup
+ * [#2383] Do the same for IPtoIP (init localn ip with first in the
+ list)
+ * [#2383] Use first interface in the list if local addresss is not
+ defined
+ * [#2403] Clean up unuseful addresses/ports
+ * [#2403] Use the IP profile SIP port as global SIP port
+ * [#2383] Fix dbus_get_all_ip_interface warnings
+ * [#2383] Take into account sameAsLocal when loading published address
+ * [#2383] Tsake into account sameAsLocal option when saving published
+ address
+ * [#2383] Update local ip address in ip to ip config
+ * [#2383] Save ip 2 ip local port in config
+ * [#2406] Update toolbar at startup
+ * [#2284] Remove redefinition warnings + speex warnings
+ * [#2383] Fix security table in account config
+ * [#2383] Save ip 2 ip network interface parameters in config
+ * [#2403] Restore sip transport selector
+ * [#2383] Fix filling the Localt IP Address on account creation
+ * [#2383] Fix Gtk-Critical when checking STUN
+ * [#2383] Fix reopening account configuration display issue
+ * [#2383] Load IPtoIP local address and port in preference iptoiptab
+ * [#2383] Add LocalAddress and Localport in Preference IpToIp tab
+ * [#2403] Use the address and port associated to the account as often
+ as possible
+ * [#1753] Removed pjsip generated files
+ * [#1753] Removed remaining milenage lib references
+ * [#2383] Add _publishedSameasLocal variable in sipaccount
+ * [#2383] Add PUBLISHED_SAMEAS_LOCAL variable in config
+ * [#2383] Fix stun set active or not when opening config
+ * [#2181] Added RPM 64bits dbus patch
+ * [#2402] Code indentation
+ * [#2313] Force $(HOME).cache directory creation at startup
+ * [#2383] Separate network interface and published address in account
+ config
+ * [#2400] Change dbus service installation path to libdir
+ * [#2382] Move TLS related published address options in security tab
+ * [#2382] Indent accountconfigdialog.c
+ * [#2181] Install libdbus-c++ in $pkglib instead of $lib
+ * [#1753] Remove ILBC code and disable it by default in the configure
+ * [#1753] Remove milenage directory
+ * [#2382] Fix switching interaface instabilities
+ * [#2396] Save local ip in account creation wizard
+ * [#2284] Remove warning on hold
+ * [#2387] Fixes history searching and filtering
+ * [#1215] Add samplerate display in the GUI
+ * [#1663] Voicemail icon reflects voice messages
+ * [#2395] Fix account registration ( specifically with callcentric)
+ * [#2386] Strip "sip:" on incoming call, fixing history call back
+ * [#2181] Updated spec files
+ * [#1215] Display codec name in calltree instead of status bar
+ * [#2390] Move back nbCalls and stopStream higher in refuseCall
+ * [#2392] Fix ringtone during call in IAX
+ * [#2391] Stop audio streams when there is 0 calls only
+ * [#2391] Add debug when call state is not valid
+ * [#2390] Clear returns in IAXvoipLink::sendAudioFromMic() method
+ * [#2380] Fixing IncomingCallNotification not regular
+ * [#2339] Query conference at client startup
+ * [#2339] Working conference querying at startup
+ * [#2339] Add conference in call tree
+ * [#2339] Primitives to query conferences at client startup
+ * [#2320] Add account selection in history
+ * [#2355] Temporary solution: do not delete pointer when removing
+ account
+ * [#2380] Change algorithm in AudioRtp to trigger an
+ IncomingCallNotification
+ * [#2274] Comment sdebug in MainBuffer flush method
+ * [#2274] Add flushMain() in ManagerImpl::addStream
+ * [#2274] Add getBufferID() method in ring buffer
+ * [#2274] Fix warning, comment debug in ringbuffer's flush method
+ * [#2274] Use AudioLayer flushMain() and flushUrgent() in ALSA
+ * [#2274] Clean up unused variable warning
+ * [#2274] Protect minbudffer pointer on flushing
+ * [#2274] Fix playATone method which writing empty buffer in urgent
+ ringbuffer
+ * [#2274] Use audio layer flushUrgent and flushMain in createStreams
+ * [#2274] Use flush audio calls from audiolayer
+ * [#2274] Flush when peer answered call
+ * [#2375] Flush main buffer in iax when answering a call
+ * [#2274] Parse displayname using c++ string method
+ * [#2375] Flush main buffer when off holding calls
+ * [#2375] Flush main buffer mon RTP startup
+ * [#2376] Use now Pulseaudio module-cork-music-on-phone
+ * Updated OSC packaging
+
+ -- Julien Bonjean <julien.bonjean@savoirfairelinux.com> Fri, 20 Nov 2009 14:00:02 -0500
+
+sflphone-common (0.9.7~beta~ppa1~SYSTEM) SYSTEM; urgency=low
- ** 0.9.7~beta~ppa1~karmic **
+ ** 0.9.7~beta~ppa1~SYSTEM **
* [#1933] Cleanup debug
* [#1933] Clean up debug
@@ -567,7 +726,7 @@ sflphone-common (0.9.7~beta~ppa1~karmic) karmic; urgency=low
-- Julien Bonjean <julien.bonjean@savoirfairelinux.com> Fri, 06 Nov 2009 11:23:15 -0500
-sflphone-common (0.9.6-SYSVER) karmic; urgency=low
+sflphone-common (0.9.6-SYSTEM) SYSTEM; urgency=low
** 0.9.6 **
@@ -634,7 +793,7 @@ sflphone-common (0.9.6-SYSVER) karmic; urgency=low
-- SFLphone Automatic Build System <team@sflphone.org> Mon, 27 Jul 2009 09:53:00 -0400
-sflphone-common (0.9.6~rc2-SYSVER) karmic; urgency=low
+sflphone-common (0.9.6~rc2-SYSTEM) SYSTEM; urgency=low
** 0.9.6~rc2 **
@@ -689,7 +848,7 @@ sflphone-common (0.9.6~rc2-SYSVER) karmic; urgency=low
-- SFLphone Automatic Build System <team@sflphone.org> Fri, 17 Jul 2009 19:12:44 -0400
-sflphone-common (0.9.6~rc1-SYSVER) karmic; urgency=low
+sflphone-common (0.9.6~rc1-SYSTEM) SYSTEM; urgency=low
** 0.9.6~rc1 **
@@ -797,7 +956,7 @@ sflphone-common (0.9.6~rc1-SYSVER) karmic; urgency=low
-- SFLphone Automatic Build System <team@sflphone.org> Fri, 10 Jul 2009 15:49:56 -0400
-sflphone-common (0.9.6~beta-SYSVER) karmic; urgency=low
+sflphone-common (0.9.6~beta-SYSTEM) SYSTEM; urgency=low
** 0.9.6~beta **
@@ -1092,7 +1251,7 @@ sflphone-common (0.9.6~beta-SYSVER) karmic; urgency=low
-- SFLphone Automatic Build System <team@sflphone.org> Tue, 23 Jun 2009 11:12:06 -0400
-sflphone-common (0.9.5-SYSVER) karmic; urgency=low
+sflphone-common (0.9.5-SYSTEM) SYSTEM; urgency=low
** 0.9.5 release **
@@ -1123,7 +1282,7 @@ sflphone-common (0.9.5-SYSVER) karmic; urgency=low
-- SFLphone Automatic Build System <team@sflphone.org> Mon, 25 May 2009 11:34:40 -0400
-sflphone-common (0.9.5-SYSVER~rc2) karmic; urgency=low
+sflphone-common (0.9.5-SYSTEM~rc2) SYSTEM; urgency=low
** 0.9.5 rc2 **
@@ -1177,7 +1336,7 @@ sflphone-common (0.9.5-SYSVER~rc2) karmic; urgency=low
-- SFLphone Automatic Build System <team@sflphone.org> Tue, 19 May 2009 12:08:03 -0400
-sflphone-common (0.9.5-0ubuntu1~rc1) karmic; urgency=low
+sflphone-common (0.9.5-0ubuntu1~rc1) SYSTEM; urgency=low
[ SFLphone Project ]
* [#1262] Updated changelogs for version 0.9.5-0ubuntu1 Snapshot 2009-
@@ -1206,7 +1365,7 @@ sflphone-common (0.9.5-0ubuntu1~rc1) karmic; urgency=low
-- Sflphone Project <sflphone@mtl.savoirfairelinux.net> Tue, 05 May 2009 19:16:09 -0400
-sflphone-common (0.9.5-0ubuntu1~beta) karmic; urgency=low
+sflphone-common (0.9.5-0ubuntu1~beta) SYSTEM; urgency=low
[ Julien Bonjean ]
* Updated Eclipse stuff
@@ -1428,7 +1587,7 @@ sflphone-common (0.9.5-0ubuntu1~beta) karmic; urgency=low
-- Sflphone Project <sflphone@mtl.savoirfairelinux.net> Mon, 27 Apr 2009 16:57:00 -0400
-sflphone-common (0.9.4-0ubuntu2) karmic; urgency=low
+sflphone-common (0.9.4-0ubuntu2) SYSTEM; urgency=low
[ Alexandre Savard ]
* Restore speex and GSM detection
@@ -1438,7 +1597,7 @@ sflphone-common (0.9.4-0ubuntu2) karmic; urgency=low
-- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Wed, 8 Apr 2009 11:29:15 -0500
-sflphone (0.9.4-0ubuntu1) karmic; urgency=low
+sflphone (0.9.4-0ubuntu1) SYSTEM; urgency=low
[ Emmanuel Milou ]
* Integrate DBus-c++ and libiax2 in the main build system
@@ -1463,7 +1622,7 @@ sflphone (0.9.4-0ubuntu1) karmic; urgency=low
-- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Fri, 3 Apr 2009 18:29:15 -0500
-sflphone (0.9.4-rc1) karmic; urgency=low
+sflphone (0.9.4-rc1) SYSTEM; urgency=low
[ Emmanuel Milou ]
* Fix bug while trying to hold/unhold several simultaneous call
@@ -1477,7 +1636,7 @@ sflphone (0.9.4-rc1) karmic; urgency=low
-- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Fri, 27 Mar 2009 18:29:15 -0500
-sflphone (0.9.4-0beta1) karmic; urgency=low
+sflphone (0.9.4-0beta1) SYSTEM; urgency=low
[ Alexandre Savard ]
* Display codec used during conversation on the GUI
@@ -1493,7 +1652,7 @@ sflphone (0.9.4-0beta1) karmic; urgency=low
-- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Fri, 20 Mar 2009 18:29:15 -0500
-sflphone (0.9.3-0ubuntu3) karmic; urgency=low
+sflphone (0.9.3-0ubuntu3) SYSTEM; urgency=low
[ Alexandre Savard ]
* Both playback and record streams in PA_STREAM_CORKED (pulseaudio)
@@ -1518,7 +1677,7 @@ sflphone (0.9.3-0ubuntu3) karmic; urgency=low
-- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Sat, 14 Feb 2009 13:29:15 -0500
-sflphone (0.9.3-0ubuntu2) karmic; urgency=low
+sflphone (0.9.3-0ubuntu2) SYSTEM; urgency=low
[ Emmanuel Milou ]
* Add compilation note in README
@@ -1587,7 +1746,7 @@ sflphone (0.9.3-0ubuntu2) karmic; urgency=low
-- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Sat, 14 Feb 2009 13:29:15 -0500
-sflphone (0.9.3-0ubuntu1) karmic; urgency=low
+sflphone (0.9.3-0ubuntu1) SYSTEM; urgency=low
* Remove debug
* Join thread before leaving
@@ -1600,7 +1759,7 @@ sflphone (0.9.3-0ubuntu1) karmic; urgency=low
-- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Fri, 06 Feb 2009 19:17:32 -0500
-sflphone (0.9.2-2ubuntu9) karmic; urgency=low
+sflphone (0.9.2-2ubuntu9) SYSTEM; urgency=low
[ Alexandre Savard ]
* Speex audio codec preprocessing initialization
@@ -1628,7 +1787,7 @@ sflphone (0.9.2-2ubuntu9) karmic; urgency=low
-- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Thu, 05 Feb 2009 18:27:53 -0500
-sflphone (0.9.2-2ubuntu8) karmic; urgency=low
+sflphone (0.9.2-2ubuntu8) SYSTEM; urgency=low
[ Emmanuel Milou ]
* Update changelogs
@@ -1672,7 +1831,7 @@ sflphone (0.9.2-2ubuntu8) karmic; urgency=low
-- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Wed, 04 Feb 2009 14:00:30 -0500
-sflphone (0.9.2-2ubuntu7) karmic; urgency=low
+sflphone (0.9.2-2ubuntu7) SYSTEM; urgency=low
[ Emmanuel Milou ]
* Update changelog to 0.9.2-6
@@ -1694,7 +1853,7 @@ sflphone (0.9.2-2ubuntu7) karmic; urgency=low
-- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Fri, 23 Jan 2009 17:48:13 -0500
-sflphone (0.9.2-2ubuntu6) karmic; urgency=low
+sflphone (0.9.2-2ubuntu6) SYSTEM; urgency=low
[ Emmanuel Milou ]
* Migrate STUN configuration to the main config window
@@ -1728,7 +1887,7 @@ sflphone (0.9.2-2ubuntu6) karmic; urgency=low
-- Emmanuel Milou <manu@sulfur.inside.savoirfairelinux.net> Fri, 16 Jan 2009 18:19:05 -0500
-sflphone (0.9.2-2ubuntu5) karmic; urgency=low
+sflphone (0.9.2-2ubuntu5) SYSTEM; urgency=low
* Fix memory leak in the pulseaudio callback
* Update debian package generation script
@@ -1744,7 +1903,7 @@ sflphone (0.9.2-2ubuntu5) karmic; urgency=low
-- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Wed, 14 Jan 2009 21:17:20 -0500
-sflphone (0.9.2-2ubuntu4) karmic; urgency=low
+sflphone (0.9.2-2ubuntu4) SYSTEM; urgency=low
[ Emmanuel Milou ]
* add german translation
@@ -1754,7 +1913,7 @@ sflphone (0.9.2-2ubuntu4) karmic; urgency=low
-- Yun Liu <yun.liu@savoirfairelinux.com> Thu, 08 Jan 2009 13:08:51 -0500
-sflphone (0.9.2-2ubuntu3) karmic; urgency=low
+sflphone (0.9.2-2ubuntu3) SYSTEM; urgency=low
[ Emmanuel Milou ]
* The main thread synchronizes the ringtone thread
@@ -1766,13 +1925,13 @@ sflphone (0.9.2-2ubuntu3) karmic; urgency=low
-- Yun Liu <yun.liu@savoirfairelinux.com> Tue, 06 Jan 2009 16:18:38 -0500
-sflphone (0.9.2-2ubuntu2) karmic; urgency=low
+sflphone (0.9.2-2ubuntu2) SYSTEM; urgency=low
* Fix bug ticket #129
-- Yun Liu <yun.liu@savoirfairelinux.com> Wed, 5 Jan 2009 15:54:53 -0500
-sflphone (0.9.2-2ubuntu1) karmic; urgency=low
+sflphone (0.9.2-2ubuntu1) SYSTEM; urgency=low
* Migrate from eXosip library to pjsip
* Add multiple SIP accounts support
diff --git a/tools/build-system/launchpad/sflphone-common/debian/control.jaunty b/tools/build-system/launchpad/sflphone-common/debian/control.jaunty
index ba94b329a2b62fc41015d35f65f3b0a3e9f881ec..8700719c003eb8c46780ca12aa608dd1639490b2 100644
--- a/tools/build-system/launchpad/sflphone-common/debian/control.jaunty
+++ b/tools/build-system/launchpad/sflphone-common/debian/control.jaunty
@@ -2,13 +2,13 @@ Source: sflphone-common
Maintainer: SavoirFaireLinux Inc <julien.bonjean@savoirfairelinux.com>
Section: gnome
Priority: optional
-Build-Depends: debhelper, libgcc1 , autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libgsm1-dev, libspeex-dev, libtool, libdbus-1-dev, libasound2-dev, libspeexdsp-dev, uuid-dev, libexpat1-dev, libzrtpcpp-dev, libssl-dev
+Build-Depends: debhelper, libgcc1 , autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libgsm1-dev, libspeex-dev, libtool, libdbus-1-dev, libasound2-dev, libspeexdsp-dev, uuid-dev, libexpat1-dev, libzrtpcpp-dev, libssl-dev, libpcre3-dev
Standards-Version: 3.7.3
Package: sflphone-common
Priority: optional
Architecture: any
-Depends: libsamplerate0, libexpat1 , libc6, libcommoncpp2-1.6-0, libgsm1, libspeex1, libdbus-1-3, libasound2, libpulse0, libccrtp1-1.6-1, libspeexdsp1, libzrtpcpp-1.3-0, libssl0.9.8
+Depends: libsamplerate0, libexpat1 , libc6, libcommoncpp2-1.6-0, libgsm1, libspeex1, libdbus-1-3, libasound2, libpulse0, libccrtp1-1.6-1, libspeexdsp1, libzrtpcpp-1.3-0, libssl0.9.8, libpcre3
Replaces: sflphone
Conflicts: sflphone
Homepage: http://www.sflphone.org
diff --git a/tools/build-system/launchpad/sflphone-common/debian/control.karmic b/tools/build-system/launchpad/sflphone-common/debian/control.karmic
index 47e571b4f2d9fd62147cd09bbee7139cedfef231..177306ed35bf7cae2a8d1f2e7bc03a3772cc24c9 100644
--- a/tools/build-system/launchpad/sflphone-common/debian/control.karmic
+++ b/tools/build-system/launchpad/sflphone-common/debian/control.karmic
@@ -2,13 +2,13 @@ Source: sflphone-common
Maintainer: SavoirFaireLinux Inc <julien.bonjean@savoirfairelinux.com>
Section: gnome
Priority: optional
-Build-Depends: debhelper, libgcc1 , autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libgsm1-dev, libspeex-dev, libtool, libdbus-1-dev, libasound2-dev, libspeexdsp-dev, uuid-dev, libexpat1-dev, libzrtpcpp-dev, libssl-dev
+Build-Depends: debhelper, libgcc1 , autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libgsm1-dev, libspeex-dev, libtool, libdbus-1-dev, libasound2-dev, libspeexdsp-dev, uuid-dev, libexpat1-dev, libzrtpcpp-dev, libssl-dev, libpcre3-dev
Standards-Version: 3.7.3
Package: sflphone-common
Priority: optional
Architecture: any
-Depends: libsamplerate0, libexpat1 , libc6, libccgnu2-1.7-0, libgsm1, libspeex1, libdbus-1-3, libasound2, libpulse0, libccrtp1-1.7-0, libspeexdsp1, libzrtpcpp-1.4-0, libssl0.9.8
+Depends: libsamplerate0, libexpat1 , libc6, libccgnu2-1.7-0, libgsm1, libspeex1, libdbus-1-3, libasound2, libpulse0, libccrtp1-1.7-0, libspeexdsp1, libzrtpcpp-1.4-0, libssl0.9.8, libpcre3
Replaces: sflphone
Conflicts: sflphone
Homepage: http://www.sflphone.org
diff --git a/tools/build-system/make-telify-package.sh b/tools/build-system/make-telify-package.sh
new file mode 100644
index 0000000000000000000000000000000000000000..be3be86bd2f38dd67536029430396a11bf3db668
--- /dev/null
+++ b/tools/build-system/make-telify-package.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+#####################################################
+# File Name: make-telify-package.sh
+#
+# Purpose :
+#
+# Author: Julien Bonjean (julien@bonjean.info)
+#
+# Creation Date: 2009-12-15
+# Last Modified: 2009-12-15 18:16:47 -0500
+#####################################################
+
+#set -x
+
+. `dirname $0`/setenv.sh
+
+# change to working directory
+cd ${LAUNCHPAD_DIR}
+
+if [ "$?" -ne "0" ]; then
+ echo " !! Cannot cd to launchpad directory"
+ exit -1
+fi
+
+cd ${REFERENCE_REPOSITORY}
+
+for LAUNCHPAD_DISTRIBUTION in ${LAUNCHPAD_DISTRIBUTIONS[*]}
+do
+ LOCAL_VERSION="${SOFTWARE_VERSION}~ppa${VERSION_INDEX}~${LAUNCHPAD_DISTRIBUTION}"
+
+ cp ${DEBIAN_DIR}/control.${LAUNCHPAD_DISTRIBUTION} ${DEBIAN_DIR}/control
+ cp ${DEBIAN_DIR}/changelog.generic ${DEBIAN_DIR}/changelog
+
+ sed -i "s/SYSTEM/${LAUNCHPAD_DISTRIBUTION}/g" ${DEBIAN_DIR}/changelog
+
+ cd ${LAUNCHPAD_DIR}/${LAUNCHPAD_PACKAGE}
+ ./autogen.sh
+ debuild -S -sa -kFDFE4451
+ cd ${LAUNCHPAD_DIR}
+
+ if [ ${DO_UPLOAD} ] ; then
+ dput -f -c ${LAUNCHPAD_DIR}/dput.conf ${LAUNCHPAD_CONF_PREFIX}-${LAUNCHPAD_DISTRIBUTION} ${LAUNCHPAD_PACKAGE}_${LOCAL_VERSION}_source.changes
+ fi
+done
+
diff --git a/tools/build-system/osc/sflphone-client-gnome.spec b/tools/build-system/osc/sflphone-client-gnome.spec
index 794dc7784e837ebecbf98a18f77336f8a4850701..dba4cd8ebbdf090931c142a83b961ed2299b0805 100644
--- a/tools/build-system/osc/sflphone-client-gnome.spec
+++ b/tools/build-system/osc/sflphone-client-gnome.spec
@@ -125,6 +125,7 @@ make clean
%lang(zh_HK) %{_prefix}/share/locale/zh_HK/LC_MESSAGES/*.mo
%lang(it) %{_prefix}/share/locale/it/LC_MESSAGES/*.mo
%lang(pt_BR) %{_prefix}/share/locale/pt_BR/LC_MESSAGES/*.mo
+%lang(da) %{_prefix}/share/locale/da/LC_MESSAGES/*.mo
%doc AUTHORS COPYING README
%doc %{_prefix}/share/man/man1/sflphone-client-gnome.1.gz
%doc %{_prefix}/share/man/man1/sflphone.1.gz
diff --git a/tools/build-system/osc/sflphone-common-dbus-service-in-libdir.patch b/tools/build-system/osc/sflphone-common-dbus-service-in-libdir.patch
deleted file mode 100644
index 72d23454fb73ad3a87f1b83cdf9cc809a844d50a..0000000000000000000000000000000000000000
--- a/tools/build-system/osc/sflphone-common-dbus-service-in-libdir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git sflphone-common/src/dbus/Makefile.am sflphone-common/src/dbus/Makefile.am
-index 5a2745e..5ca2e42 100644
---- sflphone-common/src/dbus/Makefile.am
-+++ sflphone-common/src/dbus/Makefile.am
-@@ -38,7 +38,7 @@ service_DATA = $(service_in_files:.service.in=.service)
-
- # Rule to make the service file with bindir expanded
- $(service_DATA): $(service_in_files) Makefile
-- sed -e "s|libexec|$(prefix)/lib/sflphone|" $<> $@
-+ sed -e "s|libexec|$(libdir)/sflphone|" $<> $@
-
- EXTRA_DIST = *.xml README
-
-
diff --git a/tools/build-system/osc/sflphone-common.spec b/tools/build-system/osc/sflphone-common.spec
index 9fccf3ef7d27aab0d6130959c532dfab4ece62ce..d44f94103e8e4e61fefc2be0a03d0e2b4a9f58c4 100644
--- a/tools/build-system/osc/sflphone-common.spec
+++ b/tools/build-system/osc/sflphone-common.spec
@@ -21,7 +21,6 @@ Packager: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
BuildRoot: %{_tmppath}/%{name}
Source0: sflphone-common-%{version}.tar.gz
-Patch0: sflphone-common-dbus-service-in-libdir.patch
BuildRequires: speex-devel
BuildRequires: gcc-c++
BuildRequires: expat
@@ -57,7 +56,6 @@ BuildRequires: gsm-devel
Requires: libsamplerate
Requires: commoncpp2
Requires: dbus-1
-Requires: dbus-1-x11
%if %{defined suse_version}
Requires: libgsm1
@@ -127,7 +125,7 @@ make clean
%dir %{_libdir}/sflphone/plugins
%dir %{_prefix}/share/sflphone
%dir %{_prefix}/share/sflphone/ringtones
-%{_libdir}/libdbus-*
+%{_libdir}/sflphone/libdbus-*
%{_libdir}/sflphone/codecs/*
%{_libdir}/sflphone/plugins/*
%{_prefix}/share/dbus-1/services/org.sflphone.*
diff --git a/tools/build-system/packages/git-buildpackage_0.4.45_all.deb b/tools/build-system/packages/git-buildpackage_0.4.45_all.deb
deleted file mode 100644
index cf62358c48f1a5ce054c997b8b87ef9dac677028..0000000000000000000000000000000000000000
Binary files a/tools/build-system/packages/git-buildpackage_0.4.45_all.deb and /dev/null differ
diff --git a/tools/build-system/remote/update-repository.sh b/tools/build-system/remote/update-repository.sh
deleted file mode 100755
index a488a297455839de1a60b981a1293ace0d20b882..0000000000000000000000000000000000000000
--- a/tools/build-system/remote/update-repository.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-# Script to update the debian repository description files (Release, Packages, Sources)
-#
-# @author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
-# @date: 2008 Jan 16
-
-ROOT_DIR="/var/repos/sflphone/debian"
-
-# gpg passphrase file
-GPG_FILE="${ROOT_DIR}/.gpg-sflphone"
-
-USER="sflphone-package-manager"
-
-export LANG=en_CA.UTF-8
-export LC_ALL=en_CA.UTF-8
-
-WHO=`whoami`
-
-if [ "${WHO}" != "${USER}" ]; then
- echo "!! Please use user ${USER} to run this script"
- exit -1;
-fi
-
-echo "Remove cache files"
-rm -f packages-i386.db
-rm -f packages-amd64.db
-
-apt-ftparchive generate conf/apt-ftparchive.conf
-
-echo "Generate the description file for each distribution"
-apt-ftparchive -c conf/apt-hardy-release.conf release dists/hardy > dists/hardy/Release
-apt-ftparchive -c conf/apt-hardy-testing.conf release dists/hardy-testing > dists/hardy-testing/Release
-apt-ftparchive -c conf/apt-hardy-daily.conf release dists/hardy-daily > dists/hardy-daily/Release
-
-apt-ftparchive -c conf/apt-intrepid-release.conf release dists/intrepid > dists/intrepid/Release
-apt-ftparchive -c conf/apt-intrepid-testing.conf release dists/intrepid-testing > dists/intrepid-testing/Release
-apt-ftparchive -c conf/apt-intrepid-daily.conf release dists/intrepid-daily > dists/intrepid-daily/Release
-
-apt-ftparchive -c conf/apt-jaunty-release.conf release dists/jaunty > dists/jaunty/Release
-apt-ftparchive -c conf/apt-jaunty-testing.conf release dists/jaunty-testing > dists/jaunty-testing/Release
-apt-ftparchive -c conf/apt-jaunty-daily.conf release dists/jaunty-daily > dists/jaunty-daily/Release
-
-echo "Sign the Release files"
-
-rm -f dists/intrepid/Release.gpg
-rm -f dists/intrepid-testing/Release.gpg
-rm -f dists/intrepid-daily/Release.gpg
-gpg --passphrase `cat ${GPG_FILE}` --no-tty -u C842D122 --output dists/intrepid/Release.gpg -ba dists/intrepid/Release
-gpg --passphrase `cat ${GPG_FILE}` --no-tty -u C842D122 --output dists/intrepid-testing/Release.gpg -ba dists/intrepid-testing/Release
-gpg --passphrase `cat ${GPG_FILE}` --no-tty -u C842D122 --output dists/intrepid-daily/Release.gpg -ba dists/intrepid-daily/Release
-
-rm -f dists/hardy/Release.gpg
-rm -f dists/hardy-testing/Release.gpg
-rm -f dists/hardy-daily/Release.gpg
-gpg --passphrase `cat ${GPG_FILE}` --no-tty -u C842D122 --output dists/hardy/Release.gpg -ba dists/hardy/Release
-gpg --passphrase `cat ${GPG_FILE}` --no-tty -u C842D122 --output dists/hardy-testing/Release.gpg -ba dists/hardy-testing/Release
-gpg --passphrase `cat ${GPG_FILE}` --no-tty -u C842D122 --output dists/hardy-daily/Release.gpg -ba dists/hardy-daily/Release
-
-rm -f dists/jaunty/Release.gpg
-rm -f dists/jaunty-testing/Release.gpg
-rm -f dists/jaunty-daily/Release.gpg
-gpg --passphrase `cat ${GPG_FILE}` --no-tty -u C842D122 --output dists/jaunty/Release.gpg -ba dists/jaunty/Release
-gpg --passphrase `cat ${GPG_FILE}` --no-tty -u C842D122 --output dists/jaunty-testing/Release.gpg -ba dists/jaunty-testing/Release
-gpg --passphrase `cat ${GPG_FILE}` --no-tty -u C842D122 --output dists/jaunty-daily/Release.gpg -ba dists/jaunty-daily/Release
-
-echo "All done"
-exit 0
diff --git a/tools/build-system/send-emails.sh b/tools/build-system/send-emails.sh
deleted file mode 100755
index 4b9c7d52bc460a3707b7044d8b6620e4405d3352..0000000000000000000000000000000000000000
--- a/tools/build-system/send-emails.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-#####################################################
-# File Name: send-emails.sh
-#
-# Purpose :
-#
-# Author: Julien Bonjean (julien@bonjean.info)
-#
-# Creation Date: 2009-04-20
-# Last Modified: 2009-06-01 18:11:20 -0400
-#####################################################
-
-TAG=`date +%Y-%m-%d`
-ROOT_DIR="/home/projects/sflphone"
-PACKAGING_RESULT_DIR=${ROOT_DIR}/packages-${TAG}
-STATUS="OK"
-
-if [ "$1" -ne 0 ]; then
- STATUS="ERROR"
-fi
-
-echo
-echo "Send notification emails"
-echo
-
-MAIL_SUBJECT="[ ${TAG} ] SFLphone Automatic Build System : ${STATUS}"
-
-if [ "$1" -eq 0 ]; then
- echo | mail -s "${MAIL_SUBJECT}" -c emmanuel.milou@savoirfairelinux.com julien.bonjean@savoirfairelinux.com
-else
-# (
-# for i in ${PACKAGING_RESULT_DIR}/*.log
-# do
-# uuencode $i $(basename $i)
-# done
-# )
- cat ${PACKAGING_RESULT_DIR}/stats.log | mail -s "${MAIL_SUBJECT}" -c emmanuel.milou@savoirfairelinux.com julien.bonjean@savoirfairelinux.com
-fi
-
-exit 0
-
diff --git a/tools/build-system/setenv.sh b/tools/build-system/setenv.sh
new file mode 100644
index 0000000000000000000000000000000000000000..ee6bbb068d40a615243101fea56e8d3735a04949
--- /dev/null
+++ b/tools/build-system/setenv.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+#####################################################
+# File Name: setenv.sh
+#
+# Purpose :
+#
+# Author: Julien Bonjean (julien@bonjean.info)
+#
+# Creation Date: 2009-12-15
+# Last Modified: 2009-12-15 18:16:52 -0500
+#####################################################
+
+# home directory
+export ROOT_DIR=${HOME}
+
+# gpg passphrase file
+export GPG_FILE="${ROOT_DIR}/.gpg-sflphone"
+
+export EDITOR="echo"
+
+export REFERENCE_REPOSITORY="${ROOT_DIR}/sflphone-source-repository"
+
+export WORKING_DIR="${ROOT_DIR}/sflphone-build-repository/tools/build-system"
+export LAUNCHPAD_DIR="${WORKING_DIR}/launchpad"
+LAUNCHPAD_DISTRIBUTIONS=( "jaunty" "karmic" )
+export LAUNCHPAD_DISTRIBUTIONS
+
diff --git a/tools/build-system/sfl-git-dch.sh b/tools/build-system/sfl-git-dch.sh
deleted file mode 100755
index 740cc448b635e81b879d638daf0dfec495bad682..0000000000000000000000000000000000000000
--- a/tools/build-system/sfl-git-dch.sh
+++ /dev/null
@@ -1,163 +0,0 @@
-#!/bin/bash
-#####################################################
-# File Name: sfl-git-dch.sh
-#
-# Purpose :
-#
-# Author: Julien Bonjean (julien@bonjean.info)
-#
-# Creation Date: 2009-05-13
-# Last Modified: 2009-07-20 23:03:24 -0400
-#####################################################
-
-# set -x
-
-VERSION=$1
-RELEASE_MODE=$2
-
-ROOT_DIR="/home/projects/sflphone"
-TODEPLOY_DIR="${ROOT_DIR}/sflphone-packaging"
-TODEPLOY_BUILD_DIR="${TODEPLOY_DIR}/build"
-REPOSITORY_DIR="${TODEPLOY_BUILD_DIR}/sflphone"
-SCRIPTS_DIR="${ROOT_DIR}/build-system"
-DEBIAN_DIR="${SCRIPTS_DIR}/distributions/ubuntu"
-CHANGELOG_FILES=( "${DEBIAN_DIR}/debian-sflphone-common/changelog" "${DEBIAN_DIR}/debian-sflphone-client-gnome/changelog" "${DEBIAN_DIR}/debian-sflphone-client-kde/changelog")
-
-export DEBFULLNAME="SFLphone Automatic Build System"
-export DEBEMAIL="team@sflphone.org"
-export EDITOR="echo"
-
-cd ${REPOSITORY_DIR}
-
-if [ "$?" -ne "0" ]; then
- echo " !! Cannot cd to working directory"
- exit -1
-fi
-
-# get last release tag
-LAST_RELEASE_TAG_NAME=`git tag -l "[0-9]\.[0-9]\.[0-9]\.*" | tail -n 1`
-
-if [ "$?" -ne "0" ]; then
- echo " !! Error when retrieving last tag"
- exit -1
-fi
-
-# get last release tag
-PREVIOUS_RELEASE_TAG_NAME=`git tag -l "[0-9]\.[0-9]\.[0-9]\.*" | tail -n 2 | sed -n '1p;1q'`
-
-if [ "$?" -ne "0" ]; then
- echo " !! Error when retrieving previous revision tag"
- exit -1
-fi
-
-echo "Last release tag is : ${LAST_RELEASE_TAG_NAME}"
-
-# get last release commit hash
-REF_COMMIT_HASH=
-if [ ${RELEASE_MODE} ]; then
- echo "Reference tag is : ${PREVIOUS_RELEASE_TAG_NAME}"
- REF_COMMIT_HASH=`git show --pretty=format:"%H" -s ${PREVIOUS_RELEASE_TAG_NAME} | tail -n 1`
-else
- echo "Reference tag is : ${LAST_RELEASE_TAG_NAME}"
- REF_COMMIT_HASH=`git show --pretty=format:"%H" -s ${LAST_RELEASE_TAG_NAME} | tail -n 1`
-fi
-
-if [ "$?" -ne "0" ]; then
- echo " !! Error when retrieving last release commit hash"
- exit -1
-fi
-
-echo "Reference commit is : ${REF_COMMIT_HASH}"
-echo
-
-# use git log to retrieve changelog content
-CHANGELOG_CONTENT=`git log --no-merges --pretty=format:"%s" ${REF_COMMIT_HASH}.. | grep -v "\[\#1262\]"`
-
-if [ "$?" -eq "1" ]; then
- echo " !! No new commit since last release"
- CHANGELOG_CONTENT="No new commit"
-fi
-
-if [ "$?" -ne "0" ]; then
- echo " !! Error when retrieving changelog content"
- exit -1
-fi
-
-# iterate throw changelog files
-for CHANGELOG_FILE in ${CHANGELOG_FILES[@]}
-do
- echo "Changelog : ${CHANGELOG_FILE}"
- echo
- rm -f ${CHANGELOG_FILE}.dch >/dev/null 2>&1
-
- # if previous entry is a snapshot, remove it
- sed -n 's/ //g;3p;3q' ${CHANGELOG_FILE} | grep "**SNAPSHOT" >/dev/null 2>&1
- if [ $? -eq 0 ]; then
- echo "Previous entry is a snapshot, removing it"
-
- # detect first section length
- FIRST_SECTION_LENGTH=`tail -n +2 ${CHANGELOG_FILE} | nl -ba | grep -m 1 "sflphone-.* SYSTEM; urgency=.*" | awk '{print $1}'`
-
- if [ "$?" -ne "0" ] || [ ! ${FIRST_SECTION_LENGTH} ]; then
- echo " !! Error when retrieving snapshot entry length"
- exit -1
- fi
-
- # remove first section
- sed -i "1,${FIRST_SECTION_LENGTH}d" ${CHANGELOG_FILE}
-
- if [ "$?" -ne "0" ]; then
- echo " !! Error when removing snapshot section"
- exit -1
- fi
- fi
-
- echo -n "Generate changelog "
- IS_FIRST=1
- echo "${CHANGELOG_CONTENT}" | while read line
- do
-
- if [ ${IS_FIRST} ]
- then
- yes | dch --changelog ${CHANGELOG_FILE} -b --allow-lower-version --no-auto-nmu --distribution SYSTEM --newversion ${VERSION}-SYSVER "$line" >/dev/null 2>&1
-
- if [ "$?" -ne "0" ]; then
- echo
- echo " !! Error with new version"
- exit -1
- fi
-
- IS_FIRST=
- else
- dch --changelog ${CHANGELOG_FILE} --no-auto-nmu "$line"
- if [ "$?" -ne "0" ]; then
- echo
- echo " !! Error when adding changelog entry"
- exit -1
- fi
- fi
- echo -n .
- done
-
- # add snapshot or release flag if needed
- echo
- if [ ${RELEASE_MODE} ]; then
- sed -i "3i\ ** ${VERSION} **\n" ${CHANGELOG_FILE}
- if [ "$?" -ne "0" ]; then
- echo " !! Error when adding snapshot flag"
- exit -1
- fi
- else
- sed -i "3i\ ** SNAPSHOT ${VERSION} **\n" ${CHANGELOG_FILE}
- if [ "$?" -ne "0" ]; then
- echo " !! Error when adding snapshot flag"
- exit -1
- fi
- fi
- echo
-done
-
-echo "All done !"
-
-exit 0
-
diff --git a/tools/mozilla-telify-sflphone/sflphone-handler b/tools/mozilla-telify-sflphone/sflphone-handler
new file mode 100755
index 0000000000000000000000000000000000000000..727ef0f93c26927ed962654154418cd59ca2983a
--- /dev/null
+++ b/tools/mozilla-telify-sflphone/sflphone-handler
@@ -0,0 +1,52 @@
+#!/bin/sh
+#
+# This script can be used as a callto: (or other) protocol handler in
+# Mozilla Firefox-based browser.
+# In Firefox use Preferences > Applications and set the callto handler
+# to this script.
+
+# The sflphone daemon config file
+RESFILE=~/.config/sflphone/sflphonedrc
+
+# Parse sflphonedrc and get default account id string
+if [ -f "$RESFILE" ]; then
+
+ # Use first ID
+ ACCOUNTID=`grep Accounts.order $RESFILE | sed -e 's/Accounts.order=//' -e 's/\/.*//'`
+
+ # Accounts.order is not set
+ if [ -z $ACCOUNTID ]; then
+
+ # Use first account declared in sflphone config
+ ACCOUNTID="`grep -m 1 Account: $RESFILE | sed -e 's/\[//' -e 's/\]//'`"
+ fi
+
+else
+ echo Fatal: Cant find sflphonedrc config file.
+ exit 1
+fi
+
+# Check 1st argument (phone number)
+if [ -z $1 ]; then
+ echo "Error: argument 1 (phone number) not provided."
+ exit 1
+fi
+
+# Cleanup destination, keeping numbers only
+TO="`echo $1 | sed -e 's/[^0123456789]//g'`"
+
+# Generate call id.
+CALLID=${RANDOM}$$
+
+dbus-send \
+ --type="method_call" \
+ --dest="org.sflphone.SFLphone" \
+ "/org/sflphone/SFLphone/CallManager" \
+ "org.sflphone.SFLphone.CallManager.placeCall" \
+ string:"$ACCOUNTID" \
+ string:"$CALLID" \
+ string:"$TO"
+
+exit 0
+
+# EOF
diff --git a/tools/mozilla-telify-sflphone/telify-0.4.7.3-fx.xpi b/tools/mozilla-telify-sflphone/telify-0.4.7.3-fx.xpi
new file mode 100644
index 0000000000000000000000000000000000000000..ec1eff1fe541400731f1b2e5b6e33a30c8cd9a4a
Binary files /dev/null and b/tools/mozilla-telify-sflphone/telify-0.4.7.3-fx.xpi differ