diff --git a/sflphone-common/po/de.po b/sflphone-common/po/de.po
index f0e8f4fd94452609c1e1c2cbc8c59b721a92c686..a0b349866a415e7294860ab6ada369041ea58d05 100644
--- a/sflphone-common/po/de.po
+++ b/sflphone-common/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sflphone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-05 17:03-0400\n"
+"POT-Creation-Date: 2009-05-19 15:18-0400\n"
 "PO-Revision-Date: 2009-01-08 10:46-0500\n"
 "Last-Translator: Sven Werlen <sven.werlen@savoirfairelinux.com>\n"
 "Language-Team: SavoirFaire Linux Inc <sflphoneteam@savoirfairelinux.com>\n"
@@ -72,7 +72,7 @@ msgstr "%d Voice Nachricht"
 
 #: ../../sflphone-client-gnome/src/actions.c:81
 #, fuzzy, c-format
-msgid "Connected to %s (%s)"
+msgid "Registered to %s (%s)"
 msgstr "registriert"
 
 #: ../../sflphone-client-gnome/src/actions.c:87
@@ -88,17 +88,17 @@ msgstr ""
 "SFLphone Server kann nicht verbunden werden. Stellen Sie sicher, dass der "
 "Dämon läuft."
 
-#: ../../sflphone-client-gnome/src/actions.c:775
+#: ../../sflphone-client-gnome/src/actions.c:787
 #, c-format
 msgid "IP call - %s"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/actions.c:778
+#: ../../sflphone-client-gnome/src/actions.c:790
 #, c-format
 msgid "%s account- %s             %s"
 msgstr "%s Konto- %s             %s"
 
-#: ../../sflphone-client-gnome/src/actions.c:868
+#: ../../sflphone-client-gnome/src/actions.c:880
 #, c-format
 msgid ""
 "<b>Error: No audio codecs found.\n"
@@ -226,7 +226,7 @@ msgid "IAX2 account configuration"
 msgstr "Konfiguration des IAX2 Konto"
 
 #: ../../sflphone-client-gnome/src/assistant.c:405
-#: ../../sflphone-client-gnome/src/config/configwindow.c:840
+#: ../../sflphone-client-gnome/src/config/configwindow.c:863
 msgid "Network Address Translation"
 msgstr "Network Address Translation (NAT)"
 
@@ -235,7 +235,7 @@ msgid "You should probably enable this if you are behind a firewall."
 msgstr "Sie sollten dieses einschalten, falls Sie hinter einer Firewall sind."
 
 #: ../../sflphone-client-gnome/src/assistant.c:414
-#: ../../sflphone-client-gnome/src/config/configwindow.c:504
+#: ../../sflphone-client-gnome/src/config/configwindow.c:516
 msgid "E_nable STUN"
 msgstr "STUN Ei_nschalten"
 
@@ -296,7 +296,7 @@ msgstr "Laufende Anrufe."
 msgid "Do you still want to quit?"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/mainwindow.c:293
+#: ../../sflphone-client-gnome/src/mainwindow.c:296
 #, fuzzy
 msgid "SFLphone Error"
 msgstr "SFLphone 0.9.2"
@@ -438,8 +438,8 @@ msgid "_Show main window"
 msgstr "_Hauptfenster anzeigen"
 
 #: ../../sflphone-client-gnome/src/statusicon.c:124
-#, c-format
-msgid "SFLphone - %i accounts registered"
+#, fuzzy, c-format
+msgid "SFLphone - %i accounts configured"
 msgstr "SFLphone - %i Konten registriert"
 
 #: ../../sflphone-client-gnome/src/timestamp.c:46
@@ -510,7 +510,8 @@ msgid "Account settings"
 msgstr "Kontoeinstellungen"
 
 #: ../../sflphone-client-gnome/src/config/accountwindow.c:120
-msgid "Account parameters"
+#, fuzzy
+msgid "Account Parameters"
 msgstr "Kontoparameter"
 
 #: ../../sflphone-client-gnome/src/config/accountwindow.c:142
@@ -526,12 +527,12 @@ msgid "Unknown"
 msgstr "unbekannt"
 
 #: ../../sflphone-client-gnome/src/config/addressbook-config.c:265
-#: ../../sflphone-client-gnome/src/config/configwindow.c:709
+#: ../../sflphone-client-gnome/src/config/configwindow.c:732
 msgid "General"
 msgstr "Allgemein"
 
 #: ../../sflphone-client-gnome/src/config/addressbook-config.c:276
-msgid "_Use Evolution address book"
+msgid "_Use Evolution address books"
 msgstr ""
 
 #: ../../sflphone-client-gnome/src/config/addressbook-config.c:283
@@ -542,27 +543,35 @@ msgstr ""
 msgid "_Display contact photo if available"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:299
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:301
 msgid "Fields"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:309
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:311
+msgid "Use the following fields from Evolution's address books:"
+msgstr ""
+
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:316
 msgid "_Business phone"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:314
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:321
 msgid "_Home phone"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:319
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:326
 msgid "_Mobile phone"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:324
-msgid "Books"
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:333
+msgid "Address Books"
+msgstr ""
+
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:343
+msgid "Select which Evolution address books to use:"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:356
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:377
 #: ../../sflphone-client-gnome/src/config/audioconf.c:574
 msgid "Name"
 msgstr "Name"
@@ -608,196 +617,224 @@ msgstr "Eingabe"
 msgid "_Enable ringtones"
 msgstr "Klingeltöne _einschalten"
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:763
+#: ../../sflphone-client-gnome/src/config/audioconf.c:764
 msgid "Choose a ringtone"
 msgstr "Klingelton auswählen"
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:768
+#: ../../sflphone-client-gnome/src/config/audioconf.c:769
 msgid "Audio Files"
 msgstr "Audio Dateien"
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:787
+#: ../../sflphone-client-gnome/src/config/audioconf.c:788
 msgid "_Voice Activity Detection"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:797
+#: ../../sflphone-client-gnome/src/config/audioconf.c:798
 msgid "_Noise Reduction (Narrow-Band Companding)"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:825
+#: ../../sflphone-client-gnome/src/config/audioconf.c:826
 msgid "Sound Manager"
 msgstr "Sound Manager"
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:832
+#: ../../sflphone-client-gnome/src/config/audioconf.c:833
 msgid "ALSA configuration"
 msgstr "ALSA Konfiguration"
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:849
+#: ../../sflphone-client-gnome/src/config/audioconf.c:850
 msgid "Codecs"
 msgstr "Codecs"
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:872
+#: ../../sflphone-client-gnome/src/config/audioconf.c:873
 msgid "Ringtones"
 msgstr "Klingeltöne"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:390
+#: ../../sflphone-client-gnome/src/config/configwindow.c:402
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:397
+#: ../../sflphone-client-gnome/src/config/configwindow.c:409
 msgid "Status"
 msgstr "Status"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:500
+#: ../../sflphone-client-gnome/src/config/configwindow.c:512
 msgid "Stun parameters will apply to each SIP account created."
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:508
+#: ../../sflphone-client-gnome/src/config/configwindow.c:520
 msgid "Enable it if you are behind a firewall"
 msgstr "Einschalten falls Sie hinter einer Firewall sind"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:516
+#: ../../sflphone-client-gnome/src/config/configwindow.c:528
 msgid "Format: name.server:port"
 msgstr "Format: Name.Server:Port"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:564
-msgid "Desktop Notification"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:579
+#, fuzzy
+msgid "Desktop Notifications"
 msgstr "Desktopbenachrichtigung"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:572
-msgid "_Enable"
-msgstr "_Einschalten"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:588
+#, fuzzy
+msgid "_Enable notifications"
+msgstr "Klingeltöne _einschalten"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:577
-msgid "_Notify voice mails"
-msgstr "_Benachrichtigung für Voice Nachrichten"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:594
+msgid "Enable voicemail _notifications"
+msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:583
+#: ../../sflphone-client-gnome/src/config/configwindow.c:605
 msgid "System Tray Icon"
 msgstr "Benachrichtigungsfeld (\"System Tray\") Icon"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:591
+#: ../../sflphone-client-gnome/src/config/configwindow.c:613
 msgid "_Popup main window on incoming call"
 msgstr "Hauptfenster anzeigen wenn eingehendes Gespräch"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:596
+#: ../../sflphone-client-gnome/src/config/configwindow.c:618
 msgid "Ne_ver popup main window"
 msgstr "_Hauptfenster nie anzeigen"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:600
-msgid "_Start hidden"
-msgstr "_Unsichtbar beim Start"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:622
+msgid "Hide SFLphone window on _startup"
+msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:606
+#: ../../sflphone-client-gnome/src/config/configwindow.c:628
 msgid "Calls History"
 msgstr "Liste der vorherigen Anrufen"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:614
-msgid "_Maximum number of calls"
-msgstr "_maximale Anzahl von Anrufen"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:636
+#, fuzzy
+msgid "_History size limit"
+msgstr "Liste der vorherigen Anrufen is leer"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:630
+#: ../../sflphone-client-gnome/src/config/configwindow.c:653
 msgid "PulseAudio sound server"
 msgstr "PulseAudio Sound Server"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:638
