diff --git a/sflphone-client-gnome/src/actions.c b/sflphone-client-gnome/src/actions.c
index 2153c921de8c9e9d6044bbe10780a758eccbab02..120024a7c3d8eb8fc9e1463c25212bbcc1828a76 100644
--- a/sflphone-client-gnome/src/actions.c
+++ b/sflphone-client-gnome/src/actions.c
@@ -78,7 +78,7 @@ status_bar_display_account ()
acc = account_list_get_current ();
if(acc){
- msg = g_markup_printf_escaped(_("Registered to %s (%s)") ,
+ msg = g_markup_printf_escaped(_("Using %s (%s)") ,
(gchar*)g_hash_table_lookup( acc->properties , ACCOUNT_ALIAS),
(gchar*)g_hash_table_lookup( acc->properties , ACCOUNT_TYPE));
}
@@ -787,9 +787,9 @@ sflphone_display_selected_codec (const gchar* codecName)
msg = g_markup_printf_escaped (_("IP call - %s"), codecName);
}
else {
- msg = g_markup_printf_escaped(_("%s account- %s %s") ,
- (gchar*)g_hash_table_lookup( acc->properties , ACCOUNT_TYPE),
+ msg = g_markup_printf_escaped(_("Using %s (%s) - Codec: %s") ,
(gchar*)g_hash_table_lookup( acc->properties , ACCOUNT_ALIAS),
+ (gchar*)g_hash_table_lookup( acc->properties , ACCOUNT_TYPE),
codecName);
}
statusbar_push_message( msg , __MSG_ACCOUNT_DEFAULT);
diff --git a/sflphone-common/po/de.po b/sflphone-common/po/de.po
index 5a1104c6c3bb253d4433e27dd1f0b7e7ee0d05fe..4371c318d078fe25c7b44ea8d964d4412ac0e597 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:43-0400\n"
+"POT-Creation-Date: 2009-05-21 10:45-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"
@@ -71,9 +71,9 @@ msgid "%d voice mail"
msgstr "%d Voice Nachricht"
#: ../../sflphone-client-gnome/src/actions.c:81
-#, fuzzy, c-format
-msgid "Connected to %s (%s)"
-msgstr "registriert"
+#, c-format
+msgid "Using %s (%s)"
+msgstr ""
#: ../../sflphone-client-gnome/src/actions.c:87
#, fuzzy
@@ -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"
+msgid "Using %s (%s) - Codec: %s"
+msgstr ""
-#: ../../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"
@@ -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: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 "Name"
@@ -608,196 +617,231 @@ 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"
+#, fuzzy
+#~ msgid "Registered to %s (%s)"
+#~ msgstr "registriert"
+
+#~ msgid "%s account- %s %s"
+#~ msgstr "%s Konto- %s %s"
+
+#~ msgid "_Enable"
+#~ msgstr "_Einschalten"
+
+#~ msgid "_Notify voice mails"
+#~ msgstr "_Benachrichtigung für Voice Nachrichten"
+
+#~ msgid "_Start hidden"
+#~ msgstr "_Unsichtbar beim Start"
+
+#~ msgid "_Maximum number of calls"
+#~ msgstr "_maximale Anzahl von Anrufen"
+
+#~ msgid "_Control running applications volume"
+#~ msgstr "Lautstärke für laufende Anwendungen _einstellen"
+
+#, 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 +868,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 065a1d431eefe193243ae2366ce8a9c88b4035cb..df246654f815314fd63936b6e3d4d33edd42db3d 100644
--- a/sflphone-common/po/es.po
+++ b/sflphone-common/po/es.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: SFLphone 0.9.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-05 17:43-0400\n"
+"POT-Creation-Date: 2009-05-21 10:45-0400\n"
"PO-Revision-Date: 2008-08-11 11:53+0200\n"
-"Last-Translator: Maxime Chambreuil <maxime.chambreuil@savoirfairelinux.com>\n"
+"Last-Translator: Carlos Galisteo <cgalisteo AT k-rolus.net>\n"
"Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -38,11 +38,11 @@ msgstr "Error"
#: ../../sflphone-client-gnome/src/accountlist.c:181
msgid "Bad authentification"
-msgstr ""
+msgstr "Autenticación erronea"
#: ../../sflphone-client-gnome/src/accountlist.c:184
msgid "Network unreachable"
-msgstr ""
+msgstr "Red Inaccesible"
#: ../../sflphone-client-gnome/src/accountlist.c:187
msgid "Host unreachable"
@@ -72,12 +72,11 @@ msgid "%d voice mail"
msgstr "%d mensaje de voz"
#: ../../sflphone-client-gnome/src/actions.c:81
-#, fuzzy, c-format
-msgid "Connected to %s (%s)"
-msgstr "Registrado"
+#, c-format
+msgid "Using %s (%s)"
+msgstr ""
#: ../../sflphone-client-gnome/src/actions.c:87
-#, fuzzy
msgid "No registered account"
msgstr "No tiene ninguna cuenta registrada"
@@ -89,17 +88,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 ""
+msgstr "Llamada IP - %s"
-#: ../../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"
+msgid "Using %s (%s) - Codec: %s"
+msgstr ""
-#: ../../sflphone-client-gnome/src/actions.c:868
+#: ../../sflphone-client-gnome/src/actions.c:880
#, c-format
msgid ""
"<b>Error: No audio codecs found.\n"
@@ -113,7 +112,7 @@ msgstr ""
"directorio <b>.sflphone</b> de su home( <i>%s</i> )"
#: ../../sflphone-client-gnome/src/assistant.c:35
-#, fuzzy, c-format
+#, c-format
msgid ""
"This assistant is now finished.\n"
"You can at any time check your registration state or modify your accounts "
@@ -124,9 +123,12 @@ msgid ""
"Username : %s\n"
msgstr ""
"Ese asistante ha finalizado.\n"
-"\n"
"Puede comprobar en cualquier momento su estado de registro o modificar la "
-"configuración de sus cuentas en la ventana de Opciones/Cuentas."
+"configuración de sus cuentas en la ventana de Opciones/Cuentas.\n"
+"\n"
+"Alias : %s\n"
+"Server : %s\n"
+"Username : %s\n"
#: ../../sflphone-client-gnome/src/assistant.c:160
msgid "SFLphone account configuration wizard"
@@ -150,11 +152,11 @@ msgstr "Escoja un tipo de cuenta:"
#: ../../sflphone-client-gnome/src/assistant.c:219
msgid "Account"
-msgstr "Cuentas"
+msgstr "Cuenta"
#: ../../sflphone-client-gnome/src/assistant.c:219
msgid "Please select one of the following option:"
-msgstr "Por favor, rellene la siguiente información:"
+msgstr "Por favor, elija una de las siguientes opciones:"
#: ../../sflphone-client-gnome/src/assistant.c:221
msgid "Create a free SIP/IAX2 account on sflphone.org"
@@ -162,7 +164,7 @@ msgstr "Crear una cuenta SIP/IAX2 gratis en sflphone.org"
#: ../../sflphone-client-gnome/src/assistant.c:223
msgid "Register an existing SIP or IAX2 account"
-msgstr "Registrar una cuenta SIP o IAX@ existente"
+msgstr "Registrar una cuenta SIP o IAX2 existente"
#: ../../sflphone-client-gnome/src/assistant.c:236
msgid "SIP account configuration"
@@ -200,7 +202,6 @@ msgstr "_Contraseña"
#: ../../sflphone-client-gnome/src/assistant.c:294
#: ../../sflphone-client-gnome/src/assistant.c:387
#: ../../sflphone-client-gnome/src/config/accountwindow.c:223
-#, fuzzy
msgid "_Voicemail number"
msgstr "_Número de buzón de voz"
@@ -210,7 +211,7 @@ msgstr "Dirección de correo opcional "
#: ../../sflphone-client-gnome/src/assistant.c:309
msgid "This email address will be use to send your voicemail messages"
-msgstr "Este dirección de correo sera usado para mandar los mensajes"
+msgstr "Esta dirección de correo se usará para mandar sus mensajes de voz"
#: ../../sflphone-client-gnome/src/assistant.c:317
msgid "_Email"
@@ -221,7 +222,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 +231,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"
@@ -247,7 +248,6 @@ msgid "Congratulations!"
msgstr "¡Enhorabuena!"
#: ../../sflphone-client-gnome/src/errors.c:28
-#, fuzzy
msgid ""
"ALSA notification\n"
"\n"
@@ -258,7 +258,6 @@ msgstr ""
"Error al abrir el dispositivo de reproducción"
#: ../../sflphone-client-gnome/src/errors.c:31
-#, fuzzy
msgid ""
"ALSA notification\n"
"\n"
@@ -269,7 +268,6 @@ msgstr ""
"Error al abrir el dispositivo de captura"
#: ../../sflphone-client-gnome/src/errors.c:34
-#, fuzzy
msgid ""
"Pulseaudio notification\n"
"\n"
@@ -291,10 +289,9 @@ msgstr "Hay llamadas en curso."
msgid "Do you still want to quit?"
msgstr "Sin embargo quiere parar ?"
-#: ../../sflphone-client-gnome/src/mainwindow.c:293
-#, fuzzy
+#: ../../sflphone-client-gnome/src/mainwindow.c:296
msgid "SFLphone Error"
-msgstr "SFLphone 0.9.3"
+msgstr "SFLphone Error"
#: ../../sflphone-client-gnome/src/menus.c:134
msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
@@ -335,9 +332,8 @@ msgid "_Record"
msgstr "_Recordar"
#: ../../sflphone-client-gnome/src/menus.c:358
-#, fuzzy
msgid "_Account creation wizard"
-msgstr "Asistente de configuración de cuentas de SFLphone"
+msgstr "Asistente de configuración de cuentas"
#: ../../sflphone-client-gnome/src/menus.c:388
msgid "_Call"
@@ -345,7 +341,7 @@ msgstr "_Llamar"
#: ../../sflphone-client-gnome/src/menus.c:561
msgid "_Clear history"
-msgstr "Historia de Llamada"
+msgstr "_Limpiar historial"
#: ../../sflphone-client-gnome/src/menus.c:573
msgid "_Accounts"
@@ -372,13 +368,12 @@ msgid "_Call back"
msgstr "_Llamar"
#: ../../sflphone-client-gnome/src/menus.c:1082
-#, fuzzy
msgid "Edit phone"
-msgstr "_Numero de movil"
+msgstr "Editar teléfono"
#: ../../sflphone-client-gnome/src/menus.c:1093
msgid "Edit the phone number before making a call"
-msgstr ""
+msgstr "Editar el número de teléfono antes de llamar"
#: ../../sflphone-client-gnome/src/sflnotify.c:38
#: ../../sflphone-client-gnome/src/sflnotify.c:105
@@ -412,7 +407,7 @@ msgstr "Llamando con la cuenta %s <i>%s</i>"
#: ../../sflphone-client-gnome/src/sflnotify.c:145
msgid "Current account"
-msgstr "Cuenta"
+msgstr "Cuenta actual"
#: ../../sflphone-client-gnome/src/sflnotify.c:174
msgid "You haven't setup any accounts"
@@ -435,13 +430,13 @@ msgid "_Show main window"
msgstr "Mostrar ventana principal"
#: ../../sflphone-client-gnome/src/statusicon.c:124
-#, fuzzy, c-format
+#, c-format
msgid "SFLphone - %i accounts configured"
-msgstr "SFLphone - %i cuenta registrada"
+msgstr "SFLphone - %i cuentas configuradas"
#: ../../sflphone-client-gnome/src/timestamp.c:46
msgid "<small>Missed call</small>"
-msgstr "<small>Llamada faltada</small>"
+msgstr "<small>Llamada fallida</small>"
#: ../../sflphone-client-gnome/src/timestamp.c:64
#, c-format
@@ -491,28 +486,28 @@ msgstr "Historia de Llamada"
#: ../../sflphone-client-gnome/src/toolbar.c:252
#: ../../sflphone-client-gnome/src/toolbar.c:254
msgid "Address book"
-msgstr ""
+msgstr "Libreta de contactos"
#: ../../sflphone-client-gnome/src/toolbar.c:260
#: ../../sflphone-client-gnome/src/toolbar.c:264
msgid "Voicemail"
-msgstr "Mensaje"
+msgstr "Mensaje de voz"
#: ../../sflphone-client-gnome/src/toolbar.c:272
msgid "Record a call"
-msgstr "Recordar una llamada"
+msgstr "Grabar una llamada"
#: ../../sflphone-client-gnome/src/config/accountwindow.c:108
msgid "Account settings"
msgstr "Configuración de cuentas"
#: ../../sflphone-client-gnome/src/config/accountwindow.c:120
-msgid "Account parameters"
-msgstr "Paràmetros de cuenta"
+msgid "Account Parameters"
+msgstr "Parámetros de cuenta"
#: ../../sflphone-client-gnome/src/config/accountwindow.c:142
msgid "_Enable this account"
-msgstr ""
+msgstr "_Habilitar esta cuenta"
#: ../../sflphone-client-gnome/src/config/accountwindow.c:156
msgid "_Protocol"
@@ -523,43 +518,51 @@ 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"
+msgstr "General"
#: ../../sflphone-client-gnome/src/config/addressbook-config.c:276
-msgid "_Use Evolution address book"
-msgstr ""
+msgid "_Use Evolution address books"
+msgstr "_Usar libreta de contactos de Evolution"
#: ../../sflphone-client-gnome/src/config/addressbook-config.c:283
msgid "Download limit:"
-msgstr ""
+msgstr "Límite de descarga"
#: ../../sflphone-client-gnome/src/config/addressbook-config.c:294
msgid "_Display contact photo if available"
-msgstr "_Mostrar fotos de contactos, si disponible"
+msgstr "_Mostrar fotos de contactos, si está disponible"
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:299
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:301
msgid "Fields"
-msgstr ""
+msgstr "Campos"
+
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:311
+msgid "Use the following fields from Evolution's address books:"
+msgstr "Usar los siguientes campos de la libreta de direcciones de Evolution:"
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:309
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:316
msgid "_Business phone"
-msgstr "_Numero de telefono profecional"
+msgstr "_Numero de teléfono profesional"
-#: ../../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"
+msgstr "_Numero de teléfono 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"
+msgstr "_Número de movil"
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:324
-msgid "Books"
-msgstr ""
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:333
+msgid "Address Books"
+msgstr "Libreta de direcciones"
+
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:343
+msgid "Select which Evolution address books to use:"
+msgstr "Seleccione las libretas de direcciones de Evolution a usar:"
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:356
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:377
#: ../../sflphone-client-gnome/src/config/audioconf.c:574
msgid "Name"
msgstr "Nombre"
@@ -567,7 +570,7 @@ msgstr "Nombre"
#: ../../sflphone-client-gnome/src/config/audioconf.c:155
#, c-format
msgid "audio device index for output = %d"
-msgstr ""
+msgstr "índice del dispositivo de salida de audio = %d"
#: ../../sflphone-client-gnome/src/config/audioconf.c:579
msgid "Frequency"
@@ -583,11 +586,11 @@ msgstr "Ancho de banda"
#: ../../sflphone-client-gnome/src/config/audioconf.c:652
msgid "Pulseaudio"
-msgstr ""
+msgstr "Pulseaudio"
#: ../../sflphone-client-gnome/src/config/audioconf.c:655
msgid "ALSA"
-msgstr ""
+msgstr "ALSA"
#: ../../sflphone-client-gnome/src/config/audioconf.c:681
msgid "ALSA plugin"
@@ -595,235 +598,207 @@ msgstr "Plugin ALSA"
#: ../../sflphone-client-gnome/src/config/audioconf.c:703
msgid "Output"
-msgstr ""
+msgstr "Salida"
#: ../../sflphone-client-gnome/src/config/audioconf.c:725
msgid "Input"
-msgstr ""
+msgstr "Entrada"
#: ../../sflphone-client-gnome/src/config/audioconf.c:758
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 ""
+msgstr "_Detección de actividad de voz"
-#: ../../sflphone-client-gnome/src/config/audioconf.c:797
+#: ../../sflphone-client-gnome/src/config/audioconf.c:798
msgid "_Noise Reduction (Narrow-Band Companding)"
-msgstr ""
+msgstr "_Reducción de ruido"
-#: ../../sflphone-client-gnome/src/config/audioconf.c:825
+#: ../../sflphone-client-gnome/src/config/audioconf.c:826
msgid "Sound Manager"
-msgstr ""
+msgstr "Gestor de audio"
-#: ../../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"
+msgstr "Configuración de ALSA"
-#: ../../sflphone-client-gnome/src/config/audioconf.c:849
+#: ../../sflphone-client-gnome/src/config/audioconf.c:850
msgid "Codecs"
-msgstr ""
+msgstr "Códecs"
-#: ../../sflphone-client-gnome/src/config/audioconf.c:872
+#: ../../sflphone-client-gnome/src/config/audioconf.c:873
msgid "Ringtones"
-msgstr "_Permitir los ringtones"
+msgstr "Tonos de llamada"
-#: ../../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"
+msgstr "Actívelo si está detrás de un cortafuegos"
-#: ../../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
+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
+msgid "_Enable notifications"
+msgstr "_Habilitar notificaciones"
-#: ../../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 "Habilitar _notificaciones de mensajes de voz"
-#: ../../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 "Esconder SFLphone en el arranque"
-#: ../../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 "Límite de tamaño de _historial"
-#: ../../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 "Silenciar el resto de aplicaciones durante una llamada"
-#: ../../sflphone-client-gnome/src/config/configwindow.c:651
+#: ../../sflphone-client-gnome/src/config/configwindow.c:674
msgid "SIP Port"
-msgstr ""
+msgstr "Puerto SIP"
-#: ../../sflphone-client-gnome/src/config/configwindow.c:664
+#: ../../sflphone-client-gnome/src/config/configwindow.c:687
msgid "Port:"
-msgstr ""
+msgstr "Puerto:"
-#: ../../sflphone-client-gnome/src/config/configwindow.c:719
+#: ../../sflphone-client-gnome/src/config/configwindow.c:742
msgid "_Recordings folder"
-msgstr ""
+msgstr "Directorio de Grabaciones"
-#: ../../sflphone-client-gnome/src/config/configwindow.c:725
+#: ../../sflphone-client-gnome/src/config/configwindow.c:748
msgid "Select a folder"
-msgstr ""
+msgstr "Seleccione un directorio"
-#: ../../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"
+msgstr "Configuración general"
-#: ../../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
-#, fuzzy
+#: ../../sflphone-client-gnome/src/config/configwindow.c:803
msgid "Recordings"
-msgstr "Registrar"
+msgstr "Grabaciones"
-#: ../../sflphone-client-gnome/src/config/configwindow.c:785
+#: ../../sflphone-client-gnome/src/config/configwindow.c:808
msgid "Address Book"
-msgstr ""
+msgstr "Libreta de direcciones"
-#: ../../sflphone-client-gnome/src/config/configwindow.c:790
+#: ../../sflphone-client-gnome/src/config/configwindow.c:813
msgid "Hooks"
-msgstr ""
+msgstr "Disparadores"
-#: ../../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
-#, fuzzy
-msgid "Account previously setup"
-msgstr "Cuentas existentes"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:852
+msgid "Configured Accounts"
+msgstr "Cuentas Configuradas"
#: ../../sflphone-client-gnome/src/config/hooks-config.c:130
-msgid "URL argument"
-msgstr ""
+msgid "URL Passing"
+msgstr "Paso de URL"
#: ../../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 puede ejecutar órdenes personalizadas si las llamadas entrantes "
+"incluyen una URL.\n"
+"En este caso, %s se remplazará por la URL."
-#: ../../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 "Evento desencadenado con una cabecera _SIP específica"
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:157
-msgid "_Command: "
-msgstr ""
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:155
+msgid "Trigger on _IAX2 URL"
+msgstr "Evento desencadenado con una URL _IAX2"
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:164
-msgid "Phone number formatting"
-msgstr ""
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:160
+msgid "_Command to run: "
+msgstr "_Orden a ejecutar: "
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:174
-msgid "_Add phone number prefix"
-msgstr ""
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:168
+msgid "Phone Number Rewriting"
+msgstr "Reescritura de número de teléfono"
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:179
-msgid "_Prepend: "
-msgstr ""
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:178
+msgid "_Prefix dialed numbers with:"
+msgstr "_prefijar los números marcados con:"
-#: ../../sflphone-client-gnome/src/contacts/history.c:75
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:94
-#, fuzzy
+#: ../../sflphone-client-gnome/src/contacts/history.c:83
+#: ../../sflphone-client-gnome/src/contacts/searchbar.c:123
msgid "Search history"
-msgstr "Historia de Llamada"
+msgstr "Historial de búsquedas"
-#: ../../sflphone-client-gnome/src/contacts/history.c:75
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:86
-#, fuzzy
+#: ../../sflphone-client-gnome/src/contacts/history.c:83
+#: ../../sflphone-client-gnome/src/contacts/searchbar.c:110
msgid "Search contact"
-msgstr "_Buscar contactos"
-
-#~ msgid "Search"
-#~ msgstr "Buscar"
-
-#~ msgid "_Enabled"
-#~ msgstr "_Activado"
-
-#~ msgid "%s account- %s"
-#~ msgstr "%s cuenta: %s"
-
-#~ msgid "Noise reduction"
-#~ msgstr "Reducción de ruidos"
-
-#~ msgid "_Destination folder"
-#~ msgstr "_Carpeta de destinación"
-
-#~ msgid "_Account Assistant"
-#~ msgstr "_Asistente de Cuenta"
-
-#~ msgid "Setup Accounts"
-#~ msgstr "Cuentas"
-
-#~ msgid "Search Parameters"
-#~ msgstr "Buscar paràmetros"
-
-#~ msgid "Maximum result number for a request: "
-#~ msgstr "Numero maximo de resultados de búsqueda"
+msgstr "_Buscar contacto"
-#~ msgid "Search for and display: "
-#~ msgstr "Buscar y mostrar: "
+#~ msgid "Registered to %s (%s)"
+#~ msgstr "Registrado en %s (%s)"
-#~ msgid "_STUN Server"
-#~ msgstr "_Servidor STUN"
+#~ msgid "%s account- %s %s"
+#~ msgstr "%s cuenta- %s %s"
diff --git a/sflphone-common/po/fr.po b/sflphone-common/po/fr.po
index 4fcca4b483ea17a426e912c35f373be686e20658..e820d6547fc188eeacd4397ad2991f890521629c 100644
--- a/sflphone-common/po/fr.po
+++ b/sflphone-common/po/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-05-05 17:43-0400\n"
+"POT-Creation-Date: 2009-05-21 10:45-0400\n"
"PO-Revision-Date: 2008-03-31 14:15\n"
"Last-Translator: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>\n"
"Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n"
@@ -73,12 +73,12 @@ msgstr "%d message vocal"
#: ../../sflphone-client-gnome/src/actions.c:81
#, c-format
-msgid "Connected to %s (%s)"
-msgstr "Connecté avec %s (%s)"
+msgid "Using %s (%s)"
+msgstr "Utilise %s (%s)"
#: ../../sflphone-client-gnome/src/actions.c:87
msgid "No registered account"
-msgstr "Vous n'avez aucun compte enregistré"
+msgstr "Aucun compte enregistré"
#: ../../sflphone-client-gnome/src/actions.c:229
msgid ""
@@ -88,17 +88,17 @@ msgstr ""
"Impossible de se connecter au serveur SFLphone.\n"
" Assurez-vous que le démon est lancé."
-#: ../../sflphone-client-gnome/src/actions.c:775
+#: ../../sflphone-client-gnome/src/actions.c:787
#, c-format
msgid "IP call - %s"
msgstr "Appel IP - %s"
-#: ../../sflphone-client-gnome/src/actions.c:778
+#: ../../sflphone-client-gnome/src/actions.c:790
#, c-format
-msgid "%s account- %s %s"
-msgstr "compte %s- %s %s"
+msgid "Using %s (%s) - Codec: %s"
+msgstr "Utilise %s (%s) - Codec: %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 "Configuration d'un compte 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 "Traduction d'adresse réseau (NAT)"
@@ -233,7 +233,7 @@ msgstr ""
"un pare-feu."
#: ../../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_ctiver STUN"
@@ -291,7 +291,7 @@ msgstr "Vous avez des appels en cours."
msgid "Do you still want to quit?"
msgstr "Voulez-vous quitter?"
-#: ../../sflphone-client-gnome/src/mainwindow.c:293
+#: ../../sflphone-client-gnome/src/mainwindow.c:296
msgid "SFLphone Error"
msgstr "Erreur SFLphone"
@@ -432,7 +432,7 @@ msgid "_Show main window"
msgstr "_Afficher la fenêtre principale"
#: ../../sflphone-client-gnome/src/statusicon.c:124
-#, fuzzy, c-format
+#, c-format
msgid "SFLphone - %i accounts configured"
msgstr "SFLphone - %i comptes configurés"
@@ -504,8 +504,8 @@ msgid "Account settings"
msgstr "Configuration des comptes"
#: ../../sflphone-client-gnome/src/config/accountwindow.c:120
-msgid "Account parameters"
-msgstr "Paramètres du compte"
+msgid "Account Parameters"
+msgstr "Paramètres du Compte"
#: ../../sflphone-client-gnome/src/config/accountwindow.c:142
msgid "_Enable this account"
@@ -520,13 +520,13 @@ msgid "Unknown"
msgstr "Inconnu"
#: ../../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 "Général"
#: ../../sflphone-client-gnome/src/config/addressbook-config.c:276
-msgid "_Use Evolution address book"
-msgstr "Utiliser le carnet d'adresse d'Évolution"
+msgid "_Use Evolution address books"
+msgstr "Utiliser les carnets d'adresse d'Évolution"
#: ../../sflphone-client-gnome/src/config/addressbook-config.c:283
msgid "Download limit:"
@@ -536,27 +536,35 @@ msgstr "Limite de téléchargement:"
msgid "_Display contact photo if available"
msgstr "Afficher la photo si disponible"
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:299
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:301
msgid "Fields"
msgstr "Champs"
-#: ../../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 "Utiliser les champs suivants des carnets d'adresse d'Évolution"
+
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:316
msgid "_Business phone"
msgstr "Tél du bureau"
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:314
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:321
msgid "_Home phone"
msgstr "Tél du domicile"
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:319
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:326
msgid "_Mobile phone"
msgstr "Tél portable"
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:324
-msgid "Books"
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:333
+msgid "Address Books"
msgstr "Carnets d'adresse"
-#: ../../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 "Sélectionner quels carnets d'adresse d'Évolution utiliser:"
+
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:377
#: ../../sflphone-client-gnome/src/config/audioconf.c:574
msgid "Name"
msgstr "Nom"
@@ -602,188 +610,236 @@ msgstr "Entrée"
msgid "_Enable ringtones"
msgstr "_Activer les sonneries"
-#: ../../sflphone-client-gnome/src/config/audioconf.c:763
+#: ../../sflphone-client-gnome/src/config/audioconf.c:764
msgid "Choose a ringtone"
msgstr "Sélectionner une sonnerie"
-#: ../../sflphone-client-gnome/src/config/audioconf.c:768
+#: ../../sflphone-client-gnome/src/config/audioconf.c:769
msgid "Audio Files"
msgstr "Fichier Audio"
-#: ../../sflphone-client-gnome/src/config/audioconf.c:787
+#: ../../sflphone-client-gnome/src/config/audioconf.c:788
msgid "_Voice Activity Detection"
msgstr "Détection de l'activité de la voix"
-#: ../../sflphone-client-gnome/src/config/audioconf.c:797
+#: ../../sflphone-client-gnome/src/config/audioconf.c:798
msgid "_Noise Reduction (Narrow-Band Companding)"
msgstr "Réduction du bruit (Compresseur extenseur LBR)"
-#: ../../sflphone-client-gnome/src/config/audioconf.c:825
+#: ../../sflphone-client-gnome/src/config/audioconf.c:826
msgid "Sound Manager"
msgstr "Interface Audio"
-#: ../../sflphone-client-gnome/src/config/audioconf.c:832
+#: ../../sflphone-client-gnome/src/config/audioconf.c:833
msgid "ALSA configuration"
msgstr "Configuration 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 "Sonneries"
-#: ../../sflphone-client-gnome/src/config/configwindow.c:390
+#: ../../sflphone-client-gnome/src/config/configwindow.c:402
msgid "Protocol"
msgstr "Protocole"
-#: ../../sflphone-client-gnome/src/config/configwindow.c:397
+#: ../../sflphone-client-gnome/src/config/configwindow.c:409
msgid "Status"
msgstr "Statut"
-#: ../../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 "Les paramètres STUN sont appliqués à tous les comptes SIP créés"
-#: ../../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 "À activer si vous êtes derrière un pare-feu, puis redémarrez SFLphone"
-#: ../../sflphone-client-gnome/src/config/configwindow.c:516
+#: ../../sflphone-client-gnome/src/config/configwindow.c:528
msgid "Format: name.server:port"
msgstr "Format: nom.serveur:port"
-#: ../../sflphone-client-gnome/src/config/configwindow.c:564
-msgid "Desktop Notification"
-msgstr "Notifications du bureau"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:579
+msgid "Desktop Notifications"
+msgstr "Notifications de Bureau"
-#: ../../sflphone-client-gnome/src/config/configwindow.c:572
-msgid "_Enable"
-msgstr "_Activer"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:588
+msgid "_Enable notifications"
+msgstr "_Activer les notifications"
-#: ../../sflphone-client-gnome/src/config/configwindow.c:577
-msgid "_Notify voice mails"
-msgstr "_Notifier les messages vocaux"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:594
+msgid "Enable voicemail _notifications"
+msgstr "Activer les notifications de boîte vocale"
-#: ../../sflphone-client-gnome/src/config/configwindow.c:583
+#: ../../sflphone-client-gnome/src/config/configwindow.c:605
msgid "System Tray Icon"
msgstr "Icône dans la barre des tâches"
-#: ../../sflphone-client-gnome/src/config/configwindow.c:591
+#: ../../sflphone-client-gnome/src/config/configwindow.c:613
msgid "_Popup main window on incoming call"
msgstr "_Faire apparaître la fenêtre principale lors d'appel entrant"
-#: ../../sflphone-client-gnome/src/config/configwindow.c:596
+#: ../../sflphone-client-gnome/src/config/configwindow.c:618
msgid "Ne_ver popup main window"
msgstr "Ne _jamais afficher la fenêtre principale"
-#: ../../sflphone-client-gnome/src/config/configwindow.c:600
-msgid "_Start hidden"
-msgstr "_Démarrer caché"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:622
+msgid "Hide SFLphone window on _startup"
+msgstr "Cacher la fenêtre de SFLphone au démarrage"
-#: ../../sflphone-client-gnome/src/config/configwindow.c:606
+#: ../../sflphone-client-gnome/src/config/configwindow.c:628
msgid "Calls History"
msgstr "Historique des appels"
-#: ../../sflphone-client-gnome/src/config/configwindow.c:614
-msgid "_Maximum number of calls"
-msgstr "N_ombre maximum d'appels"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:636
+msgid "_History size limit"
+msgstr "_Taille limite de l'historique"
-#: ../../sflphone-client-gnome/src/config/configwindow.c:630
+#: ../../sflphone-client-gnome/src/config/configwindow.c:653
msgid "PulseAudio sound server"
msgstr "Serveur de son PulseAudio"
-#: ../../sflphone-client-gnome/src/config/configwindow.c:638
-msgid "_Control running applications volume"
-msgstr "_Autoriser à modifier le volume des autres applications"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:661
+msgid "Mute other applications during a _call"
+msgstr "Éteindre le son des autres applications lors d'un appel"
-#: ../../sflphone-client-gnome/src/config/configwindow.c:651
+#: ../../sflphone-client-gnome/src/config/configwindow.c:674
msgid "SIP Port"
msgstr "Port 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 "Dossier pour les enregistrements"
-#: ../../sflphone-client-gnome/src/config/configwindow.c:725
+#: ../../sflphone-client-gnome/src/config/configwindow.c:748
msgid "Select a folder"
msgstr "Choisissez un dossier"
-#: ../../sflphone-client-gnome/src/config/configwindow.c:750
+#: ../../sflphone-client-gnome/src/config/configwindow.c:773
msgid "Preferences"
msgstr "Préférences"
-#: ../../sflphone-client-gnome/src/config/configwindow.c:770
+#: ../../sflphone-client-gnome/src/config/configwindow.c:793
msgid "General Settings"
msgstr "Préférences"
-#: ../../sflphone-client-gnome/src/config/configwindow.c:775
+#: ../../sflphone-client-gnome/src/config/configwindow.c:798
msgid "Audio Settings"
msgstr "Paramètres Audio"
-#: ../../sflphone-client-gnome/src/config/configwindow.c:780
+#: ../../sflphone-client-gnome/src/config/configwindow.c:803
msgid "Recordings"
msgstr "Enregistrements"
-#: ../../sflphone-client-gnome/src/config/configwindow.c:785
+#: ../../sflphone-client-gnome/src/config/configwindow.c:808
msgid "Address Book"
msgstr "Carnet d'adresse"
-#: ../../sflphone-client-gnome/src/config/configwindow.c:790
+#: ../../sflphone-client-gnome/src/config/configwindow.c:813
msgid "Hooks"
msgstr "Ancrage"
-#: ../../sflphone-client-gnome/src/config/configwindow.c:817
+#: ../../sflphone-client-gnome/src/config/configwindow.c:840
msgid "Accounts"
msgstr "Comptes"
-#: ../../sflphone-client-gnome/src/config/configwindow.c:829
-msgid "Account previously setup"
-msgstr "Liste des comptes existants"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:852
+msgid "Configured Accounts"
+msgstr "Comptes Configurés"
#: ../../sflphone-client-gnome/src/config/hooks-config.c:130
-msgid "URL argument"
-msgstr "Argument URL"
+msgid "URL Passing"
+msgstr "Passage d'URL"
#: ../../sflphone-client-gnome/src/config/hooks-config.c:140
-msgid "_SIP protocol"
-msgstr "_Protocole SIP"
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:145
-msgid "_SIP Header: "
-msgstr "En-tête SIP: "
+#, 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 peut exécuter des commandes lors d'appels entrants qui ont un URL "
+"associé.\n"
+"Dans ce cas, %s sera remplacé par l'URL en question."
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:152
-msgid "_IAX2 protocol"
-msgstr "_Protocole IAX2"
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:143
+msgid "Trigger on specific _SIP header"
+msgstr "Déclencher sur un entête _SIP spécifique"
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:157
-msgid "_Command: "
-msgstr "Commande"
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:155
+msgid "Trigger on _IAX2 URL"
+msgstr "Déclencher en _IAX2"
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:164
-msgid "Phone number formatting"
-msgstr "Formattage du numéro"
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:160
+msgid "_Command to run: "
+msgstr "Commande à exécuter: "
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:174
-msgid "_Add phone number prefix"
-msgstr "Ajouter un préfixe au numéro"
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:168
+msgid "Phone Number Rewriting"
+msgstr "Rééecriture du numéro"
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:179
-msgid "_Prepend: "
-msgstr "Préfixe: "
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:178
+msgid "_Prefix dialed numbers with:"
+msgstr "Préfixer les numéros composés par:"
-#: ../../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
msgid "Search history"
-msgstr "ReChercher"
+msgstr "Rechercher"
-#: ../../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
msgid "Search contact"
msgstr "Rechercher un contact"
+
+#~ msgid "Registered to %s (%s)"
+#~ msgstr "Connecté avec %s (%s)"
+
+#~ msgid "%s account- %s %s"
+#~ msgstr "compte %s- %s %s"
+
+#~ msgid "Books"
+#~ msgstr "Carnets d'adresse"
+
+#~ msgid "_Enable"
+#~ msgstr "_Activer"
+
+#~ msgid "_Notify voice mails"
+#~ msgstr "_Notifier les messages vocaux"
+
+#~ msgid "_Start hidden"
+#~ msgstr "_Démarrer caché"
+
+#~ msgid "_Maximum number of calls"
+#~ msgstr "N_ombre maximum d'appels"
+
+#~ msgid "_Control running applications volume"
+#~ msgstr "_Autoriser à modifier le volume des autres applications"
+
+#~ msgid "Account previously setup"
+#~ msgstr "Liste des comptes existants"
+
+#~ msgid "URL argument"
+#~ msgstr "Argument URL"
+
+#~ msgid "_SIP protocol"
+#~ msgstr "_Protocole SIP"
+
+#~ msgid "_SIP Header: "
+#~ msgstr "En-tête SIP: "
+
+#~ msgid "_IAX2 protocol"
+#~ msgstr "_Protocole IAX2"
+
+#~ msgid "_Add phone number prefix"
+#~ msgstr "Ajouter un préfixe au numéro"
+
+#~ msgid "_Prepend: "
+#~ msgstr "Préfixe: "
diff --git a/sflphone-common/po/ru.po b/sflphone-common/po/ru.po
index 109c66c9b80adeb83c9385990a4865295f60004c..32edc9fd5bffff08ed0407437e881a9ac5195f87 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:43-0400\n"
+"POT-Creation-Date: 2009-05-21 10:45-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"
@@ -70,9 +70,9 @@ msgid "%d voice mail"
msgstr "%d речевое сообщение"
#: ../../sflphone-client-gnome/src/actions.c:81
-#, fuzzy, c-format
-msgid "Connected to %s (%s)"
-msgstr "Зарегистрирован"
+#, c-format
+msgid "Using %s (%s)"
+msgstr ""
#: ../../sflphone-client-gnome/src/actions.c:87
#, fuzzy
@@ -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
-#, fuzzy, c-format
-msgid "%s account- %s %s"
-msgstr "%s аккаунт- %s"
+#: ../../sflphone-client-gnome/src/actions.c:790
+#, c-format
+msgid "Using %s (%s) - Codec: %s"
+msgstr ""
-#: ../../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"
@@ -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,246 @@ 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"
+#: ../../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 "_Стереть журнал"
-#: ../../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 "Registered to %s (%s)"
+#~ msgstr "Зарегистрирован"
+
+#, fuzzy
+#~ msgid "%s account- %s %s"
+#~ msgstr "%s аккаунт- %s"
+
+#, fuzzy
+#~ msgid "Books"
+#~ msgstr "перехватчики (hooks)"
+
+#~ msgid "_Enable"
+#~ msgstr "_Включить"
+
+#~ msgid "_Notify voice mails"
+#~ msgstr "_Предупредить о новых речевых сообщениях"
+
+#~ msgid "_Start hidden"
+#~ msgstr "_Начать спрятанным"
+
+#~ msgid "_Maximum number of calls"
+#~ msgstr "_Максимальное количество звонков"
+
+#~ msgid "_Control running applications volume"
+#~ msgstr "_Начать спрятанным "
+
+#, fuzzy
+#~ msgid "Account previously setup"
+#~ msgstr "Существующие аккаунты"
+
+#~ msgid "URL argument"
+#~ msgstr "URL аргумент"
+
+#~ msgid "_SIP protocol"
+#~ msgstr "Пр_отокол"
+
+#~ msgid "_SIP Header: "
+#~ msgstr "_SIP Заголовок"
+
+#~ msgid "_IAX2 protocol"
+#~ msgstr "Пр_отокол"
+
#~ msgid "Search"
#~ msgstr "Поиск"
@@ -832,8 +888,5 @@ msgstr "_Искать в журнале"
#~ msgid "Apply"
#~ msgstr "Применить"
-#~ msgid "History empty"
-#~ msgstr "Журнал пуст"
-
#~ msgid "Enabled"
#~ msgstr "Включен"
diff --git a/sflphone-common/po/sflphone.pot b/sflphone-common/po/sflphone.pot
index 0ad7f6d38a0d5f9d90412587038df5bc8c72124a..b00ff4c9854108cda6e75fccfa3023e583f76b5e 100644
--- a/sflphone-common/po/sflphone.pot
+++ b/sflphone-common/po/sflphone.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-05 17:43-0400\n"
+"POT-Creation-Date: 2009-05-21 10:45-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -71,7 +71,7 @@ msgstr ""
#: ../../sflphone-client-gnome/src/actions.c:81
#, c-format
-msgid "Connected to %s (%s)"
+msgid "Using %s (%s)"
msgstr ""
#: ../../sflphone-client-gnome/src/actions.c:87
@@ -84,17 +84,17 @@ msgid ""
"Make sure the daemon is running."
msgstr ""
-#: ../../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"
+msgid "Using %s (%s) - Codec: %s"
msgstr ""
-#: ../../sflphone-client-gnome/src/actions.c:868
+#: ../../sflphone-client-gnome/src/actions.c:880
#, c-format
msgid ""
"<b>Error: No audio codecs found.\n"
@@ -207,7 +207,7 @@ msgid "IAX2 account configuration"
msgstr ""
#: ../../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 ""
@@ -216,7 +216,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 ""
@@ -265,7 +265,7 @@ msgstr ""
msgid "Do you still want to quit?"
msgstr ""
-#: ../../sflphone-client-gnome/src/mainwindow.c:293
+#: ../../sflphone-client-gnome/src/mainwindow.c:296
msgid "SFLphone Error"
msgstr ""
@@ -477,7 +477,7 @@ msgid "Account settings"
msgstr ""
#: ../../sflphone-client-gnome/src/config/accountwindow.c:120
-msgid "Account parameters"
+msgid "Account Parameters"
msgstr ""
#: ../../sflphone-client-gnome/src/config/accountwindow.c:142
@@ -493,12 +493,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
@@ -509,27 +509,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 ""
@@ -575,188 +583,188 @@ 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
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 ""
-#: ../../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 ""
-#: ../../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 ""
-#: ../../sflphone-client-gnome/src/config/configwindow.c:564
-msgid "Desktop Notification"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:579
+msgid "Desktop Notifications"
msgstr ""
-#: ../../sflphone-client-gnome/src/config/configwindow.c:572
-msgid "_Enable"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:588
+msgid "_Enable notifications"
msgstr ""
-#: ../../sflphone-client-gnome/src/config/configwindow.c:577
-msgid "_Notify voice mails"
+#: ../../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 ""
-#: ../../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"
+#: ../../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"
+#: ../../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 ""
-#: ../../sflphone-client-gnome/src/config/configwindow.c:638
-msgid "_Control running applications volume"
+#: ../../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 ""
-#: ../../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
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
-msgid "Account previously setup"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:852
+msgid "Configured Accounts"
msgstr ""
#: ../../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 ""
-
-#: ../../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"
+#: ../../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
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
msgid "Search contact"
msgstr ""
diff --git a/sflphone-common/po/zh_CN.po b/sflphone-common/po/zh_CN.po
index 0cfb2ca145f72e76b3f53cb96672438368c3d5bb..913b59b252d231d2f3945f1ee07340431ae4da3a 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:43-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"
@@ -71,12 +71,10 @@ msgid "%d voice mail"
msgstr "%d 个语音信息"
#: ../../sflphone-client-gnome/src/actions.c:81
-#, fuzzy, c-format
-msgid "Connected to %s (%s)"
-msgstr "已注册"
+msgid "Registered to %s (%s)"
+msgstr "注册到 %s (%s)"
#: ../../sflphone-client-gnome/src/actions.c:87
-#, fuzzy
msgid "No registered account"
msgstr "未发现已注册帐户"
@@ -88,17 +86,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 ""
+msgstr "IP 电话 - %s"
-#: ../../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"
@@ -112,7 +110,6 @@ msgstr ""
"sflphone</b>目录下"
#: ../../sflphone-client-gnome/src/assistant.c:35
-#, fuzzy, c-format
msgid ""
"This assistant is now finished.\n"
"You can at any time check your registration state or modify your accounts "
@@ -128,7 +125,6 @@ msgstr ""
"别名: %s\n"
"服务器: %s\n"
"用户名: %s\n"
-"密码: %s"
#: ../../sflphone-client-gnome/src/assistant.c:160
msgid "SFLphone account configuration wizard"
@@ -202,9 +198,8 @@ msgstr "密码(P)"
#: ../../sflphone-client-gnome/src/assistant.c:294
#: ../../sflphone-client-gnome/src/assistant.c:387
#: ../../sflphone-client-gnome/src/config/accountwindow.c:223
-#, fuzzy
msgid "_Voicemail number"
-msgstr "语音信箱(V)"
+msgstr "语音信箱号码(V)"
#: ../../sflphone-client-gnome/src/assistant.c:309
msgid "Optional Email Address "
@@ -223,7 +218,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 +227,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)"
@@ -249,24 +244,22 @@ msgid "Congratulations!"
msgstr "恭喜！"
#: ../../sflphone-client-gnome/src/errors.c:28
-#, fuzzy
msgid ""
"ALSA notification\n"
"\n"
"Error while opening playback device"
msgstr ""
-"<b>ALSA提示</b>\n"
+"ALSA提示\n"
"\n"
"打开回放设备时出错"
#: ../../sflphone-client-gnome/src/errors.c:31
-#, fuzzy
msgid ""
"ALSA notification\n"
"\n"
"Error while opening capture device"
msgstr ""
-"<b>ALSA提示</b>\n"
+"ALSA提示\n"
"\n"
"打开采集设备时出错"
@@ -276,6 +269,9 @@ msgid ""
"\n"
"Pulseaudio is not running"
msgstr ""
+"Pulseaudio提示\n"
+"\n"
+"Pulseaudio未运行"
#: ../../sflphone-client-gnome/src/mainwindow.c:70
msgid "There is one call in progress."
@@ -289,10 +285,9 @@ msgstr "有电话正在处理中"
msgid "Do you still want to quit?"
msgstr "确认要退出?"
-#: ../../sflphone-client-gnome/src/mainwindow.c:293
-#, fuzzy
+#: ../../sflphone-client-gnome/src/mainwindow.c:296
msgid "SFLphone Error"
-msgstr "SFLphone 0.9.2"
+msgstr "SFLphone出错"
#: ../../sflphone-client-gnome/src/menus.c:134
msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
@@ -332,9 +327,8 @@ msgid "_Record"
msgstr "记录(R)"
#: ../../sflphone-client-gnome/src/menus.c:358
-#, fuzzy
msgid "_Account creation wizard"
-msgstr "SFLphone 帐户设置向导"
+msgstr "帐户创建向导"
#: ../../sflphone-client-gnome/src/menus.c:388
msgid "_Call"
@@ -369,13 +363,12 @@ msgid "_Call back"
msgstr "回叫(C)"
#: ../../sflphone-client-gnome/src/menus.c:1082
-#, fuzzy
msgid "Edit phone"
-msgstr "移动电话(M)"
+msgstr "编辑电话"
#: ../../sflphone-client-gnome/src/menus.c:1093
msgid "Edit the phone number before making a call"
-msgstr ""
+msgstr "拨出电话前编辑电话号码"
#: ../../sflphone-client-gnome/src/sflnotify.c:38
#: ../../sflphone-client-gnome/src/sflnotify.c:105
@@ -432,9 +425,8 @@ msgid "_Show main window"
msgstr "显示主窗口(S)"
#: ../../sflphone-client-gnome/src/statusicon.c:124
-#, fuzzy, c-format
msgid "SFLphone - %i accounts configured"
-msgstr "SFLphone - %i 个帐户已注册"
+msgstr "SFLphone - %i 个帐户已配置"
#: ../../sflphone-client-gnome/src/timestamp.c:46
msgid "<small>Missed call</small>"
@@ -504,12 +496,12 @@ msgid "Account settings"
msgstr "帐户设置"
#: ../../sflphone-client-gnome/src/config/accountwindow.c:120
-msgid "Account parameters"
+msgid "Account Parameters"
msgstr "帐户相关参数"
#: ../../sflphone-client-gnome/src/config/accountwindow.c:142
msgid "_Enable this account"
-msgstr ""
+msgstr "启用该账户(E)"
#: ../../sflphone-client-gnome/src/config/accountwindow.c:156
msgid "_Protocol"
@@ -520,52 +512,58 @@ 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"
-msgstr ""
+msgid "_Use Evolution address books"
+msgstr "使用Evolution地址薄(U)"
#: ../../sflphone-client-gnome/src/config/addressbook-config.c:283
msgid "Download limit:"
-msgstr ""
+msgstr "下载上限:"
#: ../../sflphone-client-gnome/src/config/addressbook-config.c:294
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 ""
+msgstr "字段"
+
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:311
+msgid "Use the following fields from Evolution's address books:"
+msgstr "使用Evolution地址薄中的如下字段:"
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:309
+#: ../../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
-#, fuzzy
-msgid "Books"
-msgstr "钩键"
+#: ../../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 "选择使用如下Evolution地址薄:"
-#: ../../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 "名称"
#: ../../sflphone-client-gnome/src/config/audioconf.c:155
-#, fuzzy, c-format
msgid "audio device index for output = %d"
-msgstr "音频设备索引输出 ＝ %d\n"
+msgstr "音频设备输出索引 ＝ %d\n"
#: ../../sflphone-client-gnome/src/config/audioconf.c:579
msgid "Frequency"
@@ -603,196 +601,226 @@ 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
-#, fuzzy
+#: ../../sflphone-client-gnome/src/config/audioconf.c:788
msgid "_Voice Activity Detection"
-msgstr "启用静音检测(A)"
+msgstr "声音状态检测(V)"
-#: ../../sflphone-client-gnome/src/config/audioconf.c:797
+#: ../../sflphone-client-gnome/src/config/audioconf.c:798
msgid "_Noise Reduction (Narrow-Band Companding)"
-msgstr ""
+msgstr "降噪处理-窄频压缩(N)"
-#: ../../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
+msgid "Desktop Notifications"
msgstr "桌面提示"
-#: ../../sflphone-client-gnome/src/config/configwindow.c:572
-msgid "_Enable"
-msgstr "启用(E)"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:588
+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 "启用语音邮箱提示(n)"
-#: ../../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主窗口"
-#: ../../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
+msgid "_History size limit"
+msgstr "历史记录上限(H)"
-#: ../../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 "当有来电时静音其它应用程序(c)"
-#: ../../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 ""
+msgstr "记录文件夹(R)"
-#: ../../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
-#, fuzzy
+#: ../../sflphone-client-gnome/src/config/configwindow.c:803
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
-#, fuzzy
-msgid "Account previously setup"
-msgstr "以前帐户设置"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:852
+msgid "Configured Accounts"
+msgstr "已配置帐户"
#: ../../sflphone-client-gnome/src/config/hooks-config.c:130
-msgid "URL argument"
-msgstr "URL参数"
+msgid "URL Passing"
+msgstr "传输URL"
#: ../../sflphone-client-gnome/src/config/hooks-config.c:140
-msgid "_SIP protocol"
-msgstr "SIP 协议(S)"
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:145
-msgid "_SIP Header: "
-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 ""
+"当来电有附加的URL时,SFLphone可运行客户命令.\n"
+"在此情况下,传输的URL会被替换成%s."
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:152
-msgid "_IAX2 protocol"
-msgstr "IAX2 协议(I)"
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:143
+msgid "Trigger on specific _SIP header"
+msgstr "激活指定的SIP头(S)"
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:157
-msgid "_Command: "
-msgstr "命令(C):"
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:155
+msgid "Trigger on _IAX2 URL"
+msgstr "激活IAX2 URL(I)"
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:164
-msgid "Phone number formatting"
-msgstr ""
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:160
+msgid "_Command to run: "
+msgstr "运行命令(C):"
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:174
-msgid "_Add phone number prefix"
-msgstr ""
+#: ../../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: "
-msgstr ""
+#: ../../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
-#, fuzzy
+#: ../../sflphone-client-gnome/src/contacts/history.c:83
+#: ../../sflphone-client-gnome/src/contacts/searchbar.c:123
msgid "Search history"
-msgstr "清空历史记录(C)"
+msgstr "查找历史记录"
-#: ../../sflphone-client-gnome/src/contacts/history.c:75
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:86
-#, fuzzy
+#: ../../sflphone-client-gnome/src/contacts/history.c:83
+#: ../../sflphone-client-gnome/src/contacts/searchbar.c:110
msgid "Search contact"
-msgstr "查找历史(S)"
+msgstr "查找联系人(S)"
+
+#~ msgid "Books"
+#~ msgstr "钩键"
+
+#~ msgid "_Enable"
+#~ msgstr "启用(E)"
+
+#~ msgid "_Notify voice mails"
+#~ msgstr "通知语音邮件(N)"
+
+#~ msgid "_Start hidden"
+#~ msgstr "启动时隐藏(S)"
+
+#~ msgid "_Maximum number of calls"
+#~ msgstr "最大拨号数(M)"
+
+#~ msgid "_Control running applications volume"
+#~ msgstr "控制正在运行的应用程序的音量(C)"
+
+#~ msgid "Account previously setup"
+#~ msgstr "帐户以前设置"
+
+#~ msgid "URL argument"
+#~ msgstr "URL参数"
+
+#~ msgid "_SIP protocol"
+#~ msgstr "SIP 协议(S)"
+
+#~ msgid "_SIP Header: "
+#~ msgstr "SIP消息头(S):"
+
+#~ msgid "_IAX2 protocol"
+#~ msgstr "IAX2 协议(I)"
#~ msgid "Search"
#~ msgstr "查找"
@@ -829,6 +857,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 fa7d301e6528165bd73e5d413cc186380675c7b5..4401a1c7a215c4c908aee67f1cb88f94edf04222 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:43-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"
@@ -71,12 +71,10 @@ msgid "%d voice mail"
msgstr "%d 個語音郵件"
#: ../../sflphone-client-gnome/src/actions.c:81
-#, fuzzy, c-format
-msgid "Connected to %s (%s)"
-msgstr "已註冊"
+msgid "Registered to %s (%s)"
+msgstr "註冊到 %s (%s)"
#: ../../sflphone-client-gnome/src/actions.c:87
-#, fuzzy
msgid "No registered account"
msgstr "未發現已註冊帳戶"
@@ -88,17 +86,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 ""
+msgstr "IP電話- %s"
-#: ../../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"
@@ -112,7 +110,6 @@ msgstr ""
"sflphone</b>目錄下"
#: ../../sflphone-client-gnome/src/assistant.c:35
-#, fuzzy, c-format
msgid ""
"This assistant is now finished.\n"
"You can at any time check your registration state or modify your accounts "
@@ -127,7 +124,6 @@ msgstr ""
"別稱: %s\n"
"伺服器: %s\n"
"使用者名稱: %s\n"
-"密碼: %s"
#: ../../sflphone-client-gnome/src/assistant.c:160
msgid "SFLphone account configuration wizard"
@@ -201,7 +197,6 @@ msgstr "密碼(P)"
#: ../../sflphone-client-gnome/src/assistant.c:294
#: ../../sflphone-client-gnome/src/assistant.c:387
#: ../../sflphone-client-gnome/src/config/accountwindow.c:223
-#, fuzzy
msgid "_Voicemail number"
msgstr "語音郵箱(V)"
@@ -222,7 +217,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 +226,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)"
@@ -248,24 +243,22 @@ msgid "Congratulations!"
msgstr "恭喜！"
#: ../../sflphone-client-gnome/src/errors.c:28
-#, fuzzy
msgid ""
"ALSA notification\n"
"\n"
"Error while opening playback device"
msgstr ""
-"<b>ALSA提示</b>\n"
+"ALSA提示\n"
"\n"
"打開回放設備時出錯"
#: ../../sflphone-client-gnome/src/errors.c:31
-#, fuzzy
msgid ""
"ALSA notification\n"
"\n"
"Error while opening capture device"
msgstr ""
-"<b>ALSA提示</b>\n"
+"ALSA提示\n"
"\n"
"打開采集設備時出錯"
@@ -275,6 +268,9 @@ msgid ""
"\n"
"Pulseaudio is not running"
msgstr ""
+"Pulseaudio提示\n"
+"\n"
+"Pulseaudio未運行"
#: ../../sflphone-client-gnome/src/mainwindow.c:70
msgid "There is one call in progress."
@@ -288,10 +284,9 @@ msgstr "有電話正在處理中."
msgid "Do you still want to quit?"
msgstr "確認要退出?"
-#: ../../sflphone-client-gnome/src/mainwindow.c:293
-#, fuzzy
+#: ../../sflphone-client-gnome/src/mainwindow.c:296
msgid "SFLphone Error"
-msgstr "SFLphone 0.9.2"
+msgstr "SFLphone 出錯"
#: ../../sflphone-client-gnome/src/menus.c:134
msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
@@ -331,9 +326,8 @@ msgid "_Record"
msgstr "記錄(R)"
#: ../../sflphone-client-gnome/src/menus.c:358
-#, fuzzy
msgid "_Account creation wizard"
-msgstr "SFLphone 帳戶設置向導"
+msgstr "帳戶創建向導(A)"
#: ../../sflphone-client-gnome/src/menus.c:388
msgid "_Call"
@@ -368,13 +362,12 @@ msgid "_Call back"
msgstr "回叫(C)"
#: ../../sflphone-client-gnome/src/menus.c:1082
-#, fuzzy
msgid "Edit phone"
-msgstr "移動電話(M)"
+msgstr "編輯電話"
#: ../../sflphone-client-gnome/src/menus.c:1093
msgid "Edit the phone number before making a call"
-msgstr ""
+msgstr "撥出電話前編輯電話號碼"
#: ../../sflphone-client-gnome/src/sflnotify.c:38
#: ../../sflphone-client-gnome/src/sflnotify.c:105
@@ -431,9 +424,8 @@ msgid "_Show main window"
msgstr "顯示主窗口(S)"
#: ../../sflphone-client-gnome/src/statusicon.c:124
-#, fuzzy, c-format
msgid "SFLphone - %i accounts configured"
-msgstr "SFLphone - %i 個帳戶已註冊"
+msgstr "SFLphone - %i 個帳戶已配置"
#: ../../sflphone-client-gnome/src/timestamp.c:46
msgid "<small>Missed call</small>"
@@ -503,12 +495,12 @@ msgid "Account settings"
msgstr "帳戶設置"
#: ../../sflphone-client-gnome/src/config/accountwindow.c:120
-msgid "Account parameters"
+msgid "Account Parameters"
msgstr "帳戶相關參數"
#: ../../sflphone-client-gnome/src/config/accountwindow.c:142
msgid "_Enable this account"
-msgstr ""
+msgstr "啟用該賬戶(E)"
#: ../../sflphone-client-gnome/src/config/accountwindow.c:156
msgid "_Protocol"
@@ -519,52 +511,58 @@ 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"
-msgstr ""
+msgid "_Use Evolution address books"
+msgstr "使用Evolution地址薄(U)"
#: ../../sflphone-client-gnome/src/config/addressbook-config.c:283
msgid "Download limit:"
-msgstr ""
+msgstr "下載上限:"
#: ../../sflphone-client-gnome/src/config/addressbook-config.c:294
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 ""
+msgstr "字段"
+
+#: ../../sflphone-client-gnome/src/config/addressbook-config.c:311
+msgid "Use the following fields from Evolution's address books:"
+msgstr "使用Evolution地址薄中的如下字段:"
-#: ../../sflphone-client-gnome/src/config/addressbook-config.c:309
+#: ../../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
-#, fuzzy
-msgid "Books"
-msgstr "鉤鍵"
+#: ../../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 "選擇使用如下Evolution地址薄:"
-#: ../../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 "名稱"
#: ../../sflphone-client-gnome/src/config/audioconf.c:155
-#, fuzzy, c-format
msgid "audio device index for output = %d"
-msgstr "音訊設備索引輸出 ＝ %d\n"
+msgstr "音訊設備輸出索引 ＝ %d\n"
#: ../../sflphone-client-gnome/src/config/audioconf.c:579
msgid "Frequency"
@@ -602,196 +600,226 @@ 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
-#, fuzzy
+#: ../../sflphone-client-gnome/src/config/audioconf.c:788
msgid "_Voice Activity Detection"
-msgstr "啟用靜音檢測(A)"
+msgstr "聲音狀態檢測(V)"
-#: ../../sflphone-client-gnome/src/config/audioconf.c:797
+#: ../../sflphone-client-gnome/src/config/audioconf.c:798
msgid "_Noise Reduction (Narrow-Band Companding)"
-msgstr ""
+msgstr "降噪處理-窄頻壓縮(N)"
-#: ../../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
+msgid "Desktop Notifications"
msgstr "桌面提示"
-#: ../../sflphone-client-gnome/src/config/configwindow.c:572
-msgid "_Enable"
-msgstr "啟用(E)"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:588
+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 "啟用語音郵箱提示(n)"
-#: ../../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主窗口"
-#: ../../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
+msgid "_History size limit"
+msgstr "歷史記錄上限(H)"
-#: ../../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 "當有來電時靜音其它應用程序(c)"
-#: ../../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 ""
+msgstr "記錄文件夾(R)"
-#: ../../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
-#, fuzzy
+#: ../../sflphone-client-gnome/src/config/configwindow.c:803
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
-#, fuzzy
-msgid "Account previously setup"
-msgstr "以前帳戶設定"
+#: ../../sflphone-client-gnome/src/config/configwindow.c:852
+msgid "Configured Accounts"
+msgstr "已配置帳戶"
#: ../../sflphone-client-gnome/src/config/hooks-config.c:130
-msgid "URL argument"
-msgstr "URL參數"
+msgid "URL Passing"
+msgstr "傳輸URL"
#: ../../sflphone-client-gnome/src/config/hooks-config.c:140
-msgid "_SIP protocol"
-msgstr "SIP 協議(S)"
-
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:145
-msgid "_SIP Header: "
-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 ""
+"當來電有附加的URL時,SFLphone可運行客戶命令.\n"
+"在此情況下,傳輸的URL會被替換成%s."
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:152
-msgid "_IAX2 protocol"
-msgstr "IAX2 協議(I)"
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:143
+msgid "Trigger on specific _SIP header"
+msgstr "激活指定的SIP頭(S)"
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:157
-msgid "_Command: "
-msgstr "命令(C):"
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:155
+msgid "Trigger on _IAX2 URL"
+msgstr "激活IAX2 URL(I)"
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:164
-msgid "Phone number formatting"
-msgstr ""
+#: ../../sflphone-client-gnome/src/config/hooks-config.c:160
+msgid "_Command to run: "
+msgstr "運行命令(C):"
-#: ../../sflphone-client-gnome/src/config/hooks-config.c:174
-msgid "_Add phone number prefix"
-msgstr ""
+#: ../../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: "
-msgstr ""
+#: ../../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
-#, fuzzy
+#: ../../sflphone-client-gnome/src/contacts/history.c:83
+#: ../../sflphone-client-gnome/src/contacts/searchbar.c:123
msgid "Search history"
-msgstr "清空曆史記錄(C)"
+msgstr "搜尋歷史記錄"
-#: ../../sflphone-client-gnome/src/contacts/history.c:75
-#: ../../sflphone-client-gnome/src/contacts/searchbar.c:86
-#, fuzzy
+#: ../../sflphone-client-gnome/src/contacts/history.c:83
+#: ../../sflphone-client-gnome/src/contacts/searchbar.c:110
msgid "Search contact"
-msgstr "搜尋歷史(S)"
+msgstr "搜尋聯繫人(S)"
+
+#~ msgid "Books"
+#~ msgstr "鉤鍵"
+
+#~ msgid "_Enable"
+#~ msgstr "啟用(E)"
+
+#~ msgid "_Notify voice mails"
+#~ msgstr "語音郵件通知(N)"
+
+#~ msgid "_Start hidden"
+#~ msgstr "啟動時隱藏(S)"
+
+#~ msgid "_Maximum number of calls"
+#~ msgstr "最大打出電話數目(M)"
+
+#~ msgid "_Control running applications volume"
+#~ msgstr "控制正在運行中的應用程式的音量(C)"
+
+#~ msgid "Account previously setup"
+#~ msgstr "帳戶以前設定"
+
+#~ msgid "URL argument"
+#~ msgstr "URL參數"
+
+#~ msgid "_SIP protocol"
+#~ msgstr "SIP 協議(S)"
+
+#~ msgid "_SIP Header: "
+#~ msgstr "SIP消息頭(S):"
+
+#~ msgid "_IAX2 protocol"
+#~ msgstr "IAX2 協議(I)"
#~ msgid "Search"
#~ msgstr "搜尋"
@@ -828,6 +856,3 @@ msgstr "搜尋歷史(S)"
#~ msgid "Apply"
#~ msgstr "套用"
-
-#~ msgid "History empty"
-#~ msgstr "無曆史記錄"
diff --git a/sflphone-common/src/managerimpl.cpp b/sflphone-common/src/managerimpl.cpp
index a9886dd739a8159032bfe38097e1485f991aceef..5f08b84bb08b427bb39dd0a804bea68b70a7729c 100644
--- a/sflphone-common/src/managerimpl.cpp
+++ b/sflphone-common/src/managerimpl.cpp
@@ -2507,11 +2507,11 @@ ManagerImpl::getAccountIdFromNameAndServer(const std::string& userName, const st
}
}
- // We failed! Then only match the username
+ // We failed! Then only match the hostname
for(iter = _accountMap.begin(); iter != _accountMap.end(); ++iter) {
account = dynamic_cast<SIPAccount *>(iter->second);
if ( account != NULL ) {
- if(account->userMatch(userName))
+ if(account->hostnameMatch(server))
return iter->first;
}
}
diff --git a/sflphone-common/src/sipaccount.cpp b/sflphone-common/src/sipaccount.cpp
index b72eb15e0f9bcbb78c60230b0ecddf2b18af0467..31502460a398788f81478dd451fd3f99ea2718f8 100644
--- a/sflphone-common/src/sipaccount.cpp
+++ b/sflphone-common/src/sipaccount.cpp
@@ -87,7 +87,7 @@ void SIPAccount::loadConfig()
bool SIPAccount::fullMatch(const std::string& username, const std::string& hostname)
{
- return (username == getUsername() && hostname == getHostname());
+ return (userMatch (username) && hostnameMatch (hostname));
}
bool SIPAccount::userMatch(const std::string& username)
@@ -95,3 +95,8 @@ bool SIPAccount::userMatch(const std::string& username)
return (username == getUsername());
}
+bool SIPAccount::hostnameMatch(const std::string& hostname)
+{
+ return (hostname == getHostname());
+}
+
diff --git a/sflphone-common/src/sipaccount.h b/sflphone-common/src/sipaccount.h
index a49af2d00864a29c674a2ac152dcd2663d75620c..a9925d734f8d67a46c4d438fdfd3154a9046594a 100644
--- a/sflphone-common/src/sipaccount.h
+++ b/sflphone-common/src/sipaccount.h
@@ -76,6 +76,7 @@ class SIPAccount : public Account
bool fullMatch(const std::string& username, const std::string& hostname);
bool userMatch(const std::string& username);
+ bool hostnameMatch(const std::string& hostname);
pjsip_regc* getRegistrationInfo( void ) { return _regc; }
void setRegistrationInfo( pjsip_regc *regc ) { _regc = regc; }