-msgid "_Control running applications volume"
-msgstr "Lautstärke für laufende Anwendungen _einstellen"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:661
+msgid "Mute other applications during a _call"
+msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:651
+#: ../../sflphone-client-gnome/src/config/configwindow.c:674
 msgid "SIP Port"
 msgstr "SIP Port"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:664
+#: ../../sflphone-client-gnome/src/config/configwindow.c:687
 msgid "Port:"
 msgstr "Port:"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:719
+#: ../../sflphone-client-gnome/src/config/configwindow.c:742
 msgid "_Recordings folder"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:725
+#: ../../sflphone-client-gnome/src/config/configwindow.c:748
 msgid "Select a folder"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:750
+#: ../../sflphone-client-gnome/src/config/configwindow.c:773
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:770
+#: ../../sflphone-client-gnome/src/config/configwindow.c:793
 msgid "General Settings"
 msgstr "Allgemeine Einstellungen"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:775
+#: ../../sflphone-client-gnome/src/config/configwindow.c:798
 msgid "Audio Settings"
 msgstr "Audio Einstellungen"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:780
+#: ../../sflphone-client-gnome/src/config/configwindow.c:803
 #, fuzzy
 msgid "Recordings"
 msgstr "_Gespräch aufzeichnen"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:785
+#: ../../sflphone-client-gnome/src/config/configwindow.c:808
 msgid "Address Book"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:790
+#: ../../sflphone-client-gnome/src/config/configwindow.c:813
 msgid "Hooks"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:817
+#: ../../sflphone-client-gnome/src/config/configwindow.c:840
 msgid "Accounts"
 msgstr "Konten"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:829
+#: ../../sflphone-client-gnome/src/config/configwindow.c:852
 #, fuzzy
-msgid "Account previously setup"
-msgstr "Zuvor eingestellte Konten"
+msgid "Configured Accounts"
+msgstr "Aktuelles Konto"
 
 #: ../../sflphone-client-gnome/src/config/hooks-config.c:130
-msgid "URL argument"
+msgid "URL Passing"
 msgstr ""
 
 #: ../../sflphone-client-gnome/src/config/hooks-config.c:140
-msgid "_SIP protocol"
-msgstr "_SIP protokoll"
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:145
-msgid "_SIP Header: "
+#, c-format
+msgid ""
+"SFLphone can run custom commands if incoming calls come with an URL "
+"attached.\n"
+"In this case, %s will be replaced with the passed URL."
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:152
-msgid "_IAX2 protocol"
-msgstr "_IAX2 protokoll"
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:143
+msgid "Trigger on specific _SIP header"
+msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:157
-msgid "_Command: "
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:155
+msgid "Trigger on _IAX2 URL"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:164
-msgid "Phone number formatting"
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:160
+msgid "_Command to run: "
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:174
-msgid "_Add phone number prefix"
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:168
+msgid "Phone Number Rewriting"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:179
-msgid "_Prepend: "
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:178
+msgid "_Prefix dialed numbers with:"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/contacts/history.c:75
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:94
+#: ../../sflphone-client-gnome/src/contacts/history.c:83
+#: ../../sflphone-client-gnome/src/contacts/searchbar.c:123
 #, fuzzy
 msgid "Search history"
 msgstr "Liste der vorherigen Anrufen _leeren"
 
-#: ../../sflphone-client-gnome/src/contacts/history.c:75
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:86
+#: ../../sflphone-client-gnome/src/contacts/history.c:83
+#: ../../sflphone-client-gnome/src/contacts/searchbar.c:110
 #, fuzzy
 msgid "Search contact"
 msgstr "Adressbuch _Suche"
 
+#~ msgid "_Enable"
+#~ msgstr "_Einschalten"
+
+#~ msgid "_Notify voice mails"
+#~ msgstr "_Benachrichtigung für Voice Nachrichten"
+
+#~ msgid "_Start hidden"
+#~ msgstr "_Unsichtbar beim Start"
+
+#~ msgid "_Maximum number of calls"
+#~ msgstr "_maximale Anzahl von Anrufen"
+
+#~ msgid "_Control running applications volume"
+#~ msgstr "Lautstärke für laufende Anwendungen _einstellen"
+
+#, fuzzy
+#~ msgid "Account previously setup"
+#~ msgstr "Zuvor eingestellte Konten"
+
+#~ msgid "_SIP protocol"
+#~ msgstr "_SIP protokoll"
+
+#~ msgid "_IAX2 protocol"
+#~ msgstr "_IAX2 protokoll"
+
 #~ msgid "Search"
 #~ msgstr "Suchen"
 
@@ -824,6 +861,3 @@ msgstr "Adressbuch _Suche"
 
 #~ msgid "Apply"
 #~ msgstr "übernehmen"
-
-#~ msgid "History empty"
-#~ msgstr "Liste der vorherigen Anrufen is leer"
diff --git a/sflphone-common/po/es.po b/sflphone-common/po/es.po
index 867ee386d22d2588b897f88fc91ec32c9757a0f4..3d3e8147ad7a18aab5ac2e5d8cfe6e1492f26ae8 100644
--- a/sflphone-common/po/es.po
+++ b/sflphone-common/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SFLphone 0.9.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-05 17:03-0400\n"
+"POT-Creation-Date: 2009-05-19 15:18-0400\n"
 "PO-Revision-Date: 2008-08-11 11:53+0200\n"
 "Last-Translator: Maxime Chambreuil <maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n"
@@ -73,7 +73,7 @@ msgstr "%d mensaje de voz"
 
 #: ../../sflphone-client-gnome/src/actions.c:81
 #, fuzzy, c-format
-msgid "Connected to %s (%s)"
+msgid "Registered to %s (%s)"
 msgstr "Registrado"
 
 #: ../../sflphone-client-gnome/src/actions.c:87
@@ -89,17 +89,17 @@ msgstr ""
 "Incapaz de conectar con el servidor SFLphone.\n"
 " Asegúrese de que el demonio esté funcionando."
 
-#: ../../sflphone-client-gnome/src/actions.c:775
+#: ../../sflphone-client-gnome/src/actions.c:787
 #, c-format
 msgid "IP call - %s"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/actions.c:778
+#: ../../sflphone-client-gnome/src/actions.c:790
 #, c-format
 msgid "%s account- %s             %s"
 msgstr "%s cuenta- %s             %s"
 
-#: ../../sflphone-client-gnome/src/actions.c:868
+#: ../../sflphone-client-gnome/src/actions.c:880
 #, c-format
 msgid ""
 "<b>Error: No audio codecs found.\n"
@@ -221,7 +221,7 @@ msgid "IAX2 account configuration"
 msgstr "Configuración de cuenta IAX2"
 
 #: ../../sflphone-client-gnome/src/assistant.c:405
-#: ../../sflphone-client-gnome/src/config/configwindow.c:840
+#: ../../sflphone-client-gnome/src/config/configwindow.c:863
 msgid "Network Address Translation"
 msgstr "Conversión de Dirección de Red (NAT)"
 
@@ -230,7 +230,7 @@ msgid "You should probably enable this if you are behind a firewall."
 msgstr "Probablemente tiene que activar esto si está detrás de un cortafuegos."
 
 #: ../../sflphone-client-gnome/src/assistant.c:414
-#: ../../sflphone-client-gnome/src/config/configwindow.c:504
+#: ../../sflphone-client-gnome/src/config/configwindow.c:516
 msgid "E_nable STUN"
 msgstr "A_ctivar STUN"
 
@@ -291,7 +291,7 @@ msgstr "Hay llamadas en curso."
 msgid "Do you still want to quit?"
 msgstr "Sin embargo quiere parar ?"
 
-#: ../../sflphone-client-gnome/src/mainwindow.c:293
+#: ../../sflphone-client-gnome/src/mainwindow.c:296
 #, fuzzy
 msgid "SFLphone Error"
 msgstr "SFLphone 0.9.3"
@@ -435,8 +435,8 @@ msgid "_Show main window"
 msgstr "Mostrar ventana principal"
 
 #: ../../sflphone-client-gnome/src/statusicon.c:124
-#, c-format
-msgid "SFLphone - %i accounts registered"
+#, fuzzy, c-format
+msgid "SFLphone - %i accounts configured"
 msgstr "SFLphone - %i cuenta registrada"
 
 #: ../../sflphone-client-gnome/src/timestamp.c:46
@@ -507,7 +507,8 @@ msgid "Account settings"
 msgstr "Configuración de cuentas"
 
 #: ../../sflphone-client-gnome/src/config/accountwindow.c:120
-msgid "Account parameters"
+#, fuzzy
+msgid "Account Parameters"
 msgstr "Paràmetros de cuenta"
 
 #: ../../sflphone-client-gnome/src/config/accountwindow.c:142
@@ -523,12 +524,12 @@ msgid "Unknown"
 msgstr "Desconocido"
 
 #: ../../sflphone-client-gnome/src/config/addressbook-config.c:265
-#: ../../sflphone-client-gnome/src/config/configwindow.c:709
+#: ../../sflphone-client-gnome/src/config/configwindow.c:732
 msgid "General"
 msgstr "Configuración"
 
 #: ../../sflphone-client-gnome/src/config/addressbook-config.c:276
-msgid "_Use Evolution address book"
+msgid "_Use Evolution address books"
 msgstr ""
 
 #: ../../sflphone-client-gnome/src/config/addressbook-config.c:283
@@ -539,27 +540,35 @@ msgstr ""
 msgid "_Display contact photo if available"
 msgstr "_Mostrar fotos de contactos, si disponible"
 
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:299
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:301
 msgid "Fields"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:309
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:311
+msgid "Use the following fields from Evolution's address books:"
+msgstr ""
+
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:316
 msgid "_Business phone"
 msgstr "_Numero de telefono profecional"
 
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:314
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:321
 msgid "_Home phone"
 msgstr "_Numero de telefono personal"
 
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:319
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:326
 msgid "_Mobile phone"
 msgstr "_Numero de movil"
 
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:324
-msgid "Books"
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:333
+msgid "Address Books"
+msgstr ""
+
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:343
+msgid "Select which Evolution address books to use:"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:356
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:377
 #: ../../sflphone-client-gnome/src/config/audioconf.c:574
 msgid "Name"
 msgstr "Nombre"
@@ -605,196 +614,223 @@ msgstr ""
 msgid "_Enable ringtones"
 msgstr "_Habilitar tonos de llamada"
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:763
+#: ../../sflphone-client-gnome/src/config/audioconf.c:764
 msgid "Choose a ringtone"
 msgstr "Elija un tono de llmada"
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:768
+#: ../../sflphone-client-gnome/src/config/audioconf.c:769
 msgid "Audio Files"
 msgstr "Archivos de Audio"
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:787
+#: ../../sflphone-client-gnome/src/config/audioconf.c:788
 msgid "_Voice Activity Detection"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:797
+#: ../../sflphone-client-gnome/src/config/audioconf.c:798
 msgid "_Noise Reduction (Narrow-Band Companding)"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:825
+#: ../../sflphone-client-gnome/src/config/audioconf.c:826
 msgid "Sound Manager"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:832
+#: ../../sflphone-client-gnome/src/config/audioconf.c:833
 msgid "ALSA configuration"
 msgstr "Configuraciòn de cuenta SIP"
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:849
+#: ../../sflphone-client-gnome/src/config/audioconf.c:850
 msgid "Codecs"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:872
+#: ../../sflphone-client-gnome/src/config/audioconf.c:873
 msgid "Ringtones"
 msgstr "_Permitir los ringtones"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:390
+#: ../../sflphone-client-gnome/src/config/configwindow.c:402
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:397
+#: ../../sflphone-client-gnome/src/config/configwindow.c:409
 msgid "Status"
 msgstr "Estado"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:500
+#: ../../sflphone-client-gnome/src/config/configwindow.c:512
 msgid "Stun parameters will apply to each SIP account created."
 msgstr "Parámetros de stun se aplicarán a cada cuenta SIP creada."
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:508
+#: ../../sflphone-client-gnome/src/config/configwindow.c:520
 msgid "Enable it if you are behind a firewall"
 msgstr "Actívelo si está detrás de un cortafuegos, después reinicie SFLphone"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:516
+#: ../../sflphone-client-gnome/src/config/configwindow.c:528
 msgid "Format: name.server:port"
 msgstr "Formato: nombre.servidor:puerto"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:564
-msgid "Desktop Notification"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:579
+#, fuzzy
+msgid "Desktop Notifications"
 msgstr "Notificación de escritorio"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:572
-msgid "_Enable"
-msgstr "_Activar"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:588
+#, fuzzy
+msgid "_Enable notifications"
+msgstr "_Habilitar tonos de llamada"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:577
-msgid "_Notify voice mails"
-msgstr "_Notificar mensajes de voz"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:594
+msgid "Enable voicemail _notifications"
+msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:583
+#: ../../sflphone-client-gnome/src/config/configwindow.c:605
 msgid "System Tray Icon"
 msgstr "Icono de bandeja del sistema"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:591
+#: ../../sflphone-client-gnome/src/config/configwindow.c:613
 msgid "_Popup main window on incoming call"
 msgstr "_Popup ventana principal al recibir llamadas"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:596
+#: ../../sflphone-client-gnome/src/config/configwindow.c:618
 msgid "Ne_ver popup main window"
 msgstr "_Nunca mostrar ventana principal"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:600
-msgid "_Start hidden"
-msgstr "_Iniciar oculto"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:622
+msgid "Hide SFLphone window on _startup"
+msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:606
+#: ../../sflphone-client-gnome/src/config/configwindow.c:628
 msgid "Calls History"
 msgstr "Historial de llamadas"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:614
-msgid "_Maximum number of calls"
-msgstr "_Numero maximo de llamadas"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:636
+msgid "_History size limit"
+msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:630
+#: ../../sflphone-client-gnome/src/config/configwindow.c:653
 msgid "PulseAudio sound server"
 msgstr "Servidor de sonido Pulseaudio"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:638
-msgid "_Control running applications volume"
-msgstr "_Control del volumen de las applicaciones en curso"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:661
+msgid "Mute other applications during a _call"
+msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:651
+#: ../../sflphone-client-gnome/src/config/configwindow.c:674
 msgid "SIP Port"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:664
+#: ../../sflphone-client-gnome/src/config/configwindow.c:687
 msgid "Port:"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:719
+#: ../../sflphone-client-gnome/src/config/configwindow.c:742
 msgid "_Recordings folder"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:725
+#: ../../sflphone-client-gnome/src/config/configwindow.c:748
 msgid "Select a folder"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:750
+#: ../../sflphone-client-gnome/src/config/configwindow.c:773
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:770
+#: ../../sflphone-client-gnome/src/config/configwindow.c:793
 msgid "General Settings"
 msgstr "Configuración"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:775
+#: ../../sflphone-client-gnome/src/config/configwindow.c:798
 msgid "Audio Settings"
 msgstr "Configuración de audio"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:780
+#: ../../sflphone-client-gnome/src/config/configwindow.c:803
 #, fuzzy
 msgid "Recordings"
 msgstr "Registrar"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:785
+#: ../../sflphone-client-gnome/src/config/configwindow.c:808
 msgid "Address Book"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:790
+#: ../../sflphone-client-gnome/src/config/configwindow.c:813
 msgid "Hooks"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:817
+#: ../../sflphone-client-gnome/src/config/configwindow.c:840
 msgid "Accounts"
 msgstr "Cuentas"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:829
+#: ../../sflphone-client-gnome/src/config/configwindow.c:852
 #, fuzzy
-msgid "Account previously setup"
-msgstr "Cuentas existentes"
+msgid "Configured Accounts"
+msgstr "Cuenta"
 
 #: ../../sflphone-client-gnome/src/config/hooks-config.c:130
-msgid "URL argument"
+msgid "URL Passing"
 msgstr ""
 
 #: ../../sflphone-client-gnome/src/config/hooks-config.c:140
-msgid "_SIP protocol"
-msgstr "_Protocolo SIP"
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:145
-msgid "_SIP Header: "
+#, c-format
+msgid ""
+"SFLphone can run custom commands if incoming calls come with an URL "
+"attached.\n"
+"In this case, %s will be replaced with the passed URL."
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:152
-msgid "_IAX2 protocol"
-msgstr "_Protocolo IAX2"
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:143
+msgid "Trigger on specific _SIP header"
+msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:157
-msgid "_Command: "
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:155
+msgid "Trigger on _IAX2 URL"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:164
-msgid "Phone number formatting"
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:160
+msgid "_Command to run: "
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:174
-msgid "_Add phone number prefix"
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:168
+msgid "Phone Number Rewriting"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:179
-msgid "_Prepend: "
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:178
+msgid "_Prefix dialed numbers with:"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/contacts/history.c:75
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:94
+#: ../../sflphone-client-gnome/src/contacts/history.c:83
+#: ../../sflphone-client-gnome/src/contacts/searchbar.c:123
 #, fuzzy
 msgid "Search history"
 msgstr "Historia de Llamada"
 
-#: ../../sflphone-client-gnome/src/contacts/history.c:75
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:86
+#: ../../sflphone-client-gnome/src/contacts/history.c:83
+#: ../../sflphone-client-gnome/src/contacts/searchbar.c:110
 #, fuzzy
 msgid "Search contact"
 msgstr "_Buscar contactos"
 
+#~ msgid "_Enable"
+#~ msgstr "_Activar"
+
+#~ msgid "_Notify voice mails"
+#~ msgstr "_Notificar mensajes de voz"
+
+#~ msgid "_Start hidden"
+#~ msgstr "_Iniciar oculto"
+
+#~ msgid "_Maximum number of calls"
+#~ msgstr "_Numero maximo de llamadas"
+
+#~ msgid "_Control running applications volume"
+#~ msgstr "_Control del volumen de las applicaciones en curso"
+
+#, fuzzy
+#~ msgid "Account previously setup"
+#~ msgstr "Cuentas existentes"
+
+#~ msgid "_SIP protocol"
+#~ msgstr "_Protocolo SIP"
+
+#~ msgid "_IAX2 protocol"
+#~ msgstr "_Protocolo IAX2"
+
 #~ msgid "Search"
 #~ msgstr "Buscar"
 
diff --git a/sflphone-common/po/ru.po b/sflphone-common/po/ru.po
index 97ddd36c6d4d4c6f82659e6acdf0d54093d5cc2b..54f0844c119b22f2b89e8c088e16eead51a7419d 100644
--- a/sflphone-common/po/ru.po
+++ b/sflphone-common/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SFLphone 0.9.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-05 17:03-0400\n"
+"POT-Creation-Date: 2009-05-19 15:18-0400\n"
 "PO-Revision-Date: 2009-01-08 15:19 GMT-5\n"
 "Last-Translator: HUSSEIN ABDALLAH <hussein.abdallah@savoirfairelinux.com>\n"
 "Language-Team:  Savoir-Faire Linux Inc <sflphoneteam@savoirfairelinux.com>\n"
@@ -71,7 +71,7 @@ msgstr "%d речевое сообщение"
 
 #: ../../sflphone-client-gnome/src/actions.c:81
 #, fuzzy, c-format
-msgid "Connected to %s (%s)"
+msgid "Registered to %s (%s)"
 msgstr "Зарегистрирован"
 
 #: ../../sflphone-client-gnome/src/actions.c:87
@@ -87,17 +87,17 @@ msgstr ""
 "Невозможно подключиться к SFLphone-серверу.\n"
 "Проверьте если демон работает."
 
-#: ../../sflphone-client-gnome/src/actions.c:775
+#: ../../sflphone-client-gnome/src/actions.c:787
 #, c-format
 msgid "IP call - %s"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/actions.c:778
+#: ../../sflphone-client-gnome/src/actions.c:790
 #, fuzzy, c-format
 msgid "%s account- %s             %s"
 msgstr "%s аккаунт- %s"
 
-#: ../../sflphone-client-gnome/src/actions.c:868
+#: ../../sflphone-client-gnome/src/actions.c:880
 #, c-format
 msgid ""
 "<b>Error: No audio codecs found.\n"
@@ -219,7 +219,7 @@ msgid "IAX2 account configuration"
 msgstr "Настройка IAX2-аккаунта"
 
 #: ../../sflphone-client-gnome/src/assistant.c:405
-#: ../../sflphone-client-gnome/src/config/configwindow.c:840
+#: ../../sflphone-client-gnome/src/config/configwindow.c:863
 msgid "Network Address Translation"
 msgstr "Network Address Translation"
 
@@ -228,7 +228,7 @@ msgid "You should probably enable this if you are behind a firewall."
 msgstr "Вы наверное должны это включить если вы находитесь за сетевым экраном."
 
 #: ../../sflphone-client-gnome/src/assistant.c:414
-#: ../../sflphone-client-gnome/src/config/configwindow.c:504
+#: ../../sflphone-client-gnome/src/config/configwindow.c:516
 msgid "E_nable STUN"
 msgstr "Включить STUN"
 
@@ -289,7 +289,7 @@ msgstr "Несколько звонков ещё не окончены"
 msgid "Do you still want to quit?"
 msgstr "Вы уверенны что хотите выйти?"
 
-#: ../../sflphone-client-gnome/src/mainwindow.c:293
+#: ../../sflphone-client-gnome/src/mainwindow.c:296
 #, fuzzy
 msgid "SFLphone Error"
 msgstr "SFLphone 0.9.2"
@@ -432,8 +432,8 @@ msgid "_Show main window"
 msgstr "_Показать главное окно"
 
 #: ../../sflphone-client-gnome/src/statusicon.c:124
-#, c-format
-msgid "SFLphone - %i accounts registered"
+#, fuzzy, c-format
+msgid "SFLphone - %i accounts configured"
 msgstr "SFLphone - Зарегистрировано %i аккаунтов"
 
 #: ../../sflphone-client-gnome/src/timestamp.c:46
@@ -504,7 +504,8 @@ msgid "Account settings"
 msgstr "Настройки аккаунта"
 
 #: ../../sflphone-client-gnome/src/config/accountwindow.c:120
-msgid "Account parameters"
+#, fuzzy
+msgid "Account Parameters"
 msgstr "Параметры аккаунта"
 
 #: ../../sflphone-client-gnome/src/config/accountwindow.c:142
@@ -520,12 +521,12 @@ msgid "Unknown"
 msgstr "Неизвестный"
 
 #: ../../sflphone-client-gnome/src/config/addressbook-config.c:265
-#: ../../sflphone-client-gnome/src/config/configwindow.c:709
+#: ../../sflphone-client-gnome/src/config/configwindow.c:732
 msgid "General"
 msgstr "Общие настройки"
 
 #: ../../sflphone-client-gnome/src/config/addressbook-config.c:276
-msgid "_Use Evolution address book"
+msgid "_Use Evolution address books"
 msgstr ""
 
 #: ../../sflphone-client-gnome/src/config/addressbook-config.c:283
@@ -536,28 +537,36 @@ msgstr ""
 msgid "_Display contact photo if available"
 msgstr "_Показать фотографию контакта (если имеется):"
 
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:299
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:301
 msgid "Fields"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:309
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:311
+msgid "Use the following fields from Evolution's address books:"
+msgstr ""
+
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:316
 msgid "_Business phone"
 msgstr "_Рабочий телефон"
 
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:314
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:321
 msgid "_Home phone"
 msgstr "_Домашний телефон"
 
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:319
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:326
 msgid "_Mobile phone"
 msgstr "_Мобильный телефон"
 
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:324
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:333
 #, fuzzy
-msgid "Books"
-msgstr "перехватчики (hooks)"
+msgid "Address Books"
+msgstr "Адресная книга"
 
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:356
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:343
+msgid "Select which Evolution address books to use:"
+msgstr ""
+
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:377
 #: ../../sflphone-client-gnome/src/config/audioconf.c:574
 msgid "Name"
 msgstr "Имя"
@@ -603,199 +612,238 @@ msgstr "Вход"
 msgid "_Enable ringtones"
 msgstr "Включить звонок"
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:763
+#: ../../sflphone-client-gnome/src/config/audioconf.c:764
 msgid "Choose a ringtone"
 msgstr "Выберите звонок"
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:768
+#: ../../sflphone-client-gnome/src/config/audioconf.c:769
 msgid "Audio Files"
 msgstr "Звуковые файлы"
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:787
+#: ../../sflphone-client-gnome/src/config/audioconf.c:788
 #, fuzzy
 msgid "_Voice Activity Detection"
 msgstr "Включить детектор тишины"
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:797
+#: ../../sflphone-client-gnome/src/config/audioconf.c:798
 msgid "_Noise Reduction (Narrow-Band Companding)"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:825
+#: ../../sflphone-client-gnome/src/config/audioconf.c:826
 msgid "Sound Manager"
 msgstr "Менеджер звука"
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:832
+#: ../../sflphone-client-gnome/src/config/audioconf.c:833
 msgid "ALSA configuration"
 msgstr "Настройка ALSA"
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:849
+#: ../../sflphone-client-gnome/src/config/audioconf.c:850
 msgid "Codecs"
 msgstr "Кодеки"
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:872
+#: ../../sflphone-client-gnome/src/config/audioconf.c:873
 msgid "Ringtones"
 msgstr "Звонки"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:390
+#: ../../sflphone-client-gnome/src/config/configwindow.c:402
 msgid "Protocol"
 msgstr "Протокол"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:397
+#: ../../sflphone-client-gnome/src/config/configwindow.c:409
 msgid "Status"
 msgstr "Статус"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:500
+#: ../../sflphone-client-gnome/src/config/configwindow.c:512
 msgid "Stun parameters will apply to each SIP account created."
 msgstr "STUN-параметры будут эффективны для каждого созданного SIP-аккаунта"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:508
+#: ../../sflphone-client-gnome/src/config/configwindow.c:520
 msgid "Enable it if you are behind a firewall"
 msgstr ""
 "Включите это если вы находитесь за сетевым экраном и потом перезагрузите "
 "SFLphone"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:516
+#: ../../sflphone-client-gnome/src/config/configwindow.c:528
 msgid "Format: name.server:port"
 msgstr "Формат: имя.сервер:порт"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:564
-msgid "Desktop Notification"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:579
+#, fuzzy
+msgid "Desktop Notifications"
 msgstr "Извещения на рабочем столе"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:572
-msgid "_Enable"
-msgstr "_Включить"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:588
+#, fuzzy
+msgid "_Enable notifications"
+msgstr "Включить звонок"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:577
-msgid "_Notify voice mails"
-msgstr "_Предупредить о новых речевых сообщениях"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:594
+msgid "Enable voicemail _notifications"
+msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:583
+#: ../../sflphone-client-gnome/src/config/configwindow.c:605
 msgid "System Tray Icon"
 msgstr "System Tray Icon"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:591
+#: ../../sflphone-client-gnome/src/config/configwindow.c:613
 msgid "_Popup main window on incoming call"
 msgstr "_Показать главное окно при входящем звонке"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:596
+#: ../../sflphone-client-gnome/src/config/configwindow.c:618
 msgid "Ne_ver popup main window"
 msgstr "Никогда не показывать главное окно"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:600
-msgid "_Start hidden"
-msgstr "_Начать спрятанным"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:622
+msgid "Hide SFLphone window on _startup"
+msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:606
+#: ../../sflphone-client-gnome/src/config/configwindow.c:628
 msgid "Calls History"
 msgstr "Журнал звонков"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:614
-msgid "_Maximum number of calls"
-msgstr "_Максимальное количество звонков"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:636
+#, fuzzy
+msgid "_History size limit"
+msgstr "Журнал пуст"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:630
+#: ../../sflphone-client-gnome/src/config/configwindow.c:653
 msgid "PulseAudio sound server"
 msgstr "Сервер звука PulseAudio"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:638
-msgid "_Control running applications volume"
-msgstr "_Начать спрятанным "
+#: ../../sflphone-client-gnome/src/config/configwindow.c:661
+msgid "Mute other applications during a _call"
+msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:651
+#: ../../sflphone-client-gnome/src/config/configwindow.c:674
 msgid "SIP Port"
 msgstr "SIP-порт"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:664
+#: ../../sflphone-client-gnome/src/config/configwindow.c:687
 msgid "Port:"
 msgstr "Порт:"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:719
+#: ../../sflphone-client-gnome/src/config/configwindow.c:742
 msgid "_Recordings folder"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:725
+#: ../../sflphone-client-gnome/src/config/configwindow.c:748
 msgid "Select a folder"
 msgstr "Выберите папку"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:750
+#: ../../sflphone-client-gnome/src/config/configwindow.c:773
 msgid "Preferences"
 msgstr "Предпочтения"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:770
+#: ../../sflphone-client-gnome/src/config/configwindow.c:793
 msgid "General Settings"
 msgstr "Общие настройки"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:775
+#: ../../sflphone-client-gnome/src/config/configwindow.c:798
 msgid "Audio Settings"
 msgstr "Настройки звука"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:780
+#: ../../sflphone-client-gnome/src/config/configwindow.c:803
 #, fuzzy
 msgid "Recordings"
 msgstr "Записать"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:785
+#: ../../sflphone-client-gnome/src/config/configwindow.c:808
 msgid "Address Book"
 msgstr "Адресная книга"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:790
+#: ../../sflphone-client-gnome/src/config/configwindow.c:813
 msgid "Hooks"
 msgstr "перехватчики (hooks)"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:817
+#: ../../sflphone-client-gnome/src/config/configwindow.c:840
 msgid "Accounts"
 msgstr "Аккаунты"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:829
+#: ../../sflphone-client-gnome/src/config/configwindow.c:852
 #, fuzzy
-msgid "Account previously setup"
-msgstr "Существующие аккаунты"
+msgid "Configured Accounts"
+msgstr "Нынешний аккаунт"
 
 #: ../../sflphone-client-gnome/src/config/hooks-config.c:130
-msgid "URL argument"
-msgstr "URL аргумент"
+msgid "URL Passing"
+msgstr ""
 
 #: ../../sflphone-client-gnome/src/config/hooks-config.c:140
-msgid "_SIP protocol"
-msgstr "Пр_отокол"
+#, c-format
+msgid ""
+"SFLphone can run custom commands if incoming calls come with an URL "
+"attached.\n"
+"In this case, %s will be replaced with the passed URL."
+msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:145
-msgid "_SIP Header: "
-msgstr "_SIP Заголовок"
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:143
+msgid "Trigger on specific _SIP header"
+msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:152
-msgid "_IAX2 protocol"
-msgstr "Пр_отокол"
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:155
+msgid "Trigger on _IAX2 URL"
+msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:157
-msgid "_Command: "
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:160
+#, fuzzy
+msgid "_Command to run: "
 msgstr "_Команда"
 
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:164
-msgid "Phone number formatting"
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:174
-msgid "_Add phone number prefix"
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:168
+msgid "Phone Number Rewriting"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:179
-msgid "_Prepend: "
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:178
+msgid "_Prefix dialed numbers with:"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/contacts/history.c:75
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:94
+#: ../../sflphone-client-gnome/src/contacts/history.c:83
+#: ../../sflphone-client-gnome/src/contacts/searchbar.c:123
 #, fuzzy
 msgid "Search history"
 msgstr "_Стереть журнал"
 
-#: ../../sflphone-client-gnome/src/contacts/history.c:75
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:86
+#: ../../sflphone-client-gnome/src/contacts/history.c:83
+#: ../../sflphone-client-gnome/src/contacts/searchbar.c:110
 #, fuzzy
 msgid "Search contact"
 msgstr "_Искать в журнале"
 
+#, fuzzy
+#~ msgid "Books"
+#~ msgstr "перехватчики (hooks)"
+
+#~ msgid "_Enable"
+#~ msgstr "_Включить"
+
+#~ msgid "_Notify voice mails"
+#~ msgstr "_Предупредить о новых речевых сообщениях"
+
+#~ msgid "_Start hidden"
+#~ msgstr "_Начать спрятанным"
+
+#~ msgid "_Maximum number of calls"
+#~ msgstr "_Максимальное количество звонков"
+
+#~ msgid "_Control running applications volume"
+#~ msgstr "_Начать спрятанным "
+
+#, fuzzy
+#~ msgid "Account previously setup"
+#~ msgstr "Существующие аккаунты"
+
+#~ msgid "URL argument"
+#~ msgstr "URL аргумент"
+
+#~ msgid "_SIP protocol"
+#~ msgstr "Пр_отокол"
+
+#~ msgid "_SIP Header: "
+#~ msgstr "_SIP Заголовок"
+
+#~ msgid "_IAX2 protocol"
+#~ msgstr "Пр_отокол"
+
 #~ msgid "Search"
 #~ msgstr "Поиск"
 
@@ -832,8 +880,5 @@ msgstr "_Искать в журнале"
 #~ msgid "Apply"
 #~ msgstr "Применить"
 
-#~ msgid "History empty"
-#~ msgstr "Журнал пуст"
-
 #~ msgid "Enabled"
 #~ msgstr "Включен"
diff --git a/sflphone-common/po/zh_CN.po b/sflphone-common/po/zh_CN.po
index 08199ce8b25656394c0112db295af5feffb8303b..25a7027503aa754496ad0850a1940a5d7e926873 100644
--- a/sflphone-common/po/zh_CN.po
+++ b/sflphone-common/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SFLphone 0.9.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-05 17:03-0400\n"
+"POT-Creation-Date: 2009-05-19 15:18-0400\n"
 "PO-Revision-Date: 2008-10-28 14:15\n"
 "Last-Translator: Yun Liu <yun.liu@savoirfairelinux.com>\n"
 "Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n"
@@ -72,7 +72,7 @@ msgstr "%d 个语音信息"
 
 #: ../../sflphone-client-gnome/src/actions.c:81
 #, fuzzy, c-format
-msgid "Connected to %s (%s)"
+msgid "Registered to %s (%s)"
 msgstr "已注册"
 
 #: ../../sflphone-client-gnome/src/actions.c:87
@@ -88,17 +88,17 @@ msgstr ""
 "连接SFLphone服务器失败.\n"
 "请检查daemon是否还在运行."
 
-#: ../../sflphone-client-gnome/src/actions.c:775
+#: ../../sflphone-client-gnome/src/actions.c:787
 #, c-format
 msgid "IP call - %s"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/actions.c:778
+#: ../../sflphone-client-gnome/src/actions.c:790
 #, c-format
 msgid "%s account- %s             %s"
 msgstr "%s 帐户- %s             %s"
 
-#: ../../sflphone-client-gnome/src/actions.c:868
+#: ../../sflphone-client-gnome/src/actions.c:880
 #, c-format
 msgid ""
 "<b>Error: No audio codecs found.\n"
@@ -223,7 +223,7 @@ msgid "IAX2 account configuration"
 msgstr "IAX2帐户配置"
 
 #: ../../sflphone-client-gnome/src/assistant.c:405
-#: ../../sflphone-client-gnome/src/config/configwindow.c:840
+#: ../../sflphone-client-gnome/src/config/configwindow.c:863
 msgid "Network Address Translation"
 msgstr "网络地址解析"
 
@@ -232,7 +232,7 @@ msgid "You should probably enable this if you are behind a firewall."
 msgstr "如果你使用网络使用防火墙，你很有可能需要设定此项."
 
 #: ../../sflphone-client-gnome/src/assistant.c:414
-#: ../../sflphone-client-gnome/src/config/configwindow.c:504
+#: ../../sflphone-client-gnome/src/config/configwindow.c:516
 msgid "E_nable STUN"
 msgstr "使用STUN(n)"
 
@@ -289,7 +289,7 @@ msgstr "有电话正在处理中"
 msgid "Do you still want to quit?"
 msgstr "确认要退出?"
 
-#: ../../sflphone-client-gnome/src/mainwindow.c:293
+#: ../../sflphone-client-gnome/src/mainwindow.c:296
 #, fuzzy
 msgid "SFLphone Error"
 msgstr "SFLphone 0.9.2"
@@ -432,8 +432,8 @@ msgid "_Show main window"
 msgstr "显示主窗口(S)"
 
 #: ../../sflphone-client-gnome/src/statusicon.c:124
-#, c-format
-msgid "SFLphone - %i accounts registered"
+#, fuzzy, c-format
+msgid "SFLphone - %i accounts configured"
 msgstr "SFLphone - %i 个帐户已注册"
 
 #: ../../sflphone-client-gnome/src/timestamp.c:46
@@ -504,7 +504,8 @@ msgid "Account settings"
 msgstr "帐户设置"
 
 #: ../../sflphone-client-gnome/src/config/accountwindow.c:120
-msgid "Account parameters"
+#, fuzzy
+msgid "Account Parameters"
 msgstr "帐户相关参数"
 
 #: ../../sflphone-client-gnome/src/config/accountwindow.c:142
@@ -520,12 +521,12 @@ msgid "Unknown"
 msgstr "未知"
 
 #: ../../sflphone-client-gnome/src/config/addressbook-config.c:265
-#: ../../sflphone-client-gnome/src/config/configwindow.c:709
+#: ../../sflphone-client-gnome/src/config/configwindow.c:732
 msgid "General"
 msgstr "常用配置"
 
 #: ../../sflphone-client-gnome/src/config/addressbook-config.c:276
-msgid "_Use Evolution address book"
+msgid "_Use Evolution address books"
 msgstr ""
 
 #: ../../sflphone-client-gnome/src/config/addressbook-config.c:283
@@ -536,28 +537,36 @@ msgstr ""
 msgid "_Display contact photo if available"
 msgstr "如果可行则显示联系人照片(D)"
 
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:299
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:301
 msgid "Fields"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:309
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:311
+msgid "Use the following fields from Evolution's address books:"
+msgstr ""
+
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:316
 msgid "_Business phone"
 msgstr "商务电话(B)"
 
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:314
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:321
 msgid "_Home phone"
 msgstr "家庭电话(H)"
 
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:319
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:326
 msgid "_Mobile phone"
 msgstr "移动电话(M)"
 
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:324
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:333
 #, fuzzy
-msgid "Books"
-msgstr "钩键"
+msgid "Address Books"
+msgstr "地址簿"
 
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:356
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:343
+msgid "Select which Evolution address books to use:"
+msgstr ""
+
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:377
 #: ../../sflphone-client-gnome/src/config/audioconf.c:574
 msgid "Name"
 msgstr "名称"
@@ -603,197 +612,236 @@ msgstr "输入"
 msgid "_Enable ringtones"
 msgstr "启用铃声(E)"
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:763
+#: ../../sflphone-client-gnome/src/config/audioconf.c:764
 msgid "Choose a ringtone"
 msgstr "选择铃声"
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:768
+#: ../../sflphone-client-gnome/src/config/audioconf.c:769
 msgid "Audio Files"
 msgstr "音频文件"
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:787
+#: ../../sflphone-client-gnome/src/config/audioconf.c:788
 #, fuzzy
 msgid "_Voice Activity Detection"
 msgstr "启用静音检测(A)"
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:797
+#: ../../sflphone-client-gnome/src/config/audioconf.c:798
 msgid "_Noise Reduction (Narrow-Band Companding)"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:825
+#: ../../sflphone-client-gnome/src/config/audioconf.c:826
 msgid "Sound Manager"
 msgstr "音频管理器"
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:832
+#: ../../sflphone-client-gnome/src/config/audioconf.c:833
 msgid "ALSA configuration"
 msgstr "ALSA 配置"
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:849
+#: ../../sflphone-client-gnome/src/config/audioconf.c:850
 msgid "Codecs"
 msgstr "Codecs编码"
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:872
+#: ../../sflphone-client-gnome/src/config/audioconf.c:873
 msgid "Ringtones"
 msgstr "铃声"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:390
+#: ../../sflphone-client-gnome/src/config/configwindow.c:402
 msgid "Protocol"
 msgstr "协议"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:397
+#: ../../sflphone-client-gnome/src/config/configwindow.c:409
 msgid "Status"
 msgstr "状态"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:500
+#: ../../sflphone-client-gnome/src/config/configwindow.c:512
 msgid "Stun parameters will apply to each SIP account created."
 msgstr "Stun参数将应用于每一个注册的SIP帐户"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:508
+#: ../../sflphone-client-gnome/src/config/configwindow.c:520
 msgid "Enable it if you are behind a firewall"
 msgstr "当使用防火墙时,启用该项"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:516
+#: ../../sflphone-client-gnome/src/config/configwindow.c:528
 msgid "Format: name.server:port"
 msgstr "格式：name.server:port"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:564
-msgid "Desktop Notification"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:579
+#, fuzzy
+msgid "Desktop Notifications"
 msgstr "桌面提示"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:572
-msgid "_Enable"
-msgstr "启用(E)"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:588
+#, fuzzy
+msgid "_Enable notifications"
+msgstr "启用铃声(E)"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:577
-msgid "_Notify voice mails"
-msgstr "通知语音邮件(N)"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:594
+msgid "Enable voicemail _notifications"
+msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:583
+#: ../../sflphone-client-gnome/src/config/configwindow.c:605
 msgid "System Tray Icon"
 msgstr "系统托盘图标"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:591
+#: ../../sflphone-client-gnome/src/config/configwindow.c:613
 msgid "_Popup main window on incoming call"
 msgstr "来电时弹出主窗口(P)"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:596
+#: ../../sflphone-client-gnome/src/config/configwindow.c:618
 msgid "Ne_ver popup main window"
 msgstr "从不弹出主窗口(v)"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:600
-msgid "_Start hidden"
-msgstr "启动时隐藏(S)"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:622
+msgid "Hide SFLphone window on _startup"
+msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:606
+#: ../../sflphone-client-gnome/src/config/configwindow.c:628
 msgid "Calls History"
 msgstr "拨号历史"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:614
-msgid "_Maximum number of calls"
-msgstr "最大拨号数(M)"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:636
+#, fuzzy
+msgid "_History size limit"
+msgstr "无历史记录"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:630
+#: ../../sflphone-client-gnome/src/config/configwindow.c:653
 msgid "PulseAudio sound server"
 msgstr "PulseAudio服务器"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:638
-msgid "_Control running applications volume"
-msgstr "控制正在运行的应用程序的音量(C)"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:661
+msgid "Mute other applications during a _call"
+msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:651
+#: ../../sflphone-client-gnome/src/config/configwindow.c:674
 msgid "SIP Port"
 msgstr "SIP端口号"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:664
+#: ../../sflphone-client-gnome/src/config/configwindow.c:687
 msgid "Port:"
 msgstr "端口:"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:719
+#: ../../sflphone-client-gnome/src/config/configwindow.c:742
 msgid "_Recordings folder"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:725
+#: ../../sflphone-client-gnome/src/config/configwindow.c:748
 msgid "Select a folder"
 msgstr "选择文件夹"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:750
+#: ../../sflphone-client-gnome/src/config/configwindow.c:773
 msgid "Preferences"
 msgstr "属性"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:770
+#: ../../sflphone-client-gnome/src/config/configwindow.c:793
 msgid "General Settings"
 msgstr "常用配置"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:775
+#: ../../sflphone-client-gnome/src/config/configwindow.c:798
 msgid "Audio Settings"
 msgstr "音频配置"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:780
+#: ../../sflphone-client-gnome/src/config/configwindow.c:803
 #, fuzzy
 msgid "Recordings"
 msgstr "记录"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:785
+#: ../../sflphone-client-gnome/src/config/configwindow.c:808
 msgid "Address Book"
 msgstr "地址簿"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:790
+#: ../../sflphone-client-gnome/src/config/configwindow.c:813
 msgid "Hooks"
 msgstr "钩键"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:817
+#: ../../sflphone-client-gnome/src/config/configwindow.c:840
 msgid "Accounts"
 msgstr "帐户"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:829
+#: ../../sflphone-client-gnome/src/config/configwindow.c:852
 #, fuzzy
-msgid "Account previously setup"
-msgstr "以前帐户设置"
+msgid "Configured Accounts"
+msgstr "当前帐户"
 
 #: ../../sflphone-client-gnome/src/config/hooks-config.c:130
-msgid "URL argument"
-msgstr "URL参数"
+msgid "URL Passing"
+msgstr ""
 
 #: ../../sflphone-client-gnome/src/config/hooks-config.c:140
-msgid "_SIP protocol"
-msgstr "SIP 协议(S)"
+#, c-format
+msgid ""
+"SFLphone can run custom commands if incoming calls come with an URL "
+"attached.\n"
+"In this case, %s will be replaced with the passed URL."
+msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:145
-msgid "_SIP Header: "
-msgstr "SIP消息头(S):"
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:143
+msgid "Trigger on specific _SIP header"
+msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:152
-msgid "_IAX2 protocol"
-msgstr "IAX2 协议(I)"
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:155
+msgid "Trigger on _IAX2 URL"
+msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:157
-msgid "_Command: "
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:160
+#, fuzzy
+msgid "_Command to run: "
 msgstr "命令(C):"
 
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:164
-msgid "Phone number formatting"
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:168
+msgid "Phone Number Rewriting"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:174
-msgid "_Add phone number prefix"
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:178
+msgid "_Prefix dialed numbers with:"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:179
-msgid "_Prepend: "
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/contacts/history.c:75
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:94
+#: ../../sflphone-client-gnome/src/contacts/history.c:83
+#: ../../sflphone-client-gnome/src/contacts/searchbar.c:123
 #, fuzzy
 msgid "Search history"
 msgstr "清空历史记录(C)"
 
-#: ../../sflphone-client-gnome/src/contacts/history.c:75
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:86
+#: ../../sflphone-client-gnome/src/contacts/history.c:83
+#: ../../sflphone-client-gnome/src/contacts/searchbar.c:110
 #, fuzzy
 msgid "Search contact"
 msgstr "查找历史(S)"
 
+#, fuzzy
+#~ msgid "Books"
+#~ msgstr "钩键"
+
+#~ msgid "_Enable"
+#~ msgstr "启用(E)"
+
+#~ msgid "_Notify voice mails"
+#~ msgstr "通知语音邮件(N)"
+
+#~ msgid "_Start hidden"
+#~ msgstr "启动时隐藏(S)"
+
+#~ msgid "_Maximum number of calls"
+#~ msgstr "最大拨号数(M)"
+
+#~ msgid "_Control running applications volume"
+#~ msgstr "控制正在运行的应用程序的音量(C)"
+
+#, fuzzy
+#~ msgid "Account previously setup"
+#~ msgstr "以前帐户设置"
+
+#~ msgid "URL argument"
+#~ msgstr "URL参数"
+
+#~ msgid "_SIP protocol"
+#~ msgstr "SIP 协议(S)"
+
+#~ msgid "_SIP Header: "
+#~ msgstr "SIP消息头(S):"
+
+#~ msgid "_IAX2 protocol"
+#~ msgstr "IAX2 协议(I)"
+
 #~ msgid "Search"
 #~ msgstr "查找"
 
@@ -829,6 +877,3 @@ msgstr "查找历史(S)"
 
 #~ msgid "Apply"
 #~ msgstr "应用"
-
-#~ msgid "History empty"
-#~ msgstr "无历史记录"
diff --git a/sflphone-common/po/zh_HK.po b/sflphone-common/po/zh_HK.po
index 96b6be28b4014d748ba3fceb2ad5aa1096cdb7fa..3b865c60fccd4dac45b0bfafebb229746deec5f3 100644
--- a/sflphone-common/po/zh_HK.po
+++ b/sflphone-common/po/zh_HK.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SFLphone 0.9.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-05 17:03-0400\n"
+"POT-Creation-Date: 2009-05-19 15:18-0400\n"
 "PO-Revision-Date: 2008-10-28 14:15\n"
 "Last-Translator: Yun Liu <yun.liu@savoirfairelinux.com>\n"
 "Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n"
@@ -72,7 +72,7 @@ msgstr "%d 個語音郵件"
 
 #: ../../sflphone-client-gnome/src/actions.c:81
 #, fuzzy, c-format
-msgid "Connected to %s (%s)"
+msgid "Registered to %s (%s)"
 msgstr "已註冊"
 
 #: ../../sflphone-client-gnome/src/actions.c:87
@@ -88,17 +88,17 @@ msgstr ""
 "連接SFLphone伺服器失敗.\n"
 "請核查daemon是否正在運行."
 
-#: ../../sflphone-client-gnome/src/actions.c:775
+#: ../../sflphone-client-gnome/src/actions.c:787
 #, c-format
 msgid "IP call - %s"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/actions.c:778
+#: ../../sflphone-client-gnome/src/actions.c:790
 #, c-format
 msgid "%s account- %s             %s"
 msgstr "%s 帳戶- %s\t\t%s"
 
-#: ../../sflphone-client-gnome/src/actions.c:868
+#: ../../sflphone-client-gnome/src/actions.c:880
 #, c-format
 msgid ""
 "<b>Error: No audio codecs found.\n"
@@ -222,7 +222,7 @@ msgid "IAX2 account configuration"
 msgstr "IAX2帳戶配置"
 
 #: ../../sflphone-client-gnome/src/assistant.c:405
-#: ../../sflphone-client-gnome/src/config/configwindow.c:840
+#: ../../sflphone-client-gnome/src/config/configwindow.c:863
 msgid "Network Address Translation"
 msgstr "網路地址分析"
 
@@ -231,7 +231,7 @@ msgid "You should probably enable this if you are behind a firewall."
 msgstr "如果你使用網路防火牆，你很有可能需要設定該項."
 
 #: ../../sflphone-client-gnome/src/assistant.c:414
-#: ../../sflphone-client-gnome/src/config/configwindow.c:504
+#: ../../sflphone-client-gnome/src/config/configwindow.c:516
 msgid "E_nable STUN"
 msgstr "啟用STUN(n)"
 
@@ -288,7 +288,7 @@ msgstr "有電話正在處理中."
 msgid "Do you still want to quit?"
 msgstr "確認要退出?"
 
-#: ../../sflphone-client-gnome/src/mainwindow.c:293
+#: ../../sflphone-client-gnome/src/mainwindow.c:296
 #, fuzzy
 msgid "SFLphone Error"
 msgstr "SFLphone 0.9.2"
@@ -431,8 +431,8 @@ msgid "_Show main window"
 msgstr "顯示主窗口(S)"
 
 #: ../../sflphone-client-gnome/src/statusicon.c:124
-#, c-format
-msgid "SFLphone - %i accounts registered"
+#, fuzzy, c-format
+msgid "SFLphone - %i accounts configured"
 msgstr "SFLphone - %i 個帳戶已註冊"
 
 #: ../../sflphone-client-gnome/src/timestamp.c:46
@@ -503,7 +503,8 @@ msgid "Account settings"
 msgstr "帳戶設置"
 
 #: ../../sflphone-client-gnome/src/config/accountwindow.c:120
-msgid "Account parameters"
+#, fuzzy
+msgid "Account Parameters"
 msgstr "帳戶相關參數"
 
 #: ../../sflphone-client-gnome/src/config/accountwindow.c:142
@@ -519,12 +520,12 @@ msgid "Unknown"
 msgstr "未知"
 
 #: ../../sflphone-client-gnome/src/config/addressbook-config.c:265
-#: ../../sflphone-client-gnome/src/config/configwindow.c:709
+#: ../../sflphone-client-gnome/src/config/configwindow.c:732
 msgid "General"
 msgstr "常用配置"
 
 #: ../../sflphone-client-gnome/src/config/addressbook-config.c:276
-msgid "_Use Evolution address book"
+msgid "_Use Evolution address books"
 msgstr ""
 
 #: ../../sflphone-client-gnome/src/config/addressbook-config.c:283
@@ -535,28 +536,36 @@ msgstr ""
 msgid "_Display contact photo if available"
 msgstr "如果可以則顯示聯繫人照片(D)"
 
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:299
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:301
 msgid "Fields"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:309
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:311
+msgid "Use the following fields from Evolution's address books:"
+msgstr ""
+
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:316
 msgid "_Business phone"
 msgstr "商務電話(B)"
 
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:314
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:321
 msgid "_Home phone"
 msgstr "家庭電話(H)"
 
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:319
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:326
 msgid "_Mobile phone"
 msgstr "移動電話(M)"
 
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:324
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:333
 #, fuzzy
-msgid "Books"
-msgstr "鉤鍵"
+msgid "Address Books"
+msgstr "地址簿"
 
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:356
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:343
+msgid "Select which Evolution address books to use:"
+msgstr ""
+
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:377
 #: ../../sflphone-client-gnome/src/config/audioconf.c:574
 msgid "Name"
 msgstr "名稱"
@@ -602,197 +611,236 @@ msgstr "輸入"
 msgid "_Enable ringtones"
 msgstr "啟動鈴聲(E)"
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:763
+#: ../../sflphone-client-gnome/src/config/audioconf.c:764
 msgid "Choose a ringtone"
 msgstr "鈴聲選擇"
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:768
+#: ../../sflphone-client-gnome/src/config/audioconf.c:769
 msgid "Audio Files"
 msgstr "音訊檔案"
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:787
+#: ../../sflphone-client-gnome/src/config/audioconf.c:788
 #, fuzzy
 msgid "_Voice Activity Detection"
 msgstr "啟用靜音檢測(A)"
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:797
+#: ../../sflphone-client-gnome/src/config/audioconf.c:798
 msgid "_Noise Reduction (Narrow-Band Companding)"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:825
+#: ../../sflphone-client-gnome/src/config/audioconf.c:826
 msgid "Sound Manager"
 msgstr "聲音管理器"
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:832
+#: ../../sflphone-client-gnome/src/config/audioconf.c:833
 msgid "ALSA configuration"
 msgstr "ALSA 配置"
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:849
+#: ../../sflphone-client-gnome/src/config/audioconf.c:850
 msgid "Codecs"
 msgstr "編碼"
 
-#: ../../sflphone-client-gnome/src/config/audioconf.c:872
+#: ../../sflphone-client-gnome/src/config/audioconf.c:873
 msgid "Ringtones"
 msgstr "鈴聲"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:390
+#: ../../sflphone-client-gnome/src/config/configwindow.c:402
 msgid "Protocol"
 msgstr "協議"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:397
+#: ../../sflphone-client-gnome/src/config/configwindow.c:409
 msgid "Status"
 msgstr "狀態"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:500
+#: ../../sflphone-client-gnome/src/config/configwindow.c:512
 msgid "Stun parameters will apply to each SIP account created."
 msgstr "Stun參數將應用於每一個註冊的SIP帳戶"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:508
+#: ../../sflphone-client-gnome/src/config/configwindow.c:520
 msgid "Enable it if you are behind a firewall"
 msgstr "當使用防火牆時，需要設定此項"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:516
+#: ../../sflphone-client-gnome/src/config/configwindow.c:528
 msgid "Format: name.server:port"
 msgstr "格式：name.server:port"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:564
-msgid "Desktop Notification"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:579
+#, fuzzy
+msgid "Desktop Notifications"
 msgstr "桌面提示"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:572
-msgid "_Enable"
-msgstr "啟用(E)"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:588
+#, fuzzy
+msgid "_Enable notifications"
+msgstr "啟動鈴聲(E)"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:577
-msgid "_Notify voice mails"
-msgstr "語音郵件通知(N)"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:594
+msgid "Enable voicemail _notifications"
+msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:583
+#: ../../sflphone-client-gnome/src/config/configwindow.c:605
 msgid "System Tray Icon"
 msgstr "系統托盤圖標"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:591
+#: ../../sflphone-client-gnome/src/config/configwindow.c:613
 msgid "_Popup main window on incoming call"
 msgstr "來電話時彈出主視窗(P)"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:596
+#: ../../sflphone-client-gnome/src/config/configwindow.c:618
 msgid "Ne_ver popup main window"
 msgstr "從不彈出主視窗(v)"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:600
-msgid "_Start hidden"
-msgstr "啟動時隱藏(S)"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:622
+msgid "Hide SFLphone window on _startup"
+msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:606
+#: ../../sflphone-client-gnome/src/config/configwindow.c:628
 msgid "Calls History"
 msgstr "打電話歷史"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:614
-msgid "_Maximum number of calls"
-msgstr "最大打出電話數目(M)"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:636
+#, fuzzy
+msgid "_History size limit"
+msgstr "無曆史記錄"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:630
+#: ../../sflphone-client-gnome/src/config/configwindow.c:653
 msgid "PulseAudio sound server"
 msgstr "PulseAudio聲音伺服器"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:638
-msgid "_Control running applications volume"
-msgstr "控制正在運行中的應用程式的音量(C)"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:661
+msgid "Mute other applications during a _call"
+msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:651
+#: ../../sflphone-client-gnome/src/config/configwindow.c:674
 msgid "SIP Port"
 msgstr "SIP端口"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:664
+#: ../../sflphone-client-gnome/src/config/configwindow.c:687
 msgid "Port:"
 msgstr "端口:"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:719
+#: ../../sflphone-client-gnome/src/config/configwindow.c:742
 msgid "_Recordings folder"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:725
+#: ../../sflphone-client-gnome/src/config/configwindow.c:748
 msgid "Select a folder"
 msgstr "選擇文件夾"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:750
+#: ../../sflphone-client-gnome/src/config/configwindow.c:773
 msgid "Preferences"
 msgstr "屬性"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:770
+#: ../../sflphone-client-gnome/src/config/configwindow.c:793
 msgid "General Settings"
 msgstr "常用配置"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:775
+#: ../../sflphone-client-gnome/src/config/configwindow.c:798
 msgid "Audio Settings"
 msgstr "音訊配置"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:780
+#: ../../sflphone-client-gnome/src/config/configwindow.c:803
 #, fuzzy
 msgid "Recordings"
 msgstr "記錄"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:785
+#: ../../sflphone-client-gnome/src/config/configwindow.c:808
 msgid "Address Book"
 msgstr "地址簿"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:790
+#: ../../sflphone-client-gnome/src/config/configwindow.c:813
 msgid "Hooks"
 msgstr "鉤鍵"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:817
+#: ../../sflphone-client-gnome/src/config/configwindow.c:840
 msgid "Accounts"
 msgstr "帳戶"
 
-#: ../../sflphone-client-gnome/src/config/configwindow.c:829
+#: ../../sflphone-client-gnome/src/config/configwindow.c:852
 #, fuzzy
-msgid "Account previously setup"
-msgstr "以前帳戶設定"
+msgid "Configured Accounts"
+msgstr "當前帳戶"
 
 #: ../../sflphone-client-gnome/src/config/hooks-config.c:130
-msgid "URL argument"
-msgstr "URL參數"
+msgid "URL Passing"
+msgstr ""
 
 #: ../../sflphone-client-gnome/src/config/hooks-config.c:140
-msgid "_SIP protocol"
-msgstr "SIP 協議(S)"
+#, c-format
+msgid ""
+"SFLphone can run custom commands if incoming calls come with an URL "
+"attached.\n"
+"In this case, %s will be replaced with the passed URL."
+msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:145
-msgid "_SIP Header: "
-msgstr "SIP消息頭(S):"
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:143
+msgid "Trigger on specific _SIP header"
+msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:152
-msgid "_IAX2 protocol"
-msgstr "IAX2 協議(I)"
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:155
+msgid "Trigger on _IAX2 URL"
+msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:157
-msgid "_Command: "
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:160
+#, fuzzy
+msgid "_Command to run: "
 msgstr "命令(C):"
 
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:164
-msgid "Phone number formatting"
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:168
+msgid "Phone Number Rewriting"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:174
-msgid "_Add phone number prefix"
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:178
+msgid "_Prefix dialed numbers with:"
 msgstr ""
 
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:179
-msgid "_Prepend: "
-msgstr ""
-
-#: ../../sflphone-client-gnome/src/contacts/history.c:75
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:94
+#: ../../sflphone-client-gnome/src/contacts/history.c:83
+#: ../../sflphone-client-gnome/src/contacts/searchbar.c:123
 #, fuzzy
 msgid "Search history"
 msgstr "清空曆史記錄(C)"
 
-#: ../../sflphone-client-gnome/src/contacts/history.c:75
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:86
+#: ../../sflphone-client-gnome/src/contacts/history.c:83
+#: ../../sflphone-client-gnome/src/contacts/searchbar.c:110
 #, fuzzy
 msgid "Search contact"
 msgstr "搜尋歷史(S)"
 
+#, fuzzy
+#~ msgid "Books"
+#~ msgstr "鉤鍵"
+
+#~ msgid "_Enable"
+#~ msgstr "啟用(E)"
+
+#~ msgid "_Notify voice mails"
+#~ msgstr "語音郵件通知(N)"
+
+#~ msgid "_Start hidden"
+#~ msgstr "啟動時隱藏(S)"
+
+#~ msgid "_Maximum number of calls"
+#~ msgstr "最大打出電話數目(M)"
+
+#~ msgid "_Control running applications volume"
+#~ msgstr "控制正在運行中的應用程式的音量(C)"
+
+#, fuzzy
+#~ msgid "Account previously setup"
+#~ msgstr "以前帳戶設定"
+
+#~ msgid "URL argument"
+#~ msgstr "URL參數"
+
+#~ msgid "_SIP protocol"
+#~ msgstr "SIP 協議(S)"
+
+#~ msgid "_SIP Header: "
+#~ msgstr "SIP消息頭(S):"
+
+#~ msgid "_IAX2 protocol"
+#~ msgstr "IAX2 協議(I)"
+
 #~ msgid "Search"
 #~ msgstr "搜尋"
 
@@ -828,6 +876,3 @@ msgstr "搜尋歷史(S)"
 
 #~ msgid "Apply"
 #~ msgstr "套用"
-
-#~ msgid "History empty"
-#~ msgstr "無曆史記錄"