diff --git a/gtk/main.ui b/gtk/main.ui
index d64634c8b75524bf40ea24122c8b5372ca58d4a2..a94f5e55f06cae5cb2913d38d1e827561c996833 100644
--- a/gtk/main.ui
+++ b/gtk/main.ui
@@ -1009,7 +1009,7 @@
</child>
<child>
<object class="GtkButton" id="call_back_button">
- <property name="label" translatable="yes">Call back</property>
+ <property name="label" translatable="yes">Call</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
diff --git a/gtk/sip_account.ui b/gtk/sip_account.ui
index cbd8d6f41f336c874893b98ba28020cb7a8a56c6..3a1dac376f0fc2012406df6118041677ae10620a 100644
--- a/gtk/sip_account.ui
+++ b/gtk/sip_account.ui
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 2.6 -->
- <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">100000</property>
<property name="value">3600</property>
@@ -17,13 +16,13 @@
<property name="icon">linphone2.png</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox2">
+ <object class="GtkBox" id="dialog-vbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">2</property>
<child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area2">
+ <object class="GtkButtonBox" id="dialog-action_area2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -114,8 +113,6 @@
<property name="text" translatable="yes">sip:</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -144,8 +141,6 @@
<property name="text" translatable="yes">sip:</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -174,8 +169,6 @@
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -204,8 +197,6 @@
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
<property name="adjustment">adjustment1</property>
</object>
<packing>
@@ -224,7 +215,7 @@
</child>
<child>
<object class="GtkCheckButton" id="register">
- <property name="label" translatable="yes">Register at startup</property>
+ <property name="label" translatable="yes">Register</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
diff --git a/mediastreamer2 b/mediastreamer2
index 7ce7d1b76cf84a57489d9c8469f19d1a4113e8d3..e83722c77eedce9eadcfcf54eff1de054dc2a2e9 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 7ce7d1b76cf84a57489d9c8469f19d1a4113e8d3
+Subproject commit e83722c77eedce9eadcfcf54eff1de054dc2a2e9
diff --git a/po/cs.po b/po/cs.po
index 21d15c0dde97a61000bca65fc1892e91457879e4..02875f8166bf9ca2b48e6bf0104e2f4e8b53c3c9 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: linphone-3.4.99.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 22:29+0100\n"
+"POT-Creation-Date: 2011-12-02 16:47+0100\n"
"PO-Revision-Date: 2011-11-04 22:30+0100\n"
"Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -31,7 +31,7 @@ msgstr ""
msgid "n/a"
msgstr "–"
-#: ../gtk/conference.c:33 ../gtk/incall_view.c:178
+#: ../gtk/conference.c:33 ../gtk/incall_view.c:183
msgid "Conference"
msgstr "Konference"
@@ -49,27 +49,27 @@ msgstr "Nelze najÃt soubor s obrázkem: %s"
msgid "Chat with %s"
msgstr "Diskuze s %s"
-#: ../gtk/main.c:82
+#: ../gtk/main.c:83
msgid "log to stdout some debug information while running."
msgstr "Za běhu vypisuje některé ladicà informace na standardnà výstup."
-#: ../gtk/main.c:89
+#: ../gtk/main.c:90
msgid "path to a file to write logs into."
msgstr "Soubor, kam zapisovat protokol."
-#: ../gtk/main.c:96
+#: ../gtk/main.c:97
msgid "Start only in the system tray, do not show the main interface."
msgstr "Spustà se pouze do systémové oblasti, nezobrazà hlavnà okno."
-#: ../gtk/main.c:103
+#: ../gtk/main.c:104
msgid "address to call right now"
msgstr "Zavolá právÄ› teÄ na tuto adresu"
-#: ../gtk/main.c:110
+#: ../gtk/main.c:111
msgid "if set automatically answer incoming calls"
msgstr "je-li nastaveno, automaticky zvedne pÅ™Ãchozà hovor"
-#: ../gtk/main.c:117
+#: ../gtk/main.c:118
msgid ""
"Specifiy a working directory (should be the base of the installation, eg: c:"
"\\Program Files\\Linphone)"
@@ -77,12 +77,12 @@ msgstr ""
"Zadejte pracovnà adresář (mÄ›l by být základnà instalaÄnà adresář, napÅ™Ãklad "
"c:\\Program Files\\Linphone)"
-#: ../gtk/main.c:458
+#: ../gtk/main.c:464
#, c-format
msgid "Call with %s"
msgstr "Hovor s %s"
-#: ../gtk/main.c:809
+#: ../gtk/main.c:815
#, c-format
msgid ""
"%s would like to add you to his contact list.\n"
@@ -95,7 +95,7 @@ msgstr ""
"do svého adresáře?\n"
"OdpovÃte-li ne, tato osobo bude doÄasnÄ› blokována."
-#: ../gtk/main.c:887
+#: ../gtk/main.c:893
#, c-format
msgid ""
"Please enter your password for username <i>%s</i>\n"
@@ -104,54 +104,54 @@ msgstr ""
"ProsÃm, zadejte heslo pro uživatele <i>%s</i>\n"
"v doméně <i>%s</i>:"
-#: ../gtk/main.c:987
+#: ../gtk/main.c:993
msgid "Call error"
msgstr "Chyba hovoru"
-#: ../gtk/main.c:990 ../coreapi/linphonecore.c:2396
+#: ../gtk/main.c:996 ../coreapi/linphonecore.c:2406
msgid "Call ended"
msgstr "Hovor ukonÄen"
-#: ../gtk/main.c:993 ../coreapi/linphonecore.c:199
+#: ../gtk/main.c:999 ../coreapi/linphonecore.c:199
msgid "Incoming call"
msgstr "PÅ™Ãchozà hovor"
-#: ../gtk/main.c:995 ../gtk/incall_view.c:287 ../gtk/main.ui.h:20
+#: ../gtk/main.c:1001 ../gtk/incall_view.c:292 ../gtk/main.ui.h:20
msgid "Answer"
msgstr "Odpovědět"
-#: ../gtk/main.c:997 ../gtk/main.ui.h:29
+#: ../gtk/main.c:1003 ../gtk/main.ui.h:29
msgid "Decline"
msgstr "OdmÃtnout"
-#: ../gtk/main.c:1003
+#: ../gtk/main.c:1009
msgid "Call paused"
msgstr "Hovor odložen"
-#: ../gtk/main.c:1003
+#: ../gtk/main.c:1009
#, c-format
msgid "<span size=\"large\">by %s</span>"
msgstr "<span size=\"large\">kým: %s</span>"
-#: ../gtk/main.c:1153
+#: ../gtk/main.c:1165
msgid "Website link"
msgstr "Odkaz na webovou stránku"
-#: ../gtk/main.c:1195
+#: ../gtk/main.c:1205
msgid "Linphone - a video internet phone"
msgstr "Lipnhone – internetový videofon"
-#: ../gtk/main.c:1278
+#: ../gtk/main.c:1295
#, c-format
msgid "%s (Default)"
msgstr "%s (VýchozÃ)"
-#: ../gtk/main.c:1549 ../coreapi/callbacks.c:699
+#: ../gtk/main.c:1566 ../coreapi/callbacks.c:700
#, c-format
msgid "We are transferred to %s"
msgstr "Byly jsme přepojeni na %s"
-#: ../gtk/main.c:1559
+#: ../gtk/main.c:1576
msgid ""
"No sound cards have been detected on this computer.\n"
"You won't be able to send or receive audio calls."
@@ -159,11 +159,16 @@ msgstr ""
"Na tomto poÄÃtaÄi nebyla objevena žádná zvuková karta.\n"
"Nebudete moci vytáÄet a pÅ™ijÃmat a zvukové hovory."
-#: ../gtk/main.c:1646
+#: ../gtk/main.c:1663
msgid "A free SIP video-phone"
msgstr "Volný SIP videofon"
#: ../gtk/friendlist.c:203
+#, fuzzy
+msgid "Add to addressbook"
+msgstr "Zobrazit adresář"
+
+#: ../gtk/friendlist.c:258 ../gtk/propertybox.c:296 ../gtk/contact.ui.h:3
msgid "Name"
msgstr "Jméno"
@@ -229,7 +234,7 @@ msgstr "Povoleno"
msgid "Disabled"
msgstr "Zakázáno"
-#: ../gtk/propertybox.c:533
+#: ../gtk/propertybox.c:553
msgid "Account"
msgstr "ÚÄet"
@@ -302,11 +307,15 @@ msgid ""
"You need to restart linphone for the new language selection to take effect."
msgstr "Aby se projevil výběr nového jazyka, je nutné znovu spustit linphone."
-#: ../gtk/propertybox.c:825
+#: ../gtk/propertybox.c:835
+msgid "None"
+msgstr "Žádná"
+
+#: ../gtk/propertybox.c:839
msgid "SRTP"
msgstr "SRTP"
-#: ../gtk/propertybox.c:830
+#: ../gtk/propertybox.c:845
msgid "ZRTP"
msgstr "ZRTP"
@@ -433,77 +442,94 @@ msgstr "Připraveno!"
msgid "Call #%i"
msgstr "Hovor Ä. %i"
-#: ../gtk/incall_view.c:122
+#: ../gtk/incall_view.c:127
#, c-format
msgid "Transfer to call #%i with %s"
msgstr "PÅ™epojit hovor Ä. %i s %s"
-#: ../gtk/incall_view.c:150
+#: ../gtk/incall_view.c:155
msgid "Transfer"
msgstr "Přepojit"
-#: ../gtk/incall_view.c:266
+#: ../gtk/incall_view.c:271
msgid "<b>Calling...</b>"
msgstr "<b>Volá se…</b>"
-#: ../gtk/incall_view.c:269 ../gtk/incall_view.c:438
+#: ../gtk/incall_view.c:274 ../gtk/incall_view.c:482
msgid "00::00::00"
msgstr "00:00:00"
-#: ../gtk/incall_view.c:280
+#: ../gtk/incall_view.c:285
msgid "<b>Incoming call</b>"
msgstr "<b>PÅ™Ãchozà hovor</b>"
-#: ../gtk/incall_view.c:317
+#: ../gtk/incall_view.c:322
msgid "good"
msgstr "dobrá"
-#: ../gtk/incall_view.c:319
+#: ../gtk/incall_view.c:324
msgid "average"
msgstr "průměrná"
-#: ../gtk/incall_view.c:321
+#: ../gtk/incall_view.c:326
msgid "poor"
msgstr "slabá"
-#: ../gtk/incall_view.c:323
+#: ../gtk/incall_view.c:328
msgid "very poor"
msgstr "velmi slabá"
-#: ../gtk/incall_view.c:325
+#: ../gtk/incall_view.c:330
msgid "too bad"
msgstr "pÅ™ÃliÅ¡ Å¡patná"
-#: ../gtk/incall_view.c:326 ../gtk/incall_view.c:342
+#: ../gtk/incall_view.c:331 ../gtk/incall_view.c:347
msgid "unavailable"
msgstr "nedostupná"
-#: ../gtk/incall_view.c:436
+#: ../gtk/incall_view.c:447
+msgid "Secured by SRTP"
+msgstr ""
+
+#: ../gtk/incall_view.c:453
+#, c-format
+msgid "Secured by ZRTP - [auth token: %s]"
+msgstr ""
+
+#: ../gtk/incall_view.c:459
+msgid "Set unverified"
+msgstr ""
+
+#: ../gtk/incall_view.c:459 ../gtk/main.ui.h:49
+msgid "Set verified"
+msgstr ""
+
+#: ../gtk/incall_view.c:480
msgid "In conference"
msgstr "ProbÃhá konference"
-#: ../gtk/incall_view.c:436
+#: ../gtk/incall_view.c:480
msgid "<b>In call</b>"
msgstr "<b>ProbÃhá hovor</b>"
-#: ../gtk/incall_view.c:454
+#: ../gtk/incall_view.c:499
msgid "<b>Paused call</b>"
msgstr "<b>Odložený hovor</b>"
-#: ../gtk/incall_view.c:466
+#: ../gtk/incall_view.c:511
#, c-format
msgid "%02i::%02i::%02i"
msgstr "%02i:%02i:%02i"
-#: ../gtk/incall_view.c:482
+#: ../gtk/incall_view.c:527
msgid "<b>Call ended.</b>"
msgstr "<b>Hovor skonÄil.</b>"
-#: ../gtk/incall_view.c:539
+#: ../gtk/incall_view.c:584
msgid "Resume"
msgstr "Obnovit"
-#: ../gtk/incall_view.c:546 ../gtk/main.ui.h:45
+#: ../gtk/incall_view.c:591 ../gtk/main.ui.h:45
msgid "Pause"
msgstr "Odložit"
@@ -600,9 +626,10 @@ msgstr "B"
msgid "C"
msgstr "C"
-#: ../gtk/main.ui.h:24 ../gtk/call_logs.ui.h:1
-msgid "Call back"
-msgstr "Zavolat zpátky"
+#: ../gtk/main.ui.h:24
+#, fuzzy
+msgid "Call"
+msgstr "Volat komu: %s"
#: ../gtk/main.ui.h:25
msgid "Call quality rating"
@@ -692,32 +719,32 @@ msgstr "SIP adresa nebo telefonnà ÄÃslo:"
msgid "Search"
msgstr "Hledat"
-#: ../gtk/main.ui.h:49
+#: ../gtk/main.ui.h:50
msgid "Show debug window"
msgstr "Zobrazit ladicà okno"
-#: ../gtk/main.ui.h:50
+#: ../gtk/main.ui.h:51
msgid "Username"
msgstr "Uživatelské jméno"
-#: ../gtk/main.ui.h:51
+#: ../gtk/main.ui.h:52
msgid "_Help"
msgstr "Nápo_věda"
-#: ../gtk/main.ui.h:52
+#: ../gtk/main.ui.h:53
msgid "_Homepage"
msgstr "_Domovská stránka"
-#: ../gtk/main.ui.h:53
+#: ../gtk/main.ui.h:54
msgid "_Options"
msgstr "V_olby"
-#: ../gtk/main.ui.h:54
+#: ../gtk/main.ui.h:55
msgid "in"
msgstr "ve"
# XXX: Do not translate, this is GTK identifier
-#: ../gtk/main.ui.h:55
+#: ../gtk/main.ui.h:56
msgid "label"
msgstr ""
@@ -795,6 +822,10 @@ msgstr "ProsÃm, zadejte heslo pro doménu"
msgid "UserID"
msgstr "Identifikátor uživatele"
+#: ../gtk/call_logs.ui.h:1
+msgid "Call back"
+msgstr "Zavolat zpátky"
+
#: ../gtk/call_logs.ui.h:2
msgid "Call history"
msgstr "Historie volánÃ"
@@ -824,8 +855,8 @@ msgid "Publish presence information"
msgstr "ZveÅ™ejnit stav pÅ™Ãtomnosti"
#: ../gtk/sip_account.ui.h:6
-msgid "Register at startup"
-msgstr "Zaregistrovat pÅ™i spuÅ¡tÄ›nÃ"
+msgid "Register"
+msgstr ""
#: ../gtk/sip_account.ui.h:7
msgid "Registration duration (sec):"
@@ -1166,54 +1197,54 @@ msgstr ""
msgid "Outgoing call"
msgstr "Odchozà hovor"
-#: ../coreapi/linphonecore.c:1082
+#: ../coreapi/linphonecore.c:1088
msgid "Ready"
msgstr "Připraven."
-#: ../coreapi/linphonecore.c:1822
+#: ../coreapi/linphonecore.c:1831
msgid "Looking for telephone number destination..."
msgstr "Vyhledává se umÃstÄ›nà ÄÃsla…"
-#: ../coreapi/linphonecore.c:1825
+#: ../coreapi/linphonecore.c:1834
msgid "Could not resolve this number."
msgstr "Toto ÄÃslo nelze vyhledat."
-#: ../coreapi/linphonecore.c:1869
+#: ../coreapi/linphonecore.c:1878
msgid ""
"Could not parse given sip address. A sip url usually looks like sip:"
"user@domain"
msgstr ""
"Å patnÄ› zadaná SIP adresa. Adresa má mÃt tento formát <sip:uživatel@doména>"
-#: ../coreapi/linphonecore.c:2016
+#: ../coreapi/linphonecore.c:2025
msgid "Contacting"
msgstr "Kontaktuji"
-#: ../coreapi/linphonecore.c:2023
+#: ../coreapi/linphonecore.c:2032
msgid "Could not call"
msgstr "Nelze volat"
-#: ../coreapi/linphonecore.c:2131
+#: ../coreapi/linphonecore.c:2140
msgid "Sorry, we have reached the maximum number of simultaneous calls"
msgstr "Je nám lÃto, ale byl dosažen maximálnà poÄet souÄasných hovorů."
-#: ../coreapi/linphonecore.c:2260
+#: ../coreapi/linphonecore.c:2270
msgid "Modifying call parameters..."
msgstr "Upravujà se parametry hovoru…"
-#: ../coreapi/linphonecore.c:2356
+#: ../coreapi/linphonecore.c:2366
msgid "Connected."
msgstr "Připojeno."
-#: ../coreapi/linphonecore.c:2379
+#: ../coreapi/linphonecore.c:2389
msgid "Call aborted"
msgstr "Hovor přerušen"
-#: ../coreapi/linphonecore.c:2519
+#: ../coreapi/linphonecore.c:2530
msgid "Could not pause the call"
msgstr "Hovor nebylo možné odložit"
-#: ../coreapi/linphonecore.c:2523
+#: ../coreapi/linphonecore.c:2535
msgid "Pausing the current call..."
msgstr "SouÄasný hovor se odkládá…"
@@ -1314,135 +1345,135 @@ msgstr ""
msgid "Could not login as %s"
msgstr "Nelze se přihlásit jako %s"
-#: ../coreapi/callbacks.c:205
+#: ../coreapi/callbacks.c:206
msgid "is contacting you"
msgstr "vás volá"
-#: ../coreapi/callbacks.c:206
+#: ../coreapi/callbacks.c:207
msgid " and asked autoanswer."
msgstr " a požaduje automatickou zvednutÃ."
-#: ../coreapi/callbacks.c:206
+#: ../coreapi/callbacks.c:207
msgid "."
msgstr "."
-#: ../coreapi/callbacks.c:265
+#: ../coreapi/callbacks.c:266
msgid "Remote ringing."
msgstr "Vyzvánà na druhé straně."
-#: ../coreapi/callbacks.c:281
+#: ../coreapi/callbacks.c:282
msgid "Remote ringing..."
msgstr "Vyzvánà na druhé straně…"
-#: ../coreapi/callbacks.c:292
+#: ../coreapi/callbacks.c:293
msgid "Early media."
msgstr "Časná média."
-#: ../coreapi/callbacks.c:330
+#: ../coreapi/callbacks.c:331
#, c-format
msgid "Call with %s is paused."
msgstr "Hovor s %s je odložen."
-#: ../coreapi/callbacks.c:341
+#: ../coreapi/callbacks.c:342
#, c-format
msgid "Call answered by %s - on hold."
msgstr "Hovor přijat kým: %s – odložen."
-#: ../coreapi/callbacks.c:356
+#: ../coreapi/callbacks.c:357
msgid "Call resumed."
msgstr "Hovor obnoven."
-#: ../coreapi/callbacks.c:361
+#: ../coreapi/callbacks.c:362
#, c-format
msgid "Call answered by %s."
msgstr "Hovor přijat kým: %s."
-#: ../coreapi/callbacks.c:431
+#: ../coreapi/callbacks.c:432
msgid "We are being paused..."
msgstr "Jsme odkládáni…"
-#: ../coreapi/callbacks.c:435
+#: ../coreapi/callbacks.c:436
msgid "We have been resumed..."
msgstr "Byli jsme obnoveni…"
-#: ../coreapi/callbacks.c:440
+#: ../coreapi/callbacks.c:441
msgid "Call has been updated by remote..."
msgstr "Hovor byl aktualizován protistranou…"
-#: ../coreapi/callbacks.c:472
+#: ../coreapi/callbacks.c:473
msgid "Call terminated."
msgstr "Hovor ukonÄen."
-#: ../coreapi/callbacks.c:479
+#: ../coreapi/callbacks.c:480
msgid "User is busy."
msgstr "Uživatel je zaneprázdněn."
-#: ../coreapi/callbacks.c:480
+#: ../coreapi/callbacks.c:481
msgid "User is temporarily unavailable."
msgstr "Uživatel je doÄasnÄ› nedostupný."
#. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:482
+#: ../coreapi/callbacks.c:483
msgid "User does not want to be disturbed."
msgstr "Uživatel si nepřeje být rušen."
-#: ../coreapi/callbacks.c:483
+#: ../coreapi/callbacks.c:484
msgid "Call declined."
msgstr "Volánà odmÃtnuto."
-#: ../coreapi/callbacks.c:495
+#: ../coreapi/callbacks.c:496
msgid "No response."
msgstr "Žádná odpovÄ›Ä."
-#: ../coreapi/callbacks.c:499
+#: ../coreapi/callbacks.c:500
msgid "Protocol error."
msgstr "Chyba protokolu."
-#: ../coreapi/callbacks.c:515
+#: ../coreapi/callbacks.c:516
msgid "Redirected"
msgstr "Přesměrováno"
-#: ../coreapi/callbacks.c:525
+#: ../coreapi/callbacks.c:526
msgid "Not found"
msgstr "Nenalezeno"
-#: ../coreapi/callbacks.c:550
+#: ../coreapi/callbacks.c:551
msgid "No common codecs"
msgstr "Žádný spoleÄný formát"
-#: ../coreapi/callbacks.c:556
+#: ../coreapi/callbacks.c:557
msgid "Call failed."
msgstr "Volánà se nezdařilo."
-#: ../coreapi/callbacks.c:630
+#: ../coreapi/callbacks.c:631
#, c-format
msgid "Registration on %s successful."
msgstr "Registrace na %s byla úspěšná."
-#: ../coreapi/callbacks.c:631
+#: ../coreapi/callbacks.c:632
#, c-format
msgid "Unregistration on %s done."
msgstr "Odregistrovánà z %s hotovo."
-#: ../coreapi/callbacks.c:647
+#: ../coreapi/callbacks.c:648
msgid "no response timeout"
msgstr "odpovÄ›Ä nedorazila vÄas"
-#: ../coreapi/callbacks.c:650
+#: ../coreapi/callbacks.c:651
#, c-format
msgid "Registration on %s failed: %s"
msgstr "Registrace na %s selhala: %s"
-#: ../coreapi/sal_eXosip2.c:860 ../coreapi/sal_eXosip2.c:862
+#: ../coreapi/sal_eXosip2.c:873 ../coreapi/sal_eXosip2.c:875
msgid "Authentication failure"
msgstr "Selhánà ověřenà totožnosti"
-#: ../coreapi/linphonecall.c:136
+#: ../coreapi/linphonecall.c:128
#, c-format
msgid "Authentication token is %s"
msgstr "KlÃÄ k ověřenà totožnosti je %s"
-#: ../coreapi/linphonecall.c:1541
+#: ../coreapi/linphonecall.c:1560
#, c-format
msgid "You have missed %i call."
msgid_plural "You have missed %i calls."
@@ -1450,6 +1481,9 @@ msgstr[0] "Máte %i zmeškaný hovor."
msgstr[1] "Máte %i zmeškané hovory."
msgstr[2] "Máte %i zmeškaných hovorů."
+#~ msgid "Register at startup"
+#~ msgstr "Zaregistrovat pÅ™i spuÅ¡tÄ›nÃ"
+
#~ msgid "Windows"
#~ msgstr "Okna"
@@ -1875,9 +1909,6 @@ msgstr[2] "Máte %i zmeškaných hovorů."
#~ msgid "Exit"
#~ msgstr "UkonÄit"
-#~ msgid "Shows the address book"
-#~ msgstr "Zobrazit adresář"
-
#~ msgid "..."
#~ msgstr "…"
@@ -2208,9 +2239,6 @@ msgstr[2] "Máte %i zmeškaných hovorů."
#~ msgid "Authentication required for realm %s"
#~ msgstr "Pro doménu %s je vyžadováno ověřenÃ"
-#~ msgid "None"
-#~ msgstr "Žádná"
-
#~ msgid "Wait"
#~ msgstr "Zdržet"
diff --git a/po/de.po b/po/de.po
index d826a1ff9c4ee74c9eeedb442c03acd4b7084a07..12924c98b91a49437748d36b5771670544b4ca10 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: linphone 0.7.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-08 22:32+0200\n"
-"PO-Revision-Date: 2011-05-27 23:45+0200\n"
+"POT-Creation-Date: 2011-12-02 16:47+0100\n"
+"PO-Revision-Date: 2011-11-27 23:42+0100\n"
"Last-Translator: Gerhard Stengel <gstengel@gmx.net>\n"
"Language-Team: German <kde-i18n-de@kde.org>\n"
"Language: \n"
@@ -17,6 +17,18 @@ msgstr ""
"X-Generator: Lokalize 1.2\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
+#: ../gtk/calllogs.c:71
+msgid "n/a"
+msgstr "nicht verfügbar"
+
+#: ../gtk/conference.c:33 ../gtk/incall_view.c:183
+msgid "Conference"
+msgstr "Konferenz"
+
+#: ../gtk/conference.c:41
+msgid "Me"
+msgstr "Eigenes Telefon"
+
#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
#, c-format
msgid "Couldn't find pixmap file: %s"
@@ -27,25 +39,29 @@ msgstr "Pixmapdatei %s kann nicht gefunden werden."
msgid "Chat with %s"
msgstr "Chat mit %s"
-#: ../gtk/main.c:74
+#: ../gtk/main.c:83
msgid "log to stdout some debug information while running."
msgstr "Ausgabe von Debug-Informationen auf stdout während der Laufzeit"
-#: ../gtk/main.c:81
+#: ../gtk/main.c:90
+msgid "path to a file to write logs into."
+msgstr "Pfad zu einer Datei, in die Protokolle geschrieben werden."
+
+#: ../gtk/main.c:97
msgid "Start only in the system tray, do not show the main interface."
msgstr ""
"Nur im Systemabschnitt der Kontrollleiste starten, aber das Hauptfenster "
"nicht zeigen."
-#: ../gtk/main.c:88
+#: ../gtk/main.c:104
msgid "address to call right now"
msgstr "Im Moment anzurufende Adresse"
-#: ../gtk/main.c:95
+#: ../gtk/main.c:111
msgid "if set automatically answer incoming calls"
msgstr "Falls aktiviert, werden eingehende Anrufe automatisch beantwortet"
-#: ../gtk/main.c:102
+#: ../gtk/main.c:118
msgid ""
"Specifiy a working directory (should be the base of the installation, eg: c:"
"\\Program Files\\Linphone)"
@@ -53,12 +69,12 @@ msgstr ""
"Geben Sie einen Arbeitsordner an (sollte der Installationsordner sein, z. B. "
"C:\\Programme\\Linphone)"
-#: ../gtk/main.c:442
+#: ../gtk/main.c:464
#, c-format
msgid "Call with %s"
msgstr "Im Gespräch mit %s"
-#: ../gtk/main.c:826
+#: ../gtk/main.c:815
#, c-format
msgid ""
"%s would like to add you to his contact list.\n"
@@ -71,7 +87,7 @@ msgstr ""
"Ihrer Kontaktliste hinzufügen?\n"
"Wenn Sie mit Nein antworten, wird diese Person vorläufig blockiert."
-#: ../gtk/main.c:904
+#: ../gtk/main.c:893
#, c-format
msgid ""
"Please enter your password for username <i>%s</i>\n"
@@ -80,24 +96,54 @@ msgstr ""
"Geben Sie bitte Ihr Passwort für den Benutzernamen <i>%s</i>\n"
" auf der Domäne <i>%s</i> ein:"
-#: ../gtk/main.c:1040
+#: ../gtk/main.c:993
+msgid "Call error"
+msgstr "Anruf fehlgeschlagen"
+
+#: ../gtk/main.c:996 ../coreapi/linphonecore.c:2406
+msgid "Call ended"
+msgstr "Anruf beendet"
+
+#: ../gtk/main.c:999 ../coreapi/linphonecore.c:199
+msgid "Incoming call"
+msgstr "Eingehender Anruf"
+
+#: ../gtk/main.c:1001 ../gtk/incall_view.c:292 ../gtk/main.ui.h:20
+msgid "Answer"
+msgstr "Annehmen"
+
+#: ../gtk/main.c:1003 ../gtk/main.ui.h:29
+msgid "Decline"
+msgstr "Abweisen"
+
+#: ../gtk/main.c:1009
+msgid "Call paused"
+msgstr "Anruf wird gehalten"
+
+#: ../gtk/main.c:1009
+#, c-format
+msgid "<span size=\"large\">by %s</span>"
+msgstr "<span size=\"large\">von %s</span>"
+
+#: ../gtk/main.c:1165
msgid "Website link"
msgstr "Website-Verknüpfung"
-#: ../gtk/main.c:1076
+#: ../gtk/main.c:1205
msgid "Linphone - a video internet phone"
msgstr "Linphone - ein Internet-Video-Telefon"
-#: ../gtk/main.c:1095
+#: ../gtk/main.c:1295
#, c-format
msgid "%s (Default)"
msgstr "%s (Vorgabe)"
-#: ../gtk/main.c:1187
-msgid "Windows"
-msgstr ""
+#: ../gtk/main.c:1566 ../coreapi/callbacks.c:700
+#, c-format
+msgid "We are transferred to %s"
+msgstr "Vermittlung nach %s"
-#: ../gtk/main.c:1364
+#: ../gtk/main.c:1576
msgid ""
"No sound cards have been detected on this computer.\n"
"You won't be able to send or receive audio calls."
@@ -105,151 +151,167 @@ msgstr ""
"Auf diesem Rechner können keine Soundkarten gefunden werden.\n"
"Sie können keine Audio-Anrufe tätigen oder entgegennehmen."
-#: ../gtk/main.c:1423
+#: ../gtk/main.c:1663
msgid "A free SIP video-phone"
msgstr "Ein freies SIP-Video-Telefon"
-#: ../gtk/friendlist.c:192 ../gtk/propertybox.c:271 ../gtk/contact.ui.h:3
+#: ../gtk/friendlist.c:203
+msgid "Add to addressbook"
+msgstr "Zum Adressbuch hinzufügen"
+
+#: ../gtk/friendlist.c:258 ../gtk/propertybox.c:296 ../gtk/contact.ui.h:3
msgid "Name"
msgstr "Name"
-#: ../gtk/friendlist.c:205
+#: ../gtk/friendlist.c:271
msgid "Presence status"
msgstr "Anwesenheitsstatus"
-#: ../gtk/friendlist.c:242
+#: ../gtk/friendlist.c:308
#, c-format
msgid "Search in %s directory"
msgstr "Im %s-Verzeichnis suchen"
-#: ../gtk/friendlist.c:450
+#: ../gtk/friendlist.c:568
msgid "Invalid sip contact !"
msgstr "Ungültiger SIP-Kontakt!"
-#: ../gtk/friendlist.c:495
+#: ../gtk/friendlist.c:613
#, c-format
msgid "Call %s"
msgstr "„%s“ anrufen"
-#: ../gtk/friendlist.c:496
+#: ../gtk/friendlist.c:614
#, c-format
msgid "Send text to %s"
msgstr "Text zu „%s“ schicken"
-#: ../gtk/friendlist.c:497
+#: ../gtk/friendlist.c:615
#, c-format
msgid "Edit contact '%s'"
msgstr "Kontakt „%s“ bearbeiten"
-#: ../gtk/friendlist.c:498
+#: ../gtk/friendlist.c:616
#, c-format
msgid "Delete contact '%s'"
msgstr "Kontakt „%s“ löschen"
-#: ../gtk/friendlist.c:540
+#: ../gtk/friendlist.c:658
#, c-format
msgid "Add new contact from %s directory"
msgstr "Einen neuen Kontakt aus dem %s-Verzeichnis hinzufügen"
-#: ../gtk/propertybox.c:277
+#: ../gtk/propertybox.c:302
msgid "Rate (Hz)"
msgstr "Rate (Hz)"
-#: ../gtk/propertybox.c:283
+#: ../gtk/propertybox.c:308
msgid "Status"
msgstr "Status"
-#: ../gtk/propertybox.c:289
+#: ../gtk/propertybox.c:314
msgid "Min bitrate (kbit/s)"
-msgstr "Min Bitrate (kbit/s)"
+msgstr "Min. Bitrate (kbit/s)"
-#: ../gtk/propertybox.c:296
+#: ../gtk/propertybox.c:321
msgid "Parameters"
msgstr "Parameter"
-#: ../gtk/propertybox.c:326 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507
msgid "Enabled"
msgstr "Freigegeben"
-#: ../gtk/propertybox.c:327 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507
msgid "Disabled"
msgstr "Gesperrt"
-#: ../gtk/propertybox.c:510
+#: ../gtk/propertybox.c:553
msgid "Account"
msgstr "Konto"
-#: ../gtk/propertybox.c:650
+#: ../gtk/propertybox.c:693
msgid "English"
msgstr "Englisch"
-#: ../gtk/propertybox.c:651
+#: ../gtk/propertybox.c:694
msgid "French"
msgstr "Französisch"
-#: ../gtk/propertybox.c:652
+#: ../gtk/propertybox.c:695
msgid "Swedish"
msgstr "Schwedisch"
-#: ../gtk/propertybox.c:653
+#: ../gtk/propertybox.c:696
msgid "Italian"
msgstr "Italienisch"
-#: ../gtk/propertybox.c:654
+#: ../gtk/propertybox.c:697
msgid "Spanish"
msgstr "Spanisch"
-#: ../gtk/propertybox.c:655
+#: ../gtk/propertybox.c:698
msgid "Brazilian Portugese"
msgstr "Brasilianisches Portugiesisch"
-#: ../gtk/propertybox.c:656
+#: ../gtk/propertybox.c:699
msgid "Polish"
msgstr "Polnisch"
-#: ../gtk/propertybox.c:657
+#: ../gtk/propertybox.c:700
msgid "German"
msgstr "Deutsch"
-#: ../gtk/propertybox.c:658
+#: ../gtk/propertybox.c:701
msgid "Russian"
msgstr "Russisch"
-#: ../gtk/propertybox.c:659
+#: ../gtk/propertybox.c:702
msgid "Japanese"
msgstr "Japanisch"
-#: ../gtk/propertybox.c:660
+#: ../gtk/propertybox.c:703
msgid "Dutch"
msgstr "Niederländisch"
-#: ../gtk/propertybox.c:661
+#: ../gtk/propertybox.c:704
msgid "Hungarian"
msgstr "Ungarisch"
-#: ../gtk/propertybox.c:662
+#: ../gtk/propertybox.c:705
msgid "Czech"
msgstr "Tschechisch"
-#: ../gtk/propertybox.c:663
+#: ../gtk/propertybox.c:706
msgid "Chinese"
msgstr "Chinesisch"
-#: ../gtk/propertybox.c:664
+#: ../gtk/propertybox.c:707
msgid "Traditional Chinese"
msgstr "Traditionelles Chinesisch"
-#: ../gtk/propertybox.c:665
+#: ../gtk/propertybox.c:708
msgid "Norwegian"
msgstr "Norwegisch"
-#: ../gtk/propertybox.c:722
+#: ../gtk/propertybox.c:765
msgid ""
"You need to restart linphone for the new language selection to take effect."
msgstr ""
"Linphone muss neu gestartet werden, damit die neue Spracheinstellung wirksam "
"wird."
+#: ../gtk/propertybox.c:835
+msgid "None"
+msgstr "Keinen"
+
+#: ../gtk/propertybox.c:839
+msgid "SRTP"
+msgstr ""
+
+#: ../gtk/propertybox.c:845
+msgid "ZRTP"
+msgstr ""
+
#: ../gtk/update.c:80
#, c-format
msgid ""
@@ -371,74 +433,99 @@ msgstr "Erstellen Ihres Kontos"
msgid "Now ready !"
msgstr "Fertig!"
-#: ../gtk/incall_view.c:61
+#: ../gtk/incall_view.c:69
#, c-format
msgid "Call #%i"
msgstr "Anruf #%i"
-#: ../gtk/incall_view.c:87
+#: ../gtk/incall_view.c:127
#, c-format
msgid "Transfer to call #%i with %s"
msgstr "Vermittlung zum Anruf #%i mit %s"
-#: ../gtk/incall_view.c:113
+#: ../gtk/incall_view.c:155
msgid "Transfer"
msgstr "Vermittlung"
-#: ../gtk/incall_view.c:187
+#: ../gtk/incall_view.c:271
msgid "<b>Calling...</b>"
msgstr "<b>Verbindungsaufbau...</b>"
-#: ../gtk/incall_view.c:190 ../gtk/incall_view.c:246
+#: ../gtk/incall_view.c:274 ../gtk/incall_view.c:482
msgid "00::00::00"
msgstr ""
-#: ../gtk/incall_view.c:206
+#: ../gtk/incall_view.c:285
msgid "<b>Incoming call</b>"
msgstr "<b>Eingehender Anruf</b>"
-#: ../gtk/incall_view.c:216
-msgid ""
-"Pause all calls\n"
-"and answer"
-msgstr ""
-"Alle Anrufe halten\n"
-"und annehmen"
+#: ../gtk/incall_view.c:322
+msgid "good"
+msgstr "gut"
-#: ../gtk/incall_view.c:217 ../gtk/main.ui.h:20
-msgid "Answer"
-msgstr "Annehmen"
+#: ../gtk/incall_view.c:324
+msgid "average"
+msgstr "durchschnittlich"
+
+#: ../gtk/incall_view.c:326
+msgid "poor"
+msgstr "schlecht"
+
+#: ../gtk/incall_view.c:328
+msgid "very poor"
+msgstr "sehr schlecht"
+
+#: ../gtk/incall_view.c:330
+msgid "too bad"
+msgstr "zu schlecht"
+
+#: ../gtk/incall_view.c:331 ../gtk/incall_view.c:347
+msgid "unavailable"
+msgstr "nicht verfügbar"
-#: ../gtk/incall_view.c:244
+#: ../gtk/incall_view.c:447
+msgid "Secured by SRTP"
+msgstr "Gesichert durch SRTP"
+
+#: ../gtk/incall_view.c:453
+#, c-format
+msgid "Secured by ZRTP - [auth token: %s]"
+msgstr "Gesichert durch ZRTP - [Auth.-Token: %s]"
+
+#: ../gtk/incall_view.c:459
+msgid "Set unverified"
+msgstr "Auf „Ungeprüft“ setzen"
+
+#: ../gtk/incall_view.c:459 ../gtk/main.ui.h:49
+msgid "Set verified"
+msgstr "Auf „Geprüft“ setzen"
+
+#: ../gtk/incall_view.c:480
+msgid "In conference"
+msgstr "In Konferenz"
+
+#: ../gtk/incall_view.c:480
msgid "<b>In call</b>"
msgstr "<b>Im Gespräch</b>"
-#: ../gtk/incall_view.c:260
+#: ../gtk/incall_view.c:499
msgid "<b>Paused call</b>"
msgstr "<b>Gehaltener Anruf</b>"
-#: ../gtk/incall_view.c:272
+#: ../gtk/incall_view.c:511
#, c-format
msgid "%02i::%02i::%02i"
msgstr ""
-#: ../gtk/incall_view.c:288
+#: ../gtk/incall_view.c:527
msgid "<b>Call ended.</b>"
msgstr "<b>Anruf beendet.</b>"
-#: ../gtk/incall_view.c:309
-msgid "Unmute"
-msgstr "Stumm aus"
-
-#: ../gtk/incall_view.c:316 ../gtk/main.ui.h:42
-msgid "Mute"
-msgstr "Stumm"
-
-#: ../gtk/incall_view.c:340
+#: ../gtk/incall_view.c:584
msgid "Resume"
msgstr "Fortsetzen"
-#: ../gtk/incall_view.c:347 ../gtk/main.ui.h:46
+#: ../gtk/incall_view.c:591 ../gtk/main.ui.h:45
msgid "Pause"
msgstr "Halten"
@@ -500,8 +587,8 @@ msgid "<b>Add contacts from directory</b>"
msgstr "<b>Kontakte aus einem Verzeichnis hinzufügen</b>"
#: ../gtk/main.ui.h:14
-msgid "<b>Contact list</b>"
-msgstr "<b>Kontaktliste</b>"
+msgid "<b>Callee name</b>"
+msgstr "<b>Name des Angerufenen</b>"
#: ../gtk/main.ui.h:15
msgid "<b>Welcome !</b>"
@@ -524,25 +611,26 @@ msgid "All users"
msgstr "Alle Teilnehmer"
#: ../gtk/main.ui.h:21
-msgid "Audio & video"
-msgstr "Audio & Video"
-
-#: ../gtk/main.ui.h:22
-msgid "Audio only"
-msgstr "Nur Audio"
-
-#: ../gtk/main.ui.h:23
msgid "Automatically log me in"
msgstr "Automatisch anmelden"
-#: ../gtk/main.ui.h:24
+#: ../gtk/main.ui.h:22
msgid "B"
msgstr ""
-#: ../gtk/main.ui.h:25 ../gtk/parameters.ui.h:20
+#: ../gtk/main.ui.h:23 ../gtk/parameters.ui.h:21
msgid "C"
msgstr ""
+#: ../gtk/main.ui.h:24
+#, fuzzy
+msgid "Call"
+msgstr "„%s“ anrufen"
+
+#: ../gtk/main.ui.h:25
+msgid "Call quality rating"
+msgstr "Bewertung der Verbindungsqualität"
+
#: ../gtk/main.ui.h:26
msgid "Check _Updates"
msgstr "Auf _Aktualisierungen überprüfen"
@@ -555,10 +643,6 @@ msgstr "Kontakte"
msgid "D"
msgstr ""
-#: ../gtk/main.ui.h:29
-msgid "Decline"
-msgstr "Abweisen"
-
#: ../gtk/main.ui.h:30
msgid "Default"
msgstr "Vorgabe"
@@ -568,13 +652,13 @@ msgid "Duration"
msgstr "Dauer"
#: ../gtk/main.ui.h:32
-msgid "Duration:"
-msgstr "Dauer:"
-
-#: ../gtk/main.ui.h:33
msgid "Enable self-view"
msgstr "Selbstansicht ein"
+#: ../gtk/main.ui.h:33
+msgid "Enable video"
+msgstr "Video ein"
+
#: ../gtk/main.ui.h:34
msgid "Enter username, phone number, or full sip address"
msgstr "Teilnehmer, Telefonnummer oder vollständige SIP-Adresse eingeben"
@@ -607,18 +691,22 @@ msgstr "Anmeldeinformationen"
msgid "Lookup:"
msgstr "Suchen:"
-#: ../gtk/main.ui.h:43
+#: ../gtk/main.ui.h:42
msgid "My current identity:"
msgstr "Aktuelle Identität:"
-#: ../gtk/main.ui.h:44
+#: ../gtk/main.ui.h:43
msgid "Online users"
msgstr "Angemeldete Teilnehmer"
-#: ../gtk/main.ui.h:45
+#: ../gtk/main.ui.h:44
msgid "Password"
msgstr "Passwort"
+#: ../gtk/main.ui.h:46
+msgid "Recent calls"
+msgstr "Letzte Gespräche"
+
#: ../gtk/main.ui.h:47
msgid "SIP address or phone number:"
msgstr "SIP-Adresse oder Telefonnummer:"
@@ -627,18 +715,14 @@ msgstr "SIP-Adresse oder Telefonnummer:"
msgid "Search"
msgstr "Suchen"
-#: ../gtk/main.ui.h:49
+#: ../gtk/main.ui.h:50
msgid "Show debug window"
msgstr "Debug-Fenster anzeigen"
-#: ../gtk/main.ui.h:50
+#: ../gtk/main.ui.h:51
msgid "Username"
msgstr "Benutzername"
-#: ../gtk/main.ui.h:51
-msgid "_Call history"
-msgstr "Anrufchronik"
-
#: ../gtk/main.ui.h:52
msgid "_Help"
msgstr "_Hilfe"
@@ -648,18 +732,14 @@ msgid "_Homepage"
msgstr ""
#: ../gtk/main.ui.h:54
-msgid "_Linphone"
-msgstr ""
-
-#: ../gtk/main.ui.h:55
msgid "_Options"
msgstr "_Optionen"
-#: ../gtk/main.ui.h:56
+#: ../gtk/main.ui.h:55
msgid "in"
msgstr "in"
-#: ../gtk/main.ui.h:57
+#: ../gtk/main.ui.h:56
msgid "label"
msgstr ""
@@ -720,14 +800,6 @@ msgstr "SIP-Adresse"
msgid "Show this contact presence status"
msgstr "Anwesenheitsstatus dieses Kontakts zeigen"
-#: ../gtk/contact.ui.h:6
-msgid "gtk-cancel"
-msgstr ""
-
-#: ../gtk/contact.ui.h:7
-msgid "gtk-ok"
-msgstr ""
-
#: ../gtk/log.ui.h:1
msgid "Linphone debug window"
msgstr "Linphone Debug-Fenster"
@@ -750,7 +822,7 @@ msgstr "Benutzer-ID"
#: ../gtk/call_logs.ui.h:1
msgid "Call back"
-msgstr "Zurückrufen"
+msgstr "Anrufen"
#: ../gtk/call_logs.ui.h:2
msgid "Call history"
@@ -781,8 +853,8 @@ msgid "Publish presence information"
msgstr "Anwesenheitsstatus veröffentlichen"
#: ../gtk/sip_account.ui.h:6
-msgid "Register at startup"
-msgstr "Beim Starten registrieren"
+msgid "Register"
+msgstr ""
#: ../gtk/sip_account.ui.h:7
msgid "Registration duration (sec):"
@@ -808,10 +880,6 @@ msgstr "sip:"
msgid "Send"
msgstr "Senden"
-#: ../gtk/chatroom.ui.h:2
-msgid "gtk-close"
-msgstr ""
-
#: ../gtk/parameters.ui.h:1
msgid "0 stands for \"unlimited\""
msgstr "0 bedeutet „unbegrenzt“"
@@ -845,8 +913,8 @@ msgid "<b>NAT and Firewall</b>"
msgstr "<b>NAT und Firewall</b>"
#: ../gtk/parameters.ui.h:9
-msgid "<b>Ports</b>"
-msgstr "<b>Ports</b>"
+msgid "<b>Network protocol and ports</b>"
+msgstr "<b>Netzwerkprotokoll und Ports</b>"
#: ../gtk/parameters.ui.h:10
msgid "<b>Privacy</b>"
@@ -865,98 +933,114 @@ msgid "<b>Video</b>"
msgstr "<b>Video</b>"
#: ../gtk/parameters.ui.h:14
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
+msgstr ""
+"<i>Adaptive Ratenregelung ist eine Technik zur dynamischen Abschätzung der "
+"zur Verfügung stehenden Bandbreite während eines Anrufs.</i>"
+
+#: ../gtk/parameters.ui.h:15
msgid "ALSA special device (optional):"
msgstr "Spezielles ALSA-Gerät (optional):"
-#: ../gtk/parameters.ui.h:15
+#: ../gtk/parameters.ui.h:16
msgid "Add"
msgstr "Hinzufügen"
-#: ../gtk/parameters.ui.h:16
+#: ../gtk/parameters.ui.h:17
msgid "Audio RTP/UDP:"
msgstr ""
-#: ../gtk/parameters.ui.h:17
+#: ../gtk/parameters.ui.h:18
msgid "Audio codecs"
msgstr "Audio-Codecs"
-#: ../gtk/parameters.ui.h:18
+#: ../gtk/parameters.ui.h:19
msgid "Behind NAT / Firewall (specify gateway IP below)"
msgstr "Hinter NAT / Firewall (IP-Gateway unten angeben)"
-#: ../gtk/parameters.ui.h:19
+#: ../gtk/parameters.ui.h:20
msgid "Behind NAT / Firewall (use STUN to resolve)"
msgstr "Hinter NAT / Firewall (mit STUN auflösen)"
-#: ../gtk/parameters.ui.h:21
+#: ../gtk/parameters.ui.h:22
msgid "CIF"
msgstr ""
-#: ../gtk/parameters.ui.h:22
+#: ../gtk/parameters.ui.h:23
msgid "Capture device:"
msgstr "Aufnahmegerät:"
-#: ../gtk/parameters.ui.h:23
+#: ../gtk/parameters.ui.h:24
msgid "Codecs"
msgstr "Codecs"
-#: ../gtk/parameters.ui.h:24
+#: ../gtk/parameters.ui.h:25
msgid "Direct connection to the Internet"
msgstr "Direkte Verbindung ins Internet"
-#: ../gtk/parameters.ui.h:25
+#: ../gtk/parameters.ui.h:26
msgid "Disable"
msgstr "Sperren"
-#: ../gtk/parameters.ui.h:26
+#: ../gtk/parameters.ui.h:27
msgid "Done"
msgstr "Fertig"
-#: ../gtk/parameters.ui.h:27
+#: ../gtk/parameters.ui.h:28
msgid "Download speed limit in Kbit/sec:"
msgstr "Download-Bandbreite (kbit/sec):"
-#: ../gtk/parameters.ui.h:28
+#: ../gtk/parameters.ui.h:29
msgid "Edit"
msgstr "Bearbeiten"
-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:30
msgid "Enable"
msgstr "Freigeben"
-#: ../gtk/parameters.ui.h:30
+#: ../gtk/parameters.ui.h:31
+msgid "Enable adaptive rate control"
+msgstr "Adaptive Ratenregelung ein"
+
+#: ../gtk/parameters.ui.h:32
msgid "Enable echo cancellation"
msgstr "Echounterdrückung ein"
-#: ../gtk/parameters.ui.h:31
+#: ../gtk/parameters.ui.h:33
msgid "Erase all passwords"
msgstr "Alle Passwörter löschen"
-#: ../gtk/parameters.ui.h:32
+#: ../gtk/parameters.ui.h:34
msgid "Manage SIP Accounts"
msgstr "SIP-Konten verwalten"
-#: ../gtk/parameters.ui.h:33
+#: ../gtk/parameters.ui.h:35
+msgid "Media encryption type"
+msgstr "Verschlüsselungstyp der Medien"
+
+#: ../gtk/parameters.ui.h:36
msgid "Multimedia settings"
msgstr "Multimedia-Einstellungen"
-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:37
msgid "Network settings"
msgstr "Netzwerkeinstellungen"
-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:38
msgid "Playback device:"
msgstr "Wiedergabegerät:"
-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:39
msgid "Prefered video resolution:"
msgstr "Bevorzugte Video-Auflösung:"
-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:40
msgid "Public IP address:"
msgstr "Öffentliche IP-Adresse:"
-#: ../gtk/parameters.ui.h:38
+#: ../gtk/parameters.ui.h:41
msgid ""
"Register to FONICS\n"
"virtual network !"
@@ -964,97 +1048,101 @@ msgstr ""
"Am virtuellen FONICS\n"
"Netzwerk anmelden!"
-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:43
msgid "Remove"
msgstr "Entfernen"
-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:44
msgid "Ring device:"
msgstr "Gerät für Klingelton:"
-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:45
msgid "Ring sound:"
msgstr "Klingelton:"
-#: ../gtk/parameters.ui.h:43
-msgid "SIP (TCP):"
+#: ../gtk/parameters.ui.h:46
+msgid "SIP (TCP)"
msgstr ""
-#: ../gtk/parameters.ui.h:44
-msgid "SIP (UDP):"
+#: ../gtk/parameters.ui.h:47
+msgid "SIP (TLS)"
msgstr ""
-#: ../gtk/parameters.ui.h:45
+#: ../gtk/parameters.ui.h:48
+msgid "SIP (UDP)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:49
msgid "Send DTMFs as SIP info"
msgstr "DTMFs als SIP-Info senden"
-#: ../gtk/parameters.ui.h:46
+#: ../gtk/parameters.ui.h:50
msgid "Set Maximum Transmission Unit:"
msgstr "Maximum Transmission Unit setzen:"
-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:51
msgid "Settings"
msgstr "Einstellungen"
-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:52
msgid "Show advanced settings"
msgstr "Fortgeschrittene Einstellungen anzeigen"
-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:53
msgid "Stun server:"
msgstr "STUN-Server:"
-#: ../gtk/parameters.ui.h:50
+#: ../gtk/parameters.ui.h:54
msgid "This section defines your SIP address when not using a SIP account"
msgstr ""
"In diesem Bereich legen Sie Ihre SIP-Adresse fest, wenn Sie kein SIP-Konto "
"verwenden."
-#: ../gtk/parameters.ui.h:51
+#: ../gtk/parameters.ui.h:55
msgid "Upload speed limit in Kbit/sec:"
msgstr "Upload-Bandbreite (kbit/sec):"
-#: ../gtk/parameters.ui.h:52
+#: ../gtk/parameters.ui.h:56
msgid "Use IPv6 instead of IPv4"
msgstr "IPv6 statt IPv4 verwenden"
-#: ../gtk/parameters.ui.h:53
+#: ../gtk/parameters.ui.h:57
msgid "User interface"
msgstr "Benutzeroberfläche"
-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:58
msgid "Video RTP/UDP:"
msgstr ""
-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:59
msgid "Video codecs"
msgstr "Video-Codecs"
-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:60
msgid "Video input device:"
msgstr "Video-Aufnahmegerät:"
-#: ../gtk/parameters.ui.h:57
+#: ../gtk/parameters.ui.h:61
msgid "Your display name (eg: John Doe):"
msgstr "Ihr angezeigter Name (z. B. Heinz Müller):"
-#: ../gtk/parameters.ui.h:58
+#: ../gtk/parameters.ui.h:62
msgid "Your resulting SIP address:"
msgstr "Sich ergebende SIP-Adresse:"
-#: ../gtk/parameters.ui.h:59
+#: ../gtk/parameters.ui.h:63
msgid "Your username:"
msgstr "Ihr Benutzername:"
-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:64
msgid "a sound card"
msgstr "eine Soundkarte"
-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:65
msgid "default camera"
msgstr "Standard-Kamera"
-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:66
msgid "default soundcard"
msgstr "Standard-Soundkarte"
@@ -1078,26 +1166,19 @@ msgstr "Linphone"
msgid "Please wait"
msgstr "Bitte warten"
-#: ../coreapi/linphonecore.c:165
-#, c-format
-msgid "You have missed %i call."
-msgid_plural "You have missed %i calls."
-msgstr[0] "Sie haben %i Anruf in Abwesenheit."
-msgstr[1] "Sie haben %i Anrufe in Abwesenheit."
-
-#: ../coreapi/linphonecore.c:206
+#: ../coreapi/linphonecore.c:187
msgid "aborted"
msgstr "abgebrochen"
-#: ../coreapi/linphonecore.c:209
+#: ../coreapi/linphonecore.c:190
msgid "completed"
msgstr "beendet"
-#: ../coreapi/linphonecore.c:212
+#: ../coreapi/linphonecore.c:193
msgid "missed"
msgstr "entgangen"
-#: ../coreapi/linphonecore.c:217
+#: ../coreapi/linphonecore.c:198
#, c-format
msgid ""
"%s at %s\n"
@@ -1112,27 +1193,23 @@ msgstr ""
"Status: %s\n"
"Dauer: %i min %i sec\n"
-#: ../coreapi/linphonecore.c:218
-msgid "Incoming call"
-msgstr "Eingehender Anruf"
-
-#: ../coreapi/linphonecore.c:218
+#: ../coreapi/linphonecore.c:199
msgid "Outgoing call"
msgstr "Abgehender Anruf"
-#: ../coreapi/linphonecore.c:998
+#: ../coreapi/linphonecore.c:1088
msgid "Ready"
msgstr "Bereit"
-#: ../coreapi/linphonecore.c:1773
+#: ../coreapi/linphonecore.c:1831
msgid "Looking for telephone number destination..."
msgstr "Telefonnummernziel wird gesucht..."
-#: ../coreapi/linphonecore.c:1776
+#: ../coreapi/linphonecore.c:1834
msgid "Could not resolve this number."
msgstr "Diese Nummer kann nicht aufgelöst werden."
-#: ../coreapi/linphonecore.c:1820
+#: ../coreapi/linphonecore.c:1878
msgid ""
"Could not parse given sip address. A sip url usually looks like sip:"
"user@domain"
@@ -1140,51 +1217,38 @@ msgstr ""
"SIP-Adresse kann nicht eingelesen werden. Eine SIP-Adresse hat folgenden "
"Aufbau <sip:benutzername@domainname>"
-#: ../coreapi/linphonecore.c:1967
+#: ../coreapi/linphonecore.c:2025
msgid "Contacting"
msgstr "Verbindungsaufbau"
-#: ../coreapi/linphonecore.c:1974
+#: ../coreapi/linphonecore.c:2032
msgid "Could not call"
msgstr "Anruf kann nicht getätigt werden."
-#: ../coreapi/linphonecore.c:2081
-msgid "Sorry, you have to pause or stop the current call first !"
-msgstr "Sie müssen zuerst den aktuellen Anruf halten oder beenden!"
-
-#: ../coreapi/linphonecore.c:2086
+#: ../coreapi/linphonecore.c:2140
msgid "Sorry, we have reached the maximum number of simultaneous calls"
msgstr "Die maximale Anzahl der gleichzeitigen Anrufe ist erreicht."
-#: ../coreapi/linphonecore.c:2208
+#: ../coreapi/linphonecore.c:2270
msgid "Modifying call parameters..."
msgstr "Die Anrufparameter werden verändert..."
-#: ../coreapi/linphonecore.c:2311
+#: ../coreapi/linphonecore.c:2366
msgid "Connected."
msgstr "Verbunden."
-#: ../coreapi/linphonecore.c:2334
+#: ../coreapi/linphonecore.c:2389
msgid "Call aborted"
msgstr "Anruf abgebrochen"
-#: ../coreapi/linphonecore.c:2374
-msgid "Call ended"
-msgstr "Anruf beendet"
-
-#: ../coreapi/linphonecore.c:2456
+#: ../coreapi/linphonecore.c:2530
msgid "Could not pause the call"
msgstr "Anruf kann nicht gehalten werden"
-#: ../coreapi/linphonecore.c:2460
+#: ../coreapi/linphonecore.c:2535
msgid "Pausing the current call..."
msgstr "Aktueller Anruf wird gehalten..."
-#: ../coreapi/linphonecore.c:2499
-msgid "There is already a call in process, pause or stop it first."
-msgstr ""
-"Es wird bereits ein Anruf verarbeitet. Halten oder beenden Sie ihn zuerst."
-
#: ../coreapi/misc.c:147
msgid ""
"Your computer appears to be using ALSA sound drivers.\n"
@@ -1261,7 +1325,7 @@ msgstr "Ausstehend"
msgid "Unknown-bug"
msgstr "Unbekannter Fehler"
-#: ../coreapi/proxy.c:187
+#: ../coreapi/proxy.c:192
msgid ""
"The sip proxy address you entered is invalid, it must start with \"sip:\" "
"followed by a hostname."
@@ -1269,7 +1333,7 @@ msgstr ""
"Die von Ihnen eingegebene SIP-Proxy-Adresse ist ungültig, sie muss mit "
"„sip:“ gefolgt vom Hostnamen beginnen."
-#: ../coreapi/proxy.c:193
+#: ../coreapi/proxy.c:198
msgid ""
"The sip identity you entered is invalid.\n"
"It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1278,135 +1342,184 @@ msgstr ""
"Sie sollte wie sip:benutzername@proxydomain aussehen, also z.B. sip:"
"alice@beispiel.net"
-#: ../coreapi/proxy.c:671
+#: ../coreapi/proxy.c:690
#, c-format
msgid "Could not login as %s"
msgstr "Anmeldung als %s fehlgeschlagen"
-#: ../coreapi/callbacks.c:170
+#: ../coreapi/callbacks.c:206
msgid "is contacting you"
msgstr "ruft Sie an"
-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207
msgid " and asked autoanswer."
msgstr " und fragt nach automatischer Antwort."
-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207
msgid "."
msgstr ""
-#: ../coreapi/callbacks.c:226
+#: ../coreapi/callbacks.c:266
msgid "Remote ringing."
msgstr "Klingeln bei der Gegenseite."
-#: ../coreapi/callbacks.c:242
+#: ../coreapi/callbacks.c:282
msgid "Remote ringing..."
msgstr "Klingeln bei der Gegenseite..."
-#: ../coreapi/callbacks.c:253
+#: ../coreapi/callbacks.c:293
msgid "Early media."
msgstr ""
-#: ../coreapi/callbacks.c:291
+#: ../coreapi/callbacks.c:331
#, c-format
msgid "Call with %s is paused."
msgstr "Anruf mit %s wird gehalten."
-#: ../coreapi/callbacks.c:302
+#: ../coreapi/callbacks.c:342
#, c-format
msgid "Call answered by %s - on hold."
msgstr "Der von %s entgegengenommene Anruf wird gehalten."
-#: ../coreapi/callbacks.c:317
+#: ../coreapi/callbacks.c:357
msgid "Call resumed."
msgstr "Anruf fortgesetzt."
-#: ../coreapi/callbacks.c:322
+#: ../coreapi/callbacks.c:362
#, c-format
msgid "Call answered by %s."
msgstr "Anruf wird von %s entgegengenommen."
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:432
msgid "We are being paused..."
msgstr "Anruf wird gehalten..."
-#: ../coreapi/callbacks.c:387
+#: ../coreapi/callbacks.c:436
msgid "We have been resumed..."
-msgstr "Wir werden fortgesetzt..."
+msgstr "Anruf wird fortgesetzt..."
+
+#: ../coreapi/callbacks.c:441
+msgid "Call has been updated by remote..."
+msgstr "Anruf ist von der Gegenseite aktualisiert worden..."
-#: ../coreapi/callbacks.c:424
+#: ../coreapi/callbacks.c:473
msgid "Call terminated."
msgstr "Anruf beendet."
-#: ../coreapi/callbacks.c:431
+#: ../coreapi/callbacks.c:480
msgid "User is busy."
msgstr "Teilnehmer ist besetzt."
-#: ../coreapi/callbacks.c:432
+#: ../coreapi/callbacks.c:481
msgid "User is temporarily unavailable."
msgstr "Teilnehmer zur Zeit nicht verfügbar."
#. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:434
+#: ../coreapi/callbacks.c:483
msgid "User does not want to be disturbed."
msgstr "Teilnehmer möchte nicht gestört werden."
-#: ../coreapi/callbacks.c:435
+#: ../coreapi/callbacks.c:484
msgid "Call declined."
msgstr "Anruf abgewiesen"
-#: ../coreapi/callbacks.c:447
+#: ../coreapi/callbacks.c:496
msgid "No response."
msgstr "Keine Antwort."
-#: ../coreapi/callbacks.c:451
+#: ../coreapi/callbacks.c:500
msgid "Protocol error."
msgstr "Protokollfehler"
-#: ../coreapi/callbacks.c:467
+#: ../coreapi/callbacks.c:516
msgid "Redirected"
msgstr "Umgeleitet"
-#: ../coreapi/callbacks.c:477
+#: ../coreapi/callbacks.c:526
msgid "Not found"
msgstr "Nicht gefunden"
-#: ../coreapi/callbacks.c:487
+#: ../coreapi/callbacks.c:551
msgid "No common codecs"
msgstr "Keine gemeinsamen Codecs"
-#: ../coreapi/callbacks.c:493
+#: ../coreapi/callbacks.c:557
msgid "Call failed."
msgstr "Anruf fehlgeschlagen."
-#: ../coreapi/callbacks.c:557
+#: ../coreapi/callbacks.c:631
#, c-format
msgid "Registration on %s successful."
msgstr "Registrierung auf %s erfolgreich."
-#: ../coreapi/callbacks.c:558
+#: ../coreapi/callbacks.c:632
#, c-format
msgid "Unregistration on %s done."
msgstr "Abmeldung von %s ist erfolgt."
-#: ../coreapi/callbacks.c:574
+#: ../coreapi/callbacks.c:648
msgid "no response timeout"
msgstr "Zeitüberschreitung bei der Antwort"
-#: ../coreapi/callbacks.c:577
+#: ../coreapi/callbacks.c:651
#, c-format
msgid "Registration on %s failed: %s"
msgstr "Registrierung auf %s fehlgeschlagen: %s"
-#: ../coreapi/callbacks.c:619
-#, c-format
-msgid "We are transferred to %s"
-msgstr "Vermittlung nach %s"
-
-#: ../coreapi/sal_eXosip2.c:815 ../coreapi/sal_eXosip2.c:817
+#: ../coreapi/sal_eXosip2.c:873 ../coreapi/sal_eXosip2.c:875
msgid "Authentication failure"
msgstr "Authentifikation fehlgeschlagen"
+#: ../coreapi/linphonecall.c:128
+#, c-format
+msgid "Authentication token is %s"
+msgstr "Authentifizierungs-Token ist %s"
+
+#: ../coreapi/linphonecall.c:1560
+#, c-format
+msgid "You have missed %i call."
+msgid_plural "You have missed %i calls."
+msgstr[0] "Sie haben %i Anruf in Abwesenheit."
+msgstr[1] "Sie haben %i Anrufe in Abwesenheit."
+
+#~ msgid "Register at startup"
+#~ msgstr "Beim Starten registrieren"
+
+#~ msgid ""
+#~ "Pause all calls\n"
+#~ "and answer"
+#~ msgstr ""
+#~ "Alle Anrufe halten\n"
+#~ "und annehmen"
+
+#~ msgid "Unmute"
+#~ msgstr "Stumm aus"
+
+#~ msgid "<b>Contact list</b>"
+#~ msgstr "<b>Kontaktliste</b>"
+
+#~ msgid "Audio & video"
+#~ msgstr "Audio & Video"
+
+#~ msgid "Audio only"
+#~ msgstr "Nur Audio"
+
+#~ msgid "Duration:"
+#~ msgstr "Dauer:"
+
+#~ msgid "_Call history"
+#~ msgstr "Anrufchronik"
+
+#~ msgid "<b>Ports</b>"
+#~ msgstr "<b>Ports</b>"
+
+#~ msgid "Sorry, you have to pause or stop the current call first !"
+#~ msgstr "Sie müssen zuerst den aktuellen Anruf halten oder beenden!"
+
+#~ msgid "There is already a call in process, pause or stop it first."
+#~ msgstr ""
+#~ "Es wird bereits ein Anruf verarbeitet. Halten oder beenden Sie ihn zuerst."
+
#~ msgid "ITU-G.711 alaw encoder"
#~ msgstr "ITU-G.711 alaw Encoder"
@@ -2031,9 +2144,6 @@ msgstr "Authentifikation fehlgeschlagen"
#~ msgid "Authentication required for realm %s"
#~ msgstr "Authentifikation erforderlich für Bereich %s"
-#~ msgid "None"
-#~ msgstr "Keinen"
-
#~ msgid "Wait"
#~ msgstr "Warten"
@@ -2112,12 +2222,6 @@ msgstr "Authentifikation fehlgeschlagen"
#~ msgid "Timeout..."
#~ msgstr "Zeitüberschreitung..."
-#, fuzzy
-#~ msgid ""
-#~ "Add address\n"
-#~ "book"
-#~ msgstr "Adressbuch"
-
#~ msgid "Toggle this if you want to be registered on a remote server."
#~ msgstr ""
#~ "Bitte ankreuzen, wenn Sie auf einem Sip-Server registriert werden wollen."
diff --git a/po/es.po b/po/es.po
index 60ea5a65f53c1d6b064c4b3d9f0acd8592ebcfb4..728616e466dfcd3c91be7144e6544c0d9ca88dc3 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Linphone 0.9.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-08 22:32+0200\n"
+"POT-Creation-Date: 2011-12-02 16:47+0100\n"
"PO-Revision-Date: 2002-10-15 HO:MI+ZONE\n"
"Last-Translator: Nelson Benitez <gnelson@inMail.sk>\n"
"Language-Team: es <es@li.org>\n"
@@ -16,6 +16,18 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: ../gtk/calllogs.c:71
+msgid "n/a"
+msgstr ""
+
+#: ../gtk/conference.c:33 ../gtk/incall_view.c:183
+msgid "Conference"
+msgstr ""
+
+#: ../gtk/conference.c:41
+msgid "Me"
+msgstr ""
+
#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
#, c-format
msgid "Couldn't find pixmap file: %s"
@@ -26,34 +38,38 @@ msgstr "No se pudo encontrar el archivo pixmap: %s"
msgid "Chat with %s"
msgstr ""
-#: ../gtk/main.c:74
+#: ../gtk/main.c:83
msgid "log to stdout some debug information while running."
msgstr ""
-#: ../gtk/main.c:81
+#: ../gtk/main.c:90
+msgid "path to a file to write logs into."
+msgstr ""
+
+#: ../gtk/main.c:97
msgid "Start only in the system tray, do not show the main interface."
msgstr ""
-#: ../gtk/main.c:88
+#: ../gtk/main.c:104
msgid "address to call right now"
msgstr ""
-#: ../gtk/main.c:95
+#: ../gtk/main.c:111
msgid "if set automatically answer incoming calls"
msgstr ""
-#: ../gtk/main.c:102
+#: ../gtk/main.c:118
msgid ""
"Specifiy a working directory (should be the base of the installation, eg: c:"
"\\Program Files\\Linphone)"
msgstr ""
-#: ../gtk/main.c:442
+#: ../gtk/main.c:464
#, c-format
msgid "Call with %s"
msgstr ""
-#: ../gtk/main.c:826
+#: ../gtk/main.c:815
#, c-format
msgid ""
"%s would like to add you to his contact list.\n"
@@ -62,172 +78,232 @@ msgid ""
"If you answer no, this person will be temporarily blacklisted."
msgstr ""
-#: ../gtk/main.c:904
+#: ../gtk/main.c:893
#, c-format
msgid ""
"Please enter your password for username <i>%s</i>\n"
" at domain <i>%s</i>:"
msgstr ""
-#: ../gtk/main.c:1040
+#: ../gtk/main.c:993
+#, fuzzy
+msgid "Call error"
+msgstr "Llamada cancelada."
+
+#: ../gtk/main.c:996 ../coreapi/linphonecore.c:2406
+#, fuzzy
+msgid "Call ended"
+msgstr "Llamada cancelada."
+
+#: ../gtk/main.c:999 ../coreapi/linphonecore.c:199
+msgid "Incoming call"
+msgstr ""
+
+#: ../gtk/main.c:1001 ../gtk/incall_view.c:292 ../gtk/main.ui.h:20
+msgid "Answer"
+msgstr ""
+
+#: ../gtk/main.c:1003 ../gtk/main.ui.h:29
+#, fuzzy
+msgid "Decline"
+msgstr "linea"
+
+#: ../gtk/main.c:1009
+#, fuzzy
+msgid "Call paused"
+msgstr "Llamada cancelada."
+
+#: ../gtk/main.c:1009
+#, c-format
+msgid "<span size=\"large\">by %s</span>"
+msgstr ""
+
+#: ../gtk/main.c:1165
msgid "Website link"
msgstr ""
-#: ../gtk/main.c:1076
+#: ../gtk/main.c:1205
msgid "Linphone - a video internet phone"
msgstr ""
-#: ../gtk/main.c:1095
+#: ../gtk/main.c:1295
#, c-format
msgid "%s (Default)"
msgstr ""
-#: ../gtk/main.c:1187
-msgid "Windows"
+#: ../gtk/main.c:1566 ../coreapi/callbacks.c:700
+#, c-format
+msgid "We are transferred to %s"
msgstr ""
-#: ../gtk/main.c:1364
+#: ../gtk/main.c:1576
msgid ""
"No sound cards have been detected on this computer.\n"
"You won't be able to send or receive audio calls."
msgstr ""
-#: ../gtk/main.c:1423
+#: ../gtk/main.c:1663
msgid "A free SIP video-phone"
msgstr ""
-#: ../gtk/friendlist.c:192 ../gtk/propertybox.c:271 ../gtk/contact.ui.h:3
+#: ../gtk/friendlist.c:203
+#, fuzzy
+msgid "Add to addressbook"
+msgstr "Agenda"
+
+#: ../gtk/friendlist.c:258 ../gtk/propertybox.c:296 ../gtk/contact.ui.h:3
msgid "Name"
msgstr "Nombre"
-#: ../gtk/friendlist.c:205
+#: ../gtk/friendlist.c:271
#, fuzzy
msgid "Presence status"
msgstr "Estado"
-#: ../gtk/friendlist.c:242
+#: ../gtk/friendlist.c:308
#, c-format
msgid "Search in %s directory"
msgstr ""
-#: ../gtk/friendlist.c:450
+#: ../gtk/friendlist.c:568
msgid "Invalid sip contact !"
msgstr ""
-#: ../gtk/friendlist.c:495
+#: ../gtk/friendlist.c:613
#, c-format
msgid "Call %s"
msgstr ""
-#: ../gtk/friendlist.c:496
+#: ../gtk/friendlist.c:614
#, c-format
msgid "Send text to %s"
msgstr ""
-#: ../gtk/friendlist.c:497
+#: ../gtk/friendlist.c:615
#, fuzzy, c-format
msgid "Edit contact '%s'"
msgstr "(Ninguna informacion de contacto !)"
-#: ../gtk/friendlist.c:498
+#: ../gtk/friendlist.c:616
#, c-format
msgid "Delete contact '%s'"
msgstr ""
-#: ../gtk/friendlist.c:540
+#: ../gtk/friendlist.c:658
#, c-format
msgid "Add new contact from %s directory"
msgstr ""
-#: ../gtk/propertybox.c:277
+#: ../gtk/propertybox.c:302
msgid "Rate (Hz)"
msgstr ""
-#: ../gtk/propertybox.c:283
+#: ../gtk/propertybox.c:308
msgid "Status"
msgstr "Estado"
-#: ../gtk/propertybox.c:289
+#: ../gtk/propertybox.c:314
msgid "Min bitrate (kbit/s)"
msgstr ""
-#: ../gtk/propertybox.c:296
+#: ../gtk/propertybox.c:321
msgid "Parameters"
msgstr "Parametros"
-#: ../gtk/propertybox.c:326 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507
msgid "Enabled"
msgstr "Activado"
-#: ../gtk/propertybox.c:327 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507
msgid "Disabled"
msgstr "Desactivado"
-#: ../gtk/propertybox.c:510
+#: ../gtk/propertybox.c:553
msgid "Account"
msgstr ""
-#: ../gtk/propertybox.c:650
+#: ../gtk/propertybox.c:693
msgid "English"
msgstr ""
-#: ../gtk/propertybox.c:651
+#: ../gtk/propertybox.c:694
msgid "French"
msgstr ""
-#: ../gtk/propertybox.c:652
+#: ../gtk/propertybox.c:695
msgid "Swedish"
msgstr ""
-#: ../gtk/propertybox.c:653
+#: ../gtk/propertybox.c:696
msgid "Italian"
msgstr ""
-#: ../gtk/propertybox.c:654
+#: ../gtk/propertybox.c:697
msgid "Spanish"
msgstr ""
-#: ../gtk/propertybox.c:655
+#: ../gtk/propertybox.c:698
msgid "Brazilian Portugese"
msgstr ""
-#: ../gtk/propertybox.c:656
+#: ../gtk/propertybox.c:699
msgid "Polish"
msgstr ""
-#: ../gtk/propertybox.c:657
+#: ../gtk/propertybox.c:700
msgid "German"
msgstr ""
-#: ../gtk/propertybox.c:658
+#: ../gtk/propertybox.c:701
msgid "Russian"
msgstr ""
-#: ../gtk/propertybox.c:659
+#: ../gtk/propertybox.c:702
msgid "Japanese"
msgstr ""
-#: ../gtk/propertybox.c:660
+#: ../gtk/propertybox.c:703
msgid "Dutch"
msgstr ""
-#: ../gtk/propertybox.c:661
+#: ../gtk/propertybox.c:704
msgid "Hungarian"
msgstr ""
-#: ../gtk/propertybox.c:662
+#: ../gtk/propertybox.c:705
msgid "Czech"
msgstr ""
-#: ../gtk/propertybox.c:663
+#: ../gtk/propertybox.c:706
msgid "Chinese"
msgstr ""
-#: ../gtk/propertybox.c:720
+#: ../gtk/propertybox.c:707
+msgid "Traditional Chinese"
+msgstr ""
+
+#: ../gtk/propertybox.c:708
+msgid "Norwegian"
+msgstr ""
+
+#: ../gtk/propertybox.c:765
msgid ""
"You need to restart linphone for the new language selection to take effect."
msgstr ""
+#: ../gtk/propertybox.c:835
+#, fuzzy
+msgid "None"
+msgstr "Ninguno."
+
+#: ../gtk/propertybox.c:839
+msgid "SRTP"
+msgstr ""
+
+#: ../gtk/propertybox.c:845
+msgid "ZRTP"
+msgstr ""
+
#: ../gtk/update.c:80
#, c-format
msgid ""
@@ -345,77 +421,104 @@ msgstr ""
msgid "Now ready !"
msgstr ""
-#: ../gtk/incall_view.c:61
+#: ../gtk/incall_view.c:69
#, fuzzy, c-format
msgid "Call #%i"
msgstr "Llamada cancelada."
-#: ../gtk/incall_view.c:87
+#: ../gtk/incall_view.c:127
#, c-format
msgid "Transfer to call #%i with %s"
msgstr ""
-#: ../gtk/incall_view.c:113
+#: ../gtk/incall_view.c:155
msgid "Transfer"
msgstr ""
-#: ../gtk/incall_view.c:187
+#: ../gtk/incall_view.c:271
#, fuzzy
msgid "<b>Calling...</b>"
msgstr "Contactando "
-#: ../gtk/incall_view.c:190 ../gtk/incall_view.c:246
+#: ../gtk/incall_view.c:274 ../gtk/incall_view.c:482
msgid "00::00::00"
msgstr ""
-#: ../gtk/incall_view.c:206
+#: ../gtk/incall_view.c:285
#, fuzzy
msgid "<b>Incoming call</b>"
msgstr "Contactando "
-#: ../gtk/incall_view.c:216
-msgid ""
-"Pause all calls\n"
-"and answer"
+#: ../gtk/incall_view.c:322
+msgid "good"
msgstr ""
-#: ../gtk/incall_view.c:217 ../gtk/main.ui.h:20
-msgid "Answer"
+#: ../gtk/incall_view.c:324
+msgid "average"
+msgstr ""
+
+#: ../gtk/incall_view.c:326
+msgid "poor"
+msgstr ""
+
+#: ../gtk/incall_view.c:328
+msgid "very poor"
+msgstr ""
+
+#: ../gtk/incall_view.c:330
+msgid "too bad"
msgstr ""
-#: ../gtk/incall_view.c:244
+#: ../gtk/incall_view.c:331 ../gtk/incall_view.c:347
+msgid "unavailable"
+msgstr ""
+
+#: ../gtk/incall_view.c:447
+msgid "Secured by SRTP"
+msgstr ""
+
+#: ../gtk/incall_view.c:453
+#, c-format
+msgid "Secured by ZRTP - [auth token: %s]"
+msgstr ""
+
+#: ../gtk/incall_view.c:459
+msgid "Set unverified"
+msgstr ""
+
+#: ../gtk/incall_view.c:459 ../gtk/main.ui.h:49
+msgid "Set verified"
+msgstr ""
+
+#: ../gtk/incall_view.c:480
+msgid "In conference"
+msgstr ""
+
+#: ../gtk/incall_view.c:480
#, fuzzy
msgid "<b>In call</b>"
msgstr "Contactando "
-#: ../gtk/incall_view.c:260
+#: ../gtk/incall_view.c:499
#, fuzzy
msgid "<b>Paused call</b>"
msgstr "Contactando "
-#: ../gtk/incall_view.c:272
+#: ../gtk/incall_view.c:511
#, c-format
msgid "%02i::%02i::%02i"
msgstr ""
-#: ../gtk/incall_view.c:288
+#: ../gtk/incall_view.c:527
#, fuzzy
msgid "<b>Call ended.</b>"
msgstr "Llamada cancelada."
-#: ../gtk/incall_view.c:309
-msgid "Unmute"
-msgstr ""
-
-#: ../gtk/incall_view.c:316 ../gtk/main.ui.h:42
-msgid "Mute"
-msgstr ""
-
-#: ../gtk/incall_view.c:340
+#: ../gtk/incall_view.c:584
msgid "Resume"
msgstr ""
-#: ../gtk/incall_view.c:347 ../gtk/main.ui.h:46
+#: ../gtk/incall_view.c:591 ../gtk/main.ui.h:45
msgid "Pause"
msgstr ""
@@ -479,8 +582,8 @@ msgstr "Informacion de codec"
#: ../gtk/main.ui.h:14
#, fuzzy
-msgid "<b>Contact list</b>"
-msgstr "Contactando "
+msgid "<b>Callee name</b>"
+msgstr "Llamada cancelada."
#: ../gtk/main.ui.h:15
#, fuzzy
@@ -505,27 +608,26 @@ msgid "All users"
msgstr ""
#: ../gtk/main.ui.h:21
-#, fuzzy
-msgid "Audio & video"
-msgstr "Propiedades del codec de Audio"
-
-#: ../gtk/main.ui.h:22
-#, fuzzy
-msgid "Audio only"
-msgstr "Propiedades del codec de Audio"
-
-#: ../gtk/main.ui.h:23
msgid "Automatically log me in"
msgstr ""
-#: ../gtk/main.ui.h:24
+#: ../gtk/main.ui.h:22
msgid "B"
msgstr ""
-#: ../gtk/main.ui.h:25 ../gtk/parameters.ui.h:20
+#: ../gtk/main.ui.h:23 ../gtk/parameters.ui.h:21
msgid "C"
msgstr ""
+#: ../gtk/main.ui.h:24
+#, fuzzy
+msgid "Call"
+msgstr "Llamada cancelada."
+
+#: ../gtk/main.ui.h:25
+msgid "Call quality rating"
+msgstr ""
+
#: ../gtk/main.ui.h:26
msgid "Check _Updates"
msgstr ""
@@ -539,11 +641,6 @@ msgstr "Contactando "
msgid "D"
msgstr ""
-#: ../gtk/main.ui.h:29
-#, fuzzy
-msgid "Decline"
-msgstr "linea"
-
#: ../gtk/main.ui.h:30
#, fuzzy
msgid "Default"
@@ -556,12 +653,12 @@ msgstr "Informacion"
#: ../gtk/main.ui.h:32
#, fuzzy
-msgid "Duration:"
-msgstr "Informacion"
+msgid "Enable self-view"
+msgstr "Activado"
#: ../gtk/main.ui.h:33
#, fuzzy
-msgid "Enable self-view"
+msgid "Enable video"
msgstr "Activado"
#: ../gtk/main.ui.h:34
@@ -598,21 +695,26 @@ msgstr "Informacion de codec"
msgid "Lookup:"
msgstr ""
-#: ../gtk/main.ui.h:43
+#: ../gtk/main.ui.h:42
#, fuzzy
msgid "My current identity:"
msgstr "Identidad"
-#: ../gtk/main.ui.h:44
+#: ../gtk/main.ui.h:43
#, fuzzy
msgid "Online users"
msgstr "linea"
-#: ../gtk/main.ui.h:45
+#: ../gtk/main.ui.h:44
#, fuzzy
msgid "Password"
msgstr "Tu Contraseña:"
+#: ../gtk/main.ui.h:46
+#, fuzzy
+msgid "Recent calls"
+msgstr "Contactando "
+
#: ../gtk/main.ui.h:47
#, fuzzy
msgid "SIP address or phone number:"
@@ -622,20 +724,16 @@ msgstr "La direccion SIP del servidor de registro."
msgid "Search"
msgstr ""
-#: ../gtk/main.ui.h:49
+#: ../gtk/main.ui.h:50
#, fuzzy
msgid "Show debug window"
msgstr "Linphone esta terminando..."
-#: ../gtk/main.ui.h:50
+#: ../gtk/main.ui.h:51
#, fuzzy
msgid "Username"
msgstr "Manual de Usuario"
-#: ../gtk/main.ui.h:51
-msgid "_Call history"
-msgstr ""
-
#: ../gtk/main.ui.h:52
msgid "_Help"
msgstr ""
@@ -645,19 +743,14 @@ msgid "_Homepage"
msgstr ""
#: ../gtk/main.ui.h:54
-#, fuzzy
-msgid "_Linphone"
-msgstr "linphone"
-
-#: ../gtk/main.ui.h:55
msgid "_Options"
msgstr ""
-#: ../gtk/main.ui.h:56
+#: ../gtk/main.ui.h:55
msgid "in"
msgstr ""
-#: ../gtk/main.ui.h:57
+#: ../gtk/main.ui.h:56
msgid "label"
msgstr ""
@@ -707,16 +800,6 @@ msgstr "Direccion"
msgid "Show this contact presence status"
msgstr ""
-#: ../gtk/contact.ui.h:6
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "Conectado."
-
-#: ../gtk/contact.ui.h:7
-#, fuzzy
-msgid "gtk-ok"
-msgstr "Borrar"
-
#: ../gtk/log.ui.h:1
#, fuzzy
msgid "Linphone debug window"
@@ -774,7 +857,7 @@ msgid "Publish presence information"
msgstr "Informacion de codec"
#: ../gtk/sip_account.ui.h:6
-msgid "Register at startup"
+msgid "Register"
msgstr ""
#: ../gtk/sip_account.ui.h:7
@@ -805,11 +888,6 @@ msgstr "SIP:"
msgid "Send"
msgstr "Sonido"
-#: ../gtk/chatroom.ui.h:2
-#, fuzzy
-msgid "gtk-close"
-msgstr "Conectado."
-
#: ../gtk/parameters.ui.h:1
msgid "0 stands for \"unlimited\""
msgstr ""
@@ -849,9 +927,8 @@ msgid "<b>NAT and Firewall</b>"
msgstr "Contactando "
#: ../gtk/parameters.ui.h:9
-#, fuzzy
-msgid "<b>Ports</b>"
-msgstr "Contactando "
+msgid "<b>Network protocol and ports</b>"
+msgstr ""
#: ../gtk/parameters.ui.h:10
#, fuzzy
@@ -874,207 +951,225 @@ msgid "<b>Video</b>"
msgstr "Contactando "
#: ../gtk/parameters.ui.h:14
-msgid "ALSA special device (optional):"
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
msgstr ""
#: ../gtk/parameters.ui.h:15
+msgid "ALSA special device (optional):"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:16
msgid "Add"
msgstr "Añadir"
-#: ../gtk/parameters.ui.h:16
+#: ../gtk/parameters.ui.h:17
msgid "Audio RTP/UDP:"
msgstr ""
-#: ../gtk/parameters.ui.h:17
+#: ../gtk/parameters.ui.h:18
#, fuzzy
msgid "Audio codecs"
msgstr "Propiedades del codec de Audio"
-#: ../gtk/parameters.ui.h:18
+#: ../gtk/parameters.ui.h:19
msgid "Behind NAT / Firewall (specify gateway IP below)"
msgstr ""
-#: ../gtk/parameters.ui.h:19
+#: ../gtk/parameters.ui.h:20
msgid "Behind NAT / Firewall (use STUN to resolve)"
msgstr ""
-#: ../gtk/parameters.ui.h:21
+#: ../gtk/parameters.ui.h:22
msgid "CIF"
msgstr ""
-#: ../gtk/parameters.ui.h:22
+#: ../gtk/parameters.ui.h:23
#, fuzzy
msgid "Capture device:"
msgstr "Usar dispositivo de sonido:"
-#: ../gtk/parameters.ui.h:23
+#: ../gtk/parameters.ui.h:24
#, fuzzy
msgid "Codecs"
msgstr "Codecs"
-#: ../gtk/parameters.ui.h:24
+#: ../gtk/parameters.ui.h:25
msgid "Direct connection to the Internet"
msgstr ""
-#: ../gtk/parameters.ui.h:25
+#: ../gtk/parameters.ui.h:26
msgid "Disable"
msgstr "Desactivado"
-#: ../gtk/parameters.ui.h:26
+#: ../gtk/parameters.ui.h:27
#, fuzzy
msgid "Done"
msgstr "Ninguno."
-#: ../gtk/parameters.ui.h:27
+#: ../gtk/parameters.ui.h:28
msgid "Download speed limit in Kbit/sec:"
msgstr ""
-#: ../gtk/parameters.ui.h:28
+#: ../gtk/parameters.ui.h:29
msgid "Edit"
msgstr ""
-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:30
msgid "Enable"
msgstr "Activado"
-#: ../gtk/parameters.ui.h:30
+#: ../gtk/parameters.ui.h:31
+msgid "Enable adaptive rate control"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:32
msgid "Enable echo cancellation"
msgstr ""
-#: ../gtk/parameters.ui.h:31
+#: ../gtk/parameters.ui.h:33
msgid "Erase all passwords"
msgstr ""
-#: ../gtk/parameters.ui.h:32
+#: ../gtk/parameters.ui.h:34
msgid "Manage SIP Accounts"
msgstr ""
-#: ../gtk/parameters.ui.h:33
+#: ../gtk/parameters.ui.h:35
+msgid "Media encryption type"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:36
msgid "Multimedia settings"
msgstr ""
-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:37
#, fuzzy
msgid "Network settings"
msgstr "Red"
-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:38
#, fuzzy
msgid "Playback device:"
msgstr "Usar dispositivo de sonido:"
-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:39
msgid "Prefered video resolution:"
msgstr ""
-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:40
#, fuzzy
msgid "Public IP address:"
msgstr "Direccion SIP"
-#: ../gtk/parameters.ui.h:38
+#: ../gtk/parameters.ui.h:41
msgid ""
"Register to FONICS\n"
"virtual network !"
msgstr ""
-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:43
msgid "Remove"
msgstr "Borrar"
-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:44
#, fuzzy
msgid "Ring device:"
msgstr "Usar dispositivo de sonido:"
-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:45
#, fuzzy
msgid "Ring sound:"
msgstr "Fuente de grabacion:"
-#: ../gtk/parameters.ui.h:43
-msgid "SIP (TCP):"
+#: ../gtk/parameters.ui.h:46
+msgid "SIP (TCP)"
msgstr ""
-#: ../gtk/parameters.ui.h:44
-msgid "SIP (UDP):"
+#: ../gtk/parameters.ui.h:47
+msgid "SIP (TLS)"
msgstr ""
-#: ../gtk/parameters.ui.h:45
+#: ../gtk/parameters.ui.h:48
+msgid "SIP (UDP)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:49
msgid "Send DTMFs as SIP info"
msgstr ""
-#: ../gtk/parameters.ui.h:46
+#: ../gtk/parameters.ui.h:50
msgid "Set Maximum Transmission Unit:"
msgstr ""
-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:51
msgid "Settings"
msgstr ""
-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:52
msgid "Show advanced settings"
msgstr ""
-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:53
#, fuzzy
msgid "Stun server:"
msgstr "Servidor de Redireccionamiento"
-#: ../gtk/parameters.ui.h:50
+#: ../gtk/parameters.ui.h:54
msgid "This section defines your SIP address when not using a SIP account"
msgstr ""
-#: ../gtk/parameters.ui.h:51
+#: ../gtk/parameters.ui.h:55
msgid "Upload speed limit in Kbit/sec:"
msgstr ""
-#: ../gtk/parameters.ui.h:52
+#: ../gtk/parameters.ui.h:56
msgid "Use IPv6 instead of IPv4"
msgstr ""
-#: ../gtk/parameters.ui.h:53
+#: ../gtk/parameters.ui.h:57
#, fuzzy
msgid "User interface"
msgstr "Manual de Usuario"
-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:58
msgid "Video RTP/UDP:"
msgstr ""
-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:59
#, fuzzy
msgid "Video codecs"
msgstr "Propiedades del codec de Audio"
-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:60
#, fuzzy
msgid "Video input device:"
msgstr "Usar dispositivo de sonido:"
-#: ../gtk/parameters.ui.h:57
+#: ../gtk/parameters.ui.h:61
msgid "Your display name (eg: John Doe):"
msgstr ""
-#: ../gtk/parameters.ui.h:58
+#: ../gtk/parameters.ui.h:62
#, fuzzy
msgid "Your resulting SIP address:"
msgstr "Tu direccion SIP:"
-#: ../gtk/parameters.ui.h:59
+#: ../gtk/parameters.ui.h:63
#, fuzzy
msgid "Your username:"
msgstr "Manual de Usuario"
-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:64
msgid "a sound card"
msgstr ""
-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:65
msgid "default camera"
msgstr ""
-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:66
msgid "default soundcard"
msgstr ""
@@ -1101,26 +1196,19 @@ msgstr "linphone"
msgid "Please wait"
msgstr ""
-#: ../coreapi/linphonecore.c:165
-#, c-format
-msgid "You have missed %i call."
-msgid_plural "You have missed %i calls."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../coreapi/linphonecore.c:206
+#: ../coreapi/linphonecore.c:187
msgid "aborted"
msgstr ""
-#: ../coreapi/linphonecore.c:209
+#: ../coreapi/linphonecore.c:190
msgid "completed"
msgstr ""
-#: ../coreapi/linphonecore.c:212
+#: ../coreapi/linphonecore.c:193
msgid "missed"
msgstr ""
-#: ../coreapi/linphonecore.c:217
+#: ../coreapi/linphonecore.c:198
#, c-format
msgid ""
"%s at %s\n"
@@ -1130,28 +1218,24 @@ msgid ""
"Duration: %i mn %i sec\n"
msgstr ""
-#: ../coreapi/linphonecore.c:218
-msgid "Incoming call"
-msgstr ""
-
-#: ../coreapi/linphonecore.c:218
+#: ../coreapi/linphonecore.c:199
msgid "Outgoing call"
msgstr ""
-#: ../coreapi/linphonecore.c:998
+#: ../coreapi/linphonecore.c:1088
#, fuzzy
msgid "Ready"
msgstr "Preparado."
-#: ../coreapi/linphonecore.c:1773
+#: ../coreapi/linphonecore.c:1831
msgid "Looking for telephone number destination..."
msgstr ""
-#: ../coreapi/linphonecore.c:1776
+#: ../coreapi/linphonecore.c:1834
msgid "Could not resolve this number."
msgstr ""
-#: ../coreapi/linphonecore.c:1820
+#: ../coreapi/linphonecore.c:1878
#, fuzzy
msgid ""
"Could not parse given sip address. A sip url usually looks like sip:"
@@ -1159,54 +1243,41 @@ msgid ""
msgstr ""
"Direccion SIP mal escrita. Una direccion SIP es <sip:username@domainname>"
-#: ../coreapi/linphonecore.c:1967
+#: ../coreapi/linphonecore.c:2025
#, fuzzy
msgid "Contacting"
msgstr "Contactando "
-#: ../coreapi/linphonecore.c:1974
+#: ../coreapi/linphonecore.c:2032
#, fuzzy
msgid "Could not call"
msgstr "No se pudo encontrar el archivo pixmap: %s"
-#: ../coreapi/linphonecore.c:2081
-msgid "Sorry, you have to pause or stop the current call first !"
-msgstr ""
-
-#: ../coreapi/linphonecore.c:2086
+#: ../coreapi/linphonecore.c:2140
msgid "Sorry, we have reached the maximum number of simultaneous calls"
msgstr ""
-#: ../coreapi/linphonecore.c:2208
+#: ../coreapi/linphonecore.c:2270
msgid "Modifying call parameters..."
msgstr ""
-#: ../coreapi/linphonecore.c:2311
+#: ../coreapi/linphonecore.c:2366
msgid "Connected."
msgstr "Conectado."
-#: ../coreapi/linphonecore.c:2334
+#: ../coreapi/linphonecore.c:2389
#, fuzzy
msgid "Call aborted"
msgstr "Llamada cancelada."
-#: ../coreapi/linphonecore.c:2374
-#, fuzzy
-msgid "Call ended"
-msgstr "Llamada cancelada."
-
-#: ../coreapi/linphonecore.c:2456
+#: ../coreapi/linphonecore.c:2530
msgid "Could not pause the call"
msgstr ""
-#: ../coreapi/linphonecore.c:2460
+#: ../coreapi/linphonecore.c:2535
msgid "Pausing the current call..."
msgstr ""
-#: ../coreapi/linphonecore.c:2499
-msgid "There is already a call in process, pause or stop it first."
-msgstr ""
-
#: ../coreapi/misc.c:147
msgid ""
"Your computer appears to be using ALSA sound drivers.\n"
@@ -1287,156 +1358,203 @@ msgstr ""
msgid "Unknown-bug"
msgstr ""
-#: ../coreapi/proxy.c:187
+#: ../coreapi/proxy.c:192
msgid ""
"The sip proxy address you entered is invalid, it must start with \"sip:\" "
"followed by a hostname."
msgstr ""
-#: ../coreapi/proxy.c:193
+#: ../coreapi/proxy.c:198
msgid ""
"The sip identity you entered is invalid.\n"
"It should look like sip:username@proxydomain, such as sip:alice@example.net"
msgstr ""
-#: ../coreapi/proxy.c:671
+#: ../coreapi/proxy.c:690
#, fuzzy, c-format
msgid "Could not login as %s"
msgstr "No se pudo encontrar el archivo pixmap: %s"
-#: ../coreapi/callbacks.c:170
+#: ../coreapi/callbacks.c:206
#, fuzzy
msgid "is contacting you"
msgstr "le esta llamando."
-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207
msgid " and asked autoanswer."
msgstr ""
-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207
msgid "."
msgstr ""
-#: ../coreapi/callbacks.c:226
+#: ../coreapi/callbacks.c:266
#, fuzzy
msgid "Remote ringing."
msgstr "Registrando..."
-#: ../coreapi/callbacks.c:242
+#: ../coreapi/callbacks.c:282
#, fuzzy
msgid "Remote ringing..."
msgstr "Registrando..."
-#: ../coreapi/callbacks.c:253
+#: ../coreapi/callbacks.c:293
msgid "Early media."
msgstr ""
-#: ../coreapi/callbacks.c:291
+#: ../coreapi/callbacks.c:331
#, c-format
msgid "Call with %s is paused."
msgstr ""
-#: ../coreapi/callbacks.c:302
+#: ../coreapi/callbacks.c:342
#, c-format
msgid "Call answered by %s - on hold."
msgstr ""
-#: ../coreapi/callbacks.c:317
+#: ../coreapi/callbacks.c:357
#, fuzzy
msgid "Call resumed."
msgstr "Llamada cancelada."
-#: ../coreapi/callbacks.c:322
+#: ../coreapi/callbacks.c:362
#, fuzzy, c-format
msgid "Call answered by %s."
msgstr ""
"Llamar o\n"
"Responder"
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:432
msgid "We are being paused..."
msgstr ""
-#: ../coreapi/callbacks.c:387
+#: ../coreapi/callbacks.c:436
msgid "We have been resumed..."
msgstr ""
-#: ../coreapi/callbacks.c:424
+#: ../coreapi/callbacks.c:441
+msgid "Call has been updated by remote..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:473
#, fuzzy
msgid "Call terminated."
msgstr "Llamada cancelada."
-#: ../coreapi/callbacks.c:431
+#: ../coreapi/callbacks.c:480
msgid "User is busy."
msgstr "El usuario esta ocupado."
-#: ../coreapi/callbacks.c:432
+#: ../coreapi/callbacks.c:481
msgid "User is temporarily unavailable."
msgstr "El usuario le dice que volvera enseguida."
#. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:434
+#: ../coreapi/callbacks.c:483
msgid "User does not want to be disturbed."
msgstr "El usuario no quiere que lo molesten."
-#: ../coreapi/callbacks.c:435
+#: ../coreapi/callbacks.c:484
msgid "Call declined."
msgstr "Llamada cancelada."
-#: ../coreapi/callbacks.c:447
+#: ../coreapi/callbacks.c:496
msgid "No response."
msgstr ""
-#: ../coreapi/callbacks.c:451
+#: ../coreapi/callbacks.c:500
msgid "Protocol error."
msgstr ""
-#: ../coreapi/callbacks.c:467
+#: ../coreapi/callbacks.c:516
msgid "Redirected"
msgstr ""
-#: ../coreapi/callbacks.c:477
+#: ../coreapi/callbacks.c:526
msgid "Not found"
msgstr ""
-#: ../coreapi/callbacks.c:487
+#: ../coreapi/callbacks.c:551
msgid "No common codecs"
msgstr ""
-#: ../coreapi/callbacks.c:493
+#: ../coreapi/callbacks.c:557
#, fuzzy
msgid "Call failed."
msgstr "Llamada cancelada."
-#: ../coreapi/callbacks.c:557
+#: ../coreapi/callbacks.c:631
#, fuzzy, c-format
msgid "Registration on %s successful."
msgstr "Se ha registrado con exito."
-#: ../coreapi/callbacks.c:558
+#: ../coreapi/callbacks.c:632
#, fuzzy, c-format
msgid "Unregistration on %s done."
msgstr "Se ha registrado con exito."
-#: ../coreapi/callbacks.c:574
+#: ../coreapi/callbacks.c:648
msgid "no response timeout"
msgstr ""
-#: ../coreapi/callbacks.c:577
+#: ../coreapi/callbacks.c:651
#, fuzzy, c-format
msgid "Registration on %s failed: %s"
msgstr "Se ha registrado con exito."
-#: ../coreapi/callbacks.c:619
-#, c-format
-msgid "We are transferred to %s"
-msgstr ""
-
-#: ../coreapi/sal_eXosip2.c:815 ../coreapi/sal_eXosip2.c:817
+#: ../coreapi/sal_eXosip2.c:873 ../coreapi/sal_eXosip2.c:875
#, fuzzy
msgid "Authentication failure"
msgstr "Informacion de codec"
+#: ../coreapi/linphonecall.c:128
+#, fuzzy, c-format
+msgid "Authentication token is %s"
+msgstr "Informacion de codec"
+
+#: ../coreapi/linphonecall.c:1560
+#, c-format
+msgid "You have missed %i call."
+msgid_plural "You have missed %i calls."
+msgstr[0] ""
+msgstr[1] ""
+
+#, fuzzy
+#~ msgid "<b>Contact list</b>"
+#~ msgstr "Contactando "
+
+#, fuzzy
+#~ msgid "Audio & video"
+#~ msgstr "Propiedades del codec de Audio"
+
+#, fuzzy
+#~ msgid "Audio only"
+#~ msgstr "Propiedades del codec de Audio"
+
+#, fuzzy
+#~ msgid "Duration:"
+#~ msgstr "Informacion"
+
+#, fuzzy
+#~ msgid "_Linphone"
+#~ msgstr "linphone"
+
+#, fuzzy
+#~ msgid "gtk-cancel"
+#~ msgstr "Conectado."
+
+#, fuzzy
+#~ msgid "gtk-ok"
+#~ msgstr "Borrar"
+
+#, fuzzy
+#~ msgid "gtk-close"
+#~ msgstr "Conectado."
+
+#, fuzzy
+#~ msgid "<b>Ports</b>"
+#~ msgstr "Contactando "
+
#, fuzzy
#~ msgid "_Modes"
#~ msgstr "Codecs"
@@ -1649,10 +1767,6 @@ msgstr "Informacion de codec"
#~ msgid "Name:"
#~ msgstr "Nombre"
-#, fuzzy
-#~ msgid "None"
-#~ msgstr "Ninguno."
-
#, fuzzy
#~ msgid "Bad sip address: a sip address looks like sip:user@domain"
#~ msgstr ""
@@ -1715,12 +1829,6 @@ msgstr "Informacion de codec"
#~ msgid "Timeout..."
#~ msgstr "Tiempo agotado."
-#, fuzzy
-#~ msgid ""
-#~ "Add address\n"
-#~ "book"
-#~ msgstr "Agenda"
-
#~ msgid "Toggle this if you want to be registered on a remote server."
#~ msgstr "Marcar opcion si desea registrarse en un servidor remoto."
diff --git a/po/fr.po b/po/fr.po
index b1cf01dcb537ca5b38c9b0e6a888ad0c86e19328..3330070e0ce66e4116f5756f5c299bf163263f39 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Linphone 0.9.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-08 22:32+0200\n"
+"POT-Creation-Date: 2011-12-02 16:47+0100\n"
"PO-Revision-Date: 2002-12-06 17:33+0100\n"
"Last-Translator: Simon Morlat <simon.morlat@linphone.org>\n"
"Language-Team: french <fr@li.org>\n"
@@ -15,6 +15,18 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: ../gtk/calllogs.c:71
+msgid "n/a"
+msgstr "inconnu"
+
+#: ../gtk/conference.c:33 ../gtk/incall_view.c:183
+msgid "Conference"
+msgstr "Conférence"
+
+#: ../gtk/conference.c:41
+msgid "Me"
+msgstr "Moi"
+
#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
#, c-format
msgid "Couldn't find pixmap file: %s"
@@ -25,23 +37,27 @@ msgstr "Icone non trouvée: %s"
msgid "Chat with %s"
msgstr "Chat avec %s"
-#: ../gtk/main.c:74
+#: ../gtk/main.c:83
msgid "log to stdout some debug information while running."
msgstr "affiche des informations de debogage"
-#: ../gtk/main.c:81
+#: ../gtk/main.c:90
+msgid "path to a file to write logs into."
+msgstr ""
+
+#: ../gtk/main.c:97
msgid "Start only in the system tray, do not show the main interface."
msgstr "Démarre iconifié, sans interface principale."
-#: ../gtk/main.c:88
+#: ../gtk/main.c:104
msgid "address to call right now"
msgstr "addresse à appeler maintenant"
-#: ../gtk/main.c:95
+#: ../gtk/main.c:111
msgid "if set automatically answer incoming calls"
msgstr "si positionné, répond automatiquement aux appels entrants"
-#: ../gtk/main.c:102
+#: ../gtk/main.c:118
msgid ""
"Specifiy a working directory (should be the base of the installation, eg: c:"
"\\Program Files\\Linphone)"
@@ -49,12 +65,12 @@ msgstr ""
"Spécifie un répertoire de travail (qui devrait être le répertoire "
"d'installation, par exemple c:\\Program Files\\Linphone)"
-#: ../gtk/main.c:442
+#: ../gtk/main.c:464
#, c-format
msgid "Call with %s"
msgstr "Appel avec %s"
-#: ../gtk/main.c:826
+#: ../gtk/main.c:815
#, c-format
msgid ""
"%s would like to add you to his contact list.\n"
@@ -68,7 +84,7 @@ msgstr ""
"Si vous répondez non, cette personne sera mise temporairement sur liste "
"noire."
-#: ../gtk/main.c:904
+#: ../gtk/main.c:893
#, c-format
msgid ""
"Please enter your password for username <i>%s</i>\n"
@@ -77,24 +93,54 @@ msgstr ""
"Entrez le mot de passe pour <i>%s</i>\n"
" sur le domaine <i>%s</i>:"
-#: ../gtk/main.c:1040
+#: ../gtk/main.c:993
+msgid "Call error"
+msgstr "Erreur lors de l'appel"
+
+#: ../gtk/main.c:996 ../coreapi/linphonecore.c:2406
+msgid "Call ended"
+msgstr "Appel terminé."
+
+#: ../gtk/main.c:999 ../coreapi/linphonecore.c:199
+msgid "Incoming call"
+msgstr "Appel entrant"
+
+#: ../gtk/main.c:1001 ../gtk/incall_view.c:292 ../gtk/main.ui.h:20
+msgid "Answer"
+msgstr "Répondre"
+
+#: ../gtk/main.c:1003 ../gtk/main.ui.h:29
+msgid "Decline"
+msgstr "Refuser"
+
+#: ../gtk/main.c:1009
+msgid "Call paused"
+msgstr "Appel en pause"
+
+#: ../gtk/main.c:1009
+#, c-format
+msgid "<span size=\"large\">by %s</span>"
+msgstr ""
+
+#: ../gtk/main.c:1165
msgid "Website link"
msgstr "Lien site web"
-#: ../gtk/main.c:1076
+#: ../gtk/main.c:1205
msgid "Linphone - a video internet phone"
msgstr "Linphone - un téléphone video pour l'internet"
-#: ../gtk/main.c:1095
+#: ../gtk/main.c:1295
#, c-format
msgid "%s (Default)"
msgstr "%s (par défaut)"
-#: ../gtk/main.c:1187
-msgid "Windows"
-msgstr ""
+#: ../gtk/main.c:1566 ../coreapi/callbacks.c:700
+#, c-format
+msgid "We are transferred to %s"
+msgstr "Transfert vers %s"
-#: ../gtk/main.c:1364
+#: ../gtk/main.c:1576
msgid ""
"No sound cards have been detected on this computer.\n"
"You won't be able to send or receive audio calls."
@@ -102,143 +148,167 @@ msgstr ""
"Aucune carte son n'a été détectée sur cet ordinateur.\n"
"Vous ne pourrez pas effectuer d'appels audio."
-#: ../gtk/main.c:1423
+#: ../gtk/main.c:1663
msgid "A free SIP video-phone"
msgstr "Un visiophone libre"
-#: ../gtk/friendlist.c:192 ../gtk/propertybox.c:271 ../gtk/contact.ui.h:3
+#: ../gtk/friendlist.c:203
+msgid "Add to addressbook"
+msgstr ""
+
+#: ../gtk/friendlist.c:258 ../gtk/propertybox.c:296 ../gtk/contact.ui.h:3
msgid "Name"
msgstr "Nom"
-#: ../gtk/friendlist.c:205
+#: ../gtk/friendlist.c:271
msgid "Presence status"
msgstr "Info de présence"
-#: ../gtk/friendlist.c:242
+#: ../gtk/friendlist.c:308
#, c-format
msgid "Search in %s directory"
msgstr "Rechercher dans l'annuaire de %s"
-#: ../gtk/friendlist.c:450
+#: ../gtk/friendlist.c:568
msgid "Invalid sip contact !"
msgstr "Contact sip invalide !"
-#: ../gtk/friendlist.c:495
+#: ../gtk/friendlist.c:613
#, c-format
msgid "Call %s"
msgstr "Appeler %s"
-#: ../gtk/friendlist.c:496
+#: ../gtk/friendlist.c:614
#, c-format
msgid "Send text to %s"
msgstr "Chatter avec %s"
-#: ../gtk/friendlist.c:497
+#: ../gtk/friendlist.c:615
#, c-format
msgid "Edit contact '%s'"
msgstr "Editer le contact '%s'"
-#: ../gtk/friendlist.c:498
+#: ../gtk/friendlist.c:616
#, c-format
msgid "Delete contact '%s'"
msgstr "Supprimer le contact '%s'"
-#: ../gtk/friendlist.c:540
+#: ../gtk/friendlist.c:658
#, c-format
msgid "Add new contact from %s directory"
msgstr "Ajouter un contact depuis l'annuaire %s"
-#: ../gtk/propertybox.c:277
+#: ../gtk/propertybox.c:302
msgid "Rate (Hz)"
msgstr "Fréquence (Hz)"
-#: ../gtk/propertybox.c:283
+#: ../gtk/propertybox.c:308
msgid "Status"
msgstr "Etat"
-#: ../gtk/propertybox.c:289
+#: ../gtk/propertybox.c:314
msgid "Min bitrate (kbit/s)"
msgstr "Débit min. (kbit/s)"
-#: ../gtk/propertybox.c:296
+#: ../gtk/propertybox.c:321
msgid "Parameters"
msgstr "Paramètres"
-#: ../gtk/propertybox.c:326 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507
msgid "Enabled"
msgstr "Activé"
-#: ../gtk/propertybox.c:327 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507
msgid "Disabled"
msgstr "Désactivé"
-#: ../gtk/propertybox.c:510
+#: ../gtk/propertybox.c:553
msgid "Account"
msgstr "Compte"
-#: ../gtk/propertybox.c:650
+#: ../gtk/propertybox.c:693
msgid "English"
msgstr ""
-#: ../gtk/propertybox.c:651
+#: ../gtk/propertybox.c:694
msgid "French"
msgstr "Français"
-#: ../gtk/propertybox.c:652
+#: ../gtk/propertybox.c:695
msgid "Swedish"
msgstr ""
-#: ../gtk/propertybox.c:653
+#: ../gtk/propertybox.c:696
msgid "Italian"
msgstr ""
-#: ../gtk/propertybox.c:654
+#: ../gtk/propertybox.c:697
msgid "Spanish"
msgstr ""
-#: ../gtk/propertybox.c:655
+#: ../gtk/propertybox.c:698
msgid "Brazilian Portugese"
msgstr ""
-#: ../gtk/propertybox.c:656
+#: ../gtk/propertybox.c:699
msgid "Polish"
msgstr ""
-#: ../gtk/propertybox.c:657
+#: ../gtk/propertybox.c:700
msgid "German"
msgstr ""
-#: ../gtk/propertybox.c:658
+#: ../gtk/propertybox.c:701
msgid "Russian"
msgstr ""
-#: ../gtk/propertybox.c:659
+#: ../gtk/propertybox.c:702
msgid "Japanese"
msgstr "日本語"
-#: ../gtk/propertybox.c:660
+#: ../gtk/propertybox.c:703
msgid "Dutch"
msgstr ""
-#: ../gtk/propertybox.c:661
+#: ../gtk/propertybox.c:704
msgid "Hungarian"
msgstr ""
-#: ../gtk/propertybox.c:662
+#: ../gtk/propertybox.c:705
msgid "Czech"
msgstr ""
-#: ../gtk/propertybox.c:663
+#: ../gtk/propertybox.c:706
msgid "Chinese"
msgstr "简体ä¸æ–‡"
-#: ../gtk/propertybox.c:720
+#: ../gtk/propertybox.c:707
+msgid "Traditional Chinese"
+msgstr ""
+
+#: ../gtk/propertybox.c:708
+msgid "Norwegian"
+msgstr ""
+
+#: ../gtk/propertybox.c:765
msgid ""
"You need to restart linphone for the new language selection to take effect."
msgstr ""
"La nouvelle selection de langue prendra effet au prochain démarrage de "
"linphone."
+#: ../gtk/propertybox.c:835
+msgid "None"
+msgstr ""
+
+#: ../gtk/propertybox.c:839
+msgid "SRTP"
+msgstr ""
+
+#: ../gtk/propertybox.c:845
+msgid "ZRTP"
+msgstr ""
+
#: ../gtk/update.c:80
#, c-format
msgid ""
@@ -333,9 +403,8 @@ msgid "Account setup assistant"
msgstr ""
#: ../gtk/setupwizard.c:236
-#, fuzzy
msgid "Choosing a username"
-msgstr "Votre nom d'utilisateur"
+msgstr "Choix du nom d'utilisateur"
#: ../gtk/setupwizard.c:240
msgid "Verifying"
@@ -354,74 +423,99 @@ msgstr ""
msgid "Now ready !"
msgstr ""
-#: ../gtk/incall_view.c:61
-#, fuzzy, c-format
+#: ../gtk/incall_view.c:69
+#, c-format
msgid "Call #%i"
-msgstr "Appeler %s"
+msgstr "Appel #%i"
-#: ../gtk/incall_view.c:87
+#: ../gtk/incall_view.c:127
#, c-format
msgid "Transfer to call #%i with %s"
-msgstr ""
+msgstr "Transférer vers l'appel #%i avec %s"
-#: ../gtk/incall_view.c:113
+#: ../gtk/incall_view.c:155
msgid "Transfer"
msgstr "Transfert"
-#: ../gtk/incall_view.c:187
+#: ../gtk/incall_view.c:271
msgid "<b>Calling...</b>"
-msgstr "<b>Appel en cours</b>"
+msgstr "<b>Tentative d'appel...</b>"
-#: ../gtk/incall_view.c:190 ../gtk/incall_view.c:246
+#: ../gtk/incall_view.c:274 ../gtk/incall_view.c:482
msgid "00::00::00"
msgstr ""
-#: ../gtk/incall_view.c:206
+#: ../gtk/incall_view.c:285
msgid "<b>Incoming call</b>"
msgstr "<b>Appel entrant</b>"
-#: ../gtk/incall_view.c:216
-msgid ""
-"Pause all calls\n"
-"and answer"
-msgstr ""
-"Pauser les appels en cours\n"
-"et répondre"
+#: ../gtk/incall_view.c:322
+msgid "good"
+msgstr "bon"
-#: ../gtk/incall_view.c:217 ../gtk/main.ui.h:20
-msgid "Answer"
-msgstr "Répondre"
+#: ../gtk/incall_view.c:324
+msgid "average"
+msgstr "moyen"
+
+#: ../gtk/incall_view.c:326
+msgid "poor"
+msgstr "faible"
+
+#: ../gtk/incall_view.c:328
+msgid "very poor"
+msgstr "très faible"
-#: ../gtk/incall_view.c:244
+#: ../gtk/incall_view.c:330
+msgid "too bad"
+msgstr "nulle"
+
+#: ../gtk/incall_view.c:331 ../gtk/incall_view.c:347
+msgid "unavailable"
+msgstr "indisponible"
+
+#: ../gtk/incall_view.c:447
+msgid "Secured by SRTP"
+msgstr "Sécurisé par SRTP"
+
+#: ../gtk/incall_view.c:453
+#, c-format
+msgid "Secured by ZRTP - [auth token: %s]"
+msgstr "Sécurisé par ZRTP- [jeton: %s]"
+
+#: ../gtk/incall_view.c:459
+msgid "Set unverified"
+msgstr "Marquer comme non vérifié"
+
+#: ../gtk/incall_view.c:459 ../gtk/main.ui.h:49
+msgid "Set verified"
+msgstr "Marquer comme vérifié"
+
+#: ../gtk/incall_view.c:480
+msgid "In conference"
+msgstr "En conférence"
+
+#: ../gtk/incall_view.c:480
msgid "<b>In call</b>"
msgstr "<b>Appel en cours</b>"
-#: ../gtk/incall_view.c:260
+#: ../gtk/incall_view.c:499
msgid "<b>Paused call</b>"
msgstr "<b>Appel en attente</b>"
-#: ../gtk/incall_view.c:272
+#: ../gtk/incall_view.c:511
#, c-format
msgid "%02i::%02i::%02i"
msgstr ""
-#: ../gtk/incall_view.c:288
+#: ../gtk/incall_view.c:527
msgid "<b>Call ended.</b>"
msgstr "<b>Appel terminé.</b>"
-#: ../gtk/incall_view.c:309
-msgid "Unmute"
-msgstr ""
-
-#: ../gtk/incall_view.c:316 ../gtk/main.ui.h:42
-msgid "Mute"
-msgstr ""
-
-#: ../gtk/incall_view.c:340
+#: ../gtk/incall_view.c:584
msgid "Resume"
msgstr "Reprendre"
-#: ../gtk/incall_view.c:347 ../gtk/main.ui.h:46
+#: ../gtk/incall_view.c:591 ../gtk/main.ui.h:45
msgid "Pause"
msgstr "Pause"
@@ -483,8 +577,8 @@ msgid "<b>Add contacts from directory</b>"
msgstr "<b>Ajouter un contact depuis l'annuaire</b>"
#: ../gtk/main.ui.h:14
-msgid "<b>Contact list</b>"
-msgstr "<b>Liste de contacts</b>"
+msgid "<b>Callee name</b>"
+msgstr "<b>Nom du correspondant</b>"
#: ../gtk/main.ui.h:15
msgid "<b>Welcome !</b>"
@@ -507,25 +601,25 @@ msgid "All users"
msgstr "Tous"
#: ../gtk/main.ui.h:21
-msgid "Audio & video"
-msgstr "Audio et video"
-
-#: ../gtk/main.ui.h:22
-msgid "Audio only"
-msgstr "Audio seul"
-
-#: ../gtk/main.ui.h:23
msgid "Automatically log me in"
msgstr "Me connecter automatiquement"
-#: ../gtk/main.ui.h:24
+#: ../gtk/main.ui.h:22
msgid "B"
msgstr ""
-#: ../gtk/main.ui.h:25 ../gtk/parameters.ui.h:20
+#: ../gtk/main.ui.h:23 ../gtk/parameters.ui.h:21
msgid "C"
msgstr ""
+#: ../gtk/main.ui.h:24
+msgid "Call"
+msgstr "Appeler"
+
+#: ../gtk/main.ui.h:25
+msgid "Call quality rating"
+msgstr "Qualité de l'appel"
+
#: ../gtk/main.ui.h:26
msgid "Check _Updates"
msgstr ""
@@ -538,10 +632,6 @@ msgstr "Contacts"
msgid "D"
msgstr ""
-#: ../gtk/main.ui.h:29
-msgid "Decline"
-msgstr "Refuser"
-
#: ../gtk/main.ui.h:30
msgid "Default"
msgstr "Par défaut"
@@ -551,13 +641,13 @@ msgid "Duration"
msgstr "Durée"
#: ../gtk/main.ui.h:32
-msgid "Duration:"
-msgstr "Durée:"
-
-#: ../gtk/main.ui.h:33
msgid "Enable self-view"
msgstr "Se voir"
+#: ../gtk/main.ui.h:33
+msgid "Enable video"
+msgstr "Activer la video"
+
#: ../gtk/main.ui.h:34
msgid "Enter username, phone number, or full sip address"
msgstr ""
@@ -591,18 +681,22 @@ msgstr "Information de login"
msgid "Lookup:"
msgstr "Rechercher:"
-#: ../gtk/main.ui.h:43
-msgid "My current default identity:"
-msgstr "Mon identité sip par défaut :"
+#: ../gtk/main.ui.h:42
+msgid "My current identity:"
+msgstr "Mon identité sip:"
-#: ../gtk/main.ui.h:44
+#: ../gtk/main.ui.h:43
msgid "Online users"
msgstr "En ligne"
-#: ../gtk/main.ui.h:45
+#: ../gtk/main.ui.h:44
msgid "Password"
msgstr "Mot de passe"
+#: ../gtk/main.ui.h:46
+msgid "Recent calls"
+msgstr "Appels récents"
+
#: ../gtk/main.ui.h:47
msgid "SIP address or phone number:"
msgstr "Addresse SIP ou numéro"
@@ -611,19 +705,14 @@ msgstr "Addresse SIP ou numéro"
msgid "Search"
msgstr "Rechercher"
-#: ../gtk/main.ui.h:49
+#: ../gtk/main.ui.h:50
msgid "Show debug window"
msgstr "Fenêtre de débogage"
-#: ../gtk/main.ui.h:50
+#: ../gtk/main.ui.h:51
msgid "Username"
msgstr "Nom d'utilisateur"
-#: ../gtk/main.ui.h:51
-#, fuzzy
-msgid "_Call history"
-msgstr "Historique des appels"
-
#: ../gtk/main.ui.h:52
msgid "_Help"
msgstr "_Aide"
@@ -633,18 +722,14 @@ msgid "_Homepage"
msgstr "_Site web"
#: ../gtk/main.ui.h:54
-msgid "_Linphone"
-msgstr "_Linphone"
-
-#: ../gtk/main.ui.h:55
msgid "_Options"
msgstr ""
-#: ../gtk/main.ui.h:56
+#: ../gtk/main.ui.h:55
msgid "in"
msgstr "dans"
-#: ../gtk/main.ui.h:57
+#: ../gtk/main.ui.h:56
msgid "label"
msgstr ""
@@ -691,14 +776,6 @@ msgstr "Adresse SIP"
msgid "Show this contact presence status"
msgstr "Voir l'état de présence de ce contact"
-#: ../gtk/contact.ui.h:6
-msgid "gtk-cancel"
-msgstr ""
-
-#: ../gtk/contact.ui.h:7
-msgid "gtk-ok"
-msgstr ""
-
#: ../gtk/log.ui.h:1
msgid "Linphone debug window"
msgstr "Fenêtre de débogage de linphone"
@@ -752,8 +829,8 @@ msgid "Publish presence information"
msgstr "Publier la présence"
#: ../gtk/sip_account.ui.h:6
-msgid "Register at startup"
-msgstr "S'enregistrer au démarrage"
+msgid "Register"
+msgstr "S'enregistrer"
#: ../gtk/sip_account.ui.h:7
msgid "Registration duration (sec):"
@@ -779,10 +856,6 @@ msgstr ""
msgid "Send"
msgstr "Envoyer"
-#: ../gtk/chatroom.ui.h:2
-msgid "gtk-close"
-msgstr ""
-
#: ../gtk/parameters.ui.h:1
msgid "0 stands for \"unlimited\""
msgstr "Indiquez 0 pour ne pas mettre de limite"
@@ -816,8 +889,8 @@ msgid "<b>NAT and Firewall</b>"
msgstr "<b>Paramètres liés au pare-feu</b>"
#: ../gtk/parameters.ui.h:9
-msgid "<b>Ports</b>"
-msgstr "<b>Ports utilisés</b>"
+msgid "<b>Network protocol and ports</b>"
+msgstr "<b>Protocoles réseaux et ports</b>"
#: ../gtk/parameters.ui.h:10
msgid "<b>Privacy</b>"
@@ -836,194 +909,212 @@ msgid "<b>Video</b>"
msgstr "<b>Video</b>"
#: ../gtk/parameters.ui.h:14
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
+msgstr "<i>Le control de débit adaptatif est une technique pour adapter la qualité de l'audio et de la video en fonction de la bande passante disponible, durant l'appel.</i>"
+
+#: ../gtk/parameters.ui.h:15
msgid "ALSA special device (optional):"
msgstr ""
-#: ../gtk/parameters.ui.h:15
+#: ../gtk/parameters.ui.h:16
msgid "Add"
msgstr "Ajouter"
-#: ../gtk/parameters.ui.h:16
+#: ../gtk/parameters.ui.h:17
msgid "Audio RTP/UDP:"
msgstr ""
-#: ../gtk/parameters.ui.h:17
+#: ../gtk/parameters.ui.h:18
msgid "Audio codecs"
msgstr "Codecs audio"
-#: ../gtk/parameters.ui.h:18
+#: ../gtk/parameters.ui.h:19
msgid "Behind NAT / Firewall (specify gateway IP below)"
msgstr "Derrière un pare-feu (spécifier la passerelle ci dessous)"
-#: ../gtk/parameters.ui.h:19
+#: ../gtk/parameters.ui.h:20
msgid "Behind NAT / Firewall (use STUN to resolve)"
msgstr "Derrière un pare-feu (utiliser STUN)"
-#: ../gtk/parameters.ui.h:21
+#: ../gtk/parameters.ui.h:22
msgid "CIF"
msgstr ""
-#: ../gtk/parameters.ui.h:22
+#: ../gtk/parameters.ui.h:23
msgid "Capture device:"
msgstr "Périphérique de capture:"
-#: ../gtk/parameters.ui.h:23
+#: ../gtk/parameters.ui.h:24
msgid "Codecs"
msgstr ""
-#: ../gtk/parameters.ui.h:24
+#: ../gtk/parameters.ui.h:25
msgid "Direct connection to the Internet"
msgstr "Connection directe à l'Internet"
-#: ../gtk/parameters.ui.h:25
+#: ../gtk/parameters.ui.h:26
msgid "Disable"
msgstr "Désactiver"
-#: ../gtk/parameters.ui.h:26
+#: ../gtk/parameters.ui.h:27
msgid "Done"
msgstr "Fermer"
-#: ../gtk/parameters.ui.h:27
+#: ../gtk/parameters.ui.h:28
msgid "Download speed limit in Kbit/sec:"
msgstr "Limite de débit descendant en kbits/sec:"
-#: ../gtk/parameters.ui.h:28
+#: ../gtk/parameters.ui.h:29
msgid "Edit"
msgstr "Editer"
-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:30
msgid "Enable"
msgstr "Activer"
-#: ../gtk/parameters.ui.h:30
+#: ../gtk/parameters.ui.h:31
+msgid "Enable adaptive rate control"
+msgstr "Activer le control de débit adaptatif."
+
+#: ../gtk/parameters.ui.h:32
msgid "Enable echo cancellation"
msgstr "Activer l'annulation d'écho"
-#: ../gtk/parameters.ui.h:31
+#: ../gtk/parameters.ui.h:33
msgid "Erase all passwords"
msgstr "Effacer tous les mots de passe"
-#: ../gtk/parameters.ui.h:32
+#: ../gtk/parameters.ui.h:34
msgid "Manage SIP Accounts"
msgstr "Gérer mes comptes SIP"
-#: ../gtk/parameters.ui.h:33
+#: ../gtk/parameters.ui.h:35
+msgid "Media encryption type"
+msgstr "Type d'encryption media"
+
+#: ../gtk/parameters.ui.h:36
msgid "Multimedia settings"
msgstr "Paramètres multimedia"
-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:37
msgid "Network settings"
msgstr "Paramètres réseau"
-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:38
msgid "Playback device:"
msgstr "Périphérique d'écoute:"
-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:39
msgid "Prefered video resolution:"
msgstr "Résolution video préférée:"
-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:40
msgid "Public IP address:"
msgstr "Addresse IP publique:"
-#: ../gtk/parameters.ui.h:38
+#: ../gtk/parameters.ui.h:41
msgid ""
"Register to FONICS\n"
"virtual network !"
msgstr ""
-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:43
msgid "Remove"
msgstr "Enlever"
-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:44
msgid "Ring device:"
msgstr "Périphérique de sonnerie:"
-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:45
msgid "Ring sound:"
msgstr "Sonnerie:"
-#: ../gtk/parameters.ui.h:43
-msgid "SIP (TCP):"
+#: ../gtk/parameters.ui.h:46
+msgid "SIP (TCP)"
msgstr ""
-#: ../gtk/parameters.ui.h:44
-msgid "SIP (UDP):"
+#: ../gtk/parameters.ui.h:47
+msgid "SIP (TLS)"
msgstr ""
-#: ../gtk/parameters.ui.h:45
+#: ../gtk/parameters.ui.h:48
+msgid "SIP (UDP)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:49
msgid "Send DTMFs as SIP info"
msgstr "Envoyer les digits en tant que SIP INFO"
-#: ../gtk/parameters.ui.h:46
+#: ../gtk/parameters.ui.h:50
msgid "Set Maximum Transmission Unit:"
msgstr "Spécifier la Maximum Transmission Unit"
-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:51
msgid "Settings"
msgstr "Réglages"
-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:52
msgid "Show advanced settings"
msgstr "Montrer les réglages avancés"
-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:53
msgid "Stun server:"
msgstr "Serveur STUN:"
-#: ../gtk/parameters.ui.h:50
+#: ../gtk/parameters.ui.h:54
msgid "This section defines your SIP address when not using a SIP account"
msgstr ""
"Cette rubrique permet de définir son addresse SIP lorsqu'on ne possède pas "
"de compte SIP"
-#: ../gtk/parameters.ui.h:51
+#: ../gtk/parameters.ui.h:55
msgid "Upload speed limit in Kbit/sec:"
msgstr "Limite de débit montant en kbits/sec:"
-#: ../gtk/parameters.ui.h:52
+#: ../gtk/parameters.ui.h:56
msgid "Use IPv6 instead of IPv4"
msgstr "Utiliser l'IPv6 au lieu d'IPv4"
-#: ../gtk/parameters.ui.h:53
+#: ../gtk/parameters.ui.h:57
msgid "User interface"
msgstr "Interface utilisateur"
-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:58
msgid "Video RTP/UDP:"
msgstr ""
-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:59
msgid "Video codecs"
msgstr "Codecs video"
-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:60
msgid "Video input device:"
msgstr "Périphérique d'entrée video"
-#: ../gtk/parameters.ui.h:57
+#: ../gtk/parameters.ui.h:61
msgid "Your display name (eg: John Doe):"
msgstr "Votre nom d'affichage (ex: John Doe)"
-#: ../gtk/parameters.ui.h:58
+#: ../gtk/parameters.ui.h:62
msgid "Your resulting SIP address:"
msgstr "Votre addresse SIP:"
-#: ../gtk/parameters.ui.h:59
+#: ../gtk/parameters.ui.h:63
msgid "Your username:"
msgstr "Votre nom d'utilisateur:"
-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:64
msgid "a sound card"
msgstr "une carte son"
-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:65
msgid "default camera"
msgstr "camera par défaut"
-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:66
msgid "default soundcard"
msgstr "Carte son par défaut"
@@ -1047,26 +1138,19 @@ msgstr "Linphone"
msgid "Please wait"
msgstr "En attente"
-#: ../coreapi/linphonecore.c:165
-#, c-format
-msgid "You have missed %i call."
-msgid_plural "You have missed %i calls."
-msgstr[0] "Vous avez manqué %i appel"
-msgstr[1] "Vous avez manqué %i appels"
-
-#: ../coreapi/linphonecore.c:206
+#: ../coreapi/linphonecore.c:187
msgid "aborted"
msgstr "abandonné"
-#: ../coreapi/linphonecore.c:209
+#: ../coreapi/linphonecore.c:190
msgid "completed"
msgstr "terminé"
-#: ../coreapi/linphonecore.c:212
+#: ../coreapi/linphonecore.c:193
msgid "missed"
msgstr "manqué"
-#: ../coreapi/linphonecore.c:217
+#: ../coreapi/linphonecore.c:198
#, c-format
msgid ""
"%s at %s\n"
@@ -1081,79 +1165,61 @@ msgstr ""
"Etat: %s\n"
"Durée: %i mn %i sec\n"
-#: ../coreapi/linphonecore.c:218
-msgid "Incoming call"
-msgstr "Appel entrant"
-
-#: ../coreapi/linphonecore.c:218
+#: ../coreapi/linphonecore.c:199
msgid "Outgoing call"
msgstr "Appel sortant"
-#: ../coreapi/linphonecore.c:998
+#: ../coreapi/linphonecore.c:1088
msgid "Ready"
msgstr "Prêt."
-#: ../coreapi/linphonecore.c:1773
+#: ../coreapi/linphonecore.c:1831
msgid "Looking for telephone number destination..."
msgstr "Recherche de la destination du numéro de téléphone..."
-#: ../coreapi/linphonecore.c:1776
+#: ../coreapi/linphonecore.c:1834
msgid "Could not resolve this number."
msgstr "La destination n'a pu être trouvée."
-#: ../coreapi/linphonecore.c:1820
+#: ../coreapi/linphonecore.c:1878
msgid ""
"Could not parse given sip address. A sip url usually looks like sip:"
"user@domain"
msgstr ""
"Adresse SIP mal formulée. Une address sip ressemble à <sip:nom@domaine>"
-#: ../coreapi/linphonecore.c:1967
+#: ../coreapi/linphonecore.c:2025
msgid "Contacting"
msgstr "Appel de"
-#: ../coreapi/linphonecore.c:1974
+#: ../coreapi/linphonecore.c:2032
msgid "Could not call"
msgstr "Echec de l'appel"
-#: ../coreapi/linphonecore.c:2081
-msgid "Sorry, you have to pause or stop the current call first !"
-msgstr "Désolé, vous devez d'abord mettre en attente l'appel en cours."
-
-#: ../coreapi/linphonecore.c:2086
+#: ../coreapi/linphonecore.c:2140
msgid "Sorry, we have reached the maximum number of simultaneous calls"
-msgstr ""
+msgstr "Désolé, le nombre maximum d'appels simultanés est atteint."
-#: ../coreapi/linphonecore.c:2208
+#: ../coreapi/linphonecore.c:2270
msgid "Modifying call parameters..."
msgstr "Modifications des paramètres d'appels..."
-#: ../coreapi/linphonecore.c:2311
+#: ../coreapi/linphonecore.c:2366
msgid "Connected."
msgstr "En ligne."
-#: ../coreapi/linphonecore.c:2334
+#: ../coreapi/linphonecore.c:2389
msgid "Call aborted"
msgstr "Appel abandonné"
-#: ../coreapi/linphonecore.c:2374
-msgid "Call ended"
-msgstr "Appel terminé."
-
-#: ../coreapi/linphonecore.c:2456
+#: ../coreapi/linphonecore.c:2530
msgid "Could not pause the call"
msgstr "La mise en attente a échoué"
-#: ../coreapi/linphonecore.c:2460
+#: ../coreapi/linphonecore.c:2535
msgid "Pausing the current call..."
msgstr "Mise en attente de l'appel..."
-#: ../coreapi/linphonecore.c:2499
-msgid "There is already a call in process, pause or stop it first."
-msgstr ""
-"Il y a déjà un appel en cours, veuillez d'abord le mettre en attente ou le "
-"raccrocher."
-
#: ../coreapi/misc.c:147
msgid ""
"Your computer appears to be using ALSA sound drivers.\n"
@@ -1231,7 +1297,7 @@ msgstr "En attente"
msgid "Unknown-bug"
msgstr "Bug inconnu"
-#: ../coreapi/proxy.c:187
+#: ../coreapi/proxy.c:192
msgid ""
"The sip proxy address you entered is invalid, it must start with \"sip:\" "
"followed by a hostname."
@@ -1239,7 +1305,7 @@ msgstr ""
"L'addresse SIP du proxy est invalide. Elle doit commencer par \"sip:\" "
"suivie par un nom de domaine."
-#: ../coreapi/proxy.c:193
+#: ../coreapi/proxy.c:198
msgid ""
"The sip identity you entered is invalid.\n"
"It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1248,131 +1314,182 @@ msgstr ""
"Elle doit être de la forme sip:username@domain, comme par example sip:"
"alice@example.net"
-#: ../coreapi/proxy.c:671
+#: ../coreapi/proxy.c:690
#, c-format
msgid "Could not login as %s"
msgstr "Echec de la connexion en tant que %s"
-#: ../coreapi/callbacks.c:170
+#: ../coreapi/callbacks.c:206
msgid "is contacting you"
msgstr "vous appelle"
-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207
msgid " and asked autoanswer."
msgstr "et sollicite un décrochage automatique."
-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207
msgid "."
msgstr ""
-#: ../coreapi/callbacks.c:226
+#: ../coreapi/callbacks.c:266
msgid "Remote ringing."
msgstr "Sonnerie distante."
-#: ../coreapi/callbacks.c:242
+#: ../coreapi/callbacks.c:282
msgid "Remote ringing..."
msgstr "Sonnerie distante..."
-#: ../coreapi/callbacks.c:253
+#: ../coreapi/callbacks.c:293
msgid "Early media."
msgstr "Prise d'appel anticipée"
-#: ../coreapi/callbacks.c:291
+#: ../coreapi/callbacks.c:331
#, c-format
msgid "Call with %s is paused."
msgstr "%s est maintenant en attente."
-#: ../coreapi/callbacks.c:302
+#: ../coreapi/callbacks.c:342
#, c-format
msgid "Call answered by %s - on hold."
msgstr "Appel répondu par %s - en attente"
-#: ../coreapi/callbacks.c:317
+#: ../coreapi/callbacks.c:357
msgid "Call resumed."
msgstr "Appel repris."
-#: ../coreapi/callbacks.c:322
+#: ../coreapi/callbacks.c:362
#, c-format
msgid "Call answered by %s."
msgstr "Appel répondu par %s."
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:432
msgid "We are being paused..."
msgstr "Mise en attente..."
-#: ../coreapi/callbacks.c:387
+#: ../coreapi/callbacks.c:436
msgid "We have been resumed..."
msgstr "Reprise..."
-#: ../coreapi/callbacks.c:424
+#: ../coreapi/callbacks.c:441
+msgid "Call has been updated by remote..."
+msgstr "L'appel a été repris par le correspondant."
+
+#: ../coreapi/callbacks.c:473
msgid "Call terminated."
msgstr "Appel terminé."
-#: ../coreapi/callbacks.c:431
+#: ../coreapi/callbacks.c:480
msgid "User is busy."
msgstr "Occupé..."
-#: ../coreapi/callbacks.c:432
+#: ../coreapi/callbacks.c:481
msgid "User is temporarily unavailable."
msgstr "L'usager est temporairement indisponible."
#. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:434
+#: ../coreapi/callbacks.c:483
msgid "User does not want to be disturbed."
msgstr "L'usager ne souhaite pas être dérangé"
-#: ../coreapi/callbacks.c:435
+#: ../coreapi/callbacks.c:484
msgid "Call declined."
msgstr "Appel décliné."
-#: ../coreapi/callbacks.c:447
+#: ../coreapi/callbacks.c:496
msgid "No response."
msgstr "Pas de réponse."
-#: ../coreapi/callbacks.c:451
+#: ../coreapi/callbacks.c:500
msgid "Protocol error."
msgstr "Erreur de protocole"
-#: ../coreapi/callbacks.c:467
+#: ../coreapi/callbacks.c:516
msgid "Redirected"
msgstr "Redirection"
-#: ../coreapi/callbacks.c:477
+#: ../coreapi/callbacks.c:526
msgid "Not found"
msgstr "Non trouvé"
-#: ../coreapi/callbacks.c:487
+#: ../coreapi/callbacks.c:551
msgid "No common codecs"
msgstr "Pas de codecs commun"
-#: ../coreapi/callbacks.c:493
+#: ../coreapi/callbacks.c:557
msgid "Call failed."
msgstr "L'appel a échoué."
-#: ../coreapi/callbacks.c:557
+#: ../coreapi/callbacks.c:631
#, c-format
msgid "Registration on %s successful."
msgstr "Enregistrement sur %s effectué."
-#: ../coreapi/callbacks.c:558
+#: ../coreapi/callbacks.c:632
#, c-format
msgid "Unregistration on %s done."
msgstr "Désenregistrement sur %s effectué."
-#: ../coreapi/callbacks.c:574
+#: ../coreapi/callbacks.c:648
msgid "no response timeout"
msgstr "Pas de réponse"
-#: ../coreapi/callbacks.c:577
+#: ../coreapi/callbacks.c:651
#, c-format
msgid "Registration on %s failed: %s"
msgstr "Echec de l'enregistrement sur %s: %s"
-#: ../coreapi/callbacks.c:619
-#, c-format
-msgid "We are transferred to %s"
-msgstr "Transfert vers %s"
-
-#: ../coreapi/sal_eXosip2.c:815 ../coreapi/sal_eXosip2.c:817
+#: ../coreapi/sal_eXosip2.c:873 ../coreapi/sal_eXosip2.c:875
msgid "Authentication failure"
msgstr "Echec d'authentification"
+
+#: ../coreapi/linphonecall.c:128
+#, c-format
+msgid "Authentication token is %s"
+msgstr "Le jeton d'authentification est %s"
+
+#: ../coreapi/linphonecall.c:1560
+#, c-format
+msgid "You have missed %i call."
+msgid_plural "You have missed %i calls."
+msgstr[0] "Vous avez manqué %i appel"
+msgstr[1] "Vous avez manqué %i appels"
+
+#~ msgid ""
+#~ "Pause all calls\n"
+#~ "and answer"
+#~ msgstr ""
+#~ "Pauser les appels en cours\n"
+#~ "et répondre"
+
+#~ msgid "<b>Contact list</b>"
+#~ msgstr "<b>Liste de contacts</b>"
+
+#~ msgid "Audio & video"
+#~ msgstr "Audio et video"
+
+#~ msgid "Audio only"
+#~ msgstr "Audio seul"
+
+#~ msgid "Duration:"
+#~ msgstr "Durée:"
+
+#, fuzzy
+#~ msgid "_Call history"
+#~ msgstr "Historique des appels"
+
+#~ msgid "_Linphone"
+#~ msgstr "_Linphone"
+
+#~ msgid "Register at startup"
+#~ msgstr "S'enregistrer au démarrage"
+
+#~ msgid "<b>Ports</b>"
+#~ msgstr "<b>Ports utilisés</b>"
+
+#~ msgid "Sorry, you have to pause or stop the current call first !"
+#~ msgstr "Désolé, vous devez d'abord mettre en attente l'appel en cours."
+
+#~ msgid "There is already a call in process, pause or stop it first."
+#~ msgstr ""
+#~ "Il y a déjà un appel en cours, veuillez d'abord le mettre en attente ou "
+#~ "le raccrocher."
diff --git a/po/hu.po b/po/hu.po
index 184a34e84db69bd17301259d6252dcdb946c73d8..810bd43f2dfff8ada1296d29dc1a893176749578 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-08 22:32+0200\n"
+"POT-Creation-Date: 2011-12-02 16:47+0100\n"
"PO-Revision-Date: 2007-12-14 11:12+0100\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,6 +16,18 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: ../gtk/calllogs.c:71
+msgid "n/a"
+msgstr ""
+
+#: ../gtk/conference.c:33 ../gtk/incall_view.c:183
+msgid "Conference"
+msgstr ""
+
+#: ../gtk/conference.c:41
+msgid "Me"
+msgstr ""
+
#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
#, c-format
msgid "Couldn't find pixmap file: %s"
@@ -26,34 +38,38 @@ msgstr "Nemtalálható a pixmap fájl: %s"
msgid "Chat with %s"
msgstr "Chat-elés %s -el"
-#: ../gtk/main.c:74
+#: ../gtk/main.c:83
msgid "log to stdout some debug information while running."
msgstr ""
-#: ../gtk/main.c:81
+#: ../gtk/main.c:90
+msgid "path to a file to write logs into."
+msgstr ""
+
+#: ../gtk/main.c:97
msgid "Start only in the system tray, do not show the main interface."
msgstr ""
-#: ../gtk/main.c:88
+#: ../gtk/main.c:104
msgid "address to call right now"
msgstr ""
-#: ../gtk/main.c:95
+#: ../gtk/main.c:111
msgid "if set automatically answer incoming calls"
msgstr ""
-#: ../gtk/main.c:102
+#: ../gtk/main.c:118
msgid ""
"Specifiy a working directory (should be the base of the installation, eg: c:"
"\\Program Files\\Linphone)"
msgstr ""
-#: ../gtk/main.c:442
+#: ../gtk/main.c:464
#, fuzzy, c-format
msgid "Call with %s"
msgstr "Chat-elés %s -el"
-#: ../gtk/main.c:826
+#: ../gtk/main.c:815
#, c-format
msgid ""
"%s would like to add you to his contact list.\n"
@@ -62,171 +78,229 @@ msgid ""
"If you answer no, this person will be temporarily blacklisted."
msgstr ""
-#: ../gtk/main.c:904
+#: ../gtk/main.c:893
#, c-format
msgid ""
"Please enter your password for username <i>%s</i>\n"
" at domain <i>%s</i>:"
msgstr ""
-#: ../gtk/main.c:1040
+#: ../gtk/main.c:993
+#, fuzzy
+msgid "Call error"
+msgstr "Linphone - HÃváselÅ‘zmények"
+
+#: ../gtk/main.c:996 ../coreapi/linphonecore.c:2406
+msgid "Call ended"
+msgstr "HÃvás vége"
+
+#: ../gtk/main.c:999 ../coreapi/linphonecore.c:199
+msgid "Incoming call"
+msgstr "BeérkezÅ‘ hÃvás"
+
+#: ../gtk/main.c:1001 ../gtk/incall_view.c:292 ../gtk/main.ui.h:20
+msgid "Answer"
+msgstr ""
+
+#: ../gtk/main.c:1003 ../gtk/main.ui.h:29
+#, fuzzy
+msgid "Decline"
+msgstr "line"
+
+#: ../gtk/main.c:1009
+#, fuzzy
+msgid "Call paused"
+msgstr "megszakÃtva"
+
+#: ../gtk/main.c:1009
+#, c-format
+msgid "<span size=\"large\">by %s</span>"
+msgstr ""
+
+#: ../gtk/main.c:1165
msgid "Website link"
msgstr ""
-#: ../gtk/main.c:1076
+#: ../gtk/main.c:1205
msgid "Linphone - a video internet phone"
msgstr ""
-#: ../gtk/main.c:1095
+#: ../gtk/main.c:1295
#, c-format
msgid "%s (Default)"
msgstr ""
-#: ../gtk/main.c:1187
-msgid "Windows"
+#: ../gtk/main.c:1566 ../coreapi/callbacks.c:700
+#, c-format
+msgid "We are transferred to %s"
msgstr ""
-#: ../gtk/main.c:1364
+#: ../gtk/main.c:1576
msgid ""
"No sound cards have been detected on this computer.\n"
"You won't be able to send or receive audio calls."
msgstr ""
-#: ../gtk/main.c:1423
+#: ../gtk/main.c:1663
msgid "A free SIP video-phone"
msgstr "Egy ingyenes SIP video-telefon"
-#: ../gtk/friendlist.c:192 ../gtk/propertybox.c:271 ../gtk/contact.ui.h:3
+#: ../gtk/friendlist.c:203
+#, fuzzy
+msgid "Add to addressbook"
+msgstr "CÃmjegyzék"
+
+#: ../gtk/friendlist.c:258 ../gtk/propertybox.c:296 ../gtk/contact.ui.h:3
msgid "Name"
msgstr "Név"
-#: ../gtk/friendlist.c:205
+#: ../gtk/friendlist.c:271
msgid "Presence status"
msgstr "Jelenlét státusz"
-#: ../gtk/friendlist.c:242
+#: ../gtk/friendlist.c:308
#, c-format
msgid "Search in %s directory"
msgstr ""
-#: ../gtk/friendlist.c:450
+#: ../gtk/friendlist.c:568
msgid "Invalid sip contact !"
msgstr ""
-#: ../gtk/friendlist.c:495
+#: ../gtk/friendlist.c:613
#, fuzzy, c-format
msgid "Call %s"
msgstr "Hivás előzmények"
-#: ../gtk/friendlist.c:496
+#: ../gtk/friendlist.c:614
#, c-format
msgid "Send text to %s"
msgstr ""
-#: ../gtk/friendlist.c:497
+#: ../gtk/friendlist.c:615
#, fuzzy, c-format
msgid "Edit contact '%s'"
msgstr "Kapcsolatinformációk szerkesztése"
-#: ../gtk/friendlist.c:498
+#: ../gtk/friendlist.c:616
#, c-format
msgid "Delete contact '%s'"
msgstr ""
-#: ../gtk/friendlist.c:540
+#: ../gtk/friendlist.c:658
#, c-format
msgid "Add new contact from %s directory"
msgstr ""
-#: ../gtk/propertybox.c:277
+#: ../gtk/propertybox.c:302
msgid "Rate (Hz)"
msgstr "Érték (Hz)"
-#: ../gtk/propertybox.c:283
+#: ../gtk/propertybox.c:308
msgid "Status"
msgstr "Ãllapot"
-#: ../gtk/propertybox.c:289
+#: ../gtk/propertybox.c:314
msgid "Min bitrate (kbit/s)"
msgstr "Min bitrate (kbit/s)"
-#: ../gtk/propertybox.c:296
+#: ../gtk/propertybox.c:321
msgid "Parameters"
msgstr "Paraméterek"
-#: ../gtk/propertybox.c:326 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507
msgid "Enabled"
msgstr "Engedélyezve"
-#: ../gtk/propertybox.c:327 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507
msgid "Disabled"
msgstr "Tiltva"
-#: ../gtk/propertybox.c:510
+#: ../gtk/propertybox.c:553
msgid "Account"
msgstr "Hozzáférés"
-#: ../gtk/propertybox.c:650
+#: ../gtk/propertybox.c:693
msgid "English"
msgstr ""
-#: ../gtk/propertybox.c:651
+#: ../gtk/propertybox.c:694
msgid "French"
msgstr ""
-#: ../gtk/propertybox.c:652
+#: ../gtk/propertybox.c:695
msgid "Swedish"
msgstr ""
-#: ../gtk/propertybox.c:653
+#: ../gtk/propertybox.c:696
msgid "Italian"
msgstr ""
-#: ../gtk/propertybox.c:654
+#: ../gtk/propertybox.c:697
msgid "Spanish"
msgstr ""
-#: ../gtk/propertybox.c:655
+#: ../gtk/propertybox.c:698
msgid "Brazilian Portugese"
msgstr ""
-#: ../gtk/propertybox.c:656
+#: ../gtk/propertybox.c:699
msgid "Polish"
msgstr ""
-#: ../gtk/propertybox.c:657
+#: ../gtk/propertybox.c:700
msgid "German"
msgstr ""
-#: ../gtk/propertybox.c:658
+#: ../gtk/propertybox.c:701
msgid "Russian"
msgstr ""
-#: ../gtk/propertybox.c:659
+#: ../gtk/propertybox.c:702
msgid "Japanese"
msgstr ""
-#: ../gtk/propertybox.c:660
+#: ../gtk/propertybox.c:703
msgid "Dutch"
msgstr ""
-#: ../gtk/propertybox.c:661
+#: ../gtk/propertybox.c:704
msgid "Hungarian"
msgstr ""
-#: ../gtk/propertybox.c:662
+#: ../gtk/propertybox.c:705
msgid "Czech"
msgstr ""
-#: ../gtk/propertybox.c:663
+#: ../gtk/propertybox.c:706
msgid "Chinese"
msgstr ""
-#: ../gtk/propertybox.c:720
+#: ../gtk/propertybox.c:707
+msgid "Traditional Chinese"
+msgstr ""
+
+#: ../gtk/propertybox.c:708
+msgid "Norwegian"
+msgstr ""
+
+#: ../gtk/propertybox.c:765
msgid ""
"You need to restart linphone for the new language selection to take effect."
msgstr ""
+#: ../gtk/propertybox.c:835
+msgid "None"
+msgstr "Nincs"
+
+#: ../gtk/propertybox.c:839
+msgid "SRTP"
+msgstr ""
+
+#: ../gtk/propertybox.c:845
+msgid "ZRTP"
+msgstr ""
+
#: ../gtk/update.c:80
#, c-format
msgid ""
@@ -345,78 +419,104 @@ msgstr ""
msgid "Now ready !"
msgstr ""
-#: ../gtk/incall_view.c:61
+#: ../gtk/incall_view.c:69
#, fuzzy, c-format
msgid "Call #%i"
msgstr "Hivás előzmények"
-#: ../gtk/incall_view.c:87
+#: ../gtk/incall_view.c:127
#, c-format
msgid "Transfer to call #%i with %s"
msgstr ""
-#: ../gtk/incall_view.c:113
+#: ../gtk/incall_view.c:155
msgid "Transfer"
msgstr ""
-#: ../gtk/incall_view.c:187
+#: ../gtk/incall_view.c:271
#, fuzzy
msgid "<b>Calling...</b>"
msgstr "Kapcsolatilista"
-#: ../gtk/incall_view.c:190 ../gtk/incall_view.c:246
+#: ../gtk/incall_view.c:274 ../gtk/incall_view.c:482
msgid "00::00::00"
msgstr ""
-#: ../gtk/incall_view.c:206
+#: ../gtk/incall_view.c:285
#, fuzzy
msgid "<b>Incoming call</b>"
msgstr "BeérkezÅ‘ hÃvás"
-#: ../gtk/incall_view.c:216
-msgid ""
-"Pause all calls\n"
-"and answer"
+#: ../gtk/incall_view.c:322
+msgid "good"
msgstr ""
-#: ../gtk/incall_view.c:217 ../gtk/main.ui.h:20
-msgid "Answer"
+#: ../gtk/incall_view.c:324
+msgid "average"
+msgstr ""
+
+#: ../gtk/incall_view.c:326
+msgid "poor"
+msgstr ""
+
+#: ../gtk/incall_view.c:328
+msgid "very poor"
+msgstr ""
+
+#: ../gtk/incall_view.c:330
+msgid "too bad"
+msgstr ""
+
+#: ../gtk/incall_view.c:331 ../gtk/incall_view.c:347
+msgid "unavailable"
+msgstr ""
+
+#: ../gtk/incall_view.c:447
+msgid "Secured by SRTP"
+msgstr ""
+
+#: ../gtk/incall_view.c:453
+#, c-format
+msgid "Secured by ZRTP - [auth token: %s]"
+msgstr ""
+
+#: ../gtk/incall_view.c:459
+msgid "Set unverified"
+msgstr ""
+
+#: ../gtk/incall_view.c:459 ../gtk/main.ui.h:49
+msgid "Set verified"
+msgstr ""
+
+#: ../gtk/incall_view.c:480
+msgid "In conference"
msgstr ""
-#: ../gtk/incall_view.c:244
+#: ../gtk/incall_view.c:480
#, fuzzy
msgid "<b>In call</b>"
msgstr "Kapcsolatilista"
-#: ../gtk/incall_view.c:260
+#: ../gtk/incall_view.c:499
#, fuzzy
msgid "<b>Paused call</b>"
msgstr "Kapcsolatilista"
-#: ../gtk/incall_view.c:272
+#: ../gtk/incall_view.c:511
#, c-format
msgid "%02i::%02i::%02i"
msgstr ""
-#: ../gtk/incall_view.c:288
+#: ../gtk/incall_view.c:527
#, fuzzy
msgid "<b>Call ended.</b>"
msgstr "HÃvás vége"
-#: ../gtk/incall_view.c:309
-#, fuzzy
-msgid "Unmute"
-msgstr "Korlátlan"
-
-#: ../gtk/incall_view.c:316 ../gtk/main.ui.h:42
-msgid "Mute"
-msgstr ""
-
-#: ../gtk/incall_view.c:340
+#: ../gtk/incall_view.c:584
msgid "Resume"
msgstr ""
-#: ../gtk/incall_view.c:347 ../gtk/main.ui.h:46
+#: ../gtk/incall_view.c:591 ../gtk/main.ui.h:45
msgid "Pause"
msgstr ""
@@ -480,8 +580,8 @@ msgstr "Kapcsolatiinformáció"
#: ../gtk/main.ui.h:14
#, fuzzy
-msgid "<b>Contact list</b>"
-msgstr "Kapcsolatilista"
+msgid "<b>Callee name</b>"
+msgstr "HÃvás vége"
#: ../gtk/main.ui.h:15
#, fuzzy
@@ -507,27 +607,26 @@ msgstr ""
#: ../gtk/main.ui.h:21
#, fuzzy
-msgid "Audio & video"
-msgstr "Audio kodekek"
-
-#: ../gtk/main.ui.h:22
-#, fuzzy
-msgid "Audio only"
-msgstr "Audio kodekek"
-
-#: ../gtk/main.ui.h:23
-#, fuzzy
msgid "Automatically log me in"
msgstr "Automatikus valós hostnév megállapÃtása"
-#: ../gtk/main.ui.h:24
+#: ../gtk/main.ui.h:22
msgid "B"
msgstr ""
-#: ../gtk/main.ui.h:25 ../gtk/parameters.ui.h:20
+#: ../gtk/main.ui.h:23 ../gtk/parameters.ui.h:21
msgid "C"
msgstr ""
+#: ../gtk/main.ui.h:24
+#, fuzzy
+msgid "Call"
+msgstr "Hivás előzmények"
+
+#: ../gtk/main.ui.h:25
+msgid "Call quality rating"
+msgstr ""
+
#: ../gtk/main.ui.h:26
msgid "Check _Updates"
msgstr ""
@@ -541,11 +640,6 @@ msgstr "Kapcsolódás"
msgid "D"
msgstr ""
-#: ../gtk/main.ui.h:29
-#, fuzzy
-msgid "Decline"
-msgstr "line"
-
#: ../gtk/main.ui.h:30
#, fuzzy
msgid "Default"
@@ -558,13 +652,13 @@ msgstr "Információk"
#: ../gtk/main.ui.h:32
#, fuzzy
-msgid "Duration:"
-msgstr "Információk"
+msgid "Enable self-view"
+msgstr "Video engedélyezés"
#: ../gtk/main.ui.h:33
#, fuzzy
-msgid "Enable self-view"
-msgstr "Video engedélyezés"
+msgid "Enable video"
+msgstr "Engedélyezve"
#: ../gtk/main.ui.h:34
msgid "Enter username, phone number, or full sip address"
@@ -600,21 +694,26 @@ msgstr "Kapcsolatiinformáció"
msgid "Lookup:"
msgstr ""
-#: ../gtk/main.ui.h:43
+#: ../gtk/main.ui.h:42
#, fuzzy
msgid "My current identity:"
msgstr "SIP azonosÃtó:"
-#: ../gtk/main.ui.h:44
+#: ../gtk/main.ui.h:43
#, fuzzy
msgid "Online users"
msgstr "Elérhető"
-#: ../gtk/main.ui.h:45
+#: ../gtk/main.ui.h:44
#, fuzzy
msgid "Password"
msgstr "jelszó:"
+#: ../gtk/main.ui.h:46
+#, fuzzy
+msgid "Recent calls"
+msgstr "BeérkezÅ‘ hÃvás"
+
#: ../gtk/main.ui.h:47
#, fuzzy
msgid "SIP address or phone number:"
@@ -624,20 +723,15 @@ msgstr "Gépeld ide a sip cÃmet vagy a telefonszámot"
msgid "Search"
msgstr ""
-#: ../gtk/main.ui.h:49
+#: ../gtk/main.ui.h:50
msgid "Show debug window"
msgstr ""
-#: ../gtk/main.ui.h:50
+#: ../gtk/main.ui.h:51
#, fuzzy
msgid "Username"
msgstr "felhasználónév:"
-#: ../gtk/main.ui.h:51
-#, fuzzy
-msgid "_Call history"
-msgstr "Linphone - HÃváselÅ‘zmények"
-
#: ../gtk/main.ui.h:52
#, fuzzy
msgid "_Help"
@@ -648,19 +742,14 @@ msgid "_Homepage"
msgstr ""
#: ../gtk/main.ui.h:54
-#, fuzzy
-msgid "_Linphone"
-msgstr "Linphone"
-
-#: ../gtk/main.ui.h:55
msgid "_Options"
msgstr ""
-#: ../gtk/main.ui.h:56
+#: ../gtk/main.ui.h:55
msgid "in"
msgstr ""
-#: ../gtk/main.ui.h:57
+#: ../gtk/main.ui.h:56
msgid "label"
msgstr ""
@@ -710,16 +799,6 @@ msgstr "Sip cÃm:"
msgid "Show this contact presence status"
msgstr ""
-#: ../gtk/contact.ui.h:6
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "Kapcsolódva."
-
-#: ../gtk/contact.ui.h:7
-#, fuzzy
-msgid "gtk-ok"
-msgstr "EltávolÃtás"
-
#: ../gtk/log.ui.h:1
msgid "Linphone debug window"
msgstr ""
@@ -778,7 +857,7 @@ msgid "Publish presence information"
msgstr "Jelenléti információ közlése:"
#: ../gtk/sip_account.ui.h:6
-msgid "Register at startup"
+msgid "Register"
msgstr ""
#: ../gtk/sip_account.ui.h:7
@@ -809,11 +888,6 @@ msgstr "sip:"
msgid "Send"
msgstr "Hang"
-#: ../gtk/chatroom.ui.h:2
-#, fuzzy
-msgid "gtk-close"
-msgstr "Kapcsolódva."
-
#: ../gtk/parameters.ui.h:1
msgid "0 stands for \"unlimited\""
msgstr ""
@@ -853,9 +927,8 @@ msgid "<b>NAT and Firewall</b>"
msgstr "Kapcsolatilista"
#: ../gtk/parameters.ui.h:9
-#, fuzzy
-msgid "<b>Ports</b>"
-msgstr "Kapcsolatilista"
+msgid "<b>Network protocol and ports</b>"
+msgstr ""
#: ../gtk/parameters.ui.h:10
#, fuzzy
@@ -878,209 +951,227 @@ msgid "<b>Video</b>"
msgstr "Kapcsolatilista"
#: ../gtk/parameters.ui.h:14
-msgid "ALSA special device (optional):"
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
msgstr ""
#: ../gtk/parameters.ui.h:15
-msgid "Add"
+msgid "ALSA special device (optional):"
msgstr ""
#: ../gtk/parameters.ui.h:16
-msgid "Audio RTP/UDP:"
+msgid "Add"
msgstr ""
#: ../gtk/parameters.ui.h:17
+msgid "Audio RTP/UDP:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:18
#, fuzzy
msgid "Audio codecs"
msgstr "Audio kodekek"
-#: ../gtk/parameters.ui.h:18
+#: ../gtk/parameters.ui.h:19
msgid "Behind NAT / Firewall (specify gateway IP below)"
msgstr ""
-#: ../gtk/parameters.ui.h:19
+#: ../gtk/parameters.ui.h:20
msgid "Behind NAT / Firewall (use STUN to resolve)"
msgstr ""
-#: ../gtk/parameters.ui.h:21
+#: ../gtk/parameters.ui.h:22
msgid "CIF"
msgstr ""
-#: ../gtk/parameters.ui.h:22
+#: ../gtk/parameters.ui.h:23
#, fuzzy
msgid "Capture device:"
msgstr "Felvevő hang eszköz:"
-#: ../gtk/parameters.ui.h:23
+#: ../gtk/parameters.ui.h:24
#, fuzzy
msgid "Codecs"
msgstr "Kodekek"
-#: ../gtk/parameters.ui.h:24
+#: ../gtk/parameters.ui.h:25
msgid "Direct connection to the Internet"
msgstr ""
-#: ../gtk/parameters.ui.h:25
+#: ../gtk/parameters.ui.h:26
msgid "Disable"
msgstr "Tiltás"
-#: ../gtk/parameters.ui.h:26
+#: ../gtk/parameters.ui.h:27
#, fuzzy
msgid "Done"
msgstr "ElveszÃtve"
-#: ../gtk/parameters.ui.h:27
+#: ../gtk/parameters.ui.h:28
#, fuzzy
msgid "Download speed limit in Kbit/sec:"
msgstr "Letöltési sávszélesség (kbit/sec):"
-#: ../gtk/parameters.ui.h:28
+#: ../gtk/parameters.ui.h:29
msgid "Edit"
msgstr "Szerkesztés"
-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:30
msgid "Enable"
msgstr "Engedélyezés"
-#: ../gtk/parameters.ui.h:30
+#: ../gtk/parameters.ui.h:31
+msgid "Enable adaptive rate control"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:32
msgid "Enable echo cancellation"
msgstr ""
-#: ../gtk/parameters.ui.h:31
+#: ../gtk/parameters.ui.h:33
msgid "Erase all passwords"
msgstr ""
-#: ../gtk/parameters.ui.h:32
+#: ../gtk/parameters.ui.h:34
msgid "Manage SIP Accounts"
msgstr ""
-#: ../gtk/parameters.ui.h:33
+#: ../gtk/parameters.ui.h:35
+msgid "Media encryption type"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:36
msgid "Multimedia settings"
msgstr ""
-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:37
#, fuzzy
msgid "Network settings"
msgstr "Hálózat"
-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:38
#, fuzzy
msgid "Playback device:"
msgstr "Lejátszó hang eszköz:"
-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:39
msgid "Prefered video resolution:"
msgstr ""
-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:40
#, fuzzy
msgid "Public IP address:"
msgstr "Sip cÃm:"
-#: ../gtk/parameters.ui.h:38
+#: ../gtk/parameters.ui.h:41
msgid ""
"Register to FONICS\n"
"virtual network !"
msgstr ""
-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:43
msgid "Remove"
msgstr "EltávolÃtás"
-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:44
#, fuzzy
msgid "Ring device:"
msgstr "Csengőhang forrás:"
-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:45
#, fuzzy
msgid "Ring sound:"
msgstr "Csengőhang:"
-#: ../gtk/parameters.ui.h:43
-msgid "SIP (TCP):"
+#: ../gtk/parameters.ui.h:46
+msgid "SIP (TCP)"
msgstr ""
-#: ../gtk/parameters.ui.h:44
-msgid "SIP (UDP):"
+#: ../gtk/parameters.ui.h:47
+msgid "SIP (TLS)"
msgstr ""
-#: ../gtk/parameters.ui.h:45
+#: ../gtk/parameters.ui.h:48
+msgid "SIP (UDP)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:49
msgid "Send DTMFs as SIP info"
msgstr ""
-#: ../gtk/parameters.ui.h:46
+#: ../gtk/parameters.ui.h:50
msgid "Set Maximum Transmission Unit:"
msgstr ""
-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:51
msgid "Settings"
msgstr ""
-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:52
msgid "Show advanced settings"
msgstr ""
-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:53
#, fuzzy
msgid "Stun server:"
msgstr "Hang eszköz"
-#: ../gtk/parameters.ui.h:50
+#: ../gtk/parameters.ui.h:54
msgid "This section defines your SIP address when not using a SIP account"
msgstr ""
-#: ../gtk/parameters.ui.h:51
+#: ../gtk/parameters.ui.h:55
#, fuzzy
msgid "Upload speed limit in Kbit/sec:"
msgstr "Feltöltési sávszélesség (kbit/sec):"
-#: ../gtk/parameters.ui.h:52
+#: ../gtk/parameters.ui.h:56
msgid "Use IPv6 instead of IPv4"
msgstr ""
-#: ../gtk/parameters.ui.h:53
+#: ../gtk/parameters.ui.h:57
#, fuzzy
msgid "User interface"
msgstr "felhasználónév:"
-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:58
msgid "Video RTP/UDP:"
msgstr ""
-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:59
#, fuzzy
msgid "Video codecs"
msgstr "Audio kodekek"
-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:60
#, fuzzy
msgid "Video input device:"
msgstr "Hang eszköz"
-#: ../gtk/parameters.ui.h:57
+#: ../gtk/parameters.ui.h:61
msgid "Your display name (eg: John Doe):"
msgstr ""
-#: ../gtk/parameters.ui.h:58
+#: ../gtk/parameters.ui.h:62
#, fuzzy
msgid "Your resulting SIP address:"
msgstr "Saját sip cÃm:"
-#: ../gtk/parameters.ui.h:59
+#: ../gtk/parameters.ui.h:63
#, fuzzy
msgid "Your username:"
msgstr "felhasználónév:"
-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:64
msgid "a sound card"
msgstr ""
-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:65
msgid "default camera"
msgstr ""
-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:66
msgid "default soundcard"
msgstr ""
@@ -1106,26 +1197,19 @@ msgstr "Linphone"
msgid "Please wait"
msgstr ""
-#: ../coreapi/linphonecore.c:165
-#, fuzzy, c-format
-msgid "You have missed %i call."
-msgid_plural "You have missed %i calls."
-msgstr[0] "Van %i elhibázott hivás."
-msgstr[1] "Van %i elhibázott hivás."
-
-#: ../coreapi/linphonecore.c:206
+#: ../coreapi/linphonecore.c:187
msgid "aborted"
msgstr "megszakÃtva"
-#: ../coreapi/linphonecore.c:209
+#: ../coreapi/linphonecore.c:190
msgid "completed"
msgstr "befejezve"
-#: ../coreapi/linphonecore.c:212
+#: ../coreapi/linphonecore.c:193
msgid "missed"
msgstr "elhibázva"
-#: ../coreapi/linphonecore.c:217
+#: ../coreapi/linphonecore.c:198
#, c-format
msgid ""
"%s at %s\n"
@@ -1140,81 +1224,65 @@ msgstr ""
"Ãllapot: %s\n"
"Időtartam: %i perc %i másodperc\n"
-#: ../coreapi/linphonecore.c:218
-msgid "Incoming call"
-msgstr "BeérkezÅ‘ hÃvás"
-
-#: ../coreapi/linphonecore.c:218
+#: ../coreapi/linphonecore.c:199
msgid "Outgoing call"
msgstr "KimenÅ‘ hÃvás"
-#: ../coreapi/linphonecore.c:998
+#: ../coreapi/linphonecore.c:1088
msgid "Ready"
msgstr "Kész"
-#: ../coreapi/linphonecore.c:1773
+#: ../coreapi/linphonecore.c:1831
msgid "Looking for telephone number destination..."
msgstr "Telefonszám-cél keresése..."
-#: ../coreapi/linphonecore.c:1776
+#: ../coreapi/linphonecore.c:1834
msgid "Could not resolve this number."
msgstr "Nem sikkerült értelmezni a számot."
-#: ../coreapi/linphonecore.c:1820
+#: ../coreapi/linphonecore.c:1878
msgid ""
"Could not parse given sip address. A sip url usually looks like sip:"
"user@domain"
msgstr ""
"Az adott szám nem értelmezhetÅ‘. Egy sip cÃm általában Ãgy néz ki: user@domain"
-#: ../coreapi/linphonecore.c:1967
+#: ../coreapi/linphonecore.c:2025
msgid "Contacting"
msgstr "Kapcsolódás"
-#: ../coreapi/linphonecore.c:1974
+#: ../coreapi/linphonecore.c:2032
#, fuzzy
msgid "Could not call"
msgstr "nem sikerült hÃvni"
-#: ../coreapi/linphonecore.c:2081
-msgid "Sorry, you have to pause or stop the current call first !"
-msgstr ""
-
-#: ../coreapi/linphonecore.c:2086
+#: ../coreapi/linphonecore.c:2140
msgid "Sorry, we have reached the maximum number of simultaneous calls"
msgstr ""
-#: ../coreapi/linphonecore.c:2208
+#: ../coreapi/linphonecore.c:2270
msgid "Modifying call parameters..."
msgstr ""
-#: ../coreapi/linphonecore.c:2311
+#: ../coreapi/linphonecore.c:2366
msgid "Connected."
msgstr "Kapcsolódva."
-#: ../coreapi/linphonecore.c:2334
+#: ../coreapi/linphonecore.c:2389
#, fuzzy
msgid "Call aborted"
msgstr "megszakÃtva"
-#: ../coreapi/linphonecore.c:2374
-msgid "Call ended"
-msgstr "HÃvás vége"
-
-#: ../coreapi/linphonecore.c:2456
+#: ../coreapi/linphonecore.c:2530
#, fuzzy
msgid "Could not pause the call"
msgstr "nem sikerült hÃvni"
-#: ../coreapi/linphonecore.c:2460
+#: ../coreapi/linphonecore.c:2535
#, fuzzy
msgid "Pausing the current call..."
msgstr "nem sikerült hÃvni"
-#: ../coreapi/linphonecore.c:2499
-msgid "There is already a call in process, pause or stop it first."
-msgstr ""
-
#: ../coreapi/misc.c:147
msgid ""
"Your computer appears to be using ALSA sound drivers.\n"
@@ -1296,157 +1364,212 @@ msgstr ""
msgid "Unknown-bug"
msgstr ""
-#: ../coreapi/proxy.c:187
+#: ../coreapi/proxy.c:192
msgid ""
"The sip proxy address you entered is invalid, it must start with \"sip:\" "
"followed by a hostname."
msgstr ""
-#: ../coreapi/proxy.c:193
+#: ../coreapi/proxy.c:198
msgid ""
"The sip identity you entered is invalid.\n"
"It should look like sip:username@proxydomain, such as sip:alice@example.net"
msgstr ""
-#: ../coreapi/proxy.c:671
+#: ../coreapi/proxy.c:690
#, fuzzy, c-format
msgid "Could not login as %s"
msgstr "Nemtalálható a pixmap fájl: %s"
-#: ../coreapi/callbacks.c:170
+#: ../coreapi/callbacks.c:206
#, fuzzy
msgid "is contacting you"
msgstr "kapcsolatba lép veled."
-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207
msgid " and asked autoanswer."
msgstr ""
-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207
msgid "."
msgstr ""
-#: ../coreapi/callbacks.c:226
+#: ../coreapi/callbacks.c:266
#, fuzzy
msgid "Remote ringing."
msgstr "Távoli szolgáltatások"
-#: ../coreapi/callbacks.c:242
+#: ../coreapi/callbacks.c:282
#, fuzzy
msgid "Remote ringing..."
msgstr "Távoli szolgáltatások"
-#: ../coreapi/callbacks.c:253
+#: ../coreapi/callbacks.c:293
msgid "Early media."
msgstr "Korai médiák."
-#: ../coreapi/callbacks.c:291
+#: ../coreapi/callbacks.c:331
#, fuzzy, c-format
msgid "Call with %s is paused."
msgstr "Chat-elés %s -el"
-#: ../coreapi/callbacks.c:302
+#: ../coreapi/callbacks.c:342
#, c-format
msgid "Call answered by %s - on hold."
msgstr ""
-#: ../coreapi/callbacks.c:317
+#: ../coreapi/callbacks.c:357
#, fuzzy
msgid "Call resumed."
msgstr "HÃvás vége"
-#: ../coreapi/callbacks.c:322
+#: ../coreapi/callbacks.c:362
#, fuzzy, c-format
msgid "Call answered by %s."
msgstr ""
"HÃvás vagy\n"
"Válasz"
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:432
msgid "We are being paused..."
msgstr ""
-#: ../coreapi/callbacks.c:387
+#: ../coreapi/callbacks.c:436
msgid "We have been resumed..."
msgstr ""
-#: ../coreapi/callbacks.c:424
+#: ../coreapi/callbacks.c:441
+msgid "Call has been updated by remote..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:473
msgid "Call terminated."
msgstr "A hÃvás befejezve."
-#: ../coreapi/callbacks.c:431
+#: ../coreapi/callbacks.c:480
msgid "User is busy."
msgstr "A felhasználó foglalt."
-#: ../coreapi/callbacks.c:432
+#: ../coreapi/callbacks.c:481
msgid "User is temporarily unavailable."
msgstr "A felhasználó ideiglenesen nem elérhető"
#. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:434
+#: ../coreapi/callbacks.c:483
msgid "User does not want to be disturbed."
msgstr "A felhasználó nem akarja, hogy zavarják."
-#: ../coreapi/callbacks.c:435
+#: ../coreapi/callbacks.c:484
msgid "Call declined."
msgstr "HÃvás elutasÃtva"
-#: ../coreapi/callbacks.c:447
+#: ../coreapi/callbacks.c:496
#, fuzzy
msgid "No response."
msgstr "időtúllépés után nincs válasz"
-#: ../coreapi/callbacks.c:451
+#: ../coreapi/callbacks.c:500
msgid "Protocol error."
msgstr ""
-#: ../coreapi/callbacks.c:467
+#: ../coreapi/callbacks.c:516
#, fuzzy
msgid "Redirected"
msgstr "ÃtirányÃtva idw %s..."
-#: ../coreapi/callbacks.c:477
+#: ../coreapi/callbacks.c:526
msgid "Not found"
msgstr ""
-#: ../coreapi/callbacks.c:487
+#: ../coreapi/callbacks.c:551
msgid "No common codecs"
msgstr ""
-#: ../coreapi/callbacks.c:493
+#: ../coreapi/callbacks.c:557
#, fuzzy
msgid "Call failed."
msgstr "HÃvás elutasÃtva"
-#: ../coreapi/callbacks.c:557
+#: ../coreapi/callbacks.c:631
#, c-format
msgid "Registration on %s successful."
msgstr "A regisztáció a %s -n sikerült."
-#: ../coreapi/callbacks.c:558
+#: ../coreapi/callbacks.c:632
#, fuzzy, c-format
msgid "Unregistration on %s done."
msgstr "A regisztáció a %s -n sikerült."
-#: ../coreapi/callbacks.c:574
+#: ../coreapi/callbacks.c:648
msgid "no response timeout"
msgstr "időtúllépés után nincs válasz"
-#: ../coreapi/callbacks.c:577
+#: ../coreapi/callbacks.c:651
#, c-format
msgid "Registration on %s failed: %s"
msgstr "A regisztáció a %s -n nem sikerült: %s"
-#: ../coreapi/callbacks.c:619
-#, c-format
-msgid "We are transferred to %s"
-msgstr ""
-
-#: ../coreapi/sal_eXosip2.c:815 ../coreapi/sal_eXosip2.c:817
+#: ../coreapi/sal_eXosip2.c:873 ../coreapi/sal_eXosip2.c:875
#, fuzzy
msgid "Authentication failure"
msgstr "HitelesÃtési információ"
+#: ../coreapi/linphonecall.c:128
+#, fuzzy, c-format
+msgid "Authentication token is %s"
+msgstr "HitelesÃtési információ"
+
+#: ../coreapi/linphonecall.c:1560
+#, fuzzy, c-format
+msgid "You have missed %i call."
+msgid_plural "You have missed %i calls."
+msgstr[0] "Van %i elhibázott hivás."
+msgstr[1] "Van %i elhibázott hivás."
+
+#, fuzzy
+#~ msgid "Unmute"
+#~ msgstr "Korlátlan"
+
+#, fuzzy
+#~ msgid "<b>Contact list</b>"
+#~ msgstr "Kapcsolatilista"
+
+#, fuzzy
+#~ msgid "Audio & video"
+#~ msgstr "Audio kodekek"
+
+#, fuzzy
+#~ msgid "Audio only"
+#~ msgstr "Audio kodekek"
+
+#, fuzzy
+#~ msgid "Duration:"
+#~ msgstr "Információk"
+
+#, fuzzy
+#~ msgid "_Call history"
+#~ msgstr "Linphone - HÃváselÅ‘zmények"
+
+#, fuzzy
+#~ msgid "_Linphone"
+#~ msgstr "Linphone"
+
+#, fuzzy
+#~ msgid "gtk-cancel"
+#~ msgstr "Kapcsolódva."
+
+#, fuzzy
+#~ msgid "gtk-ok"
+#~ msgstr "EltávolÃtás"
+
+#, fuzzy
+#~ msgid "gtk-close"
+#~ msgstr "Kapcsolódva."
+
+#, fuzzy
+#~ msgid "<b>Ports</b>"
+#~ msgstr "Kapcsolatilista"
+
#~ msgid ""
#~ "Your machine appears to be connected to an IPv6 network. By default "
#~ "linphone always uses IPv4. Please update your configuration if you want "
@@ -1577,9 +1700,6 @@ msgstr "HitelesÃtési információ"
#~ msgid "Go"
#~ msgstr "Ugrás"
-#~ msgid "Address book"
-#~ msgstr "CÃmjegyzék"
-
#~ msgid "Exit"
#~ msgstr "Kilépés"
@@ -1907,9 +2027,6 @@ msgstr "HitelesÃtési információ"
#~ msgid "Authentication required for realm %s"
#~ msgstr "HitelesÃtési kérelem ebbÅ‘l a tartományból %s"
-#~ msgid "None"
-#~ msgstr "Nincs"
-
#~ msgid "Wait"
#~ msgstr "Várakozás"
diff --git a/po/it.po b/po/it.po
index cd3e0e5f2557709eca2bf462f43667b1152af78b..f0f1fc46ea8d0b2f970eeaf382dc10643f5c2ad4 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Linphone 3.2.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-08 22:32+0200\n"
+"POT-Creation-Date: 2011-12-02 16:47+0100\n"
"PO-Revision-Date: 2002-10-15 HO:MI+ZONE\n"
"Last-Translator: Matteo Piazza <matteo.piazza@trentinonetwork.it>\n"
"Language-Team: it <it@li.org>\n"
@@ -15,6 +15,21 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: ../gtk/calllogs.c:71
+msgid "n/a"
+msgstr ""
+
+#: ../gtk/conference.c:33 ../gtk/incall_view.c:183
+msgid "Conference"
+msgstr ""
+
+#: ../gtk/conference.c:41
+#, fuzzy
+msgid "Me"
+msgstr ""
+"Chiudi\n"
+"microfono"
+
#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
#, c-format
msgid "Couldn't find pixmap file: %s"
@@ -25,34 +40,38 @@ msgstr ""
msgid "Chat with %s"
msgstr "Chat con %s"
-#: ../gtk/main.c:74
+#: ../gtk/main.c:83
msgid "log to stdout some debug information while running."
msgstr ""
-#: ../gtk/main.c:81
+#: ../gtk/main.c:90
+msgid "path to a file to write logs into."
+msgstr ""
+
+#: ../gtk/main.c:97
msgid "Start only in the system tray, do not show the main interface."
msgstr ""
-#: ../gtk/main.c:88
+#: ../gtk/main.c:104
msgid "address to call right now"
msgstr ""
-#: ../gtk/main.c:95
+#: ../gtk/main.c:111
msgid "if set automatically answer incoming calls"
msgstr ""
-#: ../gtk/main.c:102
+#: ../gtk/main.c:118
msgid ""
"Specifiy a working directory (should be the base of the installation, eg: c:"
"\\Program Files\\Linphone)"
msgstr ""
-#: ../gtk/main.c:442
+#: ../gtk/main.c:464
#, fuzzy, c-format
msgid "Call with %s"
msgstr "Chat con %s"
-#: ../gtk/main.c:826
+#: ../gtk/main.c:815
#, c-format
msgid ""
"%s would like to add you to his contact list.\n"
@@ -64,171 +83,227 @@ msgstr ""
"veda il tuo stato o aggiungerlo alla tua lista dei contatti Se rispondi no "
"questo utente sarà momentaneamente bloccato."
-#: ../gtk/main.c:904
+#: ../gtk/main.c:893
#, c-format
msgid ""
"Please enter your password for username <i>%s</i>\n"
" at domain <i>%s</i>:"
msgstr "Prego inserire la password per username <i>%s</i> e dominio <i>%s<i>"
-#: ../gtk/main.c:1040
+#: ../gtk/main.c:993
+#, fuzzy
+msgid "Call error"
+msgstr "Cronologia"
+
+#: ../gtk/main.c:996 ../coreapi/linphonecore.c:2406
+msgid "Call ended"
+msgstr "Chiamata terminata"
+
+#: ../gtk/main.c:999 ../coreapi/linphonecore.c:199
+msgid "Incoming call"
+msgstr "Chimata in entrata"
+
+#: ../gtk/main.c:1001 ../gtk/incall_view.c:292 ../gtk/main.ui.h:20
+msgid "Answer"
+msgstr ""
+
+#: ../gtk/main.c:1003 ../gtk/main.ui.h:29
+msgid "Decline"
+msgstr "Rifiuta"
+
+#: ../gtk/main.c:1009
+#, fuzzy
+msgid "Call paused"
+msgstr "annullato"
+
+#: ../gtk/main.c:1009
+#, c-format
+msgid "<span size=\"large\">by %s</span>"
+msgstr ""
+
+#: ../gtk/main.c:1165
msgid "Website link"
msgstr ""
-#: ../gtk/main.c:1076
+#: ../gtk/main.c:1205
msgid "Linphone - a video internet phone"
msgstr ""
-#: ../gtk/main.c:1095
+#: ../gtk/main.c:1295
#, c-format
msgid "%s (Default)"
msgstr "%s (Default)"
-#: ../gtk/main.c:1187
-msgid "Windows"
+#: ../gtk/main.c:1566 ../coreapi/callbacks.c:700
+#, c-format
+msgid "We are transferred to %s"
msgstr ""
-#: ../gtk/main.c:1364
+#: ../gtk/main.c:1576
msgid ""
"No sound cards have been detected on this computer.\n"
"You won't be able to send or receive audio calls."
msgstr ""
-#: ../gtk/main.c:1423
+#: ../gtk/main.c:1663
msgid "A free SIP video-phone"
msgstr ""
-#: ../gtk/friendlist.c:192 ../gtk/propertybox.c:271 ../gtk/contact.ui.h:3
+#: ../gtk/friendlist.c:203
+msgid "Add to addressbook"
+msgstr ""
+
+#: ../gtk/friendlist.c:258 ../gtk/propertybox.c:296 ../gtk/contact.ui.h:3
msgid "Name"
msgstr "Nome"
-#: ../gtk/friendlist.c:205
+#: ../gtk/friendlist.c:271
msgid "Presence status"
msgstr "Presenza"
-#: ../gtk/friendlist.c:242
+#: ../gtk/friendlist.c:308
#, c-format
msgid "Search in %s directory"
msgstr "Cerca contatti nella directory %s"
-#: ../gtk/friendlist.c:450
+#: ../gtk/friendlist.c:568
msgid "Invalid sip contact !"
msgstr "Contatto SIP non valido"
-#: ../gtk/friendlist.c:495
+#: ../gtk/friendlist.c:613
#, c-format
msgid "Call %s"
msgstr "Chiamata %s"
-#: ../gtk/friendlist.c:496
+#: ../gtk/friendlist.c:614
#, c-format
msgid "Send text to %s"
msgstr "Invia testo a %s"
-#: ../gtk/friendlist.c:497
+#: ../gtk/friendlist.c:615
#, c-format
msgid "Edit contact '%s'"
msgstr "Modifica contatto %s"
-#: ../gtk/friendlist.c:498
+#: ../gtk/friendlist.c:616
#, c-format
msgid "Delete contact '%s'"
msgstr "Elimina contatto %s"
-#: ../gtk/friendlist.c:540
+#: ../gtk/friendlist.c:658
#, c-format
msgid "Add new contact from %s directory"
msgstr "Aggiungi nuovo contatto dalla directory %s"
-#: ../gtk/propertybox.c:277
+#: ../gtk/propertybox.c:302
msgid "Rate (Hz)"
msgstr ""
-#: ../gtk/propertybox.c:283
+#: ../gtk/propertybox.c:308
msgid "Status"
msgstr "Stato"
-#: ../gtk/propertybox.c:289
+#: ../gtk/propertybox.c:314
msgid "Min bitrate (kbit/s)"
msgstr "Bitrate Min (kbit/s)"
-#: ../gtk/propertybox.c:296
+#: ../gtk/propertybox.c:321
msgid "Parameters"
msgstr "Parametri"
-#: ../gtk/propertybox.c:326 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507
msgid "Enabled"
msgstr "Attivato"
-#: ../gtk/propertybox.c:327 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507
msgid "Disabled"
msgstr "Disattivato"
-#: ../gtk/propertybox.c:510
+#: ../gtk/propertybox.c:553
msgid "Account"
msgstr "Account"
-#: ../gtk/propertybox.c:650
+#: ../gtk/propertybox.c:693
msgid "English"
msgstr "Inglese"
-#: ../gtk/propertybox.c:651
+#: ../gtk/propertybox.c:694
msgid "French"
msgstr "Francese"
-#: ../gtk/propertybox.c:652
+#: ../gtk/propertybox.c:695
msgid "Swedish"
msgstr "Svedese"
-#: ../gtk/propertybox.c:653
+#: ../gtk/propertybox.c:696
msgid "Italian"
msgstr "Italiano"
-#: ../gtk/propertybox.c:654
+#: ../gtk/propertybox.c:697
msgid "Spanish"
msgstr "Spagnolo"
-#: ../gtk/propertybox.c:655
+#: ../gtk/propertybox.c:698
msgid "Brazilian Portugese"
msgstr ""
-#: ../gtk/propertybox.c:656
+#: ../gtk/propertybox.c:699
msgid "Polish"
msgstr "Polacco"
-#: ../gtk/propertybox.c:657
+#: ../gtk/propertybox.c:700
msgid "German"
msgstr "Tedesco"
-#: ../gtk/propertybox.c:658
+#: ../gtk/propertybox.c:701
msgid "Russian"
msgstr "Russo"
-#: ../gtk/propertybox.c:659
+#: ../gtk/propertybox.c:702
msgid "Japanese"
msgstr "Giapponese"
-#: ../gtk/propertybox.c:660
+#: ../gtk/propertybox.c:703
msgid "Dutch"
msgstr "Olandese"
-#: ../gtk/propertybox.c:661
+#: ../gtk/propertybox.c:704
msgid "Hungarian"
msgstr "Ungherese"
-#: ../gtk/propertybox.c:662
+#: ../gtk/propertybox.c:705
msgid "Czech"
msgstr "Ceco"
-#: ../gtk/propertybox.c:663
+#: ../gtk/propertybox.c:706
msgid "Chinese"
msgstr ""
-#: ../gtk/propertybox.c:720
+#: ../gtk/propertybox.c:707
+msgid "Traditional Chinese"
+msgstr ""
+
+#: ../gtk/propertybox.c:708
+msgid "Norwegian"
+msgstr ""
+
+#: ../gtk/propertybox.c:765
msgid ""
"You need to restart linphone for the new language selection to take effect."
msgstr "Riavviare il software per utilizzare la nuova lingua selezionata"
+#: ../gtk/propertybox.c:835
+msgid "None"
+msgstr ""
+
+#: ../gtk/propertybox.c:839
+msgid "SRTP"
+msgstr ""
+
+#: ../gtk/propertybox.c:845
+msgid "ZRTP"
+msgstr ""
+
#: ../gtk/update.c:80
#, c-format
msgid ""
@@ -346,80 +421,103 @@ msgstr "Creazione account"
msgid "Now ready !"
msgstr "Pronto !"
-#: ../gtk/incall_view.c:61
+#: ../gtk/incall_view.c:69
#, fuzzy, c-format
msgid "Call #%i"
msgstr "Chiamata %s"
-#: ../gtk/incall_view.c:87
+#: ../gtk/incall_view.c:127
#, c-format
msgid "Transfer to call #%i with %s"
msgstr ""
-#: ../gtk/incall_view.c:113
+#: ../gtk/incall_view.c:155
msgid "Transfer"
msgstr ""
-#: ../gtk/incall_view.c:187
+#: ../gtk/incall_view.c:271
#, fuzzy
msgid "<b>Calling...</b>"
msgstr "<b>Linguaggio</b>"
-#: ../gtk/incall_view.c:190 ../gtk/incall_view.c:246
+#: ../gtk/incall_view.c:274 ../gtk/incall_view.c:482
msgid "00::00::00"
msgstr ""
-#: ../gtk/incall_view.c:206
+#: ../gtk/incall_view.c:285
#, fuzzy
msgid "<b>Incoming call</b>"
msgstr "Chimata in entrata"
-#: ../gtk/incall_view.c:216
-msgid ""
-"Pause all calls\n"
-"and answer"
+#: ../gtk/incall_view.c:322
+msgid "good"
msgstr ""
-#: ../gtk/incall_view.c:217 ../gtk/main.ui.h:20
-msgid "Answer"
+#: ../gtk/incall_view.c:324
+msgid "average"
+msgstr ""
+
+#: ../gtk/incall_view.c:326
+msgid "poor"
+msgstr ""
+
+#: ../gtk/incall_view.c:328
+msgid "very poor"
+msgstr ""
+
+#: ../gtk/incall_view.c:330
+msgid "too bad"
+msgstr ""
+
+#: ../gtk/incall_view.c:331 ../gtk/incall_view.c:347
+msgid "unavailable"
msgstr ""
-#: ../gtk/incall_view.c:244
+#: ../gtk/incall_view.c:447
+msgid "Secured by SRTP"
+msgstr ""
+
+#: ../gtk/incall_view.c:453
+#, c-format
+msgid "Secured by ZRTP - [auth token: %s]"
+msgstr ""
+
+#: ../gtk/incall_view.c:459
+msgid "Set unverified"
+msgstr ""
+
+#: ../gtk/incall_view.c:459 ../gtk/main.ui.h:49
+msgid "Set verified"
+msgstr ""
+
+#: ../gtk/incall_view.c:480
+msgid "In conference"
+msgstr ""
+
+#: ../gtk/incall_view.c:480
#, fuzzy
msgid "<b>In call</b>"
msgstr "<b>In chiamata con</b>"
-#: ../gtk/incall_view.c:260
+#: ../gtk/incall_view.c:499
#, fuzzy
msgid "<b>Paused call</b>"
msgstr "<b>Termina chiamata</b>"
-#: ../gtk/incall_view.c:272
+#: ../gtk/incall_view.c:511
#, c-format
msgid "%02i::%02i::%02i"
msgstr ""
-#: ../gtk/incall_view.c:288
+#: ../gtk/incall_view.c:527
msgid "<b>Call ended.</b>"
msgstr "<b>Chiamata terminata.</b>"
-#: ../gtk/incall_view.c:309
-msgid "Unmute"
-msgstr ""
-"Attiva\n"
-"microfono"
-
-#: ../gtk/incall_view.c:316 ../gtk/main.ui.h:42
-msgid "Mute"
-msgstr ""
-"Chiudi\n"
-"microfono"
-
-#: ../gtk/incall_view.c:340
+#: ../gtk/incall_view.c:584
msgid "Resume"
msgstr ""
-#: ../gtk/incall_view.c:347 ../gtk/main.ui.h:46
+#: ../gtk/incall_view.c:591 ../gtk/main.ui.h:45
msgid "Pause"
msgstr ""
@@ -482,8 +580,9 @@ msgid "<b>Add contacts from directory</b>"
msgstr "Aggiungi nuovo contatto dalla directory %s"
#: ../gtk/main.ui.h:14
-msgid "<b>Contact list</b>"
-msgstr "<b>Lista contatti</b>"
+#, fuzzy
+msgid "<b>Callee name</b>"
+msgstr "<b>Chiamata terminata.</b>"
#: ../gtk/main.ui.h:15
msgid "<b>Welcome !</b>"
@@ -507,26 +606,26 @@ msgid "All users"
msgstr ""
#: ../gtk/main.ui.h:21
-#, fuzzy
-msgid "Audio & video"
-msgstr "Audio & Video"
-
-#: ../gtk/main.ui.h:22
-msgid "Audio only"
-msgstr "Solo Audio"
-
-#: ../gtk/main.ui.h:23
msgid "Automatically log me in"
msgstr "Login Automatico"
-#: ../gtk/main.ui.h:24
+#: ../gtk/main.ui.h:22
msgid "B"
msgstr "B"
-#: ../gtk/main.ui.h:25 ../gtk/parameters.ui.h:20
+#: ../gtk/main.ui.h:23 ../gtk/parameters.ui.h:21
msgid "C"
msgstr "C"
+#: ../gtk/main.ui.h:24
+#, fuzzy
+msgid "Call"
+msgstr "Chiamata %s"
+
+#: ../gtk/main.ui.h:25
+msgid "Call quality rating"
+msgstr ""
+
#: ../gtk/main.ui.h:26
msgid "Check _Updates"
msgstr ""
@@ -540,10 +639,6 @@ msgstr "In connessione"
msgid "D"
msgstr "D"
-#: ../gtk/main.ui.h:29
-msgid "Decline"
-msgstr "Rifiuta"
-
#: ../gtk/main.ui.h:30
msgid "Default"
msgstr "Default"
@@ -553,13 +648,14 @@ msgid "Duration"
msgstr "Durata"
#: ../gtk/main.ui.h:32
-msgid "Duration:"
-msgstr "Durata:"
-
-#: ../gtk/main.ui.h:33
msgid "Enable self-view"
msgstr "Self-view abilitato"
+#: ../gtk/main.ui.h:33
+#, fuzzy
+msgid "Enable video"
+msgstr "Attivato"
+
#: ../gtk/main.ui.h:34
msgid "Enter username, phone number, or full sip address"
msgstr "Inserisci username, numero o indirizzo sip"
@@ -595,21 +691,26 @@ msgstr "Credenziali di accesso"
msgid "Lookup:"
msgstr ""
-#: ../gtk/main.ui.h:43
+#: ../gtk/main.ui.h:42
msgid "My current identity:"
msgstr "Identità corrente"
-#: ../gtk/main.ui.h:44
+#: ../gtk/main.ui.h:43
#, fuzzy
msgid "Online users"
msgstr ""
"Tutti gli utenti\n"
"Utenti Online"
-#: ../gtk/main.ui.h:45
+#: ../gtk/main.ui.h:44
msgid "Password"
msgstr "Password"
+#: ../gtk/main.ui.h:46
+#, fuzzy
+msgid "Recent calls"
+msgstr "In chiamata"
+
#: ../gtk/main.ui.h:47
msgid "SIP address or phone number:"
msgstr "Indirizzo sip o numero."
@@ -618,20 +719,15 @@ msgstr "Indirizzo sip o numero."
msgid "Search"
msgstr ""
-#: ../gtk/main.ui.h:49
+#: ../gtk/main.ui.h:50
#, fuzzy
msgid "Show debug window"
msgstr "Linphone debug window"
-#: ../gtk/main.ui.h:50
+#: ../gtk/main.ui.h:51
msgid "Username"
msgstr "Username"
-#: ../gtk/main.ui.h:51
-#, fuzzy
-msgid "_Call history"
-msgstr "Cronologia"
-
#: ../gtk/main.ui.h:52
msgid "_Help"
msgstr ""
@@ -641,18 +737,14 @@ msgid "_Homepage"
msgstr ""
#: ../gtk/main.ui.h:54
-msgid "_Linphone"
-msgstr "_Linphone"
-
-#: ../gtk/main.ui.h:55
msgid "_Options"
msgstr ""
-#: ../gtk/main.ui.h:56
+#: ../gtk/main.ui.h:55
msgid "in"
msgstr "in"
-#: ../gtk/main.ui.h:57
+#: ../gtk/main.ui.h:56
msgid "label"
msgstr "etichetta"
@@ -700,14 +792,6 @@ msgstr "Rubrica"
msgid "Show this contact presence status"
msgstr "Mostra lo stato di presenza del contatto"
-#: ../gtk/contact.ui.h:6
-msgid "gtk-cancel"
-msgstr ""
-
-#: ../gtk/contact.ui.h:7
-msgid "gtk-ok"
-msgstr ""
-
#: ../gtk/log.ui.h:1
msgid "Linphone debug window"
msgstr "Linphone debug window"
@@ -763,8 +847,8 @@ msgid "Publish presence information"
msgstr "Pubblica stato della presenza"
#: ../gtk/sip_account.ui.h:6
-msgid "Register at startup"
-msgstr "Registra all'avvio"
+msgid "Register"
+msgstr ""
#: ../gtk/sip_account.ui.h:7
msgid "Registration duration (sec):"
@@ -790,10 +874,6 @@ msgstr "sip:"
msgid "Send"
msgstr "Invia"
-#: ../gtk/chatroom.ui.h:2
-msgid "gtk-close"
-msgstr ""
-
#: ../gtk/parameters.ui.h:1
msgid "0 stands for \"unlimited\""
msgstr "0 sta per illimitato"
@@ -828,8 +908,8 @@ msgid "<b>NAT and Firewall</b>"
msgstr "<b>NAT and Firewall</b>"
#: ../gtk/parameters.ui.h:9
-msgid "<b>Ports</b>"
-msgstr "<b>Porte</b>"
+msgid "<b>Network protocol and ports</b>"
+msgstr ""
#: ../gtk/parameters.ui.h:10
msgid "<b>Privacy</b>"
@@ -848,101 +928,115 @@ msgid "<b>Video</b>"
msgstr "<b>Video</b>"
#: ../gtk/parameters.ui.h:14
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:15
msgid "ALSA special device (optional):"
msgstr "Dispositivo ALSA (optional):"
-#: ../gtk/parameters.ui.h:15
+#: ../gtk/parameters.ui.h:16
msgid "Add"
msgstr "Aggiungi"
-#: ../gtk/parameters.ui.h:16
+#: ../gtk/parameters.ui.h:17
msgid "Audio RTP/UDP:"
msgstr "Audio RTP/UDP:"
-#: ../gtk/parameters.ui.h:17
+#: ../gtk/parameters.ui.h:18
#, fuzzy
msgid "Audio codecs"
msgstr ""
"Audio codecs\n"
"Video codecs"
-#: ../gtk/parameters.ui.h:18
+#: ../gtk/parameters.ui.h:19
msgid "Behind NAT / Firewall (specify gateway IP below)"
msgstr "Dietro NAT / Firewall (IP del gateway)"
-#: ../gtk/parameters.ui.h:19
+#: ../gtk/parameters.ui.h:20
msgid "Behind NAT / Firewall (use STUN to resolve)"
msgstr "Dietro NAT / Firewall (utilizza STUN)"
-#: ../gtk/parameters.ui.h:21
+#: ../gtk/parameters.ui.h:22
msgid "CIF"
msgstr "CIF"
-#: ../gtk/parameters.ui.h:22
+#: ../gtk/parameters.ui.h:23
msgid "Capture device:"
msgstr "Dispositivo microfono:"
-#: ../gtk/parameters.ui.h:23
+#: ../gtk/parameters.ui.h:24
msgid "Codecs"
msgstr "Codec"
-#: ../gtk/parameters.ui.h:24
+#: ../gtk/parameters.ui.h:25
msgid "Direct connection to the Internet"
msgstr "Connessione diretta a internet"
-#: ../gtk/parameters.ui.h:25
+#: ../gtk/parameters.ui.h:26
msgid "Disable"
msgstr "Disattivato"
-#: ../gtk/parameters.ui.h:26
+#: ../gtk/parameters.ui.h:27
msgid "Done"
msgstr "Fatto"
-#: ../gtk/parameters.ui.h:27
+#: ../gtk/parameters.ui.h:28
msgid "Download speed limit in Kbit/sec:"
msgstr "Velocita massima in Dowload Kbit/sec"
-#: ../gtk/parameters.ui.h:28
+#: ../gtk/parameters.ui.h:29
msgid "Edit"
msgstr "Edita"
-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:30
msgid "Enable"
msgstr "Attivato"
-#: ../gtk/parameters.ui.h:30
+#: ../gtk/parameters.ui.h:31
+msgid "Enable adaptive rate control"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:32
msgid "Enable echo cancellation"
msgstr "Attiva cancellazione eco"
-#: ../gtk/parameters.ui.h:31
+#: ../gtk/parameters.ui.h:33
msgid "Erase all passwords"
msgstr "Cancella tutte le password"
-#: ../gtk/parameters.ui.h:32
+#: ../gtk/parameters.ui.h:34
msgid "Manage SIP Accounts"
msgstr "Gestici SIP Account"
-#: ../gtk/parameters.ui.h:33
+#: ../gtk/parameters.ui.h:35
+msgid "Media encryption type"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:36
msgid "Multimedia settings"
msgstr "Impostazioni multimediali"
-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:37
msgid "Network settings"
msgstr "Impostazioni di rete"
-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:38
msgid "Playback device:"
msgstr "Dispositivo uscita audio:"
-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:39
msgid "Prefered video resolution:"
msgstr "Risoluzione video preferita"
-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:40
msgid "Public IP address:"
msgstr "Indirizzo ip pubblico:"
-#: ../gtk/parameters.ui.h:38
+#: ../gtk/parameters.ui.h:41
msgid ""
"Register to FONICS\n"
"virtual network !"
@@ -950,101 +1044,107 @@ msgstr ""
"Registrati a FONICS\n"
"virtual network !"
-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:43
msgid "Remove"
msgstr "Rimuovi"
-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:44
msgid "Ring device:"
msgstr "Dispositivo squillo:"
-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:45
msgid "Ring sound:"
msgstr "Suoneria:"
-#: ../gtk/parameters.ui.h:43
+#: ../gtk/parameters.ui.h:46
#, fuzzy
-msgid "SIP (TCP):"
+msgid "SIP (TCP)"
msgstr "SIP (UDP)"
-#: ../gtk/parameters.ui.h:44
-msgid "SIP (UDP):"
+#: ../gtk/parameters.ui.h:47
+#, fuzzy
+msgid "SIP (TLS)"
msgstr "SIP (UDP)"
-#: ../gtk/parameters.ui.h:45
+#: ../gtk/parameters.ui.h:48
+#, fuzzy
+msgid "SIP (UDP)"
+msgstr "SIP (UDP)"
+
+#: ../gtk/parameters.ui.h:49
msgid "Send DTMFs as SIP info"
msgstr "Invia DTMF come SIP info"
-#: ../gtk/parameters.ui.h:46
+#: ../gtk/parameters.ui.h:50
msgid "Set Maximum Transmission Unit:"
msgstr "Imposta Maximum Transmission Unit:"
-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:51
msgid "Settings"
msgstr "Preferenze"
-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:52
msgid "Show advanced settings"
msgstr ""
-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:53
msgid "Stun server:"
msgstr "Stun server:"
-#: ../gtk/parameters.ui.h:50
+#: ../gtk/parameters.ui.h:54
msgid "This section defines your SIP address when not using a SIP account"
msgstr ""
"questa sezione definisce il tuo indirizzo SIP se non hai account attivi"
-#: ../gtk/parameters.ui.h:51
+#: ../gtk/parameters.ui.h:55
msgid "Upload speed limit in Kbit/sec:"
msgstr "Velocità massima in upload Kbit/sec:"
-#: ../gtk/parameters.ui.h:52
+#: ../gtk/parameters.ui.h:56
msgid "Use IPv6 instead of IPv4"
msgstr "Usa IPv6 invece che IPv4"
-#: ../gtk/parameters.ui.h:53
+#: ../gtk/parameters.ui.h:57
msgid "User interface"
msgstr "Interfaccia utente"
-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:58
msgid "Video RTP/UDP:"
msgstr "Video RTP/UDP"
-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:59
#, fuzzy
msgid "Video codecs"
msgstr ""
"Audio codecs\n"
"Video codecs"
-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:60
msgid "Video input device:"
msgstr "Dispositivo Video:"
-#: ../gtk/parameters.ui.h:57
+#: ../gtk/parameters.ui.h:61
msgid "Your display name (eg: John Doe):"
msgstr "Nome visualizzato (es: Mario Rossi):"
-#: ../gtk/parameters.ui.h:58
+#: ../gtk/parameters.ui.h:62
msgid "Your resulting SIP address:"
msgstr "Il tuo indirizzo sip:"
-#: ../gtk/parameters.ui.h:59
+#: ../gtk/parameters.ui.h:63
msgid "Your username:"
msgstr "Username"
-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:64
#, fuzzy
msgid "a sound card"
msgstr "una scheda audio\n"
-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:65
msgid "default camera"
msgstr "default videocamera"
-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:66
msgid "default soundcard"
msgstr "default scheda audio"
@@ -1068,26 +1168,19 @@ msgstr "Linphone"
msgid "Please wait"
msgstr "Prego attendere"
-#: ../coreapi/linphonecore.c:165
-#, c-format
-msgid "You have missed %i call."
-msgid_plural "You have missed %i calls."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../coreapi/linphonecore.c:206
+#: ../coreapi/linphonecore.c:187
msgid "aborted"
msgstr "annullato"
-#: ../coreapi/linphonecore.c:209
+#: ../coreapi/linphonecore.c:190
msgid "completed"
msgstr "comletato"
-#: ../coreapi/linphonecore.c:212
+#: ../coreapi/linphonecore.c:193
msgid "missed"
msgstr "mancante"
-#: ../coreapi/linphonecore.c:217
+#: ../coreapi/linphonecore.c:198
#, c-format
msgid ""
"%s at %s\n"
@@ -1102,27 +1195,23 @@ msgstr ""
"Stato: %s\n"
"Durata: %i mn %i sec\n"
-#: ../coreapi/linphonecore.c:218
-msgid "Incoming call"
-msgstr "Chimata in entrata"
-
-#: ../coreapi/linphonecore.c:218
+#: ../coreapi/linphonecore.c:199
msgid "Outgoing call"
msgstr "Chiamata in uscita"
-#: ../coreapi/linphonecore.c:998
+#: ../coreapi/linphonecore.c:1088
msgid "Ready"
msgstr "Pronto"
-#: ../coreapi/linphonecore.c:1773
+#: ../coreapi/linphonecore.c:1831
msgid "Looking for telephone number destination..."
msgstr "Ricerca numero destinazione..."
-#: ../coreapi/linphonecore.c:1776
+#: ../coreapi/linphonecore.c:1834
msgid "Could not resolve this number."
msgstr "Impossibile risolvere il numero."
-#: ../coreapi/linphonecore.c:1820
+#: ../coreapi/linphonecore.c:1878
msgid ""
"Could not parse given sip address. A sip url usually looks like sip:"
"user@domain"
@@ -1130,54 +1219,42 @@ msgstr ""
"Errore nel formato del contatto sip. Usualmente un indirizzo appare sip:"
"user@domain"
-#: ../coreapi/linphonecore.c:1967
+#: ../coreapi/linphonecore.c:2025
msgid "Contacting"
msgstr "In connessione"
-#: ../coreapi/linphonecore.c:1974
+#: ../coreapi/linphonecore.c:2032
#, fuzzy
msgid "Could not call"
msgstr "chiamata fallita"
-#: ../coreapi/linphonecore.c:2081
-msgid "Sorry, you have to pause or stop the current call first !"
-msgstr ""
-
-#: ../coreapi/linphonecore.c:2086
+#: ../coreapi/linphonecore.c:2140
msgid "Sorry, we have reached the maximum number of simultaneous calls"
msgstr ""
-#: ../coreapi/linphonecore.c:2208
+#: ../coreapi/linphonecore.c:2270
msgid "Modifying call parameters..."
msgstr ""
-#: ../coreapi/linphonecore.c:2311
+#: ../coreapi/linphonecore.c:2366
msgid "Connected."
msgstr "Connessione"
-#: ../coreapi/linphonecore.c:2334
+#: ../coreapi/linphonecore.c:2389
#, fuzzy
msgid "Call aborted"
msgstr "annullato"
-#: ../coreapi/linphonecore.c:2374
-msgid "Call ended"
-msgstr "Chiamata terminata"
-
-#: ../coreapi/linphonecore.c:2456
+#: ../coreapi/linphonecore.c:2530
#, fuzzy
msgid "Could not pause the call"
msgstr "chiamata fallita"
-#: ../coreapi/linphonecore.c:2460
+#: ../coreapi/linphonecore.c:2535
#, fuzzy
msgid "Pausing the current call..."
msgstr "Mostra chiamata corrente"
-#: ../coreapi/linphonecore.c:2499
-msgid "There is already a call in process, pause or stop it first."
-msgstr ""
-
#: ../coreapi/misc.c:147
msgid ""
"Your computer appears to be using ALSA sound drivers.\n"
@@ -1254,7 +1331,7 @@ msgstr "Pendente"
msgid "Unknown-bug"
msgstr "Bug-sconosciuto"
-#: ../coreapi/proxy.c:187
+#: ../coreapi/proxy.c:192
msgid ""
"The sip proxy address you entered is invalid, it must start with \"sip:\" "
"followed by a hostname."
@@ -1262,7 +1339,7 @@ msgstr ""
"L'indirizzo sip proxy utilizzato è invalido, deve iniziare con \"sip:\" "
"seguito dall' hostaname."
-#: ../coreapi/proxy.c:193
+#: ../coreapi/proxy.c:198
msgid ""
"The sip identity you entered is invalid.\n"
"It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1270,141 +1347,183 @@ msgstr ""
"L'identità sip utilizza è invalida.\n"
"Dovrebbre essere sip:username@proxydomain, esempio: sip:alice@example.net"
-#: ../coreapi/proxy.c:671
+#: ../coreapi/proxy.c:690
#, c-format
msgid "Could not login as %s"
msgstr "impossibile login come %s"
-#: ../coreapi/callbacks.c:170
+#: ../coreapi/callbacks.c:206
#, fuzzy
msgid "is contacting you"
msgstr "ti sta conttatando."
-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207
msgid " and asked autoanswer."
msgstr ""
-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207
msgid "."
msgstr ""
-#: ../coreapi/callbacks.c:226
+#: ../coreapi/callbacks.c:266
msgid "Remote ringing."
msgstr ""
-#: ../coreapi/callbacks.c:242
+#: ../coreapi/callbacks.c:282
msgid "Remote ringing..."
msgstr ""
-#: ../coreapi/callbacks.c:253
+#: ../coreapi/callbacks.c:293
msgid "Early media."
msgstr ""
-#: ../coreapi/callbacks.c:291
+#: ../coreapi/callbacks.c:331
#, fuzzy, c-format
msgid "Call with %s is paused."
msgstr "Chat con %s"
-#: ../coreapi/callbacks.c:302
+#: ../coreapi/callbacks.c:342
#, c-format
msgid "Call answered by %s - on hold."
msgstr ""
-#: ../coreapi/callbacks.c:317
+#: ../coreapi/callbacks.c:357
#, fuzzy
msgid "Call resumed."
msgstr "Chiamata terminata"
-#: ../coreapi/callbacks.c:322
+#: ../coreapi/callbacks.c:362
#, c-format
msgid "Call answered by %s."
msgstr ""
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:432
msgid "We are being paused..."
msgstr ""
-#: ../coreapi/callbacks.c:387
+#: ../coreapi/callbacks.c:436
msgid "We have been resumed..."
msgstr ""
-#: ../coreapi/callbacks.c:424
+#: ../coreapi/callbacks.c:441
+msgid "Call has been updated by remote..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:473
msgid "Call terminated."
msgstr "Chiamata terminata."
-#: ../coreapi/callbacks.c:431
+#: ../coreapi/callbacks.c:480
msgid "User is busy."
msgstr "Utente occupato"
-#: ../coreapi/callbacks.c:432
+#: ../coreapi/callbacks.c:481
msgid "User is temporarily unavailable."
msgstr "Utente non disponibile"
#. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:434
+#: ../coreapi/callbacks.c:483
msgid "User does not want to be disturbed."
msgstr "L'utente non vuole essere disturbato"
-#: ../coreapi/callbacks.c:435
+#: ../coreapi/callbacks.c:484
msgid "Call declined."
msgstr "Chiamata rifiutata"
-#: ../coreapi/callbacks.c:447
+#: ../coreapi/callbacks.c:496
#, fuzzy
msgid "No response."
msgstr "timeout no risposta"
-#: ../coreapi/callbacks.c:451
+#: ../coreapi/callbacks.c:500
msgid "Protocol error."
msgstr ""
-#: ../coreapi/callbacks.c:467
+#: ../coreapi/callbacks.c:516
#, fuzzy
msgid "Redirected"
msgstr "Rediretto verso %s..."
-#: ../coreapi/callbacks.c:477
+#: ../coreapi/callbacks.c:526
msgid "Not found"
msgstr ""
-#: ../coreapi/callbacks.c:487
+#: ../coreapi/callbacks.c:551
msgid "No common codecs"
msgstr ""
-#: ../coreapi/callbacks.c:493
+#: ../coreapi/callbacks.c:557
#, fuzzy
msgid "Call failed."
msgstr "Chiamata rifiutata"
-#: ../coreapi/callbacks.c:557
+#: ../coreapi/callbacks.c:631
#, c-format
msgid "Registration on %s successful."
msgstr "Registrazione su %s attiva"
-#: ../coreapi/callbacks.c:558
+#: ../coreapi/callbacks.c:632
#, c-format
msgid "Unregistration on %s done."
msgstr "Unregistrazione su %s"
-#: ../coreapi/callbacks.c:574
+#: ../coreapi/callbacks.c:648
msgid "no response timeout"
msgstr "timeout no risposta"
-#: ../coreapi/callbacks.c:577
+#: ../coreapi/callbacks.c:651
#, c-format
msgid "Registration on %s failed: %s"
msgstr "Registrazione su %s fallita: %s"
-#: ../coreapi/callbacks.c:619
-#, c-format
-msgid "We are transferred to %s"
-msgstr ""
-
-#: ../coreapi/sal_eXosip2.c:815 ../coreapi/sal_eXosip2.c:817
+#: ../coreapi/sal_eXosip2.c:873 ../coreapi/sal_eXosip2.c:875
#, fuzzy
msgid "Authentication failure"
msgstr "Linphone - Autenticazione richiesta"
+#: ../coreapi/linphonecall.c:128
+#, fuzzy, c-format
+msgid "Authentication token is %s"
+msgstr "Linphone - Autenticazione richiesta"
+
+#: ../coreapi/linphonecall.c:1560
+#, c-format
+msgid "You have missed %i call."
+msgid_plural "You have missed %i calls."
+msgstr[0] ""
+msgstr[1] ""
+
+#~ msgid "Unmute"
+#~ msgstr ""
+#~ "Attiva\n"
+#~ "microfono"
+
+#~ msgid "<b>Contact list</b>"
+#~ msgstr "<b>Lista contatti</b>"
+
+#, fuzzy
+#~ msgid "Audio & video"
+#~ msgstr "Audio & Video"
+
+#~ msgid "Audio only"
+#~ msgstr "Solo Audio"
+
+#~ msgid "Duration:"
+#~ msgstr "Durata:"
+
+#, fuzzy
+#~ msgid "_Call history"
+#~ msgstr "Cronologia"
+
+#~ msgid "_Linphone"
+#~ msgstr "_Linphone"
+
+#~ msgid "Register at startup"
+#~ msgstr "Registra all'avvio"
+
+#~ msgid "<b>Ports</b>"
+#~ msgstr "<b>Porte</b>"
+
#~ msgid "ITU-G.711 alaw encoder"
#~ msgstr "ITU-G.711 alaw encoder"
diff --git a/po/ja.po b/po/ja.po
index 1ba1a1d848d2eb98363441a8b371982fe17dac3f..138b221a2b67b5b29b07104d31a392e91d7be6fc 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: linphone 0.10\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-08 22:32+0200\n"
+"POT-Creation-Date: 2011-12-02 16:47+0100\n"
"PO-Revision-Date: 2003-01-21 00:05+9000\n"
"Last-Translator: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
"Language-Team: <ja@li.org>\n"
@@ -17,6 +17,18 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: ../gtk/calllogs.c:71
+msgid "n/a"
+msgstr ""
+
+#: ../gtk/conference.c:33 ../gtk/incall_view.c:183
+msgid "Conference"
+msgstr ""
+
+#: ../gtk/conference.c:41
+msgid "Me"
+msgstr ""
+
#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
#, c-format
msgid "Couldn't find pixmap file: %s"
@@ -27,34 +39,38 @@ msgstr "pixmapファイルãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ %s"
msgid "Chat with %s"
msgstr ""
-#: ../gtk/main.c:74
+#: ../gtk/main.c:83
msgid "log to stdout some debug information while running."
msgstr ""
-#: ../gtk/main.c:81
+#: ../gtk/main.c:90
+msgid "path to a file to write logs into."
+msgstr ""
+
+#: ../gtk/main.c:97
msgid "Start only in the system tray, do not show the main interface."
msgstr ""
-#: ../gtk/main.c:88
+#: ../gtk/main.c:104
msgid "address to call right now"
msgstr ""
-#: ../gtk/main.c:95
+#: ../gtk/main.c:111
msgid "if set automatically answer incoming calls"
msgstr ""
-#: ../gtk/main.c:102
+#: ../gtk/main.c:118
msgid ""
"Specifiy a working directory (should be the base of the installation, eg: c:"
"\\Program Files\\Linphone)"
msgstr ""
-#: ../gtk/main.c:442
+#: ../gtk/main.c:464
#, c-format
msgid "Call with %s"
msgstr ""
-#: ../gtk/main.c:826
+#: ../gtk/main.c:815
#, c-format
msgid ""
"%s would like to add you to his contact list.\n"
@@ -63,172 +79,232 @@ msgid ""
"If you answer no, this person will be temporarily blacklisted."
msgstr ""
-#: ../gtk/main.c:904
+#: ../gtk/main.c:893
#, c-format
msgid ""
"Please enter your password for username <i>%s</i>\n"
" at domain <i>%s</i>:"
msgstr ""
-#: ../gtk/main.c:1040
+#: ../gtk/main.c:993
+#, fuzzy
+msgid "Call error"
+msgstr "通話ã¯ã‚ャンセルã•ã‚Œã¾ã—ãŸã€‚"
+
+#: ../gtk/main.c:996 ../coreapi/linphonecore.c:2406
+#, fuzzy
+msgid "Call ended"
+msgstr "通話ã¯æ‹’å¦ã•ã‚Œã¾ã—ãŸã€‚"
+
+#: ../gtk/main.c:999 ../coreapi/linphonecore.c:199
+msgid "Incoming call"
+msgstr ""
+
+#: ../gtk/main.c:1001 ../gtk/incall_view.c:292 ../gtk/main.ui.h:20
+msgid "Answer"
+msgstr ""
+
+#: ../gtk/main.c:1003 ../gtk/main.ui.h:29
+#, fuzzy
+msgid "Decline"
+msgstr "ライン入力"
+
+#: ../gtk/main.c:1009
+#, fuzzy
+msgid "Call paused"
+msgstr "通話ã¯ã‚ャンセルã•ã‚Œã¾ã—ãŸã€‚"
+
+#: ../gtk/main.c:1009
+#, c-format
+msgid "<span size=\"large\">by %s</span>"
+msgstr ""
+
+#: ../gtk/main.c:1165
msgid "Website link"
msgstr ""
-#: ../gtk/main.c:1076
+#: ../gtk/main.c:1205
msgid "Linphone - a video internet phone"
msgstr ""
-#: ../gtk/main.c:1095
+#: ../gtk/main.c:1295
#, c-format
msgid "%s (Default)"
msgstr ""
-#: ../gtk/main.c:1187
-msgid "Windows"
+#: ../gtk/main.c:1566 ../coreapi/callbacks.c:700
+#, c-format
+msgid "We are transferred to %s"
msgstr ""
-#: ../gtk/main.c:1364
+#: ../gtk/main.c:1576
msgid ""
"No sound cards have been detected on this computer.\n"
"You won't be able to send or receive audio calls."
msgstr ""
-#: ../gtk/main.c:1423
+#: ../gtk/main.c:1663
msgid "A free SIP video-phone"
msgstr ""
-#: ../gtk/friendlist.c:192 ../gtk/propertybox.c:271 ../gtk/contact.ui.h:3
+#: ../gtk/friendlist.c:203
+#, fuzzy
+msgid "Add to addressbook"
+msgstr "電話帳"
+
+#: ../gtk/friendlist.c:258 ../gtk/propertybox.c:296 ../gtk/contact.ui.h:3
msgid "Name"
msgstr "åå‰"
-#: ../gtk/friendlist.c:205
+#: ../gtk/friendlist.c:271
#, fuzzy
msgid "Presence status"
msgstr "状態"
-#: ../gtk/friendlist.c:242
+#: ../gtk/friendlist.c:308
#, c-format
msgid "Search in %s directory"
msgstr ""
-#: ../gtk/friendlist.c:450
+#: ../gtk/friendlist.c:568
msgid "Invalid sip contact !"
msgstr ""
-#: ../gtk/friendlist.c:495
+#: ../gtk/friendlist.c:613
#, c-format
msgid "Call %s"
msgstr ""
-#: ../gtk/friendlist.c:496
+#: ../gtk/friendlist.c:614
#, c-format
msgid "Send text to %s"
msgstr ""
-#: ../gtk/friendlist.c:497
+#: ../gtk/friendlist.c:615
#, fuzzy, c-format
msgid "Edit contact '%s'"
msgstr "(接続ã™ã‚‹ãŸã‚ã®æƒ…å ±ãŒã‚ã‚Šã¾ã›ã‚“!)"
-#: ../gtk/friendlist.c:498
+#: ../gtk/friendlist.c:616
#, c-format
msgid "Delete contact '%s'"
msgstr ""
-#: ../gtk/friendlist.c:540
+#: ../gtk/friendlist.c:658
#, c-format
msgid "Add new contact from %s directory"
msgstr ""
-#: ../gtk/propertybox.c:277
+#: ../gtk/propertybox.c:302
msgid "Rate (Hz)"
msgstr ""
-#: ../gtk/propertybox.c:283
+#: ../gtk/propertybox.c:308
msgid "Status"
msgstr "状態"
-#: ../gtk/propertybox.c:289
+#: ../gtk/propertybox.c:314
msgid "Min bitrate (kbit/s)"
msgstr "最低é™ã®ãƒ“ットレート (kbit/s)"
-#: ../gtk/propertybox.c:296
+#: ../gtk/propertybox.c:321
msgid "Parameters"
msgstr "パラメーター"
-#: ../gtk/propertybox.c:326 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507
msgid "Enabled"
msgstr "使用ã™ã‚‹"
-#: ../gtk/propertybox.c:327 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507
msgid "Disabled"
msgstr "使用ã—ãªã„"
-#: ../gtk/propertybox.c:510
+#: ../gtk/propertybox.c:553
msgid "Account"
msgstr ""
-#: ../gtk/propertybox.c:650
+#: ../gtk/propertybox.c:693
msgid "English"
msgstr ""
-#: ../gtk/propertybox.c:651
+#: ../gtk/propertybox.c:694
msgid "French"
msgstr "Français"
-#: ../gtk/propertybox.c:652
+#: ../gtk/propertybox.c:695
msgid "Swedish"
msgstr ""
-#: ../gtk/propertybox.c:653
+#: ../gtk/propertybox.c:696
msgid "Italian"
msgstr ""
-#: ../gtk/propertybox.c:654
+#: ../gtk/propertybox.c:697
msgid "Spanish"
msgstr ""
-#: ../gtk/propertybox.c:655
+#: ../gtk/propertybox.c:698
msgid "Brazilian Portugese"
msgstr ""
-#: ../gtk/propertybox.c:656
+#: ../gtk/propertybox.c:699
msgid "Polish"
msgstr ""
-#: ../gtk/propertybox.c:657
+#: ../gtk/propertybox.c:700
msgid "German"
msgstr ""
-#: ../gtk/propertybox.c:658
+#: ../gtk/propertybox.c:701
msgid "Russian"
msgstr ""
-#: ../gtk/propertybox.c:659
+#: ../gtk/propertybox.c:702
msgid "Japanese"
msgstr "日本語"
-#: ../gtk/propertybox.c:660
+#: ../gtk/propertybox.c:703
msgid "Dutch"
msgstr ""
-#: ../gtk/propertybox.c:661
+#: ../gtk/propertybox.c:704
msgid "Hungarian"
msgstr "Magyar"
-#: ../gtk/propertybox.c:662
+#: ../gtk/propertybox.c:705
msgid "Czech"
msgstr "ÄeÅ¡tina"
-#: ../gtk/propertybox.c:663
+#: ../gtk/propertybox.c:706
msgid "Chinese"
msgstr "简体ä¸æ–‡"
-#: ../gtk/propertybox.c:720
+#: ../gtk/propertybox.c:707
+msgid "Traditional Chinese"
+msgstr ""
+
+#: ../gtk/propertybox.c:708
+msgid "Norwegian"
+msgstr ""
+
+#: ../gtk/propertybox.c:765
msgid ""
"You need to restart linphone for the new language selection to take effect."
msgstr ""
+#: ../gtk/propertybox.c:835
+#, fuzzy
+msgid "None"
+msgstr "ã‚ã‚Šã¾ã›ã‚“。"
+
+#: ../gtk/propertybox.c:839
+msgid "SRTP"
+msgstr ""
+
+#: ../gtk/propertybox.c:845
+msgid "ZRTP"
+msgstr ""
+
#: ../gtk/update.c:80
#, c-format
msgid ""
@@ -346,77 +422,104 @@ msgstr ""
msgid "Now ready !"
msgstr ""
-#: ../gtk/incall_view.c:61
+#: ../gtk/incall_view.c:69
#, fuzzy, c-format
msgid "Call #%i"
msgstr "通話ã¯ã‚ャンセルã•ã‚Œã¾ã—ãŸã€‚"
-#: ../gtk/incall_view.c:87
+#: ../gtk/incall_view.c:127
#, c-format
msgid "Transfer to call #%i with %s"
msgstr ""
-#: ../gtk/incall_view.c:113
+#: ../gtk/incall_view.c:155
msgid "Transfer"
msgstr ""
-#: ../gtk/incall_view.c:187
+#: ../gtk/incall_view.c:271
#, fuzzy
msgid "<b>Calling...</b>"
msgstr "接続ä¸"
-#: ../gtk/incall_view.c:190 ../gtk/incall_view.c:246
+#: ../gtk/incall_view.c:274 ../gtk/incall_view.c:482
msgid "00::00::00"
msgstr ""
-#: ../gtk/incall_view.c:206
+#: ../gtk/incall_view.c:285
#, fuzzy
msgid "<b>Incoming call</b>"
msgstr "接続ä¸"
-#: ../gtk/incall_view.c:216
-msgid ""
-"Pause all calls\n"
-"and answer"
+#: ../gtk/incall_view.c:322
+msgid "good"
msgstr ""
-#: ../gtk/incall_view.c:217 ../gtk/main.ui.h:20
-msgid "Answer"
+#: ../gtk/incall_view.c:324
+msgid "average"
+msgstr ""
+
+#: ../gtk/incall_view.c:326
+msgid "poor"
+msgstr ""
+
+#: ../gtk/incall_view.c:328
+msgid "very poor"
+msgstr ""
+
+#: ../gtk/incall_view.c:330
+msgid "too bad"
msgstr ""
-#: ../gtk/incall_view.c:244
+#: ../gtk/incall_view.c:331 ../gtk/incall_view.c:347
+msgid "unavailable"
+msgstr ""
+
+#: ../gtk/incall_view.c:447
+msgid "Secured by SRTP"
+msgstr ""
+
+#: ../gtk/incall_view.c:453
+#, c-format
+msgid "Secured by ZRTP - [auth token: %s]"
+msgstr ""
+
+#: ../gtk/incall_view.c:459
+msgid "Set unverified"
+msgstr ""
+
+#: ../gtk/incall_view.c:459 ../gtk/main.ui.h:49
+msgid "Set verified"
+msgstr ""
+
+#: ../gtk/incall_view.c:480
+msgid "In conference"
+msgstr ""
+
+#: ../gtk/incall_view.c:480
#, fuzzy
msgid "<b>In call</b>"
msgstr "接続ä¸"
-#: ../gtk/incall_view.c:260
+#: ../gtk/incall_view.c:499
#, fuzzy
msgid "<b>Paused call</b>"
msgstr "接続ä¸"
-#: ../gtk/incall_view.c:272
+#: ../gtk/incall_view.c:511
#, c-format
msgid "%02i::%02i::%02i"
msgstr ""
-#: ../gtk/incall_view.c:288
+#: ../gtk/incall_view.c:527
#, fuzzy
msgid "<b>Call ended.</b>"
msgstr "通話ã¯æ‹’å¦ã•ã‚Œã¾ã—ãŸã€‚"
-#: ../gtk/incall_view.c:309
-msgid "Unmute"
-msgstr ""
-
-#: ../gtk/incall_view.c:316 ../gtk/main.ui.h:42
-msgid "Mute"
-msgstr ""
-
-#: ../gtk/incall_view.c:340
+#: ../gtk/incall_view.c:584
msgid "Resume"
msgstr ""
-#: ../gtk/incall_view.c:347 ../gtk/main.ui.h:46
+#: ../gtk/incall_view.c:591 ../gtk/main.ui.h:45
msgid "Pause"
msgstr ""
@@ -480,8 +583,8 @@ msgstr "コーデックã®æƒ…å ±"
#: ../gtk/main.ui.h:14
#, fuzzy
-msgid "<b>Contact list</b>"
-msgstr "接続ä¸"
+msgid "<b>Callee name</b>"
+msgstr "通話ã¯æ‹’å¦ã•ã‚Œã¾ã—ãŸã€‚"
#: ../gtk/main.ui.h:15
#, fuzzy
@@ -506,27 +609,26 @@ msgid "All users"
msgstr ""
#: ../gtk/main.ui.h:21
-#, fuzzy
-msgid "Audio & video"
-msgstr "オーディオコーデックã®ãƒ—ãƒãƒ‘ティー"
-
-#: ../gtk/main.ui.h:22
-#, fuzzy
-msgid "Audio only"
-msgstr "オーディオ"
-
-#: ../gtk/main.ui.h:23
msgid "Automatically log me in"
msgstr ""
-#: ../gtk/main.ui.h:24
+#: ../gtk/main.ui.h:22
msgid "B"
msgstr ""
-#: ../gtk/main.ui.h:25 ../gtk/parameters.ui.h:20
+#: ../gtk/main.ui.h:23 ../gtk/parameters.ui.h:21
msgid "C"
msgstr ""
+#: ../gtk/main.ui.h:24
+#, fuzzy
+msgid "Call"
+msgstr "通話ã¯ã‚ャンセルã•ã‚Œã¾ã—ãŸã€‚"
+
+#: ../gtk/main.ui.h:25
+msgid "Call quality rating"
+msgstr ""
+
#: ../gtk/main.ui.h:26
msgid "Check _Updates"
msgstr ""
@@ -540,11 +642,6 @@ msgstr "接続ä¸"
msgid "D"
msgstr ""
-#: ../gtk/main.ui.h:29
-#, fuzzy
-msgid "Decline"
-msgstr "ライン入力"
-
#: ../gtk/main.ui.h:30
#, fuzzy
msgid "Default"
@@ -557,12 +654,12 @@ msgstr "æƒ…å ±"
#: ../gtk/main.ui.h:32
#, fuzzy
-msgid "Duration:"
-msgstr "æƒ…å ±"
+msgid "Enable self-view"
+msgstr "使用ã™ã‚‹"
#: ../gtk/main.ui.h:33
#, fuzzy
-msgid "Enable self-view"
+msgid "Enable video"
msgstr "使用ã™ã‚‹"
#: ../gtk/main.ui.h:34
@@ -599,21 +696,26 @@ msgstr "コーデックã®æƒ…å ±"
msgid "Lookup:"
msgstr ""
-#: ../gtk/main.ui.h:43
+#: ../gtk/main.ui.h:42
#, fuzzy
msgid "My current identity:"
msgstr "å€‹äººæƒ…å ±"
-#: ../gtk/main.ui.h:44
+#: ../gtk/main.ui.h:43
#, fuzzy
msgid "Online users"
msgstr "ライン入力"
-#: ../gtk/main.ui.h:45
+#: ../gtk/main.ui.h:44
#, fuzzy
msgid "Password"
msgstr "パスワード"
+#: ../gtk/main.ui.h:46
+#, fuzzy
+msgid "Recent calls"
+msgstr "接続ä¸"
+
#: ../gtk/main.ui.h:47
#, fuzzy
msgid "SIP address or phone number:"
@@ -623,19 +725,15 @@ msgstr "レジストラサーãƒãƒ¼ã®SIPアドレス"
msgid "Search"
msgstr ""
-#: ../gtk/main.ui.h:49
+#: ../gtk/main.ui.h:50
msgid "Show debug window"
msgstr ""
-#: ../gtk/main.ui.h:50
+#: ../gtk/main.ui.h:51
#, fuzzy
msgid "Username"
msgstr "ユーザーマニュアル"
-#: ../gtk/main.ui.h:51
-msgid "_Call history"
-msgstr ""
-
#: ../gtk/main.ui.h:52
msgid "_Help"
msgstr ""
@@ -645,19 +743,14 @@ msgid "_Homepage"
msgstr ""
#: ../gtk/main.ui.h:54
-#, fuzzy
-msgid "_Linphone"
-msgstr "Linphone"
-
-#: ../gtk/main.ui.h:55
msgid "_Options"
msgstr ""
-#: ../gtk/main.ui.h:56
+#: ../gtk/main.ui.h:55
msgid "in"
msgstr ""
-#: ../gtk/main.ui.h:57
+#: ../gtk/main.ui.h:56
msgid "label"
msgstr ""
@@ -707,16 +800,6 @@ msgstr "アドレス"
msgid "Show this contact presence status"
msgstr ""
-#: ../gtk/contact.ui.h:6
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "接続ã—ã¾ã—ãŸã€‚"
-
-#: ../gtk/contact.ui.h:7
-#, fuzzy
-msgid "gtk-ok"
-msgstr "削除ã™ã‚‹"
-
#: ../gtk/log.ui.h:1
msgid "Linphone debug window"
msgstr ""
@@ -773,7 +856,7 @@ msgid "Publish presence information"
msgstr "コーデックã®æƒ…å ±"
#: ../gtk/sip_account.ui.h:6
-msgid "Register at startup"
+msgid "Register"
msgstr ""
#: ../gtk/sip_account.ui.h:7
@@ -804,11 +887,6 @@ msgstr "sip:"
msgid "Send"
msgstr "サウンド"
-#: ../gtk/chatroom.ui.h:2
-#, fuzzy
-msgid "gtk-close"
-msgstr "接続ã—ã¾ã—ãŸã€‚"
-
#: ../gtk/parameters.ui.h:1
msgid "0 stands for \"unlimited\""
msgstr ""
@@ -848,9 +926,8 @@ msgid "<b>NAT and Firewall</b>"
msgstr "接続ä¸"
#: ../gtk/parameters.ui.h:9
-#, fuzzy
-msgid "<b>Ports</b>"
-msgstr "接続ä¸"
+msgid "<b>Network protocol and ports</b>"
+msgstr ""
#: ../gtk/parameters.ui.h:10
#, fuzzy
@@ -873,207 +950,225 @@ msgid "<b>Video</b>"
msgstr "接続ä¸"
#: ../gtk/parameters.ui.h:14
-msgid "ALSA special device (optional):"
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
msgstr ""
#: ../gtk/parameters.ui.h:15
+msgid "ALSA special device (optional):"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:16
msgid "Add"
msgstr "è¿½åŠ ã™ã‚‹"
-#: ../gtk/parameters.ui.h:16
+#: ../gtk/parameters.ui.h:17
msgid "Audio RTP/UDP:"
msgstr ""
-#: ../gtk/parameters.ui.h:17
+#: ../gtk/parameters.ui.h:18
#, fuzzy
msgid "Audio codecs"
msgstr "オーディオコーデックã®ãƒ—ãƒãƒ‘ティー"
-#: ../gtk/parameters.ui.h:18
+#: ../gtk/parameters.ui.h:19
msgid "Behind NAT / Firewall (specify gateway IP below)"
msgstr ""
-#: ../gtk/parameters.ui.h:19
+#: ../gtk/parameters.ui.h:20
msgid "Behind NAT / Firewall (use STUN to resolve)"
msgstr ""
-#: ../gtk/parameters.ui.h:21
+#: ../gtk/parameters.ui.h:22
msgid "CIF"
msgstr ""
-#: ../gtk/parameters.ui.h:22
+#: ../gtk/parameters.ui.h:23
#, fuzzy
msgid "Capture device:"
msgstr "使用ã™ã‚‹ã‚µã‚¦ãƒ³ãƒ‰ãƒ‡ãƒã‚¤ã‚¹"
-#: ../gtk/parameters.ui.h:23
+#: ../gtk/parameters.ui.h:24
#, fuzzy
msgid "Codecs"
msgstr "コーデック"
-#: ../gtk/parameters.ui.h:24
+#: ../gtk/parameters.ui.h:25
msgid "Direct connection to the Internet"
msgstr ""
-#: ../gtk/parameters.ui.h:25
+#: ../gtk/parameters.ui.h:26
msgid "Disable"
msgstr "使用ã—ãªã„"
-#: ../gtk/parameters.ui.h:26
+#: ../gtk/parameters.ui.h:27
#, fuzzy
msgid "Done"
msgstr "ã‚ã‚Šã¾ã›ã‚“。"
-#: ../gtk/parameters.ui.h:27
+#: ../gtk/parameters.ui.h:28
msgid "Download speed limit in Kbit/sec:"
msgstr ""
-#: ../gtk/parameters.ui.h:28
+#: ../gtk/parameters.ui.h:29
msgid "Edit"
msgstr ""
-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:30
msgid "Enable"
msgstr "使用ã™ã‚‹"
-#: ../gtk/parameters.ui.h:30
+#: ../gtk/parameters.ui.h:31
+msgid "Enable adaptive rate control"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:32
msgid "Enable echo cancellation"
msgstr ""
-#: ../gtk/parameters.ui.h:31
+#: ../gtk/parameters.ui.h:33
msgid "Erase all passwords"
msgstr ""
-#: ../gtk/parameters.ui.h:32
+#: ../gtk/parameters.ui.h:34
msgid "Manage SIP Accounts"
msgstr ""
-#: ../gtk/parameters.ui.h:33
+#: ../gtk/parameters.ui.h:35
+msgid "Media encryption type"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:36
msgid "Multimedia settings"
msgstr ""
-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:37
#, fuzzy
msgid "Network settings"
msgstr "ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯"
-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:38
#, fuzzy
msgid "Playback device:"
msgstr "使用ã™ã‚‹ã‚µã‚¦ãƒ³ãƒ‰ãƒ‡ãƒã‚¤ã‚¹"
-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:39
msgid "Prefered video resolution:"
msgstr ""
-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:40
#, fuzzy
msgid "Public IP address:"
msgstr "Sipアドレス:"
-#: ../gtk/parameters.ui.h:38
+#: ../gtk/parameters.ui.h:41
msgid ""
"Register to FONICS\n"
"virtual network !"
msgstr ""
-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:43
msgid "Remove"
msgstr "削除ã™ã‚‹"
-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:44
#, fuzzy
msgid "Ring device:"
msgstr "使用ã™ã‚‹ã‚µã‚¦ãƒ³ãƒ‰ãƒ‡ãƒã‚¤ã‚¹"
-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:45
#, fuzzy
msgid "Ring sound:"
msgstr "録音ã™ã‚‹éŸ³æº"
-#: ../gtk/parameters.ui.h:43
-msgid "SIP (TCP):"
+#: ../gtk/parameters.ui.h:46
+msgid "SIP (TCP)"
msgstr ""
-#: ../gtk/parameters.ui.h:44
-msgid "SIP (UDP):"
+#: ../gtk/parameters.ui.h:47
+msgid "SIP (TLS)"
msgstr ""
-#: ../gtk/parameters.ui.h:45
+#: ../gtk/parameters.ui.h:48
+msgid "SIP (UDP)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:49
msgid "Send DTMFs as SIP info"
msgstr ""
-#: ../gtk/parameters.ui.h:46
+#: ../gtk/parameters.ui.h:50
msgid "Set Maximum Transmission Unit:"
msgstr ""
-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:51
msgid "Settings"
msgstr ""
-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:52
msgid "Show advanced settings"
msgstr ""
-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:53
#, fuzzy
msgid "Stun server:"
msgstr "使用ã™ã‚‹ã‚µã‚¦ãƒ³ãƒ‰ãƒ‡ãƒã‚¤ã‚¹"
-#: ../gtk/parameters.ui.h:50
+#: ../gtk/parameters.ui.h:54
msgid "This section defines your SIP address when not using a SIP account"
msgstr ""
-#: ../gtk/parameters.ui.h:51
+#: ../gtk/parameters.ui.h:55
msgid "Upload speed limit in Kbit/sec:"
msgstr ""
-#: ../gtk/parameters.ui.h:52
+#: ../gtk/parameters.ui.h:56
msgid "Use IPv6 instead of IPv4"
msgstr ""
-#: ../gtk/parameters.ui.h:53
+#: ../gtk/parameters.ui.h:57
#, fuzzy
msgid "User interface"
msgstr "ユーザーマニュアル"
-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:58
msgid "Video RTP/UDP:"
msgstr ""
-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:59
#, fuzzy
msgid "Video codecs"
msgstr "オーディオコーデックã®ãƒ—ãƒãƒ‘ティー"
-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:60
#, fuzzy
msgid "Video input device:"
msgstr "使用ã™ã‚‹ã‚µã‚¦ãƒ³ãƒ‰ãƒ‡ãƒã‚¤ã‚¹"
-#: ../gtk/parameters.ui.h:57
+#: ../gtk/parameters.ui.h:61
msgid "Your display name (eg: John Doe):"
msgstr ""
-#: ../gtk/parameters.ui.h:58
+#: ../gtk/parameters.ui.h:62
#, fuzzy
msgid "Your resulting SIP address:"
msgstr "ã‚ãªãŸã®SIPアドレス"
-#: ../gtk/parameters.ui.h:59
+#: ../gtk/parameters.ui.h:63
#, fuzzy
msgid "Your username:"
msgstr "ユーザーマニュアル"
-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:64
msgid "a sound card"
msgstr ""
-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:65
msgid "default camera"
msgstr ""
-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:66
msgid "default soundcard"
msgstr ""
@@ -1100,26 +1195,19 @@ msgstr "Linphone"
msgid "Please wait"
msgstr ""
-#: ../coreapi/linphonecore.c:165
-#, c-format
-msgid "You have missed %i call."
-msgid_plural "You have missed %i calls."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../coreapi/linphonecore.c:206
+#: ../coreapi/linphonecore.c:187
msgid "aborted"
msgstr ""
-#: ../coreapi/linphonecore.c:209
+#: ../coreapi/linphonecore.c:190
msgid "completed"
msgstr ""
-#: ../coreapi/linphonecore.c:212
+#: ../coreapi/linphonecore.c:193
msgid "missed"
msgstr ""
-#: ../coreapi/linphonecore.c:217
+#: ../coreapi/linphonecore.c:198
#, c-format
msgid ""
"%s at %s\n"
@@ -1129,28 +1217,24 @@ msgid ""
"Duration: %i mn %i sec\n"
msgstr ""
-#: ../coreapi/linphonecore.c:218
-msgid "Incoming call"
-msgstr ""
-
-#: ../coreapi/linphonecore.c:218
+#: ../coreapi/linphonecore.c:199
msgid "Outgoing call"
msgstr ""
-#: ../coreapi/linphonecore.c:998
+#: ../coreapi/linphonecore.c:1088
#, fuzzy
msgid "Ready"
msgstr "準備完了。"
-#: ../coreapi/linphonecore.c:1773
+#: ../coreapi/linphonecore.c:1831
msgid "Looking for telephone number destination..."
msgstr ""
-#: ../coreapi/linphonecore.c:1776
+#: ../coreapi/linphonecore.c:1834
msgid "Could not resolve this number."
msgstr ""
-#: ../coreapi/linphonecore.c:1820
+#: ../coreapi/linphonecore.c:1878
#, fuzzy
msgid ""
"Could not parse given sip address. A sip url usually looks like sip:"
@@ -1159,54 +1243,41 @@ msgstr ""
"SIPアドレスã®å½¢å¼ã‚¨ãƒ©ãƒ¼ã§ã™ã€‚SIPアドレスã¯ã€<sip:username@domainname>ã®ã‚ˆã†ãª"
"å½¢å¼ã§ã™ã€‚"
-#: ../coreapi/linphonecore.c:1967
+#: ../coreapi/linphonecore.c:2025
#, fuzzy
msgid "Contacting"
msgstr "接続ä¸"
-#: ../coreapi/linphonecore.c:1974
+#: ../coreapi/linphonecore.c:2032
#, fuzzy
msgid "Could not call"
msgstr "pixmapファイルãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ %s"
-#: ../coreapi/linphonecore.c:2081
-msgid "Sorry, you have to pause or stop the current call first !"
-msgstr ""
-
-#: ../coreapi/linphonecore.c:2086
+#: ../coreapi/linphonecore.c:2140
msgid "Sorry, we have reached the maximum number of simultaneous calls"
msgstr ""
-#: ../coreapi/linphonecore.c:2208
+#: ../coreapi/linphonecore.c:2270
msgid "Modifying call parameters..."
msgstr ""
-#: ../coreapi/linphonecore.c:2311
+#: ../coreapi/linphonecore.c:2366
msgid "Connected."
msgstr "接続ã—ã¾ã—ãŸã€‚"
-#: ../coreapi/linphonecore.c:2334
+#: ../coreapi/linphonecore.c:2389
#, fuzzy
msgid "Call aborted"
msgstr "通話ã¯ã‚ャンセルã•ã‚Œã¾ã—ãŸã€‚"
-#: ../coreapi/linphonecore.c:2374
-#, fuzzy
-msgid "Call ended"
-msgstr "通話ã¯æ‹’å¦ã•ã‚Œã¾ã—ãŸã€‚"
-
-#: ../coreapi/linphonecore.c:2456
+#: ../coreapi/linphonecore.c:2530
msgid "Could not pause the call"
msgstr ""
-#: ../coreapi/linphonecore.c:2460
+#: ../coreapi/linphonecore.c:2535
msgid "Pausing the current call..."
msgstr ""
-#: ../coreapi/linphonecore.c:2499
-msgid "There is already a call in process, pause or stop it first."
-msgstr ""
-
#: ../coreapi/misc.c:147
msgid ""
"Your computer appears to be using ALSA sound drivers.\n"
@@ -1287,156 +1358,203 @@ msgstr ""
msgid "Unknown-bug"
msgstr ""
-#: ../coreapi/proxy.c:187
+#: ../coreapi/proxy.c:192
msgid ""
"The sip proxy address you entered is invalid, it must start with \"sip:\" "
"followed by a hostname."
msgstr ""
-#: ../coreapi/proxy.c:193
+#: ../coreapi/proxy.c:198
msgid ""
"The sip identity you entered is invalid.\n"
"It should look like sip:username@proxydomain, such as sip:alice@example.net"
msgstr ""
-#: ../coreapi/proxy.c:671
+#: ../coreapi/proxy.c:690
#, fuzzy, c-format
msgid "Could not login as %s"
msgstr "pixmapファイルãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ %s"
-#: ../coreapi/callbacks.c:170
+#: ../coreapi/callbacks.c:206
#, fuzzy
msgid "is contacting you"
msgstr "ã‹ã‚‰é›»è©±ã§ã™ã€‚"
-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207
msgid " and asked autoanswer."
msgstr ""
-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207
msgid "."
msgstr ""
-#: ../coreapi/callbacks.c:226
+#: ../coreapi/callbacks.c:266
#, fuzzy
msgid "Remote ringing."
msgstr "登録ä¸â€¦â€¦"
-#: ../coreapi/callbacks.c:242
+#: ../coreapi/callbacks.c:282
#, fuzzy
msgid "Remote ringing..."
msgstr "登録ä¸â€¦â€¦"
-#: ../coreapi/callbacks.c:253
+#: ../coreapi/callbacks.c:293
msgid "Early media."
msgstr ""
-#: ../coreapi/callbacks.c:291
+#: ../coreapi/callbacks.c:331
#, c-format
msgid "Call with %s is paused."
msgstr ""
-#: ../coreapi/callbacks.c:302
+#: ../coreapi/callbacks.c:342
#, c-format
msgid "Call answered by %s - on hold."
msgstr ""
-#: ../coreapi/callbacks.c:317
+#: ../coreapi/callbacks.c:357
#, fuzzy
msgid "Call resumed."
msgstr "通話ã¯æ‹’å¦ã•ã‚Œã¾ã—ãŸã€‚"
-#: ../coreapi/callbacks.c:322
+#: ../coreapi/callbacks.c:362
#, fuzzy, c-format
msgid "Call answered by %s."
msgstr ""
"電話をã‹ã‘ã‚‹\n"
"電話ã«å‡ºã‚‹"
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:432
msgid "We are being paused..."
msgstr ""
-#: ../coreapi/callbacks.c:387
+#: ../coreapi/callbacks.c:436
msgid "We have been resumed..."
msgstr ""
-#: ../coreapi/callbacks.c:424
+#: ../coreapi/callbacks.c:441
+msgid "Call has been updated by remote..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:473
#, fuzzy
msgid "Call terminated."
msgstr "通話ã¯æ‹’å¦ã•ã‚Œã¾ã—ãŸã€‚"
-#: ../coreapi/callbacks.c:431
+#: ../coreapi/callbacks.c:480
msgid "User is busy."
msgstr "ユーザーã¯ãƒ“ジーã§ã™"
-#: ../coreapi/callbacks.c:432
+#: ../coreapi/callbacks.c:481
msgid "User is temporarily unavailable."
msgstr "ユーザーã¯ã€ä»Šå‡ºã‚‰ã‚Œã¾ã›ã‚“。"
#. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:434
+#: ../coreapi/callbacks.c:483
msgid "User does not want to be disturbed."
msgstr "ユーザーã¯æ‰‹ãŒé›¢ã›ãªã„よã†ã§ã™ã€‚"
-#: ../coreapi/callbacks.c:435
+#: ../coreapi/callbacks.c:484
msgid "Call declined."
msgstr "通話ã¯æ‹’å¦ã•ã‚Œã¾ã—ãŸã€‚"
-#: ../coreapi/callbacks.c:447
+#: ../coreapi/callbacks.c:496
msgid "No response."
msgstr ""
-#: ../coreapi/callbacks.c:451
+#: ../coreapi/callbacks.c:500
msgid "Protocol error."
msgstr ""
-#: ../coreapi/callbacks.c:467
+#: ../coreapi/callbacks.c:516
msgid "Redirected"
msgstr ""
-#: ../coreapi/callbacks.c:477
+#: ../coreapi/callbacks.c:526
msgid "Not found"
msgstr ""
-#: ../coreapi/callbacks.c:487
+#: ../coreapi/callbacks.c:551
msgid "No common codecs"
msgstr ""
-#: ../coreapi/callbacks.c:493
+#: ../coreapi/callbacks.c:557
#, fuzzy
msgid "Call failed."
msgstr "通話ã¯ã‚ャンセルã•ã‚Œã¾ã—ãŸã€‚"
-#: ../coreapi/callbacks.c:557
+#: ../coreapi/callbacks.c:631
#, fuzzy, c-format
msgid "Registration on %s successful."
msgstr "登録ã—ã¾ã—ãŸã€‚"
-#: ../coreapi/callbacks.c:558
+#: ../coreapi/callbacks.c:632
#, fuzzy, c-format
msgid "Unregistration on %s done."
msgstr "登録ã—ã¾ã—ãŸã€‚"
-#: ../coreapi/callbacks.c:574
+#: ../coreapi/callbacks.c:648
msgid "no response timeout"
msgstr ""
-#: ../coreapi/callbacks.c:577
+#: ../coreapi/callbacks.c:651
#, fuzzy, c-format
msgid "Registration on %s failed: %s"
msgstr "登録ã—ã¾ã—ãŸã€‚"
-#: ../coreapi/callbacks.c:619
-#, c-format
-msgid "We are transferred to %s"
-msgstr ""
-
-#: ../coreapi/sal_eXosip2.c:815 ../coreapi/sal_eXosip2.c:817
+#: ../coreapi/sal_eXosip2.c:873 ../coreapi/sal_eXosip2.c:875
#, fuzzy
msgid "Authentication failure"
msgstr "コーデックã®æƒ…å ±"
+#: ../coreapi/linphonecall.c:128
+#, fuzzy, c-format
+msgid "Authentication token is %s"
+msgstr "コーデックã®æƒ…å ±"
+
+#: ../coreapi/linphonecall.c:1560
+#, c-format
+msgid "You have missed %i call."
+msgid_plural "You have missed %i calls."
+msgstr[0] ""
+msgstr[1] ""
+
+#, fuzzy
+#~ msgid "<b>Contact list</b>"
+#~ msgstr "接続ä¸"
+
+#, fuzzy
+#~ msgid "Audio & video"
+#~ msgstr "オーディオコーデックã®ãƒ—ãƒãƒ‘ティー"
+
+#, fuzzy
+#~ msgid "Audio only"
+#~ msgstr "オーディオ"
+
+#, fuzzy
+#~ msgid "Duration:"
+#~ msgstr "æƒ…å ±"
+
+#, fuzzy
+#~ msgid "_Linphone"
+#~ msgstr "Linphone"
+
+#, fuzzy
+#~ msgid "gtk-cancel"
+#~ msgstr "接続ã—ã¾ã—ãŸã€‚"
+
+#, fuzzy
+#~ msgid "gtk-ok"
+#~ msgstr "削除ã™ã‚‹"
+
+#, fuzzy
+#~ msgid "gtk-close"
+#~ msgstr "接続ã—ã¾ã—ãŸã€‚"
+
+#, fuzzy
+#~ msgid "<b>Ports</b>"
+#~ msgstr "接続ä¸"
+
#, fuzzy
#~ msgid "_Modes"
#~ msgstr "コーデック"
@@ -1630,10 +1748,6 @@ msgstr "コーデックã®æƒ…å ±"
#~ msgid "Name:"
#~ msgstr "åå‰"
-#, fuzzy
-#~ msgid "None"
-#~ msgstr "ã‚ã‚Šã¾ã›ã‚“。"
-
#, fuzzy
#~ msgid "Bad sip address: a sip address looks like sip:user@domain"
#~ msgstr ""
@@ -1690,12 +1804,6 @@ msgstr "コーデックã®æƒ…å ±"
#~ msgid "Timeout..."
#~ msgstr "時間切れã§ã™ã€‚"
-#, fuzzy
-#~ msgid ""
-#~ "Add address\n"
-#~ "book"
-#~ msgstr "電話帳"
-
#~ msgid "Toggle this if you want to be registered on a remote server."
#~ msgstr "リモートサーãƒãƒ¼ã«ç™»éŒ²ã™ã‚‹ã¨ãã¯ã€ãƒã‚§ãƒƒã‚¯ã—ã¦ä¸‹ã•ã„。"
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 9af125dc3606bb83dd5bd411b97f7bc18d0876bb..41579a75d3c40ceba6f74e34978acfbf9f214c43 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-08 22:32+0200\n"
+"POT-Creation-Date: 2011-12-02 16:47+0100\n"
"PO-Revision-Date: 2011-04-05 01:56+0200\n"
"Last-Translator: Øyvind Sæther <oyvinds@everdot.org>\n"
"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -17,6 +17,19 @@ msgstr ""
"X-Generator: Lokalize 1.2\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
+#: ../gtk/calllogs.c:71
+msgid "n/a"
+msgstr ""
+
+#: ../gtk/conference.c:33 ../gtk/incall_view.c:183
+msgid "Conference"
+msgstr ""
+
+#: ../gtk/conference.c:41
+#, fuzzy
+msgid "Me"
+msgstr "Skru mikrofonen av"
+
#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
#, c-format
msgid "Couldn't find pixmap file: %s"
@@ -27,23 +40,27 @@ msgstr "Fant ikke pixmap fli: %s"
msgid "Chat with %s"
msgstr "Chat med %s"
-#: ../gtk/main.c:74
+#: ../gtk/main.c:83
msgid "log to stdout some debug information while running."
msgstr "skriv logg-informasjon under kjøring"
-#: ../gtk/main.c:81
+#: ../gtk/main.c:90
+msgid "path to a file to write logs into."
+msgstr ""
+
+#: ../gtk/main.c:97
msgid "Start only in the system tray, do not show the main interface."
msgstr "Start skjult i systemkurven, ikke vis programbildet."
-#: ../gtk/main.c:88
+#: ../gtk/main.c:104
msgid "address to call right now"
msgstr "address som skal ringes nå"
-#: ../gtk/main.c:95
+#: ../gtk/main.c:111
msgid "if set automatically answer incoming calls"
msgstr "besvarer innkommende samtaler automatisk om valgt"
-#: ../gtk/main.c:102
+#: ../gtk/main.c:118
msgid ""
"Specifiy a working directory (should be the base of the installation, eg: c:"
"\\Program Files\\Linphone)"
@@ -51,12 +68,12 @@ msgstr ""
"Spesifiser arbeidsmappe (bør være base for installasjonen, f.eks: c:"
"\\Programfiler\\Linphone)"
-#: ../gtk/main.c:442
+#: ../gtk/main.c:464
#, c-format
msgid "Call with %s"
msgstr "Ring med %s"
-#: ../gtk/main.c:826
+#: ../gtk/main.c:815
#, c-format
msgid ""
"%s would like to add you to his contact list.\n"
@@ -69,7 +86,7 @@ msgstr ""
"din kontaktliste?\n"
"Hvis du svarer nei vil personen bli svartelyst midlertidig."
-#: ../gtk/main.c:904
+#: ../gtk/main.c:893
#, c-format
msgid ""
"Please enter your password for username <i>%s</i>\n"
@@ -78,24 +95,56 @@ msgstr ""
"Skriv inn ditt passord for brukernavn <i>%s</i>\n"
" på domene <i>%s</i>:i>:"
-#: ../gtk/main.c:1040
+#: ../gtk/main.c:993
+#, fuzzy
+msgid "Call error"
+msgstr "Samtalehistorikk"
+
+#: ../gtk/main.c:996 ../coreapi/linphonecore.c:2406
+msgid "Call ended"
+msgstr "Samtale avsluttet"
+
+#: ../gtk/main.c:999 ../coreapi/linphonecore.c:199
+msgid "Incoming call"
+msgstr "Innkommende samtale"
+
+#: ../gtk/main.c:1001 ../gtk/incall_view.c:292 ../gtk/main.ui.h:20
+msgid "Answer"
+msgstr "Svarer"
+
+#: ../gtk/main.c:1003 ../gtk/main.ui.h:29
+msgid "Decline"
+msgstr "Avvis"
+
+#: ../gtk/main.c:1009
+#, fuzzy
+msgid "Call paused"
+msgstr "Samtale avbrutt"
+
+#: ../gtk/main.c:1009
+#, c-format
+msgid "<span size=\"large\">by %s</span>"
+msgstr ""
+
+#: ../gtk/main.c:1165
msgid "Website link"
msgstr "Peker til nettsted"
-#: ../gtk/main.c:1076
+#: ../gtk/main.c:1205
msgid "Linphone - a video internet phone"
msgstr "Linphone - en video Internet telefon"
-#: ../gtk/main.c:1095
+#: ../gtk/main.c:1295
#, c-format
msgid "%s (Default)"
msgstr "%s (Standard)"
-#: ../gtk/main.c:1187
-msgid "Windows"
-msgstr "Vinduer"
+#: ../gtk/main.c:1566 ../coreapi/callbacks.c:700
+#, c-format
+msgid "We are transferred to %s"
+msgstr "Vi er overført til %s"
-#: ../gtk/main.c:1364
+#: ../gtk/main.c:1576
msgid ""
"No sound cards have been detected on this computer.\n"
"You won't be able to send or receive audio calls."
@@ -103,141 +152,165 @@ msgstr ""
"Klarte ikke å finne noe lydkort på denne datamaskinen.\n"
"Du vil ikke kunne sende eller motta lydsamtaler."
-#: ../gtk/main.c:1423
+#: ../gtk/main.c:1663
msgid "A free SIP video-phone"
msgstr "En gratis SIP video-telefon"
-#: ../gtk/friendlist.c:192 ../gtk/propertybox.c:271 ../gtk/contact.ui.h:3
+#: ../gtk/friendlist.c:203
+msgid "Add to addressbook"
+msgstr ""
+
+#: ../gtk/friendlist.c:258 ../gtk/propertybox.c:296 ../gtk/contact.ui.h:3
msgid "Name"
msgstr "Navn"
-#: ../gtk/friendlist.c:205
+#: ../gtk/friendlist.c:271
msgid "Presence status"
msgstr "Tilstedestatus"
-#: ../gtk/friendlist.c:242
+#: ../gtk/friendlist.c:308
#, c-format
msgid "Search in %s directory"
msgstr "Søk i %s katalogen"
-#: ../gtk/friendlist.c:450
+#: ../gtk/friendlist.c:568
msgid "Invalid sip contact !"
msgstr "Ugyldig SIP kontakt !"
-#: ../gtk/friendlist.c:495
+#: ../gtk/friendlist.c:613
#, c-format
msgid "Call %s"
msgstr "Ring %s"
-#: ../gtk/friendlist.c:496
+#: ../gtk/friendlist.c:614
#, c-format
msgid "Send text to %s"
msgstr "Send tekst til %s"
-#: ../gtk/friendlist.c:497
+#: ../gtk/friendlist.c:615
#, c-format
msgid "Edit contact '%s'"
msgstr "Rediger kontakt '%s'"
-#: ../gtk/friendlist.c:498
+#: ../gtk/friendlist.c:616
#, c-format
msgid "Delete contact '%s'"
msgstr "Slett kontakt '%s'"
-#: ../gtk/friendlist.c:540
+#: ../gtk/friendlist.c:658
#, c-format
msgid "Add new contact from %s directory"
msgstr "Legg til kontakt fra %s katalogen"
-#: ../gtk/propertybox.c:277
+#: ../gtk/propertybox.c:302
msgid "Rate (Hz)"
msgstr "Frekvens (Hz)"
-#: ../gtk/propertybox.c:283
+#: ../gtk/propertybox.c:308
msgid "Status"
msgstr "Status"
-#: ../gtk/propertybox.c:289
+#: ../gtk/propertybox.c:314
msgid "Min bitrate (kbit/s)"
msgstr "Min. datahastighet (kbit/s)"
-#: ../gtk/propertybox.c:296
+#: ../gtk/propertybox.c:321
msgid "Parameters"
msgstr "Parametere"
-#: ../gtk/propertybox.c:326 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507
msgid "Enabled"
msgstr "PÃ¥"
-#: ../gtk/propertybox.c:327 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507
msgid "Disabled"
msgstr "Av"
-#: ../gtk/propertybox.c:510
+#: ../gtk/propertybox.c:553
msgid "Account"
msgstr "Konto"
-#: ../gtk/propertybox.c:650
+#: ../gtk/propertybox.c:693
msgid "English"
msgstr "Engelsk"
-#: ../gtk/propertybox.c:651
+#: ../gtk/propertybox.c:694
msgid "French"
msgstr "Fransk"
-#: ../gtk/propertybox.c:652
+#: ../gtk/propertybox.c:695
msgid "Swedish"
msgstr "Svensk"
-#: ../gtk/propertybox.c:653
+#: ../gtk/propertybox.c:696
msgid "Italian"
msgstr "Italisensk"
-#: ../gtk/propertybox.c:654
+#: ../gtk/propertybox.c:697
msgid "Spanish"
msgstr "Spansk"
-#: ../gtk/propertybox.c:655
+#: ../gtk/propertybox.c:698
msgid "Brazilian Portugese"
msgstr "Portugisisk"
-#: ../gtk/propertybox.c:656
+#: ../gtk/propertybox.c:699
msgid "Polish"
msgstr "Polsk"
-#: ../gtk/propertybox.c:657
+#: ../gtk/propertybox.c:700
msgid "German"
msgstr "Tysk"
-#: ../gtk/propertybox.c:658
+#: ../gtk/propertybox.c:701
msgid "Russian"
msgstr "Russisk"
-#: ../gtk/propertybox.c:659
+#: ../gtk/propertybox.c:702
msgid "Japanese"
msgstr "Japansk"
-#: ../gtk/propertybox.c:660
+#: ../gtk/propertybox.c:703
msgid "Dutch"
msgstr "Nederlandsk"
-#: ../gtk/propertybox.c:661
+#: ../gtk/propertybox.c:704
msgid "Hungarian"
msgstr "Ungarsk"
-#: ../gtk/propertybox.c:662
+#: ../gtk/propertybox.c:705
msgid "Czech"
msgstr "Tjekkisk"
-#: ../gtk/propertybox.c:663
+#: ../gtk/propertybox.c:706
msgid "Chinese"
msgstr "Kinesisk"
-#: ../gtk/propertybox.c:720
+#: ../gtk/propertybox.c:707
+msgid "Traditional Chinese"
+msgstr ""
+
+#: ../gtk/propertybox.c:708
+msgid "Norwegian"
+msgstr ""
+
+#: ../gtk/propertybox.c:765
msgid ""
"You need to restart linphone for the new language selection to take effect."
msgstr "Du må restarte linphone for at det nye språkvalget skal iverksettes."
+#: ../gtk/propertybox.c:835
+msgid "None"
+msgstr ""
+
+#: ../gtk/propertybox.c:839
+msgid "SRTP"
+msgstr ""
+
+#: ../gtk/propertybox.c:845
+msgid "ZRTP"
+msgstr ""
+
#: ../gtk/update.c:80
#, c-format
msgid ""
@@ -355,74 +428,99 @@ msgstr "Lager brukerkontoen din"
msgid "Now ready !"
msgstr "Klar nå!"
-#: ../gtk/incall_view.c:61
+#: ../gtk/incall_view.c:69
#, fuzzy, c-format
msgid "Call #%i"
msgstr "Ring %s"
-#: ../gtk/incall_view.c:87
+#: ../gtk/incall_view.c:127
#, c-format
msgid "Transfer to call #%i with %s"
msgstr ""
-#: ../gtk/incall_view.c:113
+#: ../gtk/incall_view.c:155
msgid "Transfer"
msgstr "Overfører"
-#: ../gtk/incall_view.c:187
+#: ../gtk/incall_view.c:271
msgid "<b>Calling...</b>"
msgstr "<b>Ringer...</b>"
-#: ../gtk/incall_view.c:190 ../gtk/incall_view.c:246
+#: ../gtk/incall_view.c:274 ../gtk/incall_view.c:482
msgid "00::00::00"
msgstr "00:00:00"
-#: ../gtk/incall_view.c:206
+#: ../gtk/incall_view.c:285
msgid "<b>Incoming call</b>"
msgstr "Innkommende samtale"
-#: ../gtk/incall_view.c:216
-msgid ""
-"Pause all calls\n"
-"and answer"
+#: ../gtk/incall_view.c:322
+msgid "good"
msgstr ""
-"Pauser alle samtaler\n"
-"og svarer"
-#: ../gtk/incall_view.c:217 ../gtk/main.ui.h:20
-msgid "Answer"
-msgstr "Svarer"
+#: ../gtk/incall_view.c:324
+msgid "average"
+msgstr ""
+
+#: ../gtk/incall_view.c:326
+msgid "poor"
+msgstr ""
+
+#: ../gtk/incall_view.c:328
+msgid "very poor"
+msgstr ""
+
+#: ../gtk/incall_view.c:330
+msgid "too bad"
+msgstr ""
+
+#: ../gtk/incall_view.c:331 ../gtk/incall_view.c:347
+msgid "unavailable"
+msgstr ""
+
+#: ../gtk/incall_view.c:447
+msgid "Secured by SRTP"
+msgstr ""
+
+#: ../gtk/incall_view.c:453
+#, c-format
+msgid "Secured by ZRTP - [auth token: %s]"
+msgstr ""
+
+#: ../gtk/incall_view.c:459
+msgid "Set unverified"
+msgstr ""
+
+#: ../gtk/incall_view.c:459 ../gtk/main.ui.h:49
+msgid "Set verified"
+msgstr ""
+
+#: ../gtk/incall_view.c:480
+msgid "In conference"
+msgstr ""
-#: ../gtk/incall_view.c:244
+#: ../gtk/incall_view.c:480
msgid "<b>In call</b>"
msgstr "<b>I samtale med</b>"
-#: ../gtk/incall_view.c:260
+#: ../gtk/incall_view.c:499
msgid "<b>Paused call</b>"
msgstr "<b>Pauset samtale</b>"
-#: ../gtk/incall_view.c:272
+#: ../gtk/incall_view.c:511
#, c-format
msgid "%02i::%02i::%02i"
msgstr "%02i:%02i:%02i"
-#: ../gtk/incall_view.c:288
+#: ../gtk/incall_view.c:527
msgid "<b>Call ended.</b>"
msgstr "<b>Samtale avsluttet.</b>"
-#: ../gtk/incall_view.c:309
-msgid "Unmute"
-msgstr "Skru mikrofonen på"
-
-#: ../gtk/incall_view.c:316 ../gtk/main.ui.h:42
-msgid "Mute"
-msgstr "Skru mikrofonen av"
-
-#: ../gtk/incall_view.c:340
+#: ../gtk/incall_view.c:584
msgid "Resume"
msgstr "Fortsett"
-#: ../gtk/incall_view.c:347 ../gtk/main.ui.h:46
+#: ../gtk/incall_view.c:591 ../gtk/main.ui.h:45
msgid "Pause"
msgstr "Pause"
@@ -484,8 +582,9 @@ msgid "<b>Add contacts from directory</b>"
msgstr "<b>Legg til kontakter fra katalogen</b>"
#: ../gtk/main.ui.h:14
-msgid "<b>Contact list</b>"
-msgstr "<b>Kontaktliste</b>"
+#, fuzzy
+msgid "<b>Callee name</b>"
+msgstr "<b>Samtale avsluttet.</b>"
#: ../gtk/main.ui.h:15
msgid "<b>Welcome !</b>"
@@ -508,25 +607,26 @@ msgid "All users"
msgstr "Alle brukere"
#: ../gtk/main.ui.h:21
-msgid "Audio & video"
-msgstr "Lyd og Video"
-
-#: ../gtk/main.ui.h:22
-msgid "Audio only"
-msgstr "Kun lyd"
-
-#: ../gtk/main.ui.h:23
msgid "Automatically log me in"
msgstr "Logg meg på automatisk"
-#: ../gtk/main.ui.h:24
+#: ../gtk/main.ui.h:22
msgid "B"
msgstr "B"
-#: ../gtk/main.ui.h:25 ../gtk/parameters.ui.h:20
+#: ../gtk/main.ui.h:23 ../gtk/parameters.ui.h:21
msgid "C"
msgstr "C"
+#: ../gtk/main.ui.h:24
+#, fuzzy
+msgid "Call"
+msgstr "Ring %s"
+
+#: ../gtk/main.ui.h:25
+msgid "Call quality rating"
+msgstr ""
+
#: ../gtk/main.ui.h:26
msgid "Check _Updates"
msgstr "Sjekk _Oppdateringer"
@@ -539,10 +639,6 @@ msgstr "Kontakter"
msgid "D"
msgstr "D"
-#: ../gtk/main.ui.h:29
-msgid "Decline"
-msgstr "Avvis"
-
#: ../gtk/main.ui.h:30
msgid "Default"
msgstr "Standard"
@@ -552,13 +648,14 @@ msgid "Duration"
msgstr "Varighet"
#: ../gtk/main.ui.h:32
-msgid "Duration:"
-msgstr "Varighet:"
-
-#: ../gtk/main.ui.h:33
msgid "Enable self-view"
msgstr "Vis video av deg selv"
+#: ../gtk/main.ui.h:33
+#, fuzzy
+msgid "Enable video"
+msgstr "PÃ¥"
+
#: ../gtk/main.ui.h:34
msgid "Enter username, phone number, or full sip address"
msgstr "Skriv inn brukernavn, telefonnummer eller full SIP-addresse"
@@ -591,18 +688,23 @@ msgstr "Innlogginsinformasjon"
msgid "Lookup:"
msgstr "Slå opp:"
-#: ../gtk/main.ui.h:43
+#: ../gtk/main.ui.h:42
msgid "My current identity:"
msgstr "Min nåværende identitet:"
-#: ../gtk/main.ui.h:44
+#: ../gtk/main.ui.h:43
msgid "Online users"
msgstr "Tilkoblede brukere"
-#: ../gtk/main.ui.h:45
+#: ../gtk/main.ui.h:44
msgid "Password"
msgstr "Passord"
+#: ../gtk/main.ui.h:46
+#, fuzzy
+msgid "Recent calls"
+msgstr "I samtale"
+
#: ../gtk/main.ui.h:47
msgid "SIP address or phone number:"
msgstr "Sip adresse eller telefonnummer:"
@@ -611,19 +713,14 @@ msgstr "Sip adresse eller telefonnummer:"
msgid "Search"
msgstr "Søk"
-#: ../gtk/main.ui.h:49
+#: ../gtk/main.ui.h:50
msgid "Show debug window"
msgstr "Vis avlusningsvindu"
-#: ../gtk/main.ui.h:50
+#: ../gtk/main.ui.h:51
msgid "Username"
msgstr "Brukernavn"
-#: ../gtk/main.ui.h:51
-#, fuzzy
-msgid "_Call history"
-msgstr "Samtalehistorikk"
-
#: ../gtk/main.ui.h:52
msgid "_Help"
msgstr "_Hjelp"
@@ -633,18 +730,14 @@ msgid "_Homepage"
msgstr "H_jemmeside"
#: ../gtk/main.ui.h:54
-msgid "_Linphone"
-msgstr "_Linphone"
-
-#: ../gtk/main.ui.h:55
msgid "_Options"
msgstr "_Alternativer"
-#: ../gtk/main.ui.h:56
+#: ../gtk/main.ui.h:55
msgid "in"
msgstr "i"
-#: ../gtk/main.ui.h:57
+#: ../gtk/main.ui.h:56
msgid "label"
msgstr "etikett"
@@ -704,14 +797,6 @@ msgstr "SIP Addresse"
msgid "Show this contact presence status"
msgstr "Vis kontaktens tilstedestatus"
-#: ../gtk/contact.ui.h:6
-msgid "gtk-cancel"
-msgstr "gtk-avbryt"
-
-#: ../gtk/contact.ui.h:7
-msgid "gtk-ok"
-msgstr "gtk-ok"
-
#: ../gtk/log.ui.h:1
msgid "Linphone debug window"
msgstr "Linphone avlusningsvindu"
@@ -765,8 +850,8 @@ msgid "Publish presence information"
msgstr "Publiser tilstedestatus"
#: ../gtk/sip_account.ui.h:6
-msgid "Register at startup"
-msgstr "Registrer ved oppstart"
+msgid "Register"
+msgstr ""
#: ../gtk/sip_account.ui.h:7
msgid "Registration duration (sec):"
@@ -792,10 +877,6 @@ msgstr "sip:"
msgid "Send"
msgstr "Send"
-#: ../gtk/chatroom.ui.h:2
-msgid "gtk-close"
-msgstr "gtk-lukk"
-
#: ../gtk/parameters.ui.h:1
msgid "0 stands for \"unlimited\""
msgstr "0 betyr \"ubegrenset\""
@@ -829,8 +910,8 @@ msgid "<b>NAT and Firewall</b>"
msgstr "<b>NAT og Brannvegg</b>"
#: ../gtk/parameters.ui.h:9
-msgid "<b>Ports</b>"
-msgstr "<b>Porter</b>"
+msgid "<b>Network protocol and ports</b>"
+msgstr ""
#: ../gtk/parameters.ui.h:10
msgid "<b>Privacy</b>"
@@ -849,98 +930,112 @@ msgid "<b>Video</b>"
msgstr "<b>Video</b>"
#: ../gtk/parameters.ui.h:14
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:15
msgid "ALSA special device (optional):"
msgstr "Spesiell ALSA enhet (valgfritt):"
-#: ../gtk/parameters.ui.h:15
+#: ../gtk/parameters.ui.h:16
msgid "Add"
msgstr "Legg til"
-#: ../gtk/parameters.ui.h:16
+#: ../gtk/parameters.ui.h:17
msgid "Audio RTP/UDP:"
msgstr "Lyd RTP/UDP:"
-#: ../gtk/parameters.ui.h:17
+#: ../gtk/parameters.ui.h:18
msgid "Audio codecs"
msgstr "Lyd kodek"
-#: ../gtk/parameters.ui.h:18
+#: ../gtk/parameters.ui.h:19
msgid "Behind NAT / Firewall (specify gateway IP below)"
msgstr "Bak NAT / Brannmur (spesifiser gateway IP under)"
-#: ../gtk/parameters.ui.h:19
+#: ../gtk/parameters.ui.h:20
msgid "Behind NAT / Firewall (use STUN to resolve)"
msgstr "Bak NAT / Brannmur (bruk STUN for å avgjøre)"
-#: ../gtk/parameters.ui.h:21
+#: ../gtk/parameters.ui.h:22
msgid "CIF"
msgstr "CIF"
-#: ../gtk/parameters.ui.h:22
+#: ../gtk/parameters.ui.h:23
msgid "Capture device:"
msgstr "Mikrofonenhet:"
-#: ../gtk/parameters.ui.h:23
+#: ../gtk/parameters.ui.h:24
msgid "Codecs"
msgstr "Kodek"
-#: ../gtk/parameters.ui.h:24
+#: ../gtk/parameters.ui.h:25
msgid "Direct connection to the Internet"
msgstr "Tilkoblet Internett direkte"
-#: ../gtk/parameters.ui.h:25
+#: ../gtk/parameters.ui.h:26
msgid "Disable"
msgstr "Deaktiver"
-#: ../gtk/parameters.ui.h:26
+#: ../gtk/parameters.ui.h:27
msgid "Done"
msgstr "Ferdig"
-#: ../gtk/parameters.ui.h:27
+#: ../gtk/parameters.ui.h:28
msgid "Download speed limit in Kbit/sec:"
msgstr "Nedlastningsbegrensning i Kbit/sek:"
-#: ../gtk/parameters.ui.h:28
+#: ../gtk/parameters.ui.h:29
msgid "Edit"
msgstr "Rediger"
-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:30
msgid "Enable"
msgstr "Aktiver"
-#: ../gtk/parameters.ui.h:30
+#: ../gtk/parameters.ui.h:31
+msgid "Enable adaptive rate control"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:32
msgid "Enable echo cancellation"
msgstr "Bruk ekko-kansellering"
-#: ../gtk/parameters.ui.h:31
+#: ../gtk/parameters.ui.h:33
msgid "Erase all passwords"
msgstr "Slett alle passord"
-#: ../gtk/parameters.ui.h:32
+#: ../gtk/parameters.ui.h:34
msgid "Manage SIP Accounts"
msgstr "Behandle SIP-kontoer"
-#: ../gtk/parameters.ui.h:33
+#: ../gtk/parameters.ui.h:35
+msgid "Media encryption type"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:36
msgid "Multimedia settings"
msgstr "Multimediainnstillinger"
-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:37
msgid "Network settings"
msgstr "Nettverksinnstillinger"
-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:38
msgid "Playback device:"
msgstr "Avspillingsenhet:"
-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:39
msgid "Prefered video resolution:"
msgstr "Foretrukke video-oppløsning:"
-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:40
msgid "Public IP address:"
msgstr "Offentlig IP-addresse:"
-#: ../gtk/parameters.ui.h:38
+#: ../gtk/parameters.ui.h:41
msgid ""
"Register to FONICS\n"
"virtual network !"
@@ -948,95 +1043,102 @@ msgstr ""
"Registrer hos FONICS\n"
"virtuelle nettverk !"
-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:43
msgid "Remove"
msgstr "Fjern"
-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:44
msgid "Ring device:"
msgstr "Ringe-enhet:"
-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:45
msgid "Ring sound:"
msgstr "Ringelyd:"
-#: ../gtk/parameters.ui.h:43
-msgid "SIP (TCP):"
+#: ../gtk/parameters.ui.h:46
+#, fuzzy
+msgid "SIP (TCP)"
msgstr "SIP (TCP):"
-#: ../gtk/parameters.ui.h:44
-msgid "SIP (UDP):"
+#: ../gtk/parameters.ui.h:47
+#, fuzzy
+msgid "SIP (TLS)"
+msgstr "SIP (TCP):"
+
+#: ../gtk/parameters.ui.h:48
+#, fuzzy
+msgid "SIP (UDP)"
msgstr "SIP (UDP):"
-#: ../gtk/parameters.ui.h:45
+#: ../gtk/parameters.ui.h:49
msgid "Send DTMFs as SIP info"
msgstr "Send DTMF som SIP-info"
-#: ../gtk/parameters.ui.h:46
+#: ../gtk/parameters.ui.h:50
msgid "Set Maximum Transmission Unit:"
msgstr "Velg MTU (Maximum Transmission Unit):"
-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:51
msgid "Settings"
msgstr "Innstillinger"
-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:52
msgid "Show advanced settings"
msgstr "Vis avanserte innstillinger"
-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:53
msgid "Stun server:"
msgstr "STUN tjener:"
-#: ../gtk/parameters.ui.h:50
+#: ../gtk/parameters.ui.h:54
msgid "This section defines your SIP address when not using a SIP account"
msgstr "Denne seksjonen velger SIP-addresse når du ikke bruker en SIP-konto"
-#: ../gtk/parameters.ui.h:51
+#: ../gtk/parameters.ui.h:55
msgid "Upload speed limit in Kbit/sec:"
msgstr "Maks opplastningshastighet i Kbit/sek:"
-#: ../gtk/parameters.ui.h:52
+#: ../gtk/parameters.ui.h:56
msgid "Use IPv6 instead of IPv4"
msgstr "Bruk IPv6 istedet for IPv4"
-#: ../gtk/parameters.ui.h:53
+#: ../gtk/parameters.ui.h:57
msgid "User interface"
msgstr "Brukergrensesnitt"
-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:58
msgid "Video RTP/UDP:"
msgstr "Video RTP/UDP:"
-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:59
msgid "Video codecs"
msgstr "Video kodek"
-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:60
msgid "Video input device:"
msgstr "Videoenhet:"
-#: ../gtk/parameters.ui.h:57
+#: ../gtk/parameters.ui.h:61
msgid "Your display name (eg: John Doe):"
msgstr "Vist navn (eks: Ola Nordmann):"
-#: ../gtk/parameters.ui.h:58
+#: ../gtk/parameters.ui.h:62
msgid "Your resulting SIP address:"
msgstr "Din resulterende SIP addresse:"
-#: ../gtk/parameters.ui.h:59
+#: ../gtk/parameters.ui.h:63
msgid "Your username:"
msgstr "Ditt brukernavn:"
-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:64
msgid "a sound card"
msgstr "ett lydkort"
-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:65
msgid "default camera"
msgstr "standard kamera"
-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:66
msgid "default soundcard"
msgstr "standard lydkort"
@@ -1060,26 +1162,19 @@ msgstr "Linphone"
msgid "Please wait"
msgstr "Vennligst vent"
-#: ../coreapi/linphonecore.c:165
-#, c-format
-msgid "You have missed %i call."
-msgid_plural "You have missed %i calls."
-msgstr[0] "Du har %i ubesvarte anrop."
-msgstr[1] "Du har %i missade samtal"
-
-#: ../coreapi/linphonecore.c:206
+#: ../coreapi/linphonecore.c:187
msgid "aborted"
msgstr "avbrutt"
-#: ../coreapi/linphonecore.c:209
+#: ../coreapi/linphonecore.c:190
msgid "completed"
msgstr "Fullført"
-#: ../coreapi/linphonecore.c:212
+#: ../coreapi/linphonecore.c:193
msgid "missed"
msgstr "ubesvart"
-#: ../coreapi/linphonecore.c:217
+#: ../coreapi/linphonecore.c:198
#, c-format
msgid ""
"%s at %s\n"
@@ -1094,27 +1189,23 @@ msgstr ""
"Status: %s\n"
"Lengde: %i min %i sek\n"
-#: ../coreapi/linphonecore.c:218
-msgid "Incoming call"
-msgstr "Innkommende samtale"
-
-#: ../coreapi/linphonecore.c:218
+#: ../coreapi/linphonecore.c:199
msgid "Outgoing call"
msgstr "Utgående samtale"
-#: ../coreapi/linphonecore.c:998
+#: ../coreapi/linphonecore.c:1088
msgid "Ready"
msgstr "Klar"
-#: ../coreapi/linphonecore.c:1773
+#: ../coreapi/linphonecore.c:1831
msgid "Looking for telephone number destination..."
msgstr "Ser etter telefonnummer for destinasjonen..."
-#: ../coreapi/linphonecore.c:1776
+#: ../coreapi/linphonecore.c:1834
msgid "Could not resolve this number."
msgstr "Kan ikke tilkoble dette nummeret."
-#: ../coreapi/linphonecore.c:1820
+#: ../coreapi/linphonecore.c:1878
msgid ""
"Could not parse given sip address. A sip url usually looks like sip:"
"user@domain"
@@ -1122,50 +1213,38 @@ msgstr ""
"Klarer ikke å tolke angitt SIP-adresse. En SIP-adresse er vanligvis ut som "
"sip: brukernavn@domenenavn"
-#: ../coreapi/linphonecore.c:1967
+#: ../coreapi/linphonecore.c:2025
msgid "Contacting"
msgstr "Tilknytter"
-#: ../coreapi/linphonecore.c:1974
+#: ../coreapi/linphonecore.c:2032
msgid "Could not call"
msgstr "Kunne ikke ringe"
-#: ../coreapi/linphonecore.c:2081
-msgid "Sorry, you have to pause or stop the current call first !"
-msgstr "Beklager, du må pause eller avslutte den nåværende samtalen først !"
-
-#: ../coreapi/linphonecore.c:2086
+#: ../coreapi/linphonecore.c:2140
msgid "Sorry, we have reached the maximum number of simultaneous calls"
msgstr "Beklager, du har nådd maksimalt antall samtidige samtaler"
-#: ../coreapi/linphonecore.c:2208
+#: ../coreapi/linphonecore.c:2270
msgid "Modifying call parameters..."
msgstr "Endrer ringeparametre..."
-#: ../coreapi/linphonecore.c:2311
+#: ../coreapi/linphonecore.c:2366
msgid "Connected."
msgstr "Tilkoblet"
-#: ../coreapi/linphonecore.c:2334
+#: ../coreapi/linphonecore.c:2389
msgid "Call aborted"
msgstr "Samtale avbrutt"
-#: ../coreapi/linphonecore.c:2374
-msgid "Call ended"
-msgstr "Samtale avsluttet"
-
-#: ../coreapi/linphonecore.c:2456
+#: ../coreapi/linphonecore.c:2530
msgid "Could not pause the call"
msgstr "Kunne ikke pause samtalen"
-#: ../coreapi/linphonecore.c:2460
+#: ../coreapi/linphonecore.c:2535
msgid "Pausing the current call..."
msgstr "Pauser nåværende samtale"
-#: ../coreapi/linphonecore.c:2499
-msgid "There is already a call in process, pause or stop it first."
-msgstr "Det er allerede en samtale igang, pause eller avslutt den først."
-
#: ../coreapi/misc.c:147
msgid ""
"Your computer appears to be using ALSA sound drivers.\n"
@@ -1244,7 +1323,7 @@ msgstr "Pågående"
msgid "Unknown-bug"
msgstr "Ukjent feil"
-#: ../coreapi/proxy.c:187
+#: ../coreapi/proxy.c:192
msgid ""
"The sip proxy address you entered is invalid, it must start with \"sip:\" "
"followed by a hostname."
@@ -1252,7 +1331,7 @@ msgstr ""
"SIP proxy adressen du har angitt er ugyldig, den må begynne med \"sip:\" "
"etterfult av vertsnavn."
-#: ../coreapi/proxy.c:193
+#: ../coreapi/proxy.c:198
msgid ""
"The sip identity you entered is invalid.\n"
"It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1260,136 +1339,200 @@ msgstr ""
"SIP adressen du har angitt er feil. Adressen bør se ut som sip: "
"brukernavn@domenenavn, f.eks sip:ola@eksempel.no"
-#: ../coreapi/proxy.c:671
+#: ../coreapi/proxy.c:690
#, c-format
msgid "Could not login as %s"
msgstr "Ikke ikke logge inn som %s"
-#: ../coreapi/callbacks.c:170
+#: ../coreapi/callbacks.c:206
msgid "is contacting you"
msgstr "Kontakter deg."
-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207
msgid " and asked autoanswer."
msgstr " og ba om autosvar."
-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207
msgid "."
msgstr "."
-#: ../coreapi/callbacks.c:226
+#: ../coreapi/callbacks.c:266
msgid "Remote ringing."
msgstr "Ringer hos motparten."
-#: ../coreapi/callbacks.c:242
+#: ../coreapi/callbacks.c:282
#, fuzzy
msgid "Remote ringing..."
msgstr "Ringer hos motparten."
-#: ../coreapi/callbacks.c:253
+#: ../coreapi/callbacks.c:293
msgid "Early media."
msgstr "Tidlig media"
-#: ../coreapi/callbacks.c:291
+#: ../coreapi/callbacks.c:331
#, c-format
msgid "Call with %s is paused."
msgstr "Samtalen med %s er pauset."
-#: ../coreapi/callbacks.c:302
+#: ../coreapi/callbacks.c:342
#, c-format
msgid "Call answered by %s - on hold."
msgstr "Samtale besvart av %s - på vent."
-#: ../coreapi/callbacks.c:317
+#: ../coreapi/callbacks.c:357
msgid "Call resumed."
msgstr "Samtale gjenopptatt."
-#: ../coreapi/callbacks.c:322
+#: ../coreapi/callbacks.c:362
#, c-format
msgid "Call answered by %s."
msgstr "Samtale besvart av %s."
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:432
msgid "We are being paused..."
msgstr "Vi er satt på vent..."
-#: ../coreapi/callbacks.c:387
+#: ../coreapi/callbacks.c:436
msgid "We have been resumed..."
msgstr "Vi har blitt gjenopptatt..."
-#: ../coreapi/callbacks.c:424
+#: ../coreapi/callbacks.c:441
+msgid "Call has been updated by remote..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:473
msgid "Call terminated."
msgstr "Samtale avsluttet."
-#: ../coreapi/callbacks.c:431
+#: ../coreapi/callbacks.c:480
msgid "User is busy."
msgstr "Brukeren er opptatt."
-#: ../coreapi/callbacks.c:432
+#: ../coreapi/callbacks.c:481
msgid "User is temporarily unavailable."
msgstr "Brukeren er midlertidig ikke tilgjengelig."
#. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:434
+#: ../coreapi/callbacks.c:483
msgid "User does not want to be disturbed."
msgstr "Brukeren vil ikke bli forstyrret."
-#: ../coreapi/callbacks.c:435
+#: ../coreapi/callbacks.c:484
msgid "Call declined."
msgstr "Samtale avvist."
-#: ../coreapi/callbacks.c:447
+#: ../coreapi/callbacks.c:496
msgid "No response."
msgstr "Ikke noe svar."
-#: ../coreapi/callbacks.c:451
+#: ../coreapi/callbacks.c:500
msgid "Protocol error."
msgstr "Protokollfeil."
-#: ../coreapi/callbacks.c:467
+#: ../coreapi/callbacks.c:516
msgid "Redirected"
msgstr "Omdirigert"
-#: ../coreapi/callbacks.c:477
+#: ../coreapi/callbacks.c:526
msgid "Not found"
msgstr "Ikke funnet"
-#: ../coreapi/callbacks.c:487
+#: ../coreapi/callbacks.c:551
msgid "No common codecs"
msgstr "Ingen felles kodek"
-#: ../coreapi/callbacks.c:493
+#: ../coreapi/callbacks.c:557
msgid "Call failed."
msgstr "Samtale feilet."
-#: ../coreapi/callbacks.c:557
+#: ../coreapi/callbacks.c:631
#, c-format
msgid "Registration on %s successful."
msgstr "Registrering hos %s lykkes."
-#: ../coreapi/callbacks.c:558
+#: ../coreapi/callbacks.c:632
#, c-format
msgid "Unregistration on %s done."
msgstr "Avregistrering hos %s lykkes."
-#: ../coreapi/callbacks.c:574
+#: ../coreapi/callbacks.c:648
msgid "no response timeout"
msgstr "ingen svar innen angitt tid"
-#: ../coreapi/callbacks.c:577
+#: ../coreapi/callbacks.c:651
#, c-format
msgid "Registration on %s failed: %s"
msgstr "Registrering hos %s mislykkes: %s"
-#: ../coreapi/callbacks.c:619
-#, c-format
-msgid "We are transferred to %s"
-msgstr "Vi er overført til %s"
-
-#: ../coreapi/sal_eXosip2.c:815 ../coreapi/sal_eXosip2.c:817
+#: ../coreapi/sal_eXosip2.c:873 ../coreapi/sal_eXosip2.c:875
msgid "Authentication failure"
msgstr "Autorisering kreves"
+#: ../coreapi/linphonecall.c:128
+#, fuzzy, c-format
+msgid "Authentication token is %s"
+msgstr "Autorisering kreves"
+
+#: ../coreapi/linphonecall.c:1560
+#, c-format
+msgid "You have missed %i call."
+msgid_plural "You have missed %i calls."
+msgstr[0] "Du har %i ubesvarte anrop."
+msgstr[1] "Du har %i missade samtal"
+
+#~ msgid "Windows"
+#~ msgstr "Vinduer"
+
+#~ msgid ""
+#~ "Pause all calls\n"
+#~ "and answer"
+#~ msgstr ""
+#~ "Pauser alle samtaler\n"
+#~ "og svarer"
+
+#~ msgid "Unmute"
+#~ msgstr "Skru mikrofonen på"
+
+#~ msgid "<b>Contact list</b>"
+#~ msgstr "<b>Kontaktliste</b>"
+
+#~ msgid "Audio & video"
+#~ msgstr "Lyd og Video"
+
+#~ msgid "Audio only"
+#~ msgstr "Kun lyd"
+
+#~ msgid "Duration:"
+#~ msgstr "Varighet:"
+
+#, fuzzy
+#~ msgid "_Call history"
+#~ msgstr "Samtalehistorikk"
+
+#~ msgid "_Linphone"
+#~ msgstr "_Linphone"
+
+#~ msgid "gtk-cancel"
+#~ msgstr "gtk-avbryt"
+
+#~ msgid "gtk-ok"
+#~ msgstr "gtk-ok"
+
+#~ msgid "Register at startup"
+#~ msgstr "Registrer ved oppstart"
+
+#~ msgid "gtk-close"
+#~ msgstr "gtk-lukk"
+
+#~ msgid "<b>Ports</b>"
+#~ msgstr "<b>Porter</b>"
+
+#~ msgid "Sorry, you have to pause or stop the current call first !"
+#~ msgstr "Beklager, du må pause eller avslutte den nåværende samtalen først !"
+
+#~ msgid "There is already a call in process, pause or stop it first."
+#~ msgstr "Det er allerede en samtale igang, pause eller avslutt den først."
+
#~ msgid "ITU-G.711 alaw encoder"
#~ msgstr "ITU-G.711 alaw enkoder"
diff --git a/po/nl.po b/po/nl.po
index cc6a4a47c8c7fc9e29e0dc16a3345faf179b21f5..a05a1615e74029e8a1d50b347fdfb3d8b6174520 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-08 22:32+0200\n"
+"POT-Creation-Date: 2011-12-02 16:47+0100\n"
"PO-Revision-Date: 2007-09-05 10:40+0200\n"
"Last-Translator: Hendrik-Jan Heins <hjheins@gmail.com>\n"
"Language-Team: Nederlands <vertaling@nl.linux.org>\n"
@@ -19,6 +19,18 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: ../gtk/calllogs.c:71
+msgid "n/a"
+msgstr ""
+
+#: ../gtk/conference.c:33 ../gtk/incall_view.c:183
+msgid "Conference"
+msgstr ""
+
+#: ../gtk/conference.c:41
+msgid "Me"
+msgstr ""
+
#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
#, c-format
msgid "Couldn't find pixmap file: %s"
@@ -29,34 +41,38 @@ msgstr "Kon pixmap bestand %s niet vinden"
msgid "Chat with %s"
msgstr "Chat met %s"
-#: ../gtk/main.c:74
+#: ../gtk/main.c:83
msgid "log to stdout some debug information while running."
msgstr ""
-#: ../gtk/main.c:81
+#: ../gtk/main.c:90
+msgid "path to a file to write logs into."
+msgstr ""
+
+#: ../gtk/main.c:97
msgid "Start only in the system tray, do not show the main interface."
msgstr ""
-#: ../gtk/main.c:88
+#: ../gtk/main.c:104
msgid "address to call right now"
msgstr ""
-#: ../gtk/main.c:95
+#: ../gtk/main.c:111
msgid "if set automatically answer incoming calls"
msgstr ""
-#: ../gtk/main.c:102
+#: ../gtk/main.c:118
msgid ""
"Specifiy a working directory (should be the base of the installation, eg: c:"
"\\Program Files\\Linphone)"
msgstr ""
-#: ../gtk/main.c:442
+#: ../gtk/main.c:464
#, fuzzy, c-format
msgid "Call with %s"
msgstr "Chat met %s"
-#: ../gtk/main.c:826
+#: ../gtk/main.c:815
#, c-format
msgid ""
"%s would like to add you to his contact list.\n"
@@ -65,171 +81,229 @@ msgid ""
"If you answer no, this person will be temporarily blacklisted."
msgstr ""
-#: ../gtk/main.c:904
+#: ../gtk/main.c:893
#, c-format
msgid ""
"Please enter your password for username <i>%s</i>\n"
" at domain <i>%s</i>:"
msgstr ""
-#: ../gtk/main.c:1040
+#: ../gtk/main.c:993
+#, fuzzy
+msgid "Call error"
+msgstr "Linphone - Oproepgeschiedenis"
+
+#: ../gtk/main.c:996 ../coreapi/linphonecore.c:2406
+msgid "Call ended"
+msgstr "Oproep beeindigd"
+
+#: ../gtk/main.c:999 ../coreapi/linphonecore.c:199
+msgid "Incoming call"
+msgstr "Inkomende oproep"
+
+#: ../gtk/main.c:1001 ../gtk/incall_view.c:292 ../gtk/main.ui.h:20
+msgid "Answer"
+msgstr ""
+
+#: ../gtk/main.c:1003 ../gtk/main.ui.h:29
+#, fuzzy
+msgid "Decline"
+msgstr "lijn"
+
+#: ../gtk/main.c:1009
+#, fuzzy
+msgid "Call paused"
+msgstr "afgebroken"
+
+#: ../gtk/main.c:1009
+#, c-format
+msgid "<span size=\"large\">by %s</span>"
+msgstr ""
+
+#: ../gtk/main.c:1165
msgid "Website link"
msgstr ""
-#: ../gtk/main.c:1076
+#: ../gtk/main.c:1205
msgid "Linphone - a video internet phone"
msgstr ""
-#: ../gtk/main.c:1095
+#: ../gtk/main.c:1295
#, c-format
msgid "%s (Default)"
msgstr ""
-#: ../gtk/main.c:1187
-msgid "Windows"
+#: ../gtk/main.c:1566 ../coreapi/callbacks.c:700
+#, c-format
+msgid "We are transferred to %s"
msgstr ""
-#: ../gtk/main.c:1364
+#: ../gtk/main.c:1576
msgid ""
"No sound cards have been detected on this computer.\n"
"You won't be able to send or receive audio calls."
msgstr ""
-#: ../gtk/main.c:1423
+#: ../gtk/main.c:1663
msgid "A free SIP video-phone"
msgstr "Een Vrije SIP video-telefoon"
-#: ../gtk/friendlist.c:192 ../gtk/propertybox.c:271 ../gtk/contact.ui.h:3
+#: ../gtk/friendlist.c:203
+#, fuzzy
+msgid "Add to addressbook"
+msgstr "Adresboek"
+
+#: ../gtk/friendlist.c:258 ../gtk/propertybox.c:296 ../gtk/contact.ui.h:3
msgid "Name"
msgstr "Naam"
-#: ../gtk/friendlist.c:205
+#: ../gtk/friendlist.c:271
msgid "Presence status"
msgstr "Aanwezigheidsstatus"
-#: ../gtk/friendlist.c:242
+#: ../gtk/friendlist.c:308
#, c-format
msgid "Search in %s directory"
msgstr ""
-#: ../gtk/friendlist.c:450
+#: ../gtk/friendlist.c:568
msgid "Invalid sip contact !"
msgstr ""
-#: ../gtk/friendlist.c:495
+#: ../gtk/friendlist.c:613
#, fuzzy, c-format
msgid "Call %s"
msgstr "Oproepgeschiedenis"
-#: ../gtk/friendlist.c:496
+#: ../gtk/friendlist.c:614
#, c-format
msgid "Send text to %s"
msgstr ""
-#: ../gtk/friendlist.c:497
+#: ../gtk/friendlist.c:615
#, fuzzy, c-format
msgid "Edit contact '%s'"
msgstr "Bewerk contactgegevens"
-#: ../gtk/friendlist.c:498
+#: ../gtk/friendlist.c:616
#, c-format
msgid "Delete contact '%s'"
msgstr ""
-#: ../gtk/friendlist.c:540
+#: ../gtk/friendlist.c:658
#, c-format
msgid "Add new contact from %s directory"
msgstr ""
-#: ../gtk/propertybox.c:277
+#: ../gtk/propertybox.c:302
msgid "Rate (Hz)"
msgstr "Frequentie (Hz)"
-#: ../gtk/propertybox.c:283
+#: ../gtk/propertybox.c:308
msgid "Status"
msgstr "Status"
-#: ../gtk/propertybox.c:289
+#: ../gtk/propertybox.c:314
msgid "Min bitrate (kbit/s)"
msgstr "Minimale bitrate (kbit/s)"
-#: ../gtk/propertybox.c:296
+#: ../gtk/propertybox.c:321
msgid "Parameters"
msgstr "Parameters"
-#: ../gtk/propertybox.c:326 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507
msgid "Enabled"
msgstr "Aan"
-#: ../gtk/propertybox.c:327 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507
msgid "Disabled"
msgstr "Uit"
-#: ../gtk/propertybox.c:510
+#: ../gtk/propertybox.c:553
msgid "Account"
msgstr "Account"
-#: ../gtk/propertybox.c:650
+#: ../gtk/propertybox.c:693
msgid "English"
msgstr ""
-#: ../gtk/propertybox.c:651
+#: ../gtk/propertybox.c:694
msgid "French"
msgstr ""
-#: ../gtk/propertybox.c:652
+#: ../gtk/propertybox.c:695
msgid "Swedish"
msgstr ""
-#: ../gtk/propertybox.c:653
+#: ../gtk/propertybox.c:696
msgid "Italian"
msgstr ""
-#: ../gtk/propertybox.c:654
+#: ../gtk/propertybox.c:697
msgid "Spanish"
msgstr ""
-#: ../gtk/propertybox.c:655
+#: ../gtk/propertybox.c:698
msgid "Brazilian Portugese"
msgstr ""
-#: ../gtk/propertybox.c:656
+#: ../gtk/propertybox.c:699
msgid "Polish"
msgstr ""
-#: ../gtk/propertybox.c:657
+#: ../gtk/propertybox.c:700
msgid "German"
msgstr ""
-#: ../gtk/propertybox.c:658
+#: ../gtk/propertybox.c:701
msgid "Russian"
msgstr ""
-#: ../gtk/propertybox.c:659
+#: ../gtk/propertybox.c:702
msgid "Japanese"
msgstr ""
-#: ../gtk/propertybox.c:660
+#: ../gtk/propertybox.c:703
msgid "Dutch"
msgstr ""
-#: ../gtk/propertybox.c:661
+#: ../gtk/propertybox.c:704
msgid "Hungarian"
msgstr ""
-#: ../gtk/propertybox.c:662
+#: ../gtk/propertybox.c:705
msgid "Czech"
msgstr ""
-#: ../gtk/propertybox.c:663
+#: ../gtk/propertybox.c:706
msgid "Chinese"
msgstr ""
-#: ../gtk/propertybox.c:720
+#: ../gtk/propertybox.c:707
+msgid "Traditional Chinese"
+msgstr ""
+
+#: ../gtk/propertybox.c:708
+msgid "Norwegian"
+msgstr ""
+
+#: ../gtk/propertybox.c:765
msgid ""
"You need to restart linphone for the new language selection to take effect."
msgstr ""
+#: ../gtk/propertybox.c:835
+msgid "None"
+msgstr "Geen"
+
+#: ../gtk/propertybox.c:839
+msgid "SRTP"
+msgstr ""
+
+#: ../gtk/propertybox.c:845
+msgid "ZRTP"
+msgstr ""
+
#: ../gtk/update.c:80
#, c-format
msgid ""
@@ -348,78 +422,104 @@ msgstr ""
msgid "Now ready !"
msgstr ""
-#: ../gtk/incall_view.c:61
+#: ../gtk/incall_view.c:69
#, fuzzy, c-format
msgid "Call #%i"
msgstr "Oproepgeschiedenis"
-#: ../gtk/incall_view.c:87
+#: ../gtk/incall_view.c:127
#, c-format
msgid "Transfer to call #%i with %s"
msgstr ""
-#: ../gtk/incall_view.c:113
+#: ../gtk/incall_view.c:155
msgid "Transfer"
msgstr ""
-#: ../gtk/incall_view.c:187
+#: ../gtk/incall_view.c:271
#, fuzzy
msgid "<b>Calling...</b>"
msgstr "Contactlijst"
-#: ../gtk/incall_view.c:190 ../gtk/incall_view.c:246
+#: ../gtk/incall_view.c:274 ../gtk/incall_view.c:482
msgid "00::00::00"
msgstr ""
-#: ../gtk/incall_view.c:206
+#: ../gtk/incall_view.c:285
#, fuzzy
msgid "<b>Incoming call</b>"
msgstr "Inkomende oproep"
-#: ../gtk/incall_view.c:216
-msgid ""
-"Pause all calls\n"
-"and answer"
+#: ../gtk/incall_view.c:322
+msgid "good"
msgstr ""
-#: ../gtk/incall_view.c:217 ../gtk/main.ui.h:20
-msgid "Answer"
+#: ../gtk/incall_view.c:324
+msgid "average"
msgstr ""
-#: ../gtk/incall_view.c:244
+#: ../gtk/incall_view.c:326
+msgid "poor"
+msgstr ""
+
+#: ../gtk/incall_view.c:328
+msgid "very poor"
+msgstr ""
+
+#: ../gtk/incall_view.c:330
+msgid "too bad"
+msgstr ""
+
+#: ../gtk/incall_view.c:331 ../gtk/incall_view.c:347
+msgid "unavailable"
+msgstr ""
+
+#: ../gtk/incall_view.c:447
+msgid "Secured by SRTP"
+msgstr ""
+
+#: ../gtk/incall_view.c:453
+#, c-format
+msgid "Secured by ZRTP - [auth token: %s]"
+msgstr ""
+
+#: ../gtk/incall_view.c:459
+msgid "Set unverified"
+msgstr ""
+
+#: ../gtk/incall_view.c:459 ../gtk/main.ui.h:49
+msgid "Set verified"
+msgstr ""
+
+#: ../gtk/incall_view.c:480
+msgid "In conference"
+msgstr ""
+
+#: ../gtk/incall_view.c:480
#, fuzzy
msgid "<b>In call</b>"
msgstr "Contactlijst"
-#: ../gtk/incall_view.c:260
+#: ../gtk/incall_view.c:499
#, fuzzy
msgid "<b>Paused call</b>"
msgstr "Contactlijst"
-#: ../gtk/incall_view.c:272
+#: ../gtk/incall_view.c:511
#, c-format
msgid "%02i::%02i::%02i"
msgstr ""
-#: ../gtk/incall_view.c:288
+#: ../gtk/incall_view.c:527
#, fuzzy
msgid "<b>Call ended.</b>"
msgstr "Oproep beeindigd"
-#: ../gtk/incall_view.c:309
-#, fuzzy
-msgid "Unmute"
-msgstr "Ongelimiteerd"
-
-#: ../gtk/incall_view.c:316 ../gtk/main.ui.h:42
-msgid "Mute"
-msgstr ""
-
-#: ../gtk/incall_view.c:340
+#: ../gtk/incall_view.c:584
msgid "Resume"
msgstr ""
-#: ../gtk/incall_view.c:347 ../gtk/main.ui.h:46
+#: ../gtk/incall_view.c:591 ../gtk/main.ui.h:45
msgid "Pause"
msgstr ""
@@ -483,8 +583,8 @@ msgstr "Contact informatie"
#: ../gtk/main.ui.h:14
#, fuzzy
-msgid "<b>Contact list</b>"
-msgstr "Contactlijst"
+msgid "<b>Callee name</b>"
+msgstr "Oproep beeindigd"
#: ../gtk/main.ui.h:15
#, fuzzy
@@ -510,27 +610,26 @@ msgstr ""
#: ../gtk/main.ui.h:21
#, fuzzy
-msgid "Audio & video"
-msgstr "Audio codecs"
-
-#: ../gtk/main.ui.h:22
-#, fuzzy
-msgid "Audio only"
-msgstr "Audio codecs"
-
-#: ../gtk/main.ui.h:23
-#, fuzzy
msgid "Automatically log me in"
msgstr "Automatisch een geldige hostnaam raden"
-#: ../gtk/main.ui.h:24
+#: ../gtk/main.ui.h:22
msgid "B"
msgstr ""
-#: ../gtk/main.ui.h:25 ../gtk/parameters.ui.h:20
+#: ../gtk/main.ui.h:23 ../gtk/parameters.ui.h:21
msgid "C"
msgstr ""
+#: ../gtk/main.ui.h:24
+#, fuzzy
+msgid "Call"
+msgstr "Oproepgeschiedenis"
+
+#: ../gtk/main.ui.h:25
+msgid "Call quality rating"
+msgstr ""
+
#: ../gtk/main.ui.h:26
msgid "Check _Updates"
msgstr ""
@@ -544,11 +643,6 @@ msgstr "Verbinden"
msgid "D"
msgstr ""
-#: ../gtk/main.ui.h:29
-#, fuzzy
-msgid "Decline"
-msgstr "lijn"
-
#: ../gtk/main.ui.h:30
#, fuzzy
msgid "Default"
@@ -561,13 +655,13 @@ msgstr "Informatie"
#: ../gtk/main.ui.h:32
#, fuzzy
-msgid "Duration:"
-msgstr "Informatie"
+msgid "Enable self-view"
+msgstr "Video aan"
#: ../gtk/main.ui.h:33
#, fuzzy
-msgid "Enable self-view"
-msgstr "Video aan"
+msgid "Enable video"
+msgstr "Aan"
#: ../gtk/main.ui.h:34
msgid "Enter username, phone number, or full sip address"
@@ -603,21 +697,26 @@ msgstr "Contact informatie"
msgid "Lookup:"
msgstr ""
-#: ../gtk/main.ui.h:43
+#: ../gtk/main.ui.h:42
#, fuzzy
msgid "My current identity:"
msgstr "SIP-identiteit:"
-#: ../gtk/main.ui.h:44
+#: ../gtk/main.ui.h:43
#, fuzzy
msgid "Online users"
msgstr "Aanwezig"
-#: ../gtk/main.ui.h:45
+#: ../gtk/main.ui.h:44
#, fuzzy
msgid "Password"
msgstr "wachtwoord:"
+#: ../gtk/main.ui.h:46
+#, fuzzy
+msgid "Recent calls"
+msgstr "Inkomende oproep"
+
#: ../gtk/main.ui.h:47
#, fuzzy
msgid "SIP address or phone number:"
@@ -627,20 +726,15 @@ msgstr "Geef het SIP adres of telefoonnummer in"
msgid "Search"
msgstr ""
-#: ../gtk/main.ui.h:49
+#: ../gtk/main.ui.h:50
msgid "Show debug window"
msgstr ""
-#: ../gtk/main.ui.h:50
+#: ../gtk/main.ui.h:51
#, fuzzy
msgid "Username"
msgstr "gebruikersnaam:"
-#: ../gtk/main.ui.h:51
-#, fuzzy
-msgid "_Call history"
-msgstr "Linphone - Oproepgeschiedenis"
-
#: ../gtk/main.ui.h:52
#, fuzzy
msgid "_Help"
@@ -651,19 +745,14 @@ msgid "_Homepage"
msgstr ""
#: ../gtk/main.ui.h:54
-#, fuzzy
-msgid "_Linphone"
-msgstr "linphone"
-
-#: ../gtk/main.ui.h:55
msgid "_Options"
msgstr ""
-#: ../gtk/main.ui.h:56
+#: ../gtk/main.ui.h:55
msgid "in"
msgstr ""
-#: ../gtk/main.ui.h:57
+#: ../gtk/main.ui.h:56
msgid "label"
msgstr ""
@@ -713,16 +802,6 @@ msgstr "Adres"
msgid "Show this contact presence status"
msgstr ""
-#: ../gtk/contact.ui.h:6
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "Verbonden."
-
-#: ../gtk/contact.ui.h:7
-#, fuzzy
-msgid "gtk-ok"
-msgstr "Verwijderen"
-
#: ../gtk/log.ui.h:1
msgid "Linphone debug window"
msgstr ""
@@ -781,7 +860,7 @@ msgid "Publish presence information"
msgstr "Toon informatie over aanwezigheid:"
#: ../gtk/sip_account.ui.h:6
-msgid "Register at startup"
+msgid "Register"
msgstr ""
#: ../gtk/sip_account.ui.h:7
@@ -812,11 +891,6 @@ msgstr "sip:"
msgid "Send"
msgstr "Geluid"
-#: ../gtk/chatroom.ui.h:2
-#, fuzzy
-msgid "gtk-close"
-msgstr "Verbonden."
-
#: ../gtk/parameters.ui.h:1
msgid "0 stands for \"unlimited\""
msgstr ""
@@ -856,9 +930,8 @@ msgid "<b>NAT and Firewall</b>"
msgstr "Contactlijst"
#: ../gtk/parameters.ui.h:9
-#, fuzzy
-msgid "<b>Ports</b>"
-msgstr "Contactlijst"
+msgid "<b>Network protocol and ports</b>"
+msgstr ""
#: ../gtk/parameters.ui.h:10
#, fuzzy
@@ -881,210 +954,228 @@ msgid "<b>Video</b>"
msgstr "Contactlijst"
#: ../gtk/parameters.ui.h:14
-msgid "ALSA special device (optional):"
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
msgstr ""
#: ../gtk/parameters.ui.h:15
+msgid "ALSA special device (optional):"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:16
#, fuzzy
msgid "Add"
msgstr "Adres"
-#: ../gtk/parameters.ui.h:16
+#: ../gtk/parameters.ui.h:17
msgid "Audio RTP/UDP:"
msgstr ""
-#: ../gtk/parameters.ui.h:17
+#: ../gtk/parameters.ui.h:18
#, fuzzy
msgid "Audio codecs"
msgstr "Video codecs"
-#: ../gtk/parameters.ui.h:18
+#: ../gtk/parameters.ui.h:19
msgid "Behind NAT / Firewall (specify gateway IP below)"
msgstr ""
-#: ../gtk/parameters.ui.h:19
+#: ../gtk/parameters.ui.h:20
msgid "Behind NAT / Firewall (use STUN to resolve)"
msgstr ""
-#: ../gtk/parameters.ui.h:21
+#: ../gtk/parameters.ui.h:22
msgid "CIF"
msgstr ""
-#: ../gtk/parameters.ui.h:22
+#: ../gtk/parameters.ui.h:23
#, fuzzy
msgid "Capture device:"
msgstr "Geluidsapparaat gebruiken:"
-#: ../gtk/parameters.ui.h:23
+#: ../gtk/parameters.ui.h:24
#, fuzzy
msgid "Codecs"
msgstr "Codecs"
-#: ../gtk/parameters.ui.h:24
+#: ../gtk/parameters.ui.h:25
msgid "Direct connection to the Internet"
msgstr ""
-#: ../gtk/parameters.ui.h:25
+#: ../gtk/parameters.ui.h:26
msgid "Disable"
msgstr "Uit"
-#: ../gtk/parameters.ui.h:26
+#: ../gtk/parameters.ui.h:27
#, fuzzy
msgid "Done"
msgstr "Weg"
-#: ../gtk/parameters.ui.h:27
+#: ../gtk/parameters.ui.h:28
#, fuzzy
msgid "Download speed limit in Kbit/sec:"
msgstr "Download bandbreedte (kbit/sec):"
-#: ../gtk/parameters.ui.h:28
+#: ../gtk/parameters.ui.h:29
msgid "Edit"
msgstr "Bewerken"
-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:30
msgid "Enable"
msgstr "Aan"
-#: ../gtk/parameters.ui.h:30
+#: ../gtk/parameters.ui.h:31
+msgid "Enable adaptive rate control"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:32
msgid "Enable echo cancellation"
msgstr ""
-#: ../gtk/parameters.ui.h:31
+#: ../gtk/parameters.ui.h:33
msgid "Erase all passwords"
msgstr ""
-#: ../gtk/parameters.ui.h:32
+#: ../gtk/parameters.ui.h:34
msgid "Manage SIP Accounts"
msgstr ""
-#: ../gtk/parameters.ui.h:33
+#: ../gtk/parameters.ui.h:35
+msgid "Media encryption type"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:36
msgid "Multimedia settings"
msgstr ""
-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:37
#, fuzzy
msgid "Network settings"
msgstr "Netwerk"
-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:38
#, fuzzy
msgid "Playback device:"
msgstr "Geluidsapparaat gebruiken:"
-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:39
msgid "Prefered video resolution:"
msgstr ""
-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:40
#, fuzzy
msgid "Public IP address:"
msgstr "SIP-adres:"
-#: ../gtk/parameters.ui.h:38
+#: ../gtk/parameters.ui.h:41
msgid ""
"Register to FONICS\n"
"virtual network !"
msgstr ""
-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:43
msgid "Remove"
msgstr "Verwijderen"
-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:44
#, fuzzy
msgid "Ring device:"
msgstr "Geluidsapparaat gebruiken:"
-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:45
#, fuzzy
msgid "Ring sound:"
msgstr "Belgeluid:"
-#: ../gtk/parameters.ui.h:43
-msgid "SIP (TCP):"
+#: ../gtk/parameters.ui.h:46
+msgid "SIP (TCP)"
msgstr ""
-#: ../gtk/parameters.ui.h:44
-msgid "SIP (UDP):"
+#: ../gtk/parameters.ui.h:47
+msgid "SIP (TLS)"
msgstr ""
-#: ../gtk/parameters.ui.h:45
+#: ../gtk/parameters.ui.h:48
+msgid "SIP (UDP)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:49
msgid "Send DTMFs as SIP info"
msgstr ""
-#: ../gtk/parameters.ui.h:46
+#: ../gtk/parameters.ui.h:50
msgid "Set Maximum Transmission Unit:"
msgstr ""
-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:51
msgid "Settings"
msgstr ""
-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:52
msgid "Show advanced settings"
msgstr ""
-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:53
#, fuzzy
msgid "Stun server:"
msgstr "Geluidsapparaat"
-#: ../gtk/parameters.ui.h:50
+#: ../gtk/parameters.ui.h:54
msgid "This section defines your SIP address when not using a SIP account"
msgstr ""
-#: ../gtk/parameters.ui.h:51
+#: ../gtk/parameters.ui.h:55
#, fuzzy
msgid "Upload speed limit in Kbit/sec:"
msgstr "Upload bandbreedte (kbit/sec):"
-#: ../gtk/parameters.ui.h:52
+#: ../gtk/parameters.ui.h:56
msgid "Use IPv6 instead of IPv4"
msgstr ""
-#: ../gtk/parameters.ui.h:53
+#: ../gtk/parameters.ui.h:57
#, fuzzy
msgid "User interface"
msgstr "gebruikersnaam:"
-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:58
msgid "Video RTP/UDP:"
msgstr ""
-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:59
#, fuzzy
msgid "Video codecs"
msgstr "Video codecs"
-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:60
#, fuzzy
msgid "Video input device:"
msgstr "Geluidsapparaat"
-#: ../gtk/parameters.ui.h:57
+#: ../gtk/parameters.ui.h:61
msgid "Your display name (eg: John Doe):"
msgstr ""
-#: ../gtk/parameters.ui.h:58
+#: ../gtk/parameters.ui.h:62
#, fuzzy
msgid "Your resulting SIP address:"
msgstr "Uw SIP-adres:"
-#: ../gtk/parameters.ui.h:59
+#: ../gtk/parameters.ui.h:63
#, fuzzy
msgid "Your username:"
msgstr "gebruikersnaam:"
-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:64
msgid "a sound card"
msgstr ""
-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:65
msgid "default camera"
msgstr ""
-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:66
msgid "default soundcard"
msgstr ""
@@ -1111,26 +1202,19 @@ msgstr "linphone"
msgid "Please wait"
msgstr ""
-#: ../coreapi/linphonecore.c:165
-#, fuzzy, c-format
-msgid "You have missed %i call."
-msgid_plural "You have missed %i calls."
-msgstr[0] "U heeft %i oproep(en) gemist."
-msgstr[1] "U heeft %i oproep(en) gemist."
-
-#: ../coreapi/linphonecore.c:206
+#: ../coreapi/linphonecore.c:187
msgid "aborted"
msgstr "afgebroken"
-#: ../coreapi/linphonecore.c:209
+#: ../coreapi/linphonecore.c:190
msgid "completed"
msgstr "voltooid"
-#: ../coreapi/linphonecore.c:212
+#: ../coreapi/linphonecore.c:193
msgid "missed"
msgstr "gemist"
-#: ../coreapi/linphonecore.c:217
+#: ../coreapi/linphonecore.c:198
#, c-format
msgid ""
"%s at %s\n"
@@ -1145,27 +1229,23 @@ msgstr ""
"Status: %s\n"
"Tijdsduur: %i mins %i secs\n"
-#: ../coreapi/linphonecore.c:218
-msgid "Incoming call"
-msgstr "Inkomende oproep"
-
-#: ../coreapi/linphonecore.c:218
+#: ../coreapi/linphonecore.c:199
msgid "Outgoing call"
msgstr "Uitgaande oproep"
-#: ../coreapi/linphonecore.c:998
+#: ../coreapi/linphonecore.c:1088
msgid "Ready"
msgstr "Gereed."
-#: ../coreapi/linphonecore.c:1773
+#: ../coreapi/linphonecore.c:1831
msgid "Looking for telephone number destination..."
msgstr "Zoekt de lokatie van het telefoonnummer..."
-#: ../coreapi/linphonecore.c:1776
+#: ../coreapi/linphonecore.c:1834
msgid "Could not resolve this number."
msgstr "Kon dit nummer niet vinden."
-#: ../coreapi/linphonecore.c:1820
+#: ../coreapi/linphonecore.c:1878
msgid ""
"Could not parse given sip address. A sip url usually looks like sip:"
"user@domain"
@@ -1173,54 +1253,42 @@ msgstr ""
"Slecht geformuleerd SIP-adres. Een SIP-adres ziet er uit als sip:"
"gebruikersnaam@domeinnaam"
-#: ../coreapi/linphonecore.c:1967
+#: ../coreapi/linphonecore.c:2025
msgid "Contacting"
msgstr "Verbinden"
-#: ../coreapi/linphonecore.c:1974
+#: ../coreapi/linphonecore.c:2032
#, fuzzy
msgid "Could not call"
msgstr "Kon niet oproepen"
-#: ../coreapi/linphonecore.c:2081
-msgid "Sorry, you have to pause or stop the current call first !"
-msgstr ""
-
-#: ../coreapi/linphonecore.c:2086
+#: ../coreapi/linphonecore.c:2140
msgid "Sorry, we have reached the maximum number of simultaneous calls"
msgstr ""
-#: ../coreapi/linphonecore.c:2208
+#: ../coreapi/linphonecore.c:2270
msgid "Modifying call parameters..."
msgstr ""
-#: ../coreapi/linphonecore.c:2311
+#: ../coreapi/linphonecore.c:2366
msgid "Connected."
msgstr "Verbonden."
-#: ../coreapi/linphonecore.c:2334
+#: ../coreapi/linphonecore.c:2389
#, fuzzy
msgid "Call aborted"
msgstr "afgebroken"
-#: ../coreapi/linphonecore.c:2374
-msgid "Call ended"
-msgstr "Oproep beeindigd"
-
-#: ../coreapi/linphonecore.c:2456
+#: ../coreapi/linphonecore.c:2530
#, fuzzy
msgid "Could not pause the call"
msgstr "Kon niet oproepen"
-#: ../coreapi/linphonecore.c:2460
+#: ../coreapi/linphonecore.c:2535
#, fuzzy
msgid "Pausing the current call..."
msgstr "Kon niet oproepen"
-#: ../coreapi/linphonecore.c:2499
-msgid "There is already a call in process, pause or stop it first."
-msgstr ""
-
#: ../coreapi/misc.c:147
msgid ""
"Your computer appears to be using ALSA sound drivers.\n"
@@ -1302,156 +1370,211 @@ msgstr ""
msgid "Unknown-bug"
msgstr ""
-#: ../coreapi/proxy.c:187
+#: ../coreapi/proxy.c:192
msgid ""
"The sip proxy address you entered is invalid, it must start with \"sip:\" "
"followed by a hostname."
msgstr ""
-#: ../coreapi/proxy.c:193
+#: ../coreapi/proxy.c:198
msgid ""
"The sip identity you entered is invalid.\n"
"It should look like sip:username@proxydomain, such as sip:alice@example.net"
msgstr ""
-#: ../coreapi/proxy.c:671
+#: ../coreapi/proxy.c:690
#, fuzzy, c-format
msgid "Could not login as %s"
msgstr "Kon pixmap bestand %s niet vinden"
-#: ../coreapi/callbacks.c:170
+#: ../coreapi/callbacks.c:206
#, fuzzy
msgid "is contacting you"
msgstr "belt u."
-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207
msgid " and asked autoanswer."
msgstr ""
-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207
msgid "."
msgstr ""
-#: ../coreapi/callbacks.c:226
+#: ../coreapi/callbacks.c:266
#, fuzzy
msgid "Remote ringing."
msgstr "Externe diensten"
-#: ../coreapi/callbacks.c:242
+#: ../coreapi/callbacks.c:282
#, fuzzy
msgid "Remote ringing..."
msgstr "Externe diensten"
-#: ../coreapi/callbacks.c:253
+#: ../coreapi/callbacks.c:293
msgid "Early media."
msgstr ""
-#: ../coreapi/callbacks.c:291
+#: ../coreapi/callbacks.c:331
#, fuzzy, c-format
msgid "Call with %s is paused."
msgstr "Chat met %s"
-#: ../coreapi/callbacks.c:302
+#: ../coreapi/callbacks.c:342
#, c-format
msgid "Call answered by %s - on hold."
msgstr ""
-#: ../coreapi/callbacks.c:317
+#: ../coreapi/callbacks.c:357
#, fuzzy
msgid "Call resumed."
msgstr "Oproep beeindigd"
-#: ../coreapi/callbacks.c:322
+#: ../coreapi/callbacks.c:362
#, fuzzy, c-format
msgid "Call answered by %s."
msgstr ""
"Oproepen of\n"
"beantwoorden"
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:432
msgid "We are being paused..."
msgstr ""
-#: ../coreapi/callbacks.c:387
+#: ../coreapi/callbacks.c:436
msgid "We have been resumed..."
msgstr ""
-#: ../coreapi/callbacks.c:424
+#: ../coreapi/callbacks.c:441
+msgid "Call has been updated by remote..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:473
msgid "Call terminated."
msgstr "Oproep beeindigd."
-#: ../coreapi/callbacks.c:431
+#: ../coreapi/callbacks.c:480
msgid "User is busy."
msgstr "Gebruiker is bezet."
-#: ../coreapi/callbacks.c:432
+#: ../coreapi/callbacks.c:481
msgid "User is temporarily unavailable."
msgstr "Gebruiker is tijdelijk niet beschikbaar."
#. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:434
+#: ../coreapi/callbacks.c:483
msgid "User does not want to be disturbed."
msgstr "De gebruiker wenst niet gestoord te worden."
-#: ../coreapi/callbacks.c:435
+#: ../coreapi/callbacks.c:484
msgid "Call declined."
msgstr "Oproep geweigerd."
-#: ../coreapi/callbacks.c:447
+#: ../coreapi/callbacks.c:496
msgid "No response."
msgstr ""
-#: ../coreapi/callbacks.c:451
+#: ../coreapi/callbacks.c:500
msgid "Protocol error."
msgstr ""
-#: ../coreapi/callbacks.c:467
+#: ../coreapi/callbacks.c:516
#, fuzzy
msgid "Redirected"
msgstr "Doorgeschakeld naar %s..."
-#: ../coreapi/callbacks.c:477
+#: ../coreapi/callbacks.c:526
msgid "Not found"
msgstr ""
-#: ../coreapi/callbacks.c:487
+#: ../coreapi/callbacks.c:551
msgid "No common codecs"
msgstr ""
-#: ../coreapi/callbacks.c:493
+#: ../coreapi/callbacks.c:557
#, fuzzy
msgid "Call failed."
msgstr "Oproep geannuleerd."
-#: ../coreapi/callbacks.c:557
+#: ../coreapi/callbacks.c:631
#, c-format
msgid "Registration on %s successful."
msgstr "Registratie op %s gelukt."
-#: ../coreapi/callbacks.c:558
+#: ../coreapi/callbacks.c:632
#, fuzzy, c-format
msgid "Unregistration on %s done."
msgstr "Registratie op %s gelukt."
-#: ../coreapi/callbacks.c:574
+#: ../coreapi/callbacks.c:648
msgid "no response timeout"
msgstr ""
-#: ../coreapi/callbacks.c:577
+#: ../coreapi/callbacks.c:651
#, fuzzy, c-format
msgid "Registration on %s failed: %s"
msgstr "Registratie op %s mislukt (time-out)."
-#: ../coreapi/callbacks.c:619
-#, c-format
-msgid "We are transferred to %s"
-msgstr ""
-
-#: ../coreapi/sal_eXosip2.c:815 ../coreapi/sal_eXosip2.c:817
+#: ../coreapi/sal_eXosip2.c:873 ../coreapi/sal_eXosip2.c:875
#, fuzzy
msgid "Authentication failure"
msgstr "Authorisatie gegevens"
+#: ../coreapi/linphonecall.c:128
+#, fuzzy, c-format
+msgid "Authentication token is %s"
+msgstr "Authorisatie gegevens"
+
+#: ../coreapi/linphonecall.c:1560
+#, fuzzy, c-format
+msgid "You have missed %i call."
+msgid_plural "You have missed %i calls."
+msgstr[0] "U heeft %i oproep(en) gemist."
+msgstr[1] "U heeft %i oproep(en) gemist."
+
+#, fuzzy
+#~ msgid "Unmute"
+#~ msgstr "Ongelimiteerd"
+
+#, fuzzy
+#~ msgid "<b>Contact list</b>"
+#~ msgstr "Contactlijst"
+
+#, fuzzy
+#~ msgid "Audio & video"
+#~ msgstr "Audio codecs"
+
+#, fuzzy
+#~ msgid "Audio only"
+#~ msgstr "Audio codecs"
+
+#, fuzzy
+#~ msgid "Duration:"
+#~ msgstr "Informatie"
+
+#, fuzzy
+#~ msgid "_Call history"
+#~ msgstr "Linphone - Oproepgeschiedenis"
+
+#, fuzzy
+#~ msgid "_Linphone"
+#~ msgstr "linphone"
+
+#, fuzzy
+#~ msgid "gtk-cancel"
+#~ msgstr "Verbonden."
+
+#, fuzzy
+#~ msgid "gtk-ok"
+#~ msgstr "Verwijderen"
+
+#, fuzzy
+#~ msgid "gtk-close"
+#~ msgstr "Verbonden."
+
+#, fuzzy
+#~ msgid "<b>Ports</b>"
+#~ msgstr "Contactlijst"
+
#~ msgid ""
#~ "Your machine appears to be connected to an IPv6 network. By default "
#~ "linphone always uses IPv4. Please update your configuration if you want "
@@ -1580,9 +1703,6 @@ msgstr "Authorisatie gegevens"
#~ msgid "Go"
#~ msgstr "Ga"
-#~ msgid "Address book"
-#~ msgstr "Adresboek"
-
#~ msgid "Exit"
#~ msgstr "Einde"
@@ -1915,9 +2035,6 @@ msgstr "Authorisatie gegevens"
#~ msgid "Authentication required for realm %s"
#~ msgstr "Authorisatie benodigd voor gebied %s"
-#~ msgid "None"
-#~ msgstr "Geen"
-
#~ msgid "Wait"
#~ msgstr "Wachten"
diff --git a/po/pl.po b/po/pl.po
index f52259199349dcf699d823f3a936285e7725d06e..88772c47a01eb6f503d843f356c889f32531f995 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: linphone 0.7.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-08 22:32+0200\n"
+"POT-Creation-Date: 2011-12-02 16:47+0100\n"
"PO-Revision-Date: 2003-08-22 12:50+0200\n"
"Last-Translator: Robert Nasiadek <darkone@darkone.pl>\n"
"Language-Team: Polski <pl@li.org>\n"
@@ -15,6 +15,18 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8-bit\n"
+#: ../gtk/calllogs.c:71
+msgid "n/a"
+msgstr ""
+
+#: ../gtk/conference.c:33 ../gtk/incall_view.c:183
+msgid "Conference"
+msgstr ""
+
+#: ../gtk/conference.c:41
+msgid "Me"
+msgstr ""
+
#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
#, c-format
msgid "Couldn't find pixmap file: %s"
@@ -25,34 +37,38 @@ msgstr "Nie można znaleźć pixmapy: %s"
msgid "Chat with %s"
msgstr ""
-#: ../gtk/main.c:74
+#: ../gtk/main.c:83
msgid "log to stdout some debug information while running."
msgstr ""
-#: ../gtk/main.c:81
+#: ../gtk/main.c:90
+msgid "path to a file to write logs into."
+msgstr ""
+
+#: ../gtk/main.c:97
msgid "Start only in the system tray, do not show the main interface."
msgstr ""
-#: ../gtk/main.c:88
+#: ../gtk/main.c:104
msgid "address to call right now"
msgstr ""
-#: ../gtk/main.c:95
+#: ../gtk/main.c:111
msgid "if set automatically answer incoming calls"
msgstr ""
-#: ../gtk/main.c:102
+#: ../gtk/main.c:118
msgid ""
"Specifiy a working directory (should be the base of the installation, eg: c:"
"\\Program Files\\Linphone)"
msgstr ""
-#: ../gtk/main.c:442
+#: ../gtk/main.c:464
#, c-format
msgid "Call with %s"
msgstr ""
-#: ../gtk/main.c:826
+#: ../gtk/main.c:815
#, c-format
msgid ""
"%s would like to add you to his contact list.\n"
@@ -61,172 +77,232 @@ msgid ""
"If you answer no, this person will be temporarily blacklisted."
msgstr ""
-#: ../gtk/main.c:904
+#: ../gtk/main.c:893
#, c-format
msgid ""
"Please enter your password for username <i>%s</i>\n"
" at domain <i>%s</i>:"
msgstr ""
-#: ../gtk/main.c:1040
+#: ../gtk/main.c:993
+#, fuzzy
+msgid "Call error"
+msgstr "Połączenie odwołane."
+
+#: ../gtk/main.c:996 ../coreapi/linphonecore.c:2406
+#, fuzzy
+msgid "Call ended"
+msgstr "Rozmowa odrzucona."
+
+#: ../gtk/main.c:999 ../coreapi/linphonecore.c:199
+msgid "Incoming call"
+msgstr ""
+
+#: ../gtk/main.c:1001 ../gtk/incall_view.c:292 ../gtk/main.ui.h:20
+msgid "Answer"
+msgstr ""
+
+#: ../gtk/main.c:1003 ../gtk/main.ui.h:29
+#, fuzzy
+msgid "Decline"
+msgstr "linia"
+
+#: ../gtk/main.c:1009
+#, fuzzy
+msgid "Call paused"
+msgstr "Połączenie odwołane."
+
+#: ../gtk/main.c:1009
+#, c-format
+msgid "<span size=\"large\">by %s</span>"
+msgstr ""
+
+#: ../gtk/main.c:1165
msgid "Website link"
msgstr ""
-#: ../gtk/main.c:1076
+#: ../gtk/main.c:1205
msgid "Linphone - a video internet phone"
msgstr ""
-#: ../gtk/main.c:1095
+#: ../gtk/main.c:1295
#, c-format
msgid "%s (Default)"
msgstr ""
-#: ../gtk/main.c:1187
-msgid "Windows"
+#: ../gtk/main.c:1566 ../coreapi/callbacks.c:700
+#, c-format
+msgid "We are transferred to %s"
msgstr ""
-#: ../gtk/main.c:1364
+#: ../gtk/main.c:1576
msgid ""
"No sound cards have been detected on this computer.\n"
"You won't be able to send or receive audio calls."
msgstr ""
-#: ../gtk/main.c:1423
+#: ../gtk/main.c:1663
msgid "A free SIP video-phone"
msgstr ""
-#: ../gtk/friendlist.c:192 ../gtk/propertybox.c:271 ../gtk/contact.ui.h:3
+#: ../gtk/friendlist.c:203
+#, fuzzy
+msgid "Add to addressbook"
+msgstr "Książka adresowa"
+
+#: ../gtk/friendlist.c:258 ../gtk/propertybox.c:296 ../gtk/contact.ui.h:3
msgid "Name"
msgstr "Nazwa"
-#: ../gtk/friendlist.c:205
+#: ../gtk/friendlist.c:271
#, fuzzy
msgid "Presence status"
msgstr "Obecność"
-#: ../gtk/friendlist.c:242
+#: ../gtk/friendlist.c:308
#, c-format
msgid "Search in %s directory"
msgstr ""
-#: ../gtk/friendlist.c:450
+#: ../gtk/friendlist.c:568
msgid "Invalid sip contact !"
msgstr ""
-#: ../gtk/friendlist.c:495
+#: ../gtk/friendlist.c:613
#, c-format
msgid "Call %s"
msgstr ""
-#: ../gtk/friendlist.c:496
+#: ../gtk/friendlist.c:614
#, c-format
msgid "Send text to %s"
msgstr ""
-#: ../gtk/friendlist.c:497
+#: ../gtk/friendlist.c:615
#, fuzzy, c-format
msgid "Edit contact '%s'"
msgstr "(Brak informacji kontaktowych !)"
-#: ../gtk/friendlist.c:498
+#: ../gtk/friendlist.c:616
#, c-format
msgid "Delete contact '%s'"
msgstr ""
-#: ../gtk/friendlist.c:540
+#: ../gtk/friendlist.c:658
#, c-format
msgid "Add new contact from %s directory"
msgstr ""
-#: ../gtk/propertybox.c:277
+#: ../gtk/propertybox.c:302
msgid "Rate (Hz)"
msgstr "Jakość (Hz)"
-#: ../gtk/propertybox.c:283
+#: ../gtk/propertybox.c:308
msgid "Status"
msgstr "Status"
-#: ../gtk/propertybox.c:289
+#: ../gtk/propertybox.c:314
msgid "Min bitrate (kbit/s)"
msgstr "Min przepustowość (kbit/s)"
-#: ../gtk/propertybox.c:296
+#: ../gtk/propertybox.c:321
msgid "Parameters"
msgstr "Parametr"
-#: ../gtk/propertybox.c:326 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507
msgid "Enabled"
msgstr "WÅ‚Ä…czone"
-#: ../gtk/propertybox.c:327 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507
msgid "Disabled"
msgstr "Wyłączone"
-#: ../gtk/propertybox.c:510
+#: ../gtk/propertybox.c:553
msgid "Account"
msgstr ""
-#: ../gtk/propertybox.c:650
+#: ../gtk/propertybox.c:693
msgid "English"
msgstr ""
-#: ../gtk/propertybox.c:651
+#: ../gtk/propertybox.c:694
msgid "French"
msgstr ""
-#: ../gtk/propertybox.c:652
+#: ../gtk/propertybox.c:695
msgid "Swedish"
msgstr ""
-#: ../gtk/propertybox.c:653
+#: ../gtk/propertybox.c:696
msgid "Italian"
msgstr ""
-#: ../gtk/propertybox.c:654
+#: ../gtk/propertybox.c:697
msgid "Spanish"
msgstr ""
-#: ../gtk/propertybox.c:655
+#: ../gtk/propertybox.c:698
msgid "Brazilian Portugese"
msgstr ""
-#: ../gtk/propertybox.c:656
+#: ../gtk/propertybox.c:699
msgid "Polish"
msgstr ""
-#: ../gtk/propertybox.c:657
+#: ../gtk/propertybox.c:700
msgid "German"
msgstr ""
-#: ../gtk/propertybox.c:658
+#: ../gtk/propertybox.c:701
msgid "Russian"
msgstr ""
-#: ../gtk/propertybox.c:659
+#: ../gtk/propertybox.c:702
msgid "Japanese"
msgstr ""
-#: ../gtk/propertybox.c:660
+#: ../gtk/propertybox.c:703
msgid "Dutch"
msgstr ""
-#: ../gtk/propertybox.c:661
+#: ../gtk/propertybox.c:704
msgid "Hungarian"
msgstr ""
-#: ../gtk/propertybox.c:662
+#: ../gtk/propertybox.c:705
msgid "Czech"
msgstr ""
-#: ../gtk/propertybox.c:663
+#: ../gtk/propertybox.c:706
msgid "Chinese"
msgstr ""
-#: ../gtk/propertybox.c:720
+#: ../gtk/propertybox.c:707
+msgid "Traditional Chinese"
+msgstr ""
+
+#: ../gtk/propertybox.c:708
+msgid "Norwegian"
+msgstr ""
+
+#: ../gtk/propertybox.c:765
msgid ""
"You need to restart linphone for the new language selection to take effect."
msgstr ""
+#: ../gtk/propertybox.c:835
+#, fuzzy
+msgid "None"
+msgstr "Brak."
+
+#: ../gtk/propertybox.c:839
+msgid "SRTP"
+msgstr ""
+
+#: ../gtk/propertybox.c:845
+msgid "ZRTP"
+msgstr ""
+
#: ../gtk/update.c:80
#, c-format
msgid ""
@@ -344,77 +420,104 @@ msgstr ""
msgid "Now ready !"
msgstr ""
-#: ../gtk/incall_view.c:61
+#: ../gtk/incall_view.c:69
#, fuzzy, c-format
msgid "Call #%i"
msgstr "Połączenie odwołane."
-#: ../gtk/incall_view.c:87
+#: ../gtk/incall_view.c:127
#, c-format
msgid "Transfer to call #%i with %s"
msgstr ""
-#: ../gtk/incall_view.c:113
+#: ../gtk/incall_view.c:155
msgid "Transfer"
msgstr ""
-#: ../gtk/incall_view.c:187
+#: ../gtk/incall_view.c:271
#, fuzzy
msgid "<b>Calling...</b>"
msgstr "Dzwonie do "
-#: ../gtk/incall_view.c:190 ../gtk/incall_view.c:246
+#: ../gtk/incall_view.c:274 ../gtk/incall_view.c:482
msgid "00::00::00"
msgstr ""
-#: ../gtk/incall_view.c:206
+#: ../gtk/incall_view.c:285
#, fuzzy
msgid "<b>Incoming call</b>"
msgstr "Dzwonie do "
-#: ../gtk/incall_view.c:216
-msgid ""
-"Pause all calls\n"
-"and answer"
+#: ../gtk/incall_view.c:322
+msgid "good"
msgstr ""
-#: ../gtk/incall_view.c:217 ../gtk/main.ui.h:20
-msgid "Answer"
+#: ../gtk/incall_view.c:324
+msgid "average"
+msgstr ""
+
+#: ../gtk/incall_view.c:326
+msgid "poor"
+msgstr ""
+
+#: ../gtk/incall_view.c:328
+msgid "very poor"
+msgstr ""
+
+#: ../gtk/incall_view.c:330
+msgid "too bad"
msgstr ""
-#: ../gtk/incall_view.c:244
+#: ../gtk/incall_view.c:331 ../gtk/incall_view.c:347
+msgid "unavailable"
+msgstr ""
+
+#: ../gtk/incall_view.c:447
+msgid "Secured by SRTP"
+msgstr ""
+
+#: ../gtk/incall_view.c:453
+#, c-format
+msgid "Secured by ZRTP - [auth token: %s]"
+msgstr ""
+
+#: ../gtk/incall_view.c:459
+msgid "Set unverified"
+msgstr ""
+
+#: ../gtk/incall_view.c:459 ../gtk/main.ui.h:49
+msgid "Set verified"
+msgstr ""
+
+#: ../gtk/incall_view.c:480
+msgid "In conference"
+msgstr ""
+
+#: ../gtk/incall_view.c:480
#, fuzzy
msgid "<b>In call</b>"
msgstr "Dzwonie do "
-#: ../gtk/incall_view.c:260
+#: ../gtk/incall_view.c:499
#, fuzzy
msgid "<b>Paused call</b>"
msgstr "Dzwonie do "
-#: ../gtk/incall_view.c:272
+#: ../gtk/incall_view.c:511
#, c-format
msgid "%02i::%02i::%02i"
msgstr ""
-#: ../gtk/incall_view.c:288
+#: ../gtk/incall_view.c:527
#, fuzzy
msgid "<b>Call ended.</b>"
msgstr "Rozmowa odrzucona."
-#: ../gtk/incall_view.c:309
-msgid "Unmute"
-msgstr ""
-
-#: ../gtk/incall_view.c:316 ../gtk/main.ui.h:42
-msgid "Mute"
-msgstr ""
-
-#: ../gtk/incall_view.c:340
+#: ../gtk/incall_view.c:584
msgid "Resume"
msgstr ""
-#: ../gtk/incall_view.c:347 ../gtk/main.ui.h:46
+#: ../gtk/incall_view.c:591 ../gtk/main.ui.h:45
msgid "Pause"
msgstr ""
@@ -478,8 +581,8 @@ msgstr "Informacje o kodeku"
#: ../gtk/main.ui.h:14
#, fuzzy
-msgid "<b>Contact list</b>"
-msgstr "Dzwonie do "
+msgid "<b>Callee name</b>"
+msgstr "Rozmowa odrzucona."
#: ../gtk/main.ui.h:15
#, fuzzy
@@ -504,27 +607,26 @@ msgid "All users"
msgstr ""
#: ../gtk/main.ui.h:21
-#, fuzzy
-msgid "Audio & video"
-msgstr "Kodeki audio"
-
-#: ../gtk/main.ui.h:22
-#, fuzzy
-msgid "Audio only"
-msgstr "Kodeki audio"
-
-#: ../gtk/main.ui.h:23
msgid "Automatically log me in"
msgstr ""
-#: ../gtk/main.ui.h:24
+#: ../gtk/main.ui.h:22
msgid "B"
msgstr ""
-#: ../gtk/main.ui.h:25 ../gtk/parameters.ui.h:20
+#: ../gtk/main.ui.h:23 ../gtk/parameters.ui.h:21
msgid "C"
msgstr ""
+#: ../gtk/main.ui.h:24
+#, fuzzy
+msgid "Call"
+msgstr "Połączenie odwołane."
+
+#: ../gtk/main.ui.h:25
+msgid "Call quality rating"
+msgstr ""
+
#: ../gtk/main.ui.h:26
msgid "Check _Updates"
msgstr ""
@@ -538,11 +640,6 @@ msgstr "Dzwonie do "
msgid "D"
msgstr ""
-#: ../gtk/main.ui.h:29
-#, fuzzy
-msgid "Decline"
-msgstr "linia"
-
#: ../gtk/main.ui.h:30
#, fuzzy
msgid "Default"
@@ -555,12 +652,12 @@ msgstr "Informacja"
#: ../gtk/main.ui.h:32
#, fuzzy
-msgid "Duration:"
-msgstr "Informacja"
+msgid "Enable self-view"
+msgstr "WÅ‚Ä…czone"
#: ../gtk/main.ui.h:33
#, fuzzy
-msgid "Enable self-view"
+msgid "Enable video"
msgstr "WÅ‚Ä…czone"
#: ../gtk/main.ui.h:34
@@ -597,21 +694,26 @@ msgstr "Informacje o kodeku"
msgid "Lookup:"
msgstr ""
-#: ../gtk/main.ui.h:43
+#: ../gtk/main.ui.h:42
#, fuzzy
msgid "My current identity:"
msgstr "Tożsamość"
-#: ../gtk/main.ui.h:44
+#: ../gtk/main.ui.h:43
#, fuzzy
msgid "Online users"
msgstr "linia"
-#: ../gtk/main.ui.h:45
+#: ../gtk/main.ui.h:44
#, fuzzy
msgid "Password"
msgstr "Twoje hasło:"
+#: ../gtk/main.ui.h:46
+#, fuzzy
+msgid "Recent calls"
+msgstr "Dzwonie do "
+
#: ../gtk/main.ui.h:47
#, fuzzy
msgid "SIP address or phone number:"
@@ -621,19 +723,15 @@ msgstr "Adres serwera rejestracji sip"
msgid "Search"
msgstr ""
-#: ../gtk/main.ui.h:49
+#: ../gtk/main.ui.h:50
msgid "Show debug window"
msgstr ""
-#: ../gtk/main.ui.h:50
+#: ../gtk/main.ui.h:51
#, fuzzy
msgid "Username"
msgstr "Podręcznik"
-#: ../gtk/main.ui.h:51
-msgid "_Call history"
-msgstr ""
-
#: ../gtk/main.ui.h:52
msgid "_Help"
msgstr ""
@@ -643,19 +741,14 @@ msgid "_Homepage"
msgstr ""
#: ../gtk/main.ui.h:54
-#, fuzzy
-msgid "_Linphone"
-msgstr "linphone"
-
-#: ../gtk/main.ui.h:55
msgid "_Options"
msgstr ""
-#: ../gtk/main.ui.h:56
+#: ../gtk/main.ui.h:55
msgid "in"
msgstr ""
-#: ../gtk/main.ui.h:57
+#: ../gtk/main.ui.h:56
msgid "label"
msgstr ""
@@ -705,15 +798,6 @@ msgstr "Adres"
msgid "Show this contact presence status"
msgstr ""
-#: ../gtk/contact.ui.h:6
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "Połączony"
-
-#: ../gtk/contact.ui.h:7
-msgid "gtk-ok"
-msgstr ""
-
#: ../gtk/log.ui.h:1
msgid "Linphone debug window"
msgstr ""
@@ -770,7 +854,7 @@ msgid "Publish presence information"
msgstr "Informacje o kodeku"
#: ../gtk/sip_account.ui.h:6
-msgid "Register at startup"
+msgid "Register"
msgstr ""
#: ../gtk/sip_account.ui.h:7
@@ -801,11 +885,6 @@ msgstr "sip:"
msgid "Send"
msgstr "Dźwięk"
-#: ../gtk/chatroom.ui.h:2
-#, fuzzy
-msgid "gtk-close"
-msgstr "Połączony"
-
#: ../gtk/parameters.ui.h:1
msgid "0 stands for \"unlimited\""
msgstr ""
@@ -845,9 +924,8 @@ msgid "<b>NAT and Firewall</b>"
msgstr "Dzwonie do "
#: ../gtk/parameters.ui.h:9
-#, fuzzy
-msgid "<b>Ports</b>"
-msgstr "Dzwonie do "
+msgid "<b>Network protocol and ports</b>"
+msgstr ""
#: ../gtk/parameters.ui.h:10
#, fuzzy
@@ -870,208 +948,226 @@ msgid "<b>Video</b>"
msgstr "Dzwonie do "
#: ../gtk/parameters.ui.h:14
-msgid "ALSA special device (optional):"
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
msgstr ""
#: ../gtk/parameters.ui.h:15
+msgid "ALSA special device (optional):"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:16
#, fuzzy
msgid "Add"
msgstr "Adres"
-#: ../gtk/parameters.ui.h:16
+#: ../gtk/parameters.ui.h:17
msgid "Audio RTP/UDP:"
msgstr ""
-#: ../gtk/parameters.ui.h:17
+#: ../gtk/parameters.ui.h:18
#, fuzzy
msgid "Audio codecs"
msgstr "Kodeki audio"
-#: ../gtk/parameters.ui.h:18
+#: ../gtk/parameters.ui.h:19
msgid "Behind NAT / Firewall (specify gateway IP below)"
msgstr ""
-#: ../gtk/parameters.ui.h:19
+#: ../gtk/parameters.ui.h:20
msgid "Behind NAT / Firewall (use STUN to resolve)"
msgstr ""
-#: ../gtk/parameters.ui.h:21
+#: ../gtk/parameters.ui.h:22
msgid "CIF"
msgstr ""
-#: ../gtk/parameters.ui.h:22
+#: ../gtk/parameters.ui.h:23
#, fuzzy
msgid "Capture device:"
msgstr "Użyj tego urządzenia dźwięku:"
-#: ../gtk/parameters.ui.h:23
+#: ../gtk/parameters.ui.h:24
#, fuzzy
msgid "Codecs"
msgstr "Kodeki"
-#: ../gtk/parameters.ui.h:24
+#: ../gtk/parameters.ui.h:25
msgid "Direct connection to the Internet"
msgstr ""
-#: ../gtk/parameters.ui.h:25
+#: ../gtk/parameters.ui.h:26
msgid "Disable"
msgstr "Wyłącz"
-#: ../gtk/parameters.ui.h:26
+#: ../gtk/parameters.ui.h:27
#, fuzzy
msgid "Done"
msgstr "Brak."
-#: ../gtk/parameters.ui.h:27
+#: ../gtk/parameters.ui.h:28
msgid "Download speed limit in Kbit/sec:"
msgstr ""
-#: ../gtk/parameters.ui.h:28
+#: ../gtk/parameters.ui.h:29
msgid "Edit"
msgstr ""
-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:30
msgid "Enable"
msgstr "WÅ‚Ä…czony"
-#: ../gtk/parameters.ui.h:30
+#: ../gtk/parameters.ui.h:31
+msgid "Enable adaptive rate control"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:32
msgid "Enable echo cancellation"
msgstr ""
-#: ../gtk/parameters.ui.h:31
+#: ../gtk/parameters.ui.h:33
msgid "Erase all passwords"
msgstr ""
-#: ../gtk/parameters.ui.h:32
+#: ../gtk/parameters.ui.h:34
msgid "Manage SIP Accounts"
msgstr ""
-#: ../gtk/parameters.ui.h:33
+#: ../gtk/parameters.ui.h:35
+msgid "Media encryption type"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:36
msgid "Multimedia settings"
msgstr ""
-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:37
#, fuzzy
msgid "Network settings"
msgstr "Sieć"
-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:38
#, fuzzy
msgid "Playback device:"
msgstr "Użyj tego urządzenia dźwięku:"
-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:39
msgid "Prefered video resolution:"
msgstr ""
-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:40
#, fuzzy
msgid "Public IP address:"
msgstr "Adres sip:"
-#: ../gtk/parameters.ui.h:38
+#: ../gtk/parameters.ui.h:41
msgid ""
"Register to FONICS\n"
"virtual network !"
msgstr ""
-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:43
msgid "Remove"
msgstr ""
-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:44
#, fuzzy
msgid "Ring device:"
msgstr "Użyj tego urządzenia dźwięku:"
-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:45
#, fuzzy
msgid "Ring sound:"
msgstr "Źródło nagrywania:"
-#: ../gtk/parameters.ui.h:43
-msgid "SIP (TCP):"
+#: ../gtk/parameters.ui.h:46
+msgid "SIP (TCP)"
msgstr ""
-#: ../gtk/parameters.ui.h:44
-msgid "SIP (UDP):"
+#: ../gtk/parameters.ui.h:47
+msgid "SIP (TLS)"
msgstr ""
-#: ../gtk/parameters.ui.h:45
+#: ../gtk/parameters.ui.h:48
+msgid "SIP (UDP)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:49
msgid "Send DTMFs as SIP info"
msgstr ""
-#: ../gtk/parameters.ui.h:46
+#: ../gtk/parameters.ui.h:50
msgid "Set Maximum Transmission Unit:"
msgstr ""
-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:51
msgid "Settings"
msgstr ""
-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:52
msgid "Show advanced settings"
msgstr ""
-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:53
#, fuzzy
msgid "Stun server:"
msgstr "Dźwięk"
-#: ../gtk/parameters.ui.h:50
+#: ../gtk/parameters.ui.h:54
msgid "This section defines your SIP address when not using a SIP account"
msgstr ""
-#: ../gtk/parameters.ui.h:51
+#: ../gtk/parameters.ui.h:55
msgid "Upload speed limit in Kbit/sec:"
msgstr ""
-#: ../gtk/parameters.ui.h:52
+#: ../gtk/parameters.ui.h:56
msgid "Use IPv6 instead of IPv4"
msgstr ""
-#: ../gtk/parameters.ui.h:53
+#: ../gtk/parameters.ui.h:57
#, fuzzy
msgid "User interface"
msgstr "Podręcznik"
-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:58
msgid "Video RTP/UDP:"
msgstr ""
-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:59
#, fuzzy
msgid "Video codecs"
msgstr "Kodeki audio"
-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:60
#, fuzzy
msgid "Video input device:"
msgstr "Dźwięk"
-#: ../gtk/parameters.ui.h:57
+#: ../gtk/parameters.ui.h:61
msgid "Your display name (eg: John Doe):"
msgstr ""
-#: ../gtk/parameters.ui.h:58
+#: ../gtk/parameters.ui.h:62
#, fuzzy
msgid "Your resulting SIP address:"
msgstr "Twój adres sip:"
-#: ../gtk/parameters.ui.h:59
+#: ../gtk/parameters.ui.h:63
#, fuzzy
msgid "Your username:"
msgstr "Podręcznik"
-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:64
msgid "a sound card"
msgstr ""
-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:65
msgid "default camera"
msgstr ""
-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:66
msgid "default soundcard"
msgstr ""
@@ -1098,26 +1194,19 @@ msgstr "linphone"
msgid "Please wait"
msgstr ""
-#: ../coreapi/linphonecore.c:165
-#, c-format
-msgid "You have missed %i call."
-msgid_plural "You have missed %i calls."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../coreapi/linphonecore.c:206
+#: ../coreapi/linphonecore.c:187
msgid "aborted"
msgstr ""
-#: ../coreapi/linphonecore.c:209
+#: ../coreapi/linphonecore.c:190
msgid "completed"
msgstr ""
-#: ../coreapi/linphonecore.c:212
+#: ../coreapi/linphonecore.c:193
msgid "missed"
msgstr ""
-#: ../coreapi/linphonecore.c:217
+#: ../coreapi/linphonecore.c:198
#, c-format
msgid ""
"%s at %s\n"
@@ -1127,82 +1216,65 @@ msgid ""
"Duration: %i mn %i sec\n"
msgstr ""
-#: ../coreapi/linphonecore.c:218
-msgid "Incoming call"
-msgstr ""
-
-#: ../coreapi/linphonecore.c:218
+#: ../coreapi/linphonecore.c:199
msgid "Outgoing call"
msgstr ""
-#: ../coreapi/linphonecore.c:998
+#: ../coreapi/linphonecore.c:1088
#, fuzzy
msgid "Ready"
msgstr "Gotowy."
-#: ../coreapi/linphonecore.c:1773
+#: ../coreapi/linphonecore.c:1831
msgid "Looking for telephone number destination..."
msgstr ""
-#: ../coreapi/linphonecore.c:1776
+#: ../coreapi/linphonecore.c:1834
msgid "Could not resolve this number."
msgstr ""
-#: ../coreapi/linphonecore.c:1820
+#: ../coreapi/linphonecore.c:1878
#, fuzzy
msgid ""
"Could not parse given sip address. A sip url usually looks like sip:"
"user@domain"
msgstr "Nie poprawny adres sip. Adres sip wyglÄ…da tak <sip:osoba@serwer>"
-#: ../coreapi/linphonecore.c:1967
+#: ../coreapi/linphonecore.c:2025
#, fuzzy
msgid "Contacting"
msgstr "Dzwonie do "
-#: ../coreapi/linphonecore.c:1974
+#: ../coreapi/linphonecore.c:2032
#, fuzzy
msgid "Could not call"
msgstr "Nie można znaleźć pixmapy: %s"
-#: ../coreapi/linphonecore.c:2081
-msgid "Sorry, you have to pause or stop the current call first !"
-msgstr ""
-
-#: ../coreapi/linphonecore.c:2086
+#: ../coreapi/linphonecore.c:2140
msgid "Sorry, we have reached the maximum number of simultaneous calls"
msgstr ""
-#: ../coreapi/linphonecore.c:2208
+#: ../coreapi/linphonecore.c:2270
msgid "Modifying call parameters..."
msgstr ""
-#: ../coreapi/linphonecore.c:2311
+#: ../coreapi/linphonecore.c:2366
msgid "Connected."
msgstr "Połączony"
-#: ../coreapi/linphonecore.c:2334
+#: ../coreapi/linphonecore.c:2389
#, fuzzy
msgid "Call aborted"
msgstr "Połączenie odwołane."
-#: ../coreapi/linphonecore.c:2374
-#, fuzzy
-msgid "Call ended"
-msgstr "Rozmowa odrzucona."
-
-#: ../coreapi/linphonecore.c:2456
+#: ../coreapi/linphonecore.c:2530
msgid "Could not pause the call"
msgstr ""
-#: ../coreapi/linphonecore.c:2460
+#: ../coreapi/linphonecore.c:2535
msgid "Pausing the current call..."
msgstr ""
-#: ../coreapi/linphonecore.c:2499
-msgid "There is already a call in process, pause or stop it first."
-msgstr ""
-
#: ../coreapi/misc.c:147
msgid ""
"Your computer appears to be using ALSA sound drivers.\n"
@@ -1283,156 +1355,199 @@ msgstr ""
msgid "Unknown-bug"
msgstr ""
-#: ../coreapi/proxy.c:187
+#: ../coreapi/proxy.c:192
msgid ""
"The sip proxy address you entered is invalid, it must start with \"sip:\" "
"followed by a hostname."
msgstr ""
-#: ../coreapi/proxy.c:193
+#: ../coreapi/proxy.c:198
msgid ""
"The sip identity you entered is invalid.\n"
"It should look like sip:username@proxydomain, such as sip:alice@example.net"
msgstr ""
-#: ../coreapi/proxy.c:671
+#: ../coreapi/proxy.c:690
#, fuzzy, c-format
msgid "Could not login as %s"
msgstr "Nie można znaleźć pixmapy: %s"
-#: ../coreapi/callbacks.c:170
+#: ../coreapi/callbacks.c:206
#, fuzzy
msgid "is contacting you"
msgstr "dzwoni do Ciebie."
-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207
msgid " and asked autoanswer."
msgstr ""
-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207
msgid "."
msgstr ""
-#: ../coreapi/callbacks.c:226
+#: ../coreapi/callbacks.c:266
#, fuzzy
msgid "Remote ringing."
msgstr "Rejestruje..."
-#: ../coreapi/callbacks.c:242
+#: ../coreapi/callbacks.c:282
#, fuzzy
msgid "Remote ringing..."
msgstr "Rejestruje..."
-#: ../coreapi/callbacks.c:253
+#: ../coreapi/callbacks.c:293
msgid "Early media."
msgstr ""
-#: ../coreapi/callbacks.c:291
+#: ../coreapi/callbacks.c:331
#, c-format
msgid "Call with %s is paused."
msgstr ""
-#: ../coreapi/callbacks.c:302
+#: ../coreapi/callbacks.c:342
#, c-format
msgid "Call answered by %s - on hold."
msgstr ""
-#: ../coreapi/callbacks.c:317
+#: ../coreapi/callbacks.c:357
#, fuzzy
msgid "Call resumed."
msgstr "Rozmowa odrzucona."
-#: ../coreapi/callbacks.c:322
+#: ../coreapi/callbacks.c:362
#, fuzzy, c-format
msgid "Call answered by %s."
msgstr ""
"Zadzwoń lub\n"
"Odpowiedz"
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:432
msgid "We are being paused..."
msgstr ""
-#: ../coreapi/callbacks.c:387
+#: ../coreapi/callbacks.c:436
msgid "We have been resumed..."
msgstr ""
-#: ../coreapi/callbacks.c:424
+#: ../coreapi/callbacks.c:441
+msgid "Call has been updated by remote..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:473
#, fuzzy
msgid "Call terminated."
msgstr "Rozmowa odrzucona."
-#: ../coreapi/callbacks.c:431
+#: ../coreapi/callbacks.c:480
msgid "User is busy."
msgstr "Osoba jest zajęta."
-#: ../coreapi/callbacks.c:432
+#: ../coreapi/callbacks.c:481
msgid "User is temporarily unavailable."
msgstr "Osoba jest tymczasowo niedostępna."
#. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:434
+#: ../coreapi/callbacks.c:483
msgid "User does not want to be disturbed."
msgstr "Osoba nie chce, aby jej przeszkadzać."
-#: ../coreapi/callbacks.c:435
+#: ../coreapi/callbacks.c:484
msgid "Call declined."
msgstr "Rozmowa odrzucona."
-#: ../coreapi/callbacks.c:447
+#: ../coreapi/callbacks.c:496
msgid "No response."
msgstr ""
-#: ../coreapi/callbacks.c:451
+#: ../coreapi/callbacks.c:500
msgid "Protocol error."
msgstr ""
-#: ../coreapi/callbacks.c:467
+#: ../coreapi/callbacks.c:516
msgid "Redirected"
msgstr ""
-#: ../coreapi/callbacks.c:477
+#: ../coreapi/callbacks.c:526
msgid "Not found"
msgstr ""
-#: ../coreapi/callbacks.c:487
+#: ../coreapi/callbacks.c:551
msgid "No common codecs"
msgstr ""
-#: ../coreapi/callbacks.c:493
+#: ../coreapi/callbacks.c:557
#, fuzzy
msgid "Call failed."
msgstr "Połączenie odwołane."
-#: ../coreapi/callbacks.c:557
+#: ../coreapi/callbacks.c:631
#, fuzzy, c-format
msgid "Registration on %s successful."
msgstr "Rejestracja powiodła się."
-#: ../coreapi/callbacks.c:558
+#: ../coreapi/callbacks.c:632
#, fuzzy, c-format
msgid "Unregistration on %s done."
msgstr "Rejestracja powiodła się."
-#: ../coreapi/callbacks.c:574
+#: ../coreapi/callbacks.c:648
msgid "no response timeout"
msgstr ""
-#: ../coreapi/callbacks.c:577
+#: ../coreapi/callbacks.c:651
#, fuzzy, c-format
msgid "Registration on %s failed: %s"
msgstr "Rejestracja powiodła się."
-#: ../coreapi/callbacks.c:619
-#, c-format
-msgid "We are transferred to %s"
-msgstr ""
-
-#: ../coreapi/sal_eXosip2.c:815 ../coreapi/sal_eXosip2.c:817
+#: ../coreapi/sal_eXosip2.c:873 ../coreapi/sal_eXosip2.c:875
#, fuzzy
msgid "Authentication failure"
msgstr "Informacje o kodeku"
+#: ../coreapi/linphonecall.c:128
+#, fuzzy, c-format
+msgid "Authentication token is %s"
+msgstr "Informacje o kodeku"
+
+#: ../coreapi/linphonecall.c:1560
+#, c-format
+msgid "You have missed %i call."
+msgid_plural "You have missed %i calls."
+msgstr[0] ""
+msgstr[1] ""
+
+#, fuzzy
+#~ msgid "<b>Contact list</b>"
+#~ msgstr "Dzwonie do "
+
+#, fuzzy
+#~ msgid "Audio & video"
+#~ msgstr "Kodeki audio"
+
+#, fuzzy
+#~ msgid "Audio only"
+#~ msgstr "Kodeki audio"
+
+#, fuzzy
+#~ msgid "Duration:"
+#~ msgstr "Informacja"
+
+#, fuzzy
+#~ msgid "_Linphone"
+#~ msgstr "linphone"
+
+#, fuzzy
+#~ msgid "gtk-cancel"
+#~ msgstr "Połączony"
+
+#, fuzzy
+#~ msgid "gtk-close"
+#~ msgstr "Połączony"
+
+#, fuzzy
+#~ msgid "<b>Ports</b>"
+#~ msgstr "Dzwonie do "
+
#, fuzzy
#~ msgid "_Modes"
#~ msgstr "Kodeki"
@@ -1637,10 +1752,6 @@ msgstr "Informacje o kodeku"
#~ msgid "Name:"
#~ msgstr "Nazwa"
-#, fuzzy
-#~ msgid "None"
-#~ msgstr "Brak."
-
#, fuzzy
#~ msgid "Bad sip address: a sip address looks like sip:user@domain"
#~ msgstr "Nie poprawny adres sip. Adres sip wyglÄ…da tak <sip:osoba@serwer>"
@@ -1702,12 +1813,6 @@ msgstr "Informacje o kodeku"
#~ msgid "Timeout..."
#~ msgstr "Upłynął limit czasu."
-#, fuzzy
-#~ msgid ""
-#~ "Add address\n"
-#~ "book"
-#~ msgstr "Książka adresowa"
-
#~ msgid "Toggle this if you want to be registered on a remote server."
#~ msgstr "Włącz to, jeżeli chcesz się zarejestrować na zdalnym serwerze."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 811b22b01cd513015638a9fb9fd2e73db72229f1..68b9ef61f221ce3f2d1381c9c7f140aa0d15b5cd 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: linphone-1.1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-08 22:32+0200\n"
+"POT-Creation-Date: 2011-12-02 16:47+0100\n"
"PO-Revision-Date: 2006-07-11 23:30+0200\n"
"Last-Translator: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
"Language-Team: pt_BR <pt_BR@li.org>\n"
@@ -17,6 +17,18 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: ../gtk/calllogs.c:71
+msgid "n/a"
+msgstr ""
+
+#: ../gtk/conference.c:33 ../gtk/incall_view.c:183
+msgid "Conference"
+msgstr ""
+
+#: ../gtk/conference.c:41
+msgid "Me"
+msgstr ""
+
#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
#, c-format
msgid "Couldn't find pixmap file: %s"
@@ -27,34 +39,38 @@ msgstr "Não é possÃvel achar arquivo pixmap: %s"
msgid "Chat with %s"
msgstr "Bate-papo com %s"
-#: ../gtk/main.c:74
+#: ../gtk/main.c:83
msgid "log to stdout some debug information while running."
msgstr ""
-#: ../gtk/main.c:81
+#: ../gtk/main.c:90
+msgid "path to a file to write logs into."
+msgstr ""
+
+#: ../gtk/main.c:97
msgid "Start only in the system tray, do not show the main interface."
msgstr ""
-#: ../gtk/main.c:88
+#: ../gtk/main.c:104
msgid "address to call right now"
msgstr ""
-#: ../gtk/main.c:95
+#: ../gtk/main.c:111
msgid "if set automatically answer incoming calls"
msgstr ""
-#: ../gtk/main.c:102
+#: ../gtk/main.c:118
msgid ""
"Specifiy a working directory (should be the base of the installation, eg: c:"
"\\Program Files\\Linphone)"
msgstr ""
-#: ../gtk/main.c:442
+#: ../gtk/main.c:464
#, fuzzy, c-format
msgid "Call with %s"
msgstr "Bate-papo com %s"
-#: ../gtk/main.c:826
+#: ../gtk/main.c:815
#, c-format
msgid ""
"%s would like to add you to his contact list.\n"
@@ -63,172 +79,231 @@ msgid ""
"If you answer no, this person will be temporarily blacklisted."
msgstr ""
-#: ../gtk/main.c:904
+#: ../gtk/main.c:893
#, c-format
msgid ""
"Please enter your password for username <i>%s</i>\n"
" at domain <i>%s</i>:"
msgstr ""
-#: ../gtk/main.c:1040
+#: ../gtk/main.c:993
+#, fuzzy
+msgid "Call error"
+msgstr "Linphone - Histórico de chamadas"
+
+#: ../gtk/main.c:996 ../coreapi/linphonecore.c:2406
+#, fuzzy
+msgid "Call ended"
+msgstr "Chamada cancelada."
+
+#: ../gtk/main.c:999 ../coreapi/linphonecore.c:199
+msgid "Incoming call"
+msgstr "Camadas recebidas"
+
+#: ../gtk/main.c:1001 ../gtk/incall_view.c:292 ../gtk/main.ui.h:20
+msgid "Answer"
+msgstr ""
+
+#: ../gtk/main.c:1003 ../gtk/main.ui.h:29
+#, fuzzy
+msgid "Decline"
+msgstr "linha"
+
+#: ../gtk/main.c:1009
+#, fuzzy
+msgid "Call paused"
+msgstr "Abortado"
+
+#: ../gtk/main.c:1009
+#, c-format
+msgid "<span size=\"large\">by %s</span>"
+msgstr ""
+
+#: ../gtk/main.c:1165
msgid "Website link"
msgstr ""
-#: ../gtk/main.c:1076
+#: ../gtk/main.c:1205
msgid "Linphone - a video internet phone"
msgstr ""
-#: ../gtk/main.c:1095
+#: ../gtk/main.c:1295
#, c-format
msgid "%s (Default)"
msgstr ""
-#: ../gtk/main.c:1187
-msgid "Windows"
+#: ../gtk/main.c:1566 ../coreapi/callbacks.c:700
+#, c-format
+msgid "We are transferred to %s"
msgstr ""
-#: ../gtk/main.c:1364
+#: ../gtk/main.c:1576
msgid ""
"No sound cards have been detected on this computer.\n"
"You won't be able to send or receive audio calls."
msgstr ""
-#: ../gtk/main.c:1423
+#: ../gtk/main.c:1663
msgid "A free SIP video-phone"
msgstr ""
-#: ../gtk/friendlist.c:192 ../gtk/propertybox.c:271 ../gtk/contact.ui.h:3
+#: ../gtk/friendlist.c:203
+#, fuzzy
+msgid "Add to addressbook"
+msgstr "Catálogo de endereços"
+
+#: ../gtk/friendlist.c:258 ../gtk/propertybox.c:296 ../gtk/contact.ui.h:3
msgid "Name"
msgstr "Nome"
-#: ../gtk/friendlist.c:205
+#: ../gtk/friendlist.c:271
msgid "Presence status"
msgstr "Status de presença"
-#: ../gtk/friendlist.c:242
+#: ../gtk/friendlist.c:308
#, c-format
msgid "Search in %s directory"
msgstr ""
-#: ../gtk/friendlist.c:450
+#: ../gtk/friendlist.c:568
msgid "Invalid sip contact !"
msgstr ""
-#: ../gtk/friendlist.c:495
+#: ../gtk/friendlist.c:613
#, fuzzy, c-format
msgid "Call %s"
msgstr "Histórico de chamadas"
-#: ../gtk/friendlist.c:496
+#: ../gtk/friendlist.c:614
#, c-format
msgid "Send text to %s"
msgstr ""
-#: ../gtk/friendlist.c:497
+#: ../gtk/friendlist.c:615
#, fuzzy, c-format
msgid "Edit contact '%s'"
msgstr "Edicar informação de contato"
-#: ../gtk/friendlist.c:498
+#: ../gtk/friendlist.c:616
#, c-format
msgid "Delete contact '%s'"
msgstr ""
-#: ../gtk/friendlist.c:540
+#: ../gtk/friendlist.c:658
#, c-format
msgid "Add new contact from %s directory"
msgstr ""
-#: ../gtk/propertybox.c:277
+#: ../gtk/propertybox.c:302
msgid "Rate (Hz)"
msgstr "Taxa (Hz)"
-#: ../gtk/propertybox.c:283
+#: ../gtk/propertybox.c:308
msgid "Status"
msgstr ""
-#: ../gtk/propertybox.c:289
+#: ../gtk/propertybox.c:314
msgid "Min bitrate (kbit/s)"
msgstr "Bitrate mÃnimo (kbits/s)"
-#: ../gtk/propertybox.c:296
+#: ../gtk/propertybox.c:321
msgid "Parameters"
msgstr "Parâmetros"
-#: ../gtk/propertybox.c:326 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507
msgid "Enabled"
msgstr "Ativado"
-#: ../gtk/propertybox.c:327 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507
msgid "Disabled"
msgstr "Desativado"
-#: ../gtk/propertybox.c:510
+#: ../gtk/propertybox.c:553
#, fuzzy
msgid "Account"
msgstr "Aceitar"
-#: ../gtk/propertybox.c:650
+#: ../gtk/propertybox.c:693
msgid "English"
msgstr ""
-#: ../gtk/propertybox.c:651
+#: ../gtk/propertybox.c:694
msgid "French"
msgstr ""
-#: ../gtk/propertybox.c:652
+#: ../gtk/propertybox.c:695
msgid "Swedish"
msgstr ""
-#: ../gtk/propertybox.c:653
+#: ../gtk/propertybox.c:696
msgid "Italian"
msgstr ""
-#: ../gtk/propertybox.c:654
+#: ../gtk/propertybox.c:697
msgid "Spanish"
msgstr ""
-#: ../gtk/propertybox.c:655
+#: ../gtk/propertybox.c:698
msgid "Brazilian Portugese"
msgstr ""
-#: ../gtk/propertybox.c:656
+#: ../gtk/propertybox.c:699
msgid "Polish"
msgstr ""
-#: ../gtk/propertybox.c:657
+#: ../gtk/propertybox.c:700
msgid "German"
msgstr ""
-#: ../gtk/propertybox.c:658
+#: ../gtk/propertybox.c:701
msgid "Russian"
msgstr ""
-#: ../gtk/propertybox.c:659
+#: ../gtk/propertybox.c:702
msgid "Japanese"
msgstr ""
-#: ../gtk/propertybox.c:660
+#: ../gtk/propertybox.c:703
msgid "Dutch"
msgstr ""
-#: ../gtk/propertybox.c:661
+#: ../gtk/propertybox.c:704
msgid "Hungarian"
msgstr ""
-#: ../gtk/propertybox.c:662
+#: ../gtk/propertybox.c:705
msgid "Czech"
msgstr ""
-#: ../gtk/propertybox.c:663
+#: ../gtk/propertybox.c:706
msgid "Chinese"
msgstr ""
-#: ../gtk/propertybox.c:720
+#: ../gtk/propertybox.c:707
+msgid "Traditional Chinese"
+msgstr ""
+
+#: ../gtk/propertybox.c:708
+msgid "Norwegian"
+msgstr ""
+
+#: ../gtk/propertybox.c:765
msgid ""
"You need to restart linphone for the new language selection to take effect."
msgstr ""
+#: ../gtk/propertybox.c:835
+msgid "None"
+msgstr "Nenhum"
+
+#: ../gtk/propertybox.c:839
+msgid "SRTP"
+msgstr ""
+
+#: ../gtk/propertybox.c:845
+msgid "ZRTP"
+msgstr ""
+
#: ../gtk/update.c:80
#, c-format
msgid ""
@@ -347,77 +422,104 @@ msgstr ""
msgid "Now ready !"
msgstr ""
-#: ../gtk/incall_view.c:61
+#: ../gtk/incall_view.c:69
#, fuzzy, c-format
msgid "Call #%i"
msgstr "Histórico de chamadas"
-#: ../gtk/incall_view.c:87
+#: ../gtk/incall_view.c:127
#, c-format
msgid "Transfer to call #%i with %s"
msgstr ""
-#: ../gtk/incall_view.c:113
+#: ../gtk/incall_view.c:155
msgid "Transfer"
msgstr ""
-#: ../gtk/incall_view.c:187
+#: ../gtk/incall_view.c:271
#, fuzzy
msgid "<b>Calling...</b>"
msgstr "Contatando "
-#: ../gtk/incall_view.c:190 ../gtk/incall_view.c:246
+#: ../gtk/incall_view.c:274 ../gtk/incall_view.c:482
msgid "00::00::00"
msgstr ""
-#: ../gtk/incall_view.c:206
+#: ../gtk/incall_view.c:285
#, fuzzy
msgid "<b>Incoming call</b>"
msgstr "Camadas recebidas"
-#: ../gtk/incall_view.c:216
-msgid ""
-"Pause all calls\n"
-"and answer"
+#: ../gtk/incall_view.c:322
+msgid "good"
msgstr ""
-#: ../gtk/incall_view.c:217 ../gtk/main.ui.h:20
-msgid "Answer"
+#: ../gtk/incall_view.c:324
+msgid "average"
msgstr ""
-#: ../gtk/incall_view.c:244
+#: ../gtk/incall_view.c:326
+msgid "poor"
+msgstr ""
+
+#: ../gtk/incall_view.c:328
+msgid "very poor"
+msgstr ""
+
+#: ../gtk/incall_view.c:330
+msgid "too bad"
+msgstr ""
+
+#: ../gtk/incall_view.c:331 ../gtk/incall_view.c:347
+msgid "unavailable"
+msgstr ""
+
+#: ../gtk/incall_view.c:447
+msgid "Secured by SRTP"
+msgstr ""
+
+#: ../gtk/incall_view.c:453
+#, c-format
+msgid "Secured by ZRTP - [auth token: %s]"
+msgstr ""
+
+#: ../gtk/incall_view.c:459
+msgid "Set unverified"
+msgstr ""
+
+#: ../gtk/incall_view.c:459 ../gtk/main.ui.h:49
+msgid "Set verified"
+msgstr ""
+
+#: ../gtk/incall_view.c:480
+msgid "In conference"
+msgstr ""
+
+#: ../gtk/incall_view.c:480
#, fuzzy
msgid "<b>In call</b>"
msgstr "Contatando "
-#: ../gtk/incall_view.c:260
+#: ../gtk/incall_view.c:499
#, fuzzy
msgid "<b>Paused call</b>"
msgstr "Contatando "
-#: ../gtk/incall_view.c:272
+#: ../gtk/incall_view.c:511
#, c-format
msgid "%02i::%02i::%02i"
msgstr ""
-#: ../gtk/incall_view.c:288
+#: ../gtk/incall_view.c:527
#, fuzzy
msgid "<b>Call ended.</b>"
msgstr "Chamada cancelada."
-#: ../gtk/incall_view.c:309
-msgid "Unmute"
-msgstr ""
-
-#: ../gtk/incall_view.c:316 ../gtk/main.ui.h:42
-msgid "Mute"
-msgstr ""
-
-#: ../gtk/incall_view.c:340
+#: ../gtk/incall_view.c:584
msgid "Resume"
msgstr ""
-#: ../gtk/incall_view.c:347 ../gtk/main.ui.h:46
+#: ../gtk/incall_view.c:591 ../gtk/main.ui.h:45
msgid "Pause"
msgstr ""
@@ -481,8 +583,8 @@ msgstr "Informação de contato"
#: ../gtk/main.ui.h:14
#, fuzzy
-msgid "<b>Contact list</b>"
-msgstr "Contatando "
+msgid "<b>Callee name</b>"
+msgstr "Chamada cancelada."
#: ../gtk/main.ui.h:15
#, fuzzy
@@ -508,27 +610,26 @@ msgstr ""
#: ../gtk/main.ui.h:21
#, fuzzy
-msgid "Audio & video"
-msgstr "Codec's de áudio"
-
-#: ../gtk/main.ui.h:22
-#, fuzzy
-msgid "Audio only"
-msgstr "Codec's de áudio"
-
-#: ../gtk/main.ui.h:23
-#, fuzzy
msgid "Automatically log me in"
msgstr "Adquirir automaticamente um nome de servidor válido."
-#: ../gtk/main.ui.h:24
+#: ../gtk/main.ui.h:22
msgid "B"
msgstr ""
-#: ../gtk/main.ui.h:25 ../gtk/parameters.ui.h:20
+#: ../gtk/main.ui.h:23 ../gtk/parameters.ui.h:21
msgid "C"
msgstr ""
+#: ../gtk/main.ui.h:24
+#, fuzzy
+msgid "Call"
+msgstr "Histórico de chamadas"
+
+#: ../gtk/main.ui.h:25
+msgid "Call quality rating"
+msgstr ""
+
#: ../gtk/main.ui.h:26
msgid "Check _Updates"
msgstr ""
@@ -542,11 +643,6 @@ msgstr "Contatando "
msgid "D"
msgstr ""
-#: ../gtk/main.ui.h:29
-#, fuzzy
-msgid "Decline"
-msgstr "linha"
-
#: ../gtk/main.ui.h:30
#, fuzzy
msgid "Default"
@@ -559,12 +655,12 @@ msgstr "Informações"
#: ../gtk/main.ui.h:32
#, fuzzy
-msgid "Duration:"
-msgstr "Informações"
+msgid "Enable self-view"
+msgstr "Ativado"
#: ../gtk/main.ui.h:33
#, fuzzy
-msgid "Enable self-view"
+msgid "Enable video"
msgstr "Ativado"
#: ../gtk/main.ui.h:34
@@ -601,21 +697,26 @@ msgstr "Informação de contato"
msgid "Lookup:"
msgstr ""
-#: ../gtk/main.ui.h:43
+#: ../gtk/main.ui.h:42
#, fuzzy
msgid "My current identity:"
msgstr "Identificação SIP:"
-#: ../gtk/main.ui.h:44
+#: ../gtk/main.ui.h:43
#, fuzzy
msgid "Online users"
msgstr "linha"
-#: ../gtk/main.ui.h:45
+#: ../gtk/main.ui.h:44
#, fuzzy
msgid "Password"
msgstr "Senha:"
+#: ../gtk/main.ui.h:46
+#, fuzzy
+msgid "Recent calls"
+msgstr "Camadas recebidas"
+
#: ../gtk/main.ui.h:47
msgid "SIP address or phone number:"
msgstr ""
@@ -624,20 +725,15 @@ msgstr ""
msgid "Search"
msgstr ""
-#: ../gtk/main.ui.h:49
+#: ../gtk/main.ui.h:50
msgid "Show debug window"
msgstr ""
-#: ../gtk/main.ui.h:50
+#: ../gtk/main.ui.h:51
#, fuzzy
msgid "Username"
msgstr "Usuário"
-#: ../gtk/main.ui.h:51
-#, fuzzy
-msgid "_Call history"
-msgstr "Linphone - Histórico de chamadas"
-
#: ../gtk/main.ui.h:52
msgid "_Help"
msgstr ""
@@ -647,18 +743,14 @@ msgid "_Homepage"
msgstr ""
#: ../gtk/main.ui.h:54
-msgid "_Linphone"
-msgstr ""
-
-#: ../gtk/main.ui.h:55
msgid "_Options"
msgstr ""
-#: ../gtk/main.ui.h:56
+#: ../gtk/main.ui.h:55
msgid "in"
msgstr ""
-#: ../gtk/main.ui.h:57
+#: ../gtk/main.ui.h:56
msgid "label"
msgstr ""
@@ -707,16 +799,6 @@ msgstr "Endereço"
msgid "Show this contact presence status"
msgstr ""
-#: ../gtk/contact.ui.h:6
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "Conectado."
-
-#: ../gtk/contact.ui.h:7
-#, fuzzy
-msgid "gtk-ok"
-msgstr "Remover"
-
#: ../gtk/log.ui.h:1
msgid "Linphone debug window"
msgstr ""
@@ -775,7 +857,7 @@ msgid "Publish presence information"
msgstr "Informar informação de presença"
#: ../gtk/sip_account.ui.h:6
-msgid "Register at startup"
+msgid "Register"
msgstr ""
#: ../gtk/sip_account.ui.h:7
@@ -806,11 +888,6 @@ msgstr ""
msgid "Send"
msgstr "Som"
-#: ../gtk/chatroom.ui.h:2
-#, fuzzy
-msgid "gtk-close"
-msgstr "Conectado."
-
#: ../gtk/parameters.ui.h:1
msgid "0 stands for \"unlimited\""
msgstr ""
@@ -850,9 +927,8 @@ msgid "<b>NAT and Firewall</b>"
msgstr "Contatando "
#: ../gtk/parameters.ui.h:9
-#, fuzzy
-msgid "<b>Ports</b>"
-msgstr "Contatando "
+msgid "<b>Network protocol and ports</b>"
+msgstr ""
#: ../gtk/parameters.ui.h:10
#, fuzzy
@@ -875,208 +951,226 @@ msgid "<b>Video</b>"
msgstr "Contatando "
#: ../gtk/parameters.ui.h:14
-msgid "ALSA special device (optional):"
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
msgstr ""
#: ../gtk/parameters.ui.h:15
+msgid "ALSA special device (optional):"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:16
#, fuzzy
msgid "Add"
msgstr "Endereço"
-#: ../gtk/parameters.ui.h:16
+#: ../gtk/parameters.ui.h:17
msgid "Audio RTP/UDP:"
msgstr ""
-#: ../gtk/parameters.ui.h:17
+#: ../gtk/parameters.ui.h:18
#, fuzzy
msgid "Audio codecs"
msgstr "Codec's de áudio"
-#: ../gtk/parameters.ui.h:18
+#: ../gtk/parameters.ui.h:19
msgid "Behind NAT / Firewall (specify gateway IP below)"
msgstr ""
-#: ../gtk/parameters.ui.h:19
+#: ../gtk/parameters.ui.h:20
msgid "Behind NAT / Firewall (use STUN to resolve)"
msgstr ""
-#: ../gtk/parameters.ui.h:21
+#: ../gtk/parameters.ui.h:22
msgid "CIF"
msgstr ""
-#: ../gtk/parameters.ui.h:22
+#: ../gtk/parameters.ui.h:23
#, fuzzy
msgid "Capture device:"
msgstr "Dispositivo de captura de som:"
-#: ../gtk/parameters.ui.h:23
+#: ../gtk/parameters.ui.h:24
#, fuzzy
msgid "Codecs"
msgstr "Codec's de áudio"
-#: ../gtk/parameters.ui.h:24
+#: ../gtk/parameters.ui.h:25
msgid "Direct connection to the Internet"
msgstr ""
-#: ../gtk/parameters.ui.h:25
+#: ../gtk/parameters.ui.h:26
msgid "Disable"
msgstr "Desativar"
-#: ../gtk/parameters.ui.h:26
+#: ../gtk/parameters.ui.h:27
#, fuzzy
msgid "Done"
msgstr "Nenhum"
-#: ../gtk/parameters.ui.h:27
+#: ../gtk/parameters.ui.h:28
msgid "Download speed limit in Kbit/sec:"
msgstr ""
-#: ../gtk/parameters.ui.h:28
+#: ../gtk/parameters.ui.h:29
msgid "Edit"
msgstr "Editar"
-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:30
msgid "Enable"
msgstr "Ativado"
-#: ../gtk/parameters.ui.h:30
+#: ../gtk/parameters.ui.h:31
+msgid "Enable adaptive rate control"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:32
msgid "Enable echo cancellation"
msgstr ""
-#: ../gtk/parameters.ui.h:31
+#: ../gtk/parameters.ui.h:33
msgid "Erase all passwords"
msgstr ""
-#: ../gtk/parameters.ui.h:32
+#: ../gtk/parameters.ui.h:34
msgid "Manage SIP Accounts"
msgstr ""
-#: ../gtk/parameters.ui.h:33
+#: ../gtk/parameters.ui.h:35
+msgid "Media encryption type"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:36
msgid "Multimedia settings"
msgstr ""
-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:37
#, fuzzy
msgid "Network settings"
msgstr "Rede"
-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:38
#, fuzzy
msgid "Playback device:"
msgstr "Dispositivo de som:"
-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:39
msgid "Prefered video resolution:"
msgstr ""
-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:40
#, fuzzy
msgid "Public IP address:"
msgstr "Endereço sip:"
-#: ../gtk/parameters.ui.h:38
+#: ../gtk/parameters.ui.h:41
msgid ""
"Register to FONICS\n"
"virtual network !"
msgstr ""
-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:43
msgid "Remove"
msgstr "Remover"
-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:44
#, fuzzy
msgid "Ring device:"
msgstr "Dispositivo de som"
-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:45
#, fuzzy
msgid "Ring sound:"
msgstr "Som do toque:"
-#: ../gtk/parameters.ui.h:43
-msgid "SIP (TCP):"
+#: ../gtk/parameters.ui.h:46
+msgid "SIP (TCP)"
msgstr ""
-#: ../gtk/parameters.ui.h:44
-msgid "SIP (UDP):"
+#: ../gtk/parameters.ui.h:47
+msgid "SIP (TLS)"
msgstr ""
-#: ../gtk/parameters.ui.h:45
+#: ../gtk/parameters.ui.h:48
+msgid "SIP (UDP)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:49
msgid "Send DTMFs as SIP info"
msgstr ""
-#: ../gtk/parameters.ui.h:46
+#: ../gtk/parameters.ui.h:50
msgid "Set Maximum Transmission Unit:"
msgstr ""
-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:51
msgid "Settings"
msgstr ""
-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:52
msgid "Show advanced settings"
msgstr ""
-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:53
#, fuzzy
msgid "Stun server:"
msgstr "Dispositivo de som"
-#: ../gtk/parameters.ui.h:50
+#: ../gtk/parameters.ui.h:54
msgid "This section defines your SIP address when not using a SIP account"
msgstr ""
-#: ../gtk/parameters.ui.h:51
+#: ../gtk/parameters.ui.h:55
msgid "Upload speed limit in Kbit/sec:"
msgstr ""
-#: ../gtk/parameters.ui.h:52
+#: ../gtk/parameters.ui.h:56
msgid "Use IPv6 instead of IPv4"
msgstr ""
-#: ../gtk/parameters.ui.h:53
+#: ../gtk/parameters.ui.h:57
#, fuzzy
msgid "User interface"
msgstr "Usuário"
-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:58
msgid "Video RTP/UDP:"
msgstr ""
-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:59
#, fuzzy
msgid "Video codecs"
msgstr "Codec's de áudio"
-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:60
#, fuzzy
msgid "Video input device:"
msgstr "Dispositivo de som"
-#: ../gtk/parameters.ui.h:57
+#: ../gtk/parameters.ui.h:61
msgid "Your display name (eg: John Doe):"
msgstr ""
-#: ../gtk/parameters.ui.h:58
+#: ../gtk/parameters.ui.h:62
#, fuzzy
msgid "Your resulting SIP address:"
msgstr "Seu endereço SIP:"
-#: ../gtk/parameters.ui.h:59
+#: ../gtk/parameters.ui.h:63
#, fuzzy
msgid "Your username:"
msgstr "Usuário"
-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:64
msgid "a sound card"
msgstr ""
-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:65
msgid "default camera"
msgstr ""
-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:66
msgid "default soundcard"
msgstr ""
@@ -1102,26 +1196,19 @@ msgstr ""
msgid "Please wait"
msgstr ""
-#: ../coreapi/linphonecore.c:165
-#, fuzzy, c-format
-msgid "You have missed %i call."
-msgid_plural "You have missed %i calls."
-msgstr[0] "Você perdeu %i ligação(ões)."
-msgstr[1] "Você perdeu %i ligação(ões)."
-
-#: ../coreapi/linphonecore.c:206
+#: ../coreapi/linphonecore.c:187
msgid "aborted"
msgstr "Abortado"
-#: ../coreapi/linphonecore.c:209
+#: ../coreapi/linphonecore.c:190
msgid "completed"
msgstr "Competado"
-#: ../coreapi/linphonecore.c:212
+#: ../coreapi/linphonecore.c:193
msgid "missed"
msgstr "Perdido"
-#: ../coreapi/linphonecore.c:217
+#: ../coreapi/linphonecore.c:198
#, fuzzy, c-format
msgid ""
"%s at %s\n"
@@ -1135,81 +1222,64 @@ msgstr ""
"Status: %s\n"
"Duração: %i min %i seg\n"
-#: ../coreapi/linphonecore.c:218
-msgid "Incoming call"
-msgstr "Camadas recebidas"
-
-#: ../coreapi/linphonecore.c:218
+#: ../coreapi/linphonecore.c:199
msgid "Outgoing call"
msgstr "Chamadas efetuadas"
-#: ../coreapi/linphonecore.c:998
+#: ../coreapi/linphonecore.c:1088
#, fuzzy
msgid "Ready"
msgstr "Pronto."
-#: ../coreapi/linphonecore.c:1773
+#: ../coreapi/linphonecore.c:1831
msgid "Looking for telephone number destination..."
msgstr "Procurando por telefone de destino..."
-#: ../coreapi/linphonecore.c:1776
+#: ../coreapi/linphonecore.c:1834
msgid "Could not resolve this number."
msgstr "Não foi possÃvel encontrar este número."
-#: ../coreapi/linphonecore.c:1820
+#: ../coreapi/linphonecore.c:1878
msgid ""
"Could not parse given sip address. A sip url usually looks like sip:"
"user@domain"
msgstr ""
-#: ../coreapi/linphonecore.c:1967
+#: ../coreapi/linphonecore.c:2025
#, fuzzy
msgid "Contacting"
msgstr "Contatando "
-#: ../coreapi/linphonecore.c:1974
+#: ../coreapi/linphonecore.c:2032
#, fuzzy
msgid "Could not call"
msgstr "Não é possÃvel achar arquivo pixmap: %s"
-#: ../coreapi/linphonecore.c:2081
-msgid "Sorry, you have to pause or stop the current call first !"
-msgstr ""
-
-#: ../coreapi/linphonecore.c:2086
+#: ../coreapi/linphonecore.c:2140
msgid "Sorry, we have reached the maximum number of simultaneous calls"
msgstr ""
-#: ../coreapi/linphonecore.c:2208
+#: ../coreapi/linphonecore.c:2270
msgid "Modifying call parameters..."
msgstr ""
-#: ../coreapi/linphonecore.c:2311
+#: ../coreapi/linphonecore.c:2366
msgid "Connected."
msgstr "Conectado."
-#: ../coreapi/linphonecore.c:2334
+#: ../coreapi/linphonecore.c:2389
#, fuzzy
msgid "Call aborted"
msgstr "Abortado"
-#: ../coreapi/linphonecore.c:2374
-#, fuzzy
-msgid "Call ended"
-msgstr "Chamada cancelada."
-
-#: ../coreapi/linphonecore.c:2456
+#: ../coreapi/linphonecore.c:2530
msgid "Could not pause the call"
msgstr ""
-#: ../coreapi/linphonecore.c:2460
+#: ../coreapi/linphonecore.c:2535
msgid "Pausing the current call..."
msgstr ""
-#: ../coreapi/linphonecore.c:2499
-msgid "There is already a call in process, pause or stop it first."
-msgstr ""
-
#: ../coreapi/misc.c:147
msgid ""
"Your computer appears to be using ALSA sound drivers.\n"
@@ -1280,156 +1350,203 @@ msgstr ""
msgid "Unknown-bug"
msgstr ""
-#: ../coreapi/proxy.c:187
+#: ../coreapi/proxy.c:192
msgid ""
"The sip proxy address you entered is invalid, it must start with \"sip:\" "
"followed by a hostname."
msgstr ""
-#: ../coreapi/proxy.c:193
+#: ../coreapi/proxy.c:198
msgid ""
"The sip identity you entered is invalid.\n"
"It should look like sip:username@proxydomain, such as sip:alice@example.net"
msgstr ""
-#: ../coreapi/proxy.c:671
+#: ../coreapi/proxy.c:690
#, fuzzy, c-format
msgid "Could not login as %s"
msgstr "Não é possÃvel achar arquivo pixmap: %s"
-#: ../coreapi/callbacks.c:170
+#: ../coreapi/callbacks.c:206
#, fuzzy
msgid "is contacting you"
msgstr "está chamado você."
-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207
msgid " and asked autoanswer."
msgstr ""
-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207
msgid "."
msgstr ""
-#: ../coreapi/callbacks.c:226
+#: ../coreapi/callbacks.c:266
#, fuzzy
msgid "Remote ringing."
msgstr "Serviços remotos"
-#: ../coreapi/callbacks.c:242
+#: ../coreapi/callbacks.c:282
#, fuzzy
msgid "Remote ringing..."
msgstr "Serviços remotos"
-#: ../coreapi/callbacks.c:253
+#: ../coreapi/callbacks.c:293
msgid "Early media."
msgstr ""
-#: ../coreapi/callbacks.c:291
+#: ../coreapi/callbacks.c:331
#, fuzzy, c-format
msgid "Call with %s is paused."
msgstr "Bate-papo com %s"
-#: ../coreapi/callbacks.c:302
+#: ../coreapi/callbacks.c:342
#, c-format
msgid "Call answered by %s - on hold."
msgstr ""
-#: ../coreapi/callbacks.c:317
+#: ../coreapi/callbacks.c:357
#, fuzzy
msgid "Call resumed."
msgstr "Chamada cancelada."
-#: ../coreapi/callbacks.c:322
+#: ../coreapi/callbacks.c:362
#, fuzzy, c-format
msgid "Call answered by %s."
msgstr ""
"Ligar ou\n"
"atender"
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:432
msgid "We are being paused..."
msgstr ""
-#: ../coreapi/callbacks.c:387
+#: ../coreapi/callbacks.c:436
msgid "We have been resumed..."
msgstr ""
-#: ../coreapi/callbacks.c:424
+#: ../coreapi/callbacks.c:441
+msgid "Call has been updated by remote..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:473
msgid "Call terminated."
msgstr ""
-#: ../coreapi/callbacks.c:431
+#: ../coreapi/callbacks.c:480
msgid "User is busy."
msgstr "Usuário está ocupado."
-#: ../coreapi/callbacks.c:432
+#: ../coreapi/callbacks.c:481
msgid "User is temporarily unavailable."
msgstr "Usuário está temporáriamente indisponÃvel."
#. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:434
+#: ../coreapi/callbacks.c:483
msgid "User does not want to be disturbed."
msgstr ""
-#: ../coreapi/callbacks.c:435
+#: ../coreapi/callbacks.c:484
msgid "Call declined."
msgstr ""
-#: ../coreapi/callbacks.c:447
+#: ../coreapi/callbacks.c:496
msgid "No response."
msgstr ""
-#: ../coreapi/callbacks.c:451
+#: ../coreapi/callbacks.c:500
msgid "Protocol error."
msgstr ""
-#: ../coreapi/callbacks.c:467
+#: ../coreapi/callbacks.c:516
#, fuzzy
msgid "Redirected"
msgstr "Redirecionado para %s..."
-#: ../coreapi/callbacks.c:477
+#: ../coreapi/callbacks.c:526
msgid "Not found"
msgstr ""
-#: ../coreapi/callbacks.c:487
+#: ../coreapi/callbacks.c:551
msgid "No common codecs"
msgstr ""
-#: ../coreapi/callbacks.c:493
+#: ../coreapi/callbacks.c:557
#, fuzzy
msgid "Call failed."
msgstr "Histórico de chamadas"
-#: ../coreapi/callbacks.c:557
+#: ../coreapi/callbacks.c:631
#, fuzzy, c-format
msgid "Registration on %s successful."
msgstr "Registro em %s efetuado."
-#: ../coreapi/callbacks.c:558
+#: ../coreapi/callbacks.c:632
#, fuzzy, c-format
msgid "Unregistration on %s done."
msgstr "Registro em %s efetuado."
-#: ../coreapi/callbacks.c:574
+#: ../coreapi/callbacks.c:648
msgid "no response timeout"
msgstr ""
-#: ../coreapi/callbacks.c:577
+#: ../coreapi/callbacks.c:651
#, fuzzy, c-format
msgid "Registration on %s failed: %s"
msgstr "Registro falhou (tempo esgotado)."
-#: ../coreapi/callbacks.c:619
-#, c-format
-msgid "We are transferred to %s"
-msgstr ""
-
-#: ../coreapi/sal_eXosip2.c:815 ../coreapi/sal_eXosip2.c:817
+#: ../coreapi/sal_eXosip2.c:873 ../coreapi/sal_eXosip2.c:875
#, fuzzy
msgid "Authentication failure"
msgstr "Informações de autenticação"
+#: ../coreapi/linphonecall.c:128
+#, fuzzy, c-format
+msgid "Authentication token is %s"
+msgstr "Informações de autenticação"
+
+#: ../coreapi/linphonecall.c:1560
+#, fuzzy, c-format
+msgid "You have missed %i call."
+msgid_plural "You have missed %i calls."
+msgstr[0] "Você perdeu %i ligação(ões)."
+msgstr[1] "Você perdeu %i ligação(ões)."
+
+#, fuzzy
+#~ msgid "<b>Contact list</b>"
+#~ msgstr "Contatando "
+
+#, fuzzy
+#~ msgid "Audio & video"
+#~ msgstr "Codec's de áudio"
+
+#, fuzzy
+#~ msgid "Audio only"
+#~ msgstr "Codec's de áudio"
+
+#, fuzzy
+#~ msgid "Duration:"
+#~ msgstr "Informações"
+
+#, fuzzy
+#~ msgid "_Call history"
+#~ msgstr "Linphone - Histórico de chamadas"
+
+#, fuzzy
+#~ msgid "gtk-cancel"
+#~ msgstr "Conectado."
+
+#, fuzzy
+#~ msgid "gtk-ok"
+#~ msgstr "Remover"
+
+#, fuzzy
+#~ msgid "gtk-close"
+#~ msgstr "Conectado."
+
+#, fuzzy
+#~ msgid "<b>Ports</b>"
+#~ msgstr "Contatando "
+
#~ msgid ""
#~ "Your machine appears to be connected to an IPv6 network. By default "
#~ "linphone always uses IPv4. Please update your configuration if you want "
@@ -1507,9 +1624,6 @@ msgstr "Informações de autenticação"
#~ msgid "Go"
#~ msgstr "Ir"
-#~ msgid "Address book"
-#~ msgstr "Catálogo de endereços"
-
#, fuzzy
#~ msgid "Exit"
#~ msgstr "Editar"
@@ -1674,9 +1788,6 @@ msgstr "Informações de autenticação"
#~ msgid "linphone - receiving call from %s"
#~ msgstr "Linphone - Recebendo chamada de %s"
-#~ msgid "None"
-#~ msgstr "Nenhum"
-
#~ msgid "User manual"
#~ msgstr "Manual do usuário"
diff --git a/po/ru.po b/po/ru.po
index 9b3107602111cb2006f53296dc60ba5909d52de7..50c68d696af381854278019b61f16837353a6453 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: linphone 0.7.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-08 22:32+0200\n"
+"POT-Creation-Date: 2011-12-02 16:47+0100\n"
"PO-Revision-Date: 2010-01-22 18:43+0300\n"
"Last-Translator: Maxim Prokopyev <jazzelastic@gmail.com>\n"
"Language-Team: Russian <greg@dial.com.ru>\n"
@@ -15,6 +15,19 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: ../gtk/calllogs.c:71
+msgid "n/a"
+msgstr ""
+
+#: ../gtk/conference.c:33 ../gtk/incall_view.c:183
+msgid "Conference"
+msgstr ""
+
+#: ../gtk/conference.c:41
+#, fuzzy
+msgid "Me"
+msgstr "Приглушить"
+
#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
#, c-format
msgid "Couldn't find pixmap file: %s"
@@ -25,25 +38,29 @@ msgstr "Ðевозможно найти графичеÑкий файл: %s"
msgid "Chat with %s"
msgstr "Обмен ÑообщениÑми Ñ %s"
-#: ../gtk/main.c:74
+#: ../gtk/main.c:83
msgid "log to stdout some debug information while running."
msgstr ""
"Вывод некоторой отладочной информации на уÑтройÑтво Ñтандартного вывода во "
"Ð²Ñ€ÐµÐ¼Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹ "
-#: ../gtk/main.c:81
+#: ../gtk/main.c:90
+msgid "path to a file to write logs into."
+msgstr ""
+
+#: ../gtk/main.c:97
msgid "Start only in the system tray, do not show the main interface."
msgstr "Показывать только в ÑиÑтемном лотке, не запуÑÐºÐ°Ñ Ð³Ð»Ð°Ð²Ð½Ð¾Ðµ окно"
-#: ../gtk/main.c:88
+#: ../gtk/main.c:104
msgid "address to call right now"
msgstr "Ð°Ð´Ñ€ÐµÑ Ð´Ð»Ñ Ð·Ð²Ð¾Ð½ÐºÐ°"
-#: ../gtk/main.c:95
+#: ../gtk/main.c:111
msgid "if set automatically answer incoming calls"
msgstr "еÑли уÑтановлен автоматичеÑкий прием входÑщих вызовов"
-#: ../gtk/main.c:102
+#: ../gtk/main.c:118
msgid ""
"Specifiy a working directory (should be the base of the installation, eg: c:"
"\\Program Files\\Linphone)"
@@ -51,12 +68,12 @@ msgstr ""
"Определить рабочий каталог (отноÑительно каталога уÑтановки, например: c:"
"\\Program Files\\Linphone)"
-#: ../gtk/main.c:442
+#: ../gtk/main.c:464
#, fuzzy, c-format
msgid "Call with %s"
msgstr "Обмен ÑообщениÑми Ñ %s"
-#: ../gtk/main.c:826
+#: ../gtk/main.c:815
#, c-format
msgid ""
"%s would like to add you to his contact list.\n"
@@ -69,7 +86,7 @@ msgstr ""
"контактный лиÑÑ‚?\n"
"ЕÑли вы ответите Ðет, Ñта перÑона будет временно заблокирована."
-#: ../gtk/main.c:904
+#: ../gtk/main.c:893
#, c-format
msgid ""
"Please enter your password for username <i>%s</i>\n"
@@ -78,167 +95,224 @@ msgstr ""
"ПожалуйÑта, введите пароль Ð´Ð»Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ <i>%s</i>\n"
" в домене <i>%s</i>:"
-#: ../gtk/main.c:1040
+#: ../gtk/main.c:993
+#, fuzzy
+msgid "Call error"
+msgstr "ИÑÑ‚Ð¾Ñ€Ð¸Ñ Ð·Ð²Ð¾Ð½ÐºÐ¾Ð²"
+
+#: ../gtk/main.c:996 ../coreapi/linphonecore.c:2406
+msgid "Call ended"
+msgstr "Разговор окончен"
+
+#: ../gtk/main.c:999 ../coreapi/linphonecore.c:199
+msgid "Incoming call"
+msgstr "ВходÑщий вызов"
+
+#: ../gtk/main.c:1001 ../gtk/incall_view.c:292 ../gtk/main.ui.h:20
+msgid "Answer"
+msgstr ""
+
+#: ../gtk/main.c:1003 ../gtk/main.ui.h:29
+msgid "Decline"
+msgstr "Отклонить"
+
+#: ../gtk/main.c:1009
+#, fuzzy
+msgid "Call paused"
+msgstr "отмененный"
+
+#: ../gtk/main.c:1009
+#, c-format
+msgid "<span size=\"large\">by %s</span>"
+msgstr ""
+
+#: ../gtk/main.c:1165
msgid "Website link"
msgstr "ДомашнÑÑ Ñтраница"
-#: ../gtk/main.c:1076
+#: ../gtk/main.c:1205
msgid "Linphone - a video internet phone"
msgstr "Linphone - Интернет видео телефон"
-#: ../gtk/main.c:1095
+#: ../gtk/main.c:1295
#, c-format
msgid "%s (Default)"
msgstr "%s (По умолчанию)"
-#: ../gtk/main.c:1187
-msgid "Windows"
+#: ../gtk/main.c:1566 ../coreapi/callbacks.c:700
+#, c-format
+msgid "We are transferred to %s"
msgstr ""
-#: ../gtk/main.c:1364
+#: ../gtk/main.c:1576
msgid ""
"No sound cards have been detected on this computer.\n"
"You won't be able to send or receive audio calls."
msgstr ""
-#: ../gtk/main.c:1423
+#: ../gtk/main.c:1663
msgid "A free SIP video-phone"
msgstr "Свободный SIP видео-телефон"
-#: ../gtk/friendlist.c:192 ../gtk/propertybox.c:271 ../gtk/contact.ui.h:3
+#: ../gtk/friendlist.c:203
+#, fuzzy
+msgid "Add to addressbook"
+msgstr "Adressbuch"
+
+#: ../gtk/friendlist.c:258 ../gtk/propertybox.c:296 ../gtk/contact.ui.h:3
msgid "Name"
msgstr "ИмÑ"
-#: ../gtk/friendlist.c:205
+#: ../gtk/friendlist.c:271
msgid "Presence status"
msgstr "Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ð¿Ñ€Ð¸ÑутÑтвиÑ"
-#: ../gtk/friendlist.c:242
+#: ../gtk/friendlist.c:308
#, c-format
msgid "Search in %s directory"
msgstr "ПоиÑк в директории %s"
-#: ../gtk/friendlist.c:450
+#: ../gtk/friendlist.c:568
msgid "Invalid sip contact !"
msgstr "Ðеверный sip контакт"
-#: ../gtk/friendlist.c:495
+#: ../gtk/friendlist.c:613
#, c-format
msgid "Call %s"
msgstr "Звонк %s"
-#: ../gtk/friendlist.c:496
+#: ../gtk/friendlist.c:614
#, c-format
msgid "Send text to %s"
msgstr "ПоÑлать текÑÑ‚ %s"
-#: ../gtk/friendlist.c:497
+#: ../gtk/friendlist.c:615
#, c-format
msgid "Edit contact '%s'"
msgstr "Редактировать контакт '%s'"
-#: ../gtk/friendlist.c:498
+#: ../gtk/friendlist.c:616
#, c-format
msgid "Delete contact '%s'"
msgstr "Удалить контакт '%s'"
-#: ../gtk/friendlist.c:540
+#: ../gtk/friendlist.c:658
#, c-format
msgid "Add new contact from %s directory"
msgstr "Добавить новый контакт из директории '%s'"
-#: ../gtk/propertybox.c:277
+#: ../gtk/propertybox.c:302
msgid "Rate (Hz)"
msgstr "ЧаÑтота (Hz)"
-#: ../gtk/propertybox.c:283
+#: ../gtk/propertybox.c:308
msgid "Status"
msgstr "СтатуÑ"
-#: ../gtk/propertybox.c:289
+#: ../gtk/propertybox.c:314
msgid "Min bitrate (kbit/s)"
msgstr "Минимальный битрейт (kbit/s)"
-#: ../gtk/propertybox.c:296
+#: ../gtk/propertybox.c:321
msgid "Parameters"
msgstr "Параметры"
-#: ../gtk/propertybox.c:326 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507
msgid "Enabled"
msgstr "Включен"
-#: ../gtk/propertybox.c:327 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507
msgid "Disabled"
msgstr "Отключен"
-#: ../gtk/propertybox.c:510
+#: ../gtk/propertybox.c:553
msgid "Account"
msgstr "Ð£Ñ‡ÐµÑ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ"
-#: ../gtk/propertybox.c:650
+#: ../gtk/propertybox.c:693
msgid "English"
msgstr "ÐнглийÑкий"
-#: ../gtk/propertybox.c:651
+#: ../gtk/propertybox.c:694
msgid "French"
msgstr "ФранцузÑкий"
-#: ../gtk/propertybox.c:652
+#: ../gtk/propertybox.c:695
msgid "Swedish"
msgstr "ШведÑкий"
-#: ../gtk/propertybox.c:653
+#: ../gtk/propertybox.c:696
msgid "Italian"
msgstr "ИтальÑнÑкий"
-#: ../gtk/propertybox.c:654
+#: ../gtk/propertybox.c:697
msgid "Spanish"
msgstr "ИÑпанÑкий"
-#: ../gtk/propertybox.c:655
+#: ../gtk/propertybox.c:698
#, fuzzy
msgid "Brazilian Portugese"
msgstr "ПортугальÑкий"
-#: ../gtk/propertybox.c:656
+#: ../gtk/propertybox.c:699
msgid "Polish"
msgstr "ПольÑкий"
-#: ../gtk/propertybox.c:657
+#: ../gtk/propertybox.c:700
msgid "German"
msgstr "Ðемецкий"
-#: ../gtk/propertybox.c:658
+#: ../gtk/propertybox.c:701
msgid "Russian"
msgstr "РуÑÑкий"
-#: ../gtk/propertybox.c:659
+#: ../gtk/propertybox.c:702
msgid "Japanese"
msgstr "ЯпонÑкий"
-#: ../gtk/propertybox.c:660
+#: ../gtk/propertybox.c:703
msgid "Dutch"
msgstr "ДатÑкий"
-#: ../gtk/propertybox.c:661
+#: ../gtk/propertybox.c:704
msgid "Hungarian"
msgstr "ВенгерÑкий"
-#: ../gtk/propertybox.c:662
+#: ../gtk/propertybox.c:705
msgid "Czech"
msgstr "ЧешÑкий"
-#: ../gtk/propertybox.c:663
+#: ../gtk/propertybox.c:706
msgid "Chinese"
msgstr "КитайÑкий"
-#: ../gtk/propertybox.c:720
+#: ../gtk/propertybox.c:707
+msgid "Traditional Chinese"
+msgstr ""
+
+#: ../gtk/propertybox.c:708
+msgid "Norwegian"
+msgstr ""
+
+#: ../gtk/propertybox.c:765
msgid ""
"You need to restart linphone for the new language selection to take effect."
msgstr ""
"Ð’Ñ‹ должны перезагрузить Linphone Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾ чтобы Ñзыковые наÑтройки вÑтупили "
"в Ñилу."
+#: ../gtk/propertybox.c:835
+msgid "None"
+msgstr "Ðет"
+
+#: ../gtk/propertybox.c:839
+msgid "SRTP"
+msgstr ""
+
+#: ../gtk/propertybox.c:845
+msgid "ZRTP"
+msgstr ""
+
#: ../gtk/update.c:80
#, c-format
msgid ""
@@ -356,76 +430,102 @@ msgstr "Создание аккаунта"
msgid "Now ready !"
msgstr "Готово !"
-#: ../gtk/incall_view.c:61
+#: ../gtk/incall_view.c:69
#, fuzzy, c-format
msgid "Call #%i"
msgstr "Звонк %s"
-#: ../gtk/incall_view.c:87
+#: ../gtk/incall_view.c:127
#, c-format
msgid "Transfer to call #%i with %s"
msgstr ""
-#: ../gtk/incall_view.c:113
+#: ../gtk/incall_view.c:155
msgid "Transfer"
msgstr ""
-#: ../gtk/incall_view.c:187
+#: ../gtk/incall_view.c:271
msgid "<b>Calling...</b>"
msgstr "<b>Вызов...</b>"
-#: ../gtk/incall_view.c:190 ../gtk/incall_view.c:246
+#: ../gtk/incall_view.c:274 ../gtk/incall_view.c:482
msgid "00::00::00"
msgstr "00::00::00"
-#: ../gtk/incall_view.c:206
+#: ../gtk/incall_view.c:285
#, fuzzy
msgid "<b>Incoming call</b>"
msgstr "ВходÑщий вызов"
-#: ../gtk/incall_view.c:216
-msgid ""
-"Pause all calls\n"
-"and answer"
+#: ../gtk/incall_view.c:322
+msgid "good"
msgstr ""
-#: ../gtk/incall_view.c:217 ../gtk/main.ui.h:20
-msgid "Answer"
+#: ../gtk/incall_view.c:324
+msgid "average"
+msgstr ""
+
+#: ../gtk/incall_view.c:326
+msgid "poor"
+msgstr ""
+
+#: ../gtk/incall_view.c:328
+msgid "very poor"
+msgstr ""
+
+#: ../gtk/incall_view.c:330
+msgid "too bad"
msgstr ""
-#: ../gtk/incall_view.c:244
+#: ../gtk/incall_view.c:331 ../gtk/incall_view.c:347
+msgid "unavailable"
+msgstr ""
+
+#: ../gtk/incall_view.c:447
+msgid "Secured by SRTP"
+msgstr ""
+
+#: ../gtk/incall_view.c:453
+#, c-format
+msgid "Secured by ZRTP - [auth token: %s]"
+msgstr ""
+
+#: ../gtk/incall_view.c:459
+msgid "Set unverified"
+msgstr ""
+
+#: ../gtk/incall_view.c:459 ../gtk/main.ui.h:49
+msgid "Set verified"
+msgstr ""
+
+#: ../gtk/incall_view.c:480
+msgid "In conference"
+msgstr ""
+
+#: ../gtk/incall_view.c:480
#, fuzzy
msgid "<b>In call</b>"
msgstr "<b>Соединен Ñ</b>"
-#: ../gtk/incall_view.c:260
+#: ../gtk/incall_view.c:499
#, fuzzy
msgid "<b>Paused call</b>"
msgstr "<b>Завершить вызов</b>"
-#: ../gtk/incall_view.c:272
+#: ../gtk/incall_view.c:511
#, c-format
msgid "%02i::%02i::%02i"
msgstr "%02i::%02i::%02i"
-#: ../gtk/incall_view.c:288
+#: ../gtk/incall_view.c:527
msgid "<b>Call ended.</b>"
msgstr "<b>Звонок закончен.</b>"
-#: ../gtk/incall_view.c:309
-#, fuzzy
-msgid "Unmute"
-msgstr "Безлимитный"
-
-#: ../gtk/incall_view.c:316 ../gtk/main.ui.h:42
-msgid "Mute"
-msgstr "Приглушить"
-
-#: ../gtk/incall_view.c:340
+#: ../gtk/incall_view.c:584
msgid "Resume"
msgstr ""
-#: ../gtk/incall_view.c:347 ../gtk/main.ui.h:46
+#: ../gtk/incall_view.c:591 ../gtk/main.ui.h:45
msgid "Pause"
msgstr ""
@@ -488,8 +588,9 @@ msgid "<b>Add contacts from directory</b>"
msgstr "Добавить новый контакт из директории '%s'"
#: ../gtk/main.ui.h:14
-msgid "<b>Contact list</b>"
-msgstr "<b>СпиÑок контактов</b>"
+#, fuzzy
+msgid "<b>Callee name</b>"
+msgstr "<b>Звонок закончен.</b>"
#: ../gtk/main.ui.h:15
msgid "<b>Welcome !</b>"
@@ -513,26 +614,26 @@ msgid "All users"
msgstr ""
#: ../gtk/main.ui.h:21
-#, fuzzy
-msgid "Audio & video"
-msgstr "Ðудио и Видео"
-
-#: ../gtk/main.ui.h:22
-msgid "Audio only"
-msgstr "Только Ðудио"
-
-#: ../gtk/main.ui.h:23
msgid "Automatically log me in"
msgstr "Входить автоматичеÑки"
-#: ../gtk/main.ui.h:24
+#: ../gtk/main.ui.h:22
msgid "B"
msgstr "B"
-#: ../gtk/main.ui.h:25 ../gtk/parameters.ui.h:20
+#: ../gtk/main.ui.h:23 ../gtk/parameters.ui.h:21
msgid "C"
msgstr "C"
+#: ../gtk/main.ui.h:24
+#, fuzzy
+msgid "Call"
+msgstr "Звонк %s"
+
+#: ../gtk/main.ui.h:25
+msgid "Call quality rating"
+msgstr ""
+
#: ../gtk/main.ui.h:26
msgid "Check _Updates"
msgstr ""
@@ -546,10 +647,6 @@ msgstr "Соединение"
msgid "D"
msgstr "D"
-#: ../gtk/main.ui.h:29
-msgid "Decline"
-msgstr "Отклонить"
-
#: ../gtk/main.ui.h:30
msgid "Default"
msgstr "По умолчанию"
@@ -559,13 +656,14 @@ msgid "Duration"
msgstr "ПродолжительноÑÑ‚ÑŒ"
#: ../gtk/main.ui.h:32
-msgid "Duration:"
-msgstr "ПродолжительноÑÑ‚ÑŒ:"
-
-#: ../gtk/main.ui.h:33
msgid "Enable self-view"
msgstr "Включить видео "
+#: ../gtk/main.ui.h:33
+#, fuzzy
+msgid "Enable video"
+msgstr "Включен"
+
#: ../gtk/main.ui.h:34
msgid "Enter username, phone number, or full sip address"
msgstr "Введите Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ, "
@@ -601,21 +699,26 @@ msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ "
msgid "Lookup:"
msgstr "ПоиÑк:"
-#: ../gtk/main.ui.h:43
+#: ../gtk/main.ui.h:42
msgid "My current identity:"
msgstr "Текущий идентификатор:"
-#: ../gtk/main.ui.h:44
+#: ../gtk/main.ui.h:43
#, fuzzy
msgid "Online users"
msgstr ""
"Ð’Ñе пользователи\n"
"Пользователи в Ñети"
-#: ../gtk/main.ui.h:45
+#: ../gtk/main.ui.h:44
msgid "Password"
msgstr "Пароль"
+#: ../gtk/main.ui.h:46
+#, fuzzy
+msgid "Recent calls"
+msgstr "ВходÑщий звонок"
+
#: ../gtk/main.ui.h:47
msgid "SIP address or phone number:"
msgstr "SIP-Ð°Ð´Ñ€ÐµÑ Ð¸Ð»Ð¸ номер телефона."
@@ -625,20 +728,15 @@ msgstr "SIP-Ð°Ð´Ñ€ÐµÑ Ð¸Ð»Ð¸ номер телефона."
msgid "Search"
msgstr "ПоиÑк:"
-#: ../gtk/main.ui.h:49
+#: ../gtk/main.ui.h:50
#, fuzzy
msgid "Show debug window"
msgstr "Linphone окно отладки"
-#: ../gtk/main.ui.h:50
+#: ../gtk/main.ui.h:51
msgid "Username"
msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
-#: ../gtk/main.ui.h:51
-#, fuzzy
-msgid "_Call history"
-msgstr "ИÑÑ‚Ð¾Ñ€Ð¸Ñ Ð·Ð²Ð¾Ð½ÐºÐ¾Ð²"
-
#: ../gtk/main.ui.h:52
#, fuzzy
msgid "_Help"
@@ -649,18 +747,14 @@ msgid "_Homepage"
msgstr ""
#: ../gtk/main.ui.h:54
-msgid "_Linphone"
-msgstr "_Linphone"
-
-#: ../gtk/main.ui.h:55
msgid "_Options"
msgstr ""
-#: ../gtk/main.ui.h:56
+#: ../gtk/main.ui.h:55
msgid "in"
msgstr "в"
-#: ../gtk/main.ui.h:57
+#: ../gtk/main.ui.h:56
msgid "label"
msgstr "метка"
@@ -720,14 +814,6 @@ msgstr "SIP ÐдреÑ"
msgid "Show this contact presence status"
msgstr "Показывать Ñтому контакту ÑÑ‚Ð°Ñ‚ÑƒÑ Ð¿Ñ€Ð¸ÑутÑтвиÑ"
-#: ../gtk/contact.ui.h:6
-msgid "gtk-cancel"
-msgstr "Отмена"
-
-#: ../gtk/contact.ui.h:7
-msgid "gtk-ok"
-msgstr "Ок"
-
#: ../gtk/log.ui.h:1
msgid "Linphone debug window"
msgstr "Linphone окно отладки"
@@ -782,8 +868,8 @@ msgid "Publish presence information"
msgstr "Показывать ÑÑ‚Ð°Ñ‚ÑƒÑ Ð¿Ñ€Ð¸ÑутÑтвиÑ"
#: ../gtk/sip_account.ui.h:6
-msgid "Register at startup"
-msgstr "РегиÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ð¿Ñ€Ð¸ запуÑке"
+msgid "Register"
+msgstr ""
#: ../gtk/sip_account.ui.h:7
msgid "Registration duration (sec):"
@@ -809,10 +895,6 @@ msgstr "sip:"
msgid "Send"
msgstr "Отправить"
-#: ../gtk/chatroom.ui.h:2
-msgid "gtk-close"
-msgstr "Закрыть"
-
#: ../gtk/parameters.ui.h:1
msgid "0 stands for \"unlimited\""
msgstr "0 означает \"безлимитный\""
@@ -847,8 +929,8 @@ msgid "<b>NAT and Firewall</b>"
msgstr "<b>NAT и брандмауÑÑ€</b>"
#: ../gtk/parameters.ui.h:9
-msgid "<b>Ports</b>"
-msgstr "<b>Порты</b>"
+msgid "<b>Network protocol and ports</b>"
+msgstr ""
#: ../gtk/parameters.ui.h:10
msgid "<b>Privacy</b>"
@@ -867,101 +949,115 @@ msgid "<b>Video</b>"
msgstr "<b>Видео</b>"
#: ../gtk/parameters.ui.h:14
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:15
msgid "ALSA special device (optional):"
msgstr "Специальное уÑтройÑтво ALSA (необÑзательно)"
-#: ../gtk/parameters.ui.h:15
+#: ../gtk/parameters.ui.h:16
msgid "Add"
msgstr "Добавить"
-#: ../gtk/parameters.ui.h:16
+#: ../gtk/parameters.ui.h:17
msgid "Audio RTP/UDP:"
msgstr "Ðудио RTP/UDP"
-#: ../gtk/parameters.ui.h:17
+#: ../gtk/parameters.ui.h:18
#, fuzzy
msgid "Audio codecs"
msgstr ""
"Ðудио кодеки\n"
"Видео кодеки"
-#: ../gtk/parameters.ui.h:18
+#: ../gtk/parameters.ui.h:19
msgid "Behind NAT / Firewall (specify gateway IP below)"
msgstr "За NAT / брандмауÑÑ€ (указать IP-Ð°Ð´Ñ€ÐµÑ ÑˆÐ»ÑŽÐ·Ð° ниже)"
-#: ../gtk/parameters.ui.h:19
+#: ../gtk/parameters.ui.h:20
msgid "Behind NAT / Firewall (use STUN to resolve)"
msgstr "За NAT / брандмауÑÑ€ (иÑползовать STUN)"
-#: ../gtk/parameters.ui.h:21
+#: ../gtk/parameters.ui.h:22
msgid "CIF"
msgstr "CIF"
-#: ../gtk/parameters.ui.h:22
+#: ../gtk/parameters.ui.h:23
msgid "Capture device:"
msgstr "УÑтройÑтво захвата:"
-#: ../gtk/parameters.ui.h:23
+#: ../gtk/parameters.ui.h:24
msgid "Codecs"
msgstr "Кодеки"
-#: ../gtk/parameters.ui.h:24
+#: ../gtk/parameters.ui.h:25
msgid "Direct connection to the Internet"
msgstr "ПрÑмое подключение к Интернет"
-#: ../gtk/parameters.ui.h:25
+#: ../gtk/parameters.ui.h:26
msgid "Disable"
msgstr "Выключить"
-#: ../gtk/parameters.ui.h:26
+#: ../gtk/parameters.ui.h:27
msgid "Done"
msgstr "Готово"
-#: ../gtk/parameters.ui.h:27
+#: ../gtk/parameters.ui.h:28
msgid "Download speed limit in Kbit/sec:"
msgstr "Ограничение ÑкороÑти входÑщего потока kbit/sec"
-#: ../gtk/parameters.ui.h:28
+#: ../gtk/parameters.ui.h:29
msgid "Edit"
msgstr "Редактировать"
-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:30
msgid "Enable"
msgstr "Включить"
-#: ../gtk/parameters.ui.h:30
+#: ../gtk/parameters.ui.h:31
+msgid "Enable adaptive rate control"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:32
msgid "Enable echo cancellation"
msgstr "Включить подавление Ñхо"
-#: ../gtk/parameters.ui.h:31
+#: ../gtk/parameters.ui.h:33
msgid "Erase all passwords"
msgstr "Стереть вÑе пароли"
-#: ../gtk/parameters.ui.h:32
+#: ../gtk/parameters.ui.h:34
msgid "Manage SIP Accounts"
msgstr "Управление учетными запиÑÑми SIP"
-#: ../gtk/parameters.ui.h:33
+#: ../gtk/parameters.ui.h:35
+msgid "Media encryption type"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:36
msgid "Multimedia settings"
msgstr "ÐаÑтройка мультимедиа"
-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:37
msgid "Network settings"
msgstr "ÐаÑтройки Ñети"
-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:38
msgid "Playback device:"
msgstr "УÑтройÑтво воÑпроизведениÑ"
-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:39
msgid "Prefered video resolution:"
msgstr "Предпочтительное разрешение видео:"
-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:40
msgid "Public IP address:"
msgstr "Выделенный IP-адреÑ"
-#: ../gtk/parameters.ui.h:38
+#: ../gtk/parameters.ui.h:41
msgid ""
"Register to FONICS\n"
"virtual network !"
@@ -969,100 +1065,106 @@ msgstr ""
"РегиÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ð² \n"
"виртуальной Ñети FONICS!"
-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:43
msgid "Remove"
msgstr "Удалить"
-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:44
msgid "Ring device:"
msgstr "УÑтройÑтво звонка:"
-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:45
msgid "Ring sound:"
msgstr "Звук звонка:"
-#: ../gtk/parameters.ui.h:43
+#: ../gtk/parameters.ui.h:46
#, fuzzy
-msgid "SIP (TCP):"
+msgid "SIP (TCP)"
msgstr "SIP (UDP):"
-#: ../gtk/parameters.ui.h:44
-msgid "SIP (UDP):"
+#: ../gtk/parameters.ui.h:47
+#, fuzzy
+msgid "SIP (TLS)"
msgstr "SIP (UDP):"
-#: ../gtk/parameters.ui.h:45
+#: ../gtk/parameters.ui.h:48
+#, fuzzy
+msgid "SIP (UDP)"
+msgstr "SIP (UDP):"
+
+#: ../gtk/parameters.ui.h:49
msgid "Send DTMFs as SIP info"
msgstr "Отправить DTFM как SIP-инфо"
-#: ../gtk/parameters.ui.h:46
+#: ../gtk/parameters.ui.h:50
msgid "Set Maximum Transmission Unit:"
msgstr "УÑтановка MTU (МакÑимально Передаваемый Блок)"
-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:51
msgid "Settings"
msgstr "ÐаÑтройки:"
-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:52
msgid "Show advanced settings"
msgstr ""
-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:53
msgid "Stun server:"
msgstr "Stun Ñервер:"
-#: ../gtk/parameters.ui.h:50
+#: ../gtk/parameters.ui.h:54
msgid "This section defines your SIP address when not using a SIP account"
msgstr "Поле определÑет ваш SIP Ð°Ð´Ñ€ÐµÑ ÐºÐ¾Ð³Ð´Ð° вы не иÑпользуете SIP аккаунт"
-#: ../gtk/parameters.ui.h:51
+#: ../gtk/parameters.ui.h:55
msgid "Upload speed limit in Kbit/sec:"
msgstr "Ограничение иÑходÑщего потока kbit/sec:"
-#: ../gtk/parameters.ui.h:52
+#: ../gtk/parameters.ui.h:56
msgid "Use IPv6 instead of IPv4"
msgstr "ИÑпользовать IPv6 вмеÑто IPv4"
-#: ../gtk/parameters.ui.h:53
+#: ../gtk/parameters.ui.h:57
msgid "User interface"
msgstr "ИнтерфейÑ:"
-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:58
msgid "Video RTP/UDP:"
msgstr "Видео RTP/UDP:"
-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:59
#, fuzzy
msgid "Video codecs"
msgstr ""
"Ðудио кодеки\n"
"Видео кодеки"
-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:60
msgid "Video input device:"
msgstr "Видео уÑтройÑтво вывода:"
-#: ../gtk/parameters.ui.h:57
+#: ../gtk/parameters.ui.h:61
msgid "Your display name (eg: John Doe):"
msgstr "Отображаемое Ð¸Ð¼Ñ (Иван Сидоров):"
-#: ../gtk/parameters.ui.h:58
+#: ../gtk/parameters.ui.h:62
msgid "Your resulting SIP address:"
msgstr "Результирующий sip адреÑ:"
-#: ../gtk/parameters.ui.h:59
+#: ../gtk/parameters.ui.h:63
msgid "Your username:"
msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ:"
-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:64
#, fuzzy
msgid "a sound card"
msgstr "Ð·Ð²ÑƒÐºÐ¾Ð²Ð°Ñ ÐºÐ°Ñ€Ñ‚Ð°\n"
-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:65
msgid "default camera"
msgstr "камера по умолчаию"
-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:66
msgid "default soundcard"
msgstr "Ð·Ð²ÑƒÐºÐ¾Ð²Ð°Ñ ÐºÐ°Ñ€Ñ‚Ð° по умолчанию"
@@ -1086,26 +1188,19 @@ msgstr "Linphone"
msgid "Please wait"
msgstr "Подождите"
-#: ../coreapi/linphonecore.c:165
-#, c-format
-msgid "You have missed %i call."
-msgid_plural "You have missed %i calls."
-msgstr[0] "У Ð²Ð°Ñ Ð¿Ñ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½Ð¾ %i звонков."
-msgstr[1] "У Ð²Ð°Ñ Ð¿Ñ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½Ð¾ %i звонков."
-
-#: ../coreapi/linphonecore.c:206
+#: ../coreapi/linphonecore.c:187
msgid "aborted"
msgstr "отмененный"
-#: ../coreapi/linphonecore.c:209
+#: ../coreapi/linphonecore.c:190
msgid "completed"
msgstr "заверщённый"
-#: ../coreapi/linphonecore.c:212
+#: ../coreapi/linphonecore.c:193
msgid "missed"
msgstr "пропущенный"
-#: ../coreapi/linphonecore.c:217
+#: ../coreapi/linphonecore.c:198
#, c-format
msgid ""
"%s at %s\n"
@@ -1120,27 +1215,23 @@ msgstr ""
"СтатуÑ: %s\n"
"ДлительноÑÑ‚ÑŒ: %i мн %i Ñек\n"
-#: ../coreapi/linphonecore.c:218
-msgid "Incoming call"
-msgstr "ВходÑщий вызов"
-
-#: ../coreapi/linphonecore.c:218
+#: ../coreapi/linphonecore.c:199
msgid "Outgoing call"
msgstr "ИÑходÑщий звонок"
-#: ../coreapi/linphonecore.c:998
+#: ../coreapi/linphonecore.c:1088
msgid "Ready"
msgstr "Готов"
-#: ../coreapi/linphonecore.c:1773
+#: ../coreapi/linphonecore.c:1831
msgid "Looking for telephone number destination..."
msgstr "ПоиÑк Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð½Ð¾Ð³Ð¾ номера.."
-#: ../coreapi/linphonecore.c:1776
+#: ../coreapi/linphonecore.c:1834
msgid "Could not resolve this number."
msgstr "Ðе может принÑÑ‚ÑŒ решение по Ñтому номеру."
-#: ../coreapi/linphonecore.c:1820
+#: ../coreapi/linphonecore.c:1878
msgid ""
"Could not parse given sip address. A sip url usually looks like sip:"
"user@domain"
@@ -1148,54 +1239,42 @@ msgstr ""
"Ðе могу опознать sip адреÑ. SIP url обычно выглÑдит как: <sip:"
"username@domainname>"
-#: ../coreapi/linphonecore.c:1967
+#: ../coreapi/linphonecore.c:2025
msgid "Contacting"
msgstr "Соединение"
-#: ../coreapi/linphonecore.c:1974
+#: ../coreapi/linphonecore.c:2032
#, fuzzy
msgid "Could not call"
msgstr "невозможно позвонить"
-#: ../coreapi/linphonecore.c:2081
-msgid "Sorry, you have to pause or stop the current call first !"
-msgstr ""
-
-#: ../coreapi/linphonecore.c:2086
+#: ../coreapi/linphonecore.c:2140
msgid "Sorry, we have reached the maximum number of simultaneous calls"
msgstr ""
-#: ../coreapi/linphonecore.c:2208
+#: ../coreapi/linphonecore.c:2270
msgid "Modifying call parameters..."
msgstr ""
-#: ../coreapi/linphonecore.c:2311
+#: ../coreapi/linphonecore.c:2366
msgid "Connected."
msgstr "Соединён."
-#: ../coreapi/linphonecore.c:2334
+#: ../coreapi/linphonecore.c:2389
#, fuzzy
msgid "Call aborted"
msgstr "отмененный"
-#: ../coreapi/linphonecore.c:2374
-msgid "Call ended"
-msgstr "Разговор окончен"
-
-#: ../coreapi/linphonecore.c:2456
+#: ../coreapi/linphonecore.c:2530
#, fuzzy
msgid "Could not pause the call"
msgstr "невозможно позвонить"
-#: ../coreapi/linphonecore.c:2460
+#: ../coreapi/linphonecore.c:2535
#, fuzzy
msgid "Pausing the current call..."
msgstr "Показать текущий звонок"
-#: ../coreapi/linphonecore.c:2499
-msgid "There is already a call in process, pause or stop it first."
-msgstr ""
-
#: ../coreapi/misc.c:147
msgid ""
"Your computer appears to be using ALSA sound drivers.\n"
@@ -1274,7 +1353,7 @@ msgstr "В ожидании"
msgid "Unknown-bug"
msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°"
-#: ../coreapi/proxy.c:187
+#: ../coreapi/proxy.c:192
msgid ""
"The sip proxy address you entered is invalid, it must start with \"sip:\" "
"followed by a hostname."
@@ -1282,7 +1361,7 @@ msgstr ""
"Введеный SIP-Ð°Ð´Ñ€ÐµÑ Ð¿Ñ€Ð¾ÐºÑи ÑвлÑетÑÑ Ð½ÐµÐ´ÐµÐ¹Ñтвительным, он должен начинатьÑÑ Ñ "
"\"sip:имÑ_хоÑта\""
-#: ../coreapi/proxy.c:193
+#: ../coreapi/proxy.c:198
msgid ""
"The sip identity you entered is invalid.\n"
"It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1290,145 +1369,195 @@ msgstr ""
"Ðеверные параметры идентификации\n"
"Должно выглÑдеть как sip:username@proxydomain"
-#: ../coreapi/proxy.c:671
+#: ../coreapi/proxy.c:690
#, c-format
msgid "Could not login as %s"
msgstr "Ðевозможно зайти как: %s"
-#: ../coreapi/callbacks.c:170
+#: ../coreapi/callbacks.c:206
#, fuzzy
msgid "is contacting you"
msgstr "контактирует Ñ Ð²Ð°Ð¼Ð¸."
-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207
msgid " and asked autoanswer."
msgstr ""
-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207
msgid "."
msgstr ""
-#: ../coreapi/callbacks.c:226
+#: ../coreapi/callbacks.c:266
#, fuzzy
msgid "Remote ringing."
msgstr "Registrierung"
-#: ../coreapi/callbacks.c:242
+#: ../coreapi/callbacks.c:282
#, fuzzy
msgid "Remote ringing..."
msgstr "Registrierung"
-#: ../coreapi/callbacks.c:253
+#: ../coreapi/callbacks.c:293
msgid "Early media."
msgstr "Early media"
-#: ../coreapi/callbacks.c:291
+#: ../coreapi/callbacks.c:331
#, fuzzy, c-format
msgid "Call with %s is paused."
msgstr "Обмен ÑообщениÑми Ñ %s"
-#: ../coreapi/callbacks.c:302
+#: ../coreapi/callbacks.c:342
#, c-format
msgid "Call answered by %s - on hold."
msgstr ""
-#: ../coreapi/callbacks.c:317
+#: ../coreapi/callbacks.c:357
#, fuzzy
msgid "Call resumed."
msgstr "Разговор окончен"
-#: ../coreapi/callbacks.c:322
+#: ../coreapi/callbacks.c:362
#, fuzzy, c-format
msgid "Call answered by %s."
msgstr ""
"Позвонить\n"
"или ответить"
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:432
msgid "We are being paused..."
msgstr ""
-#: ../coreapi/callbacks.c:387
+#: ../coreapi/callbacks.c:436
msgid "We have been resumed..."
msgstr ""
-#: ../coreapi/callbacks.c:424
+#: ../coreapi/callbacks.c:441
+msgid "Call has been updated by remote..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:473
msgid "Call terminated."
msgstr "Звонок прерван."
-#: ../coreapi/callbacks.c:431
+#: ../coreapi/callbacks.c:480
msgid "User is busy."
msgstr "Пользователь занÑÑ‚."
-#: ../coreapi/callbacks.c:432
+#: ../coreapi/callbacks.c:481
msgid "User is temporarily unavailable."
msgstr "Пользователь временно недоÑтупен."
#. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:434
+#: ../coreapi/callbacks.c:483
msgid "User does not want to be disturbed."
msgstr "Пользователь не хочет чтоб его беÑпокоили."
-#: ../coreapi/callbacks.c:435
+#: ../coreapi/callbacks.c:484
msgid "Call declined."
msgstr "Звонок отклонён."
-#: ../coreapi/callbacks.c:447
+#: ../coreapi/callbacks.c:496
#, fuzzy
msgid "No response."
msgstr "Ð²Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ Ð¸Ñтекло"
-#: ../coreapi/callbacks.c:451
+#: ../coreapi/callbacks.c:500
msgid "Protocol error."
msgstr ""
-#: ../coreapi/callbacks.c:467
+#: ../coreapi/callbacks.c:516
#, fuzzy
msgid "Redirected"
msgstr "ПереадреÑован на %s..."
-#: ../coreapi/callbacks.c:477
+#: ../coreapi/callbacks.c:526
msgid "Not found"
msgstr ""
-#: ../coreapi/callbacks.c:487
+#: ../coreapi/callbacks.c:551
msgid "No common codecs"
msgstr ""
-#: ../coreapi/callbacks.c:493
+#: ../coreapi/callbacks.c:557
#, fuzzy
msgid "Call failed."
msgstr "Anruf annulliert"
-#: ../coreapi/callbacks.c:557
+#: ../coreapi/callbacks.c:631
#, c-format
msgid "Registration on %s successful."
msgstr "РегиÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ð½Ð° %s прошла уÑпешно."
-#: ../coreapi/callbacks.c:558
+#: ../coreapi/callbacks.c:632
#, c-format
msgid "Unregistration on %s done."
msgstr "Отмена региÑтрации на %s завершена."
-#: ../coreapi/callbacks.c:574
+#: ../coreapi/callbacks.c:648
msgid "no response timeout"
msgstr "Ð²Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ Ð¸Ñтекло"
-#: ../coreapi/callbacks.c:577
+#: ../coreapi/callbacks.c:651
#, c-format
msgid "Registration on %s failed: %s"
msgstr "РегиÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ð½Ð° %s не удалаÑÑŒ: %s"
-#: ../coreapi/callbacks.c:619
-#, c-format
-msgid "We are transferred to %s"
-msgstr ""
-
-#: ../coreapi/sal_eXosip2.c:815 ../coreapi/sal_eXosip2.c:817
+#: ../coreapi/sal_eXosip2.c:873 ../coreapi/sal_eXosip2.c:875
#, fuzzy
msgid "Authentication failure"
msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð°ÑƒÐ½Ñ‚ÐµÑ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸"
+#: ../coreapi/linphonecall.c:128
+#, fuzzy, c-format
+msgid "Authentication token is %s"
+msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð°ÑƒÐ½Ñ‚ÐµÑ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸"
+
+#: ../coreapi/linphonecall.c:1560
+#, c-format
+msgid "You have missed %i call."
+msgid_plural "You have missed %i calls."
+msgstr[0] "У Ð²Ð°Ñ Ð¿Ñ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½Ð¾ %i звонков."
+msgstr[1] "У Ð²Ð°Ñ Ð¿Ñ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½Ð¾ %i звонков."
+
+#, fuzzy
+#~ msgid "Unmute"
+#~ msgstr "Безлимитный"
+
+#~ msgid "<b>Contact list</b>"
+#~ msgstr "<b>СпиÑок контактов</b>"
+
+#, fuzzy
+#~ msgid "Audio & video"
+#~ msgstr "Ðудио и Видео"
+
+#~ msgid "Audio only"
+#~ msgstr "Только Ðудио"
+
+#~ msgid "Duration:"
+#~ msgstr "ПродолжительноÑÑ‚ÑŒ:"
+
+#, fuzzy
+#~ msgid "_Call history"
+#~ msgstr "ИÑÑ‚Ð¾Ñ€Ð¸Ñ Ð·Ð²Ð¾Ð½ÐºÐ¾Ð²"
+
+#~ msgid "_Linphone"
+#~ msgstr "_Linphone"
+
+#~ msgid "gtk-cancel"
+#~ msgstr "Отмена"
+
+#~ msgid "gtk-ok"
+#~ msgstr "Ок"
+
+#~ msgid "Register at startup"
+#~ msgstr "РегиÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ð¿Ñ€Ð¸ запуÑке"
+
+#~ msgid "gtk-close"
+#~ msgstr "Закрыть"
+
+#~ msgid "<b>Ports</b>"
+#~ msgstr "<b>Порты</b>"
+
#~ msgid "ITU-G.711 alaw encoder"
#~ msgstr "ITU-G.711 alaw кодировщик"
@@ -2037,9 +2166,6 @@ msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð°ÑƒÐ½Ñ‚ÐµÑ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸"
#~ msgid "Authentication required for realm %s"
#~ msgstr "РегиÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ð´Ð»Ñ %s"
-#~ msgid "None"
-#~ msgstr "Ðет"
-
#~ msgid "Wait"
#~ msgstr "Подождать"
@@ -2115,12 +2241,6 @@ msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð°ÑƒÐ½Ñ‚ÐµÑ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸"
#~ msgid "Timeout..."
#~ msgstr "Zeitberschreitung..."
-#, fuzzy
-#~ msgid ""
-#~ "Add address\n"
-#~ "book"
-#~ msgstr "Adressbuch"
-
#~ msgid "Toggle this if you want to be registered on a remote server."
#~ msgstr ""
#~ "Bitte ankreuzen, wenn Sie auf einem Sip-Server registriert werden wollen."
diff --git a/po/sv.po b/po/sv.po
index 6fd2d76cf44a8f4c647c1b81e8872510847a58ac..75ff16d4dfc54cd7b8391a0032af2b54bb323478 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-08 22:32+0200\n"
+"POT-Creation-Date: 2011-12-02 16:47+0100\n"
"PO-Revision-Date: 2009-02-17 15:22+0100\n"
"Last-Translator: Emmanuel Frécon <emmanuel.frecon@myjoice.com>\n"
"Language-Team: SWEDISH <SE@li.org>\n"
@@ -16,6 +16,19 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: ../gtk/calllogs.c:71
+msgid "n/a"
+msgstr ""
+
+#: ../gtk/conference.c:33 ../gtk/incall_view.c:183
+msgid "Conference"
+msgstr ""
+
+#: ../gtk/conference.c:41
+#, fuzzy
+msgid "Me"
+msgstr "Mikrofon av"
+
#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
#, c-format
msgid "Couldn't find pixmap file: %s"
@@ -26,23 +39,27 @@ msgstr "Kunde inte hitta pixmap filen: %s"
msgid "Chat with %s"
msgstr "Chatta med %s"
-#: ../gtk/main.c:74
+#: ../gtk/main.c:83
msgid "log to stdout some debug information while running."
msgstr "skriv loggning information under körning"
-#: ../gtk/main.c:81
+#: ../gtk/main.c:90
+msgid "path to a file to write logs into."
+msgstr ""
+
+#: ../gtk/main.c:97
msgid "Start only in the system tray, do not show the main interface."
msgstr "Starta ikonifierat, visa inte huvudfönstret"
-#: ../gtk/main.c:88
+#: ../gtk/main.c:104
msgid "address to call right now"
msgstr "Samtalsmottagare"
-#: ../gtk/main.c:95
+#: ../gtk/main.c:111
msgid "if set automatically answer incoming calls"
msgstr "Om på, besvara automatisk alla inkommande samtal"
-#: ../gtk/main.c:102
+#: ../gtk/main.c:118
msgid ""
"Specifiy a working directory (should be the base of the installation, eg: c:"
"\\Program Files\\Linphone)"
@@ -50,12 +67,12 @@ msgstr ""
"Välj en arbetskatalog som ska vara basen för installationen, såsom C:"
"\\Program\\Linphone"
-#: ../gtk/main.c:442
+#: ../gtk/main.c:464
#, c-format
msgid "Call with %s"
msgstr "Samtal med %s"
-#: ../gtk/main.c:826
+#: ../gtk/main.c:815
#, c-format
msgid ""
"%s would like to add you to his contact list.\n"
@@ -68,7 +85,7 @@ msgstr ""
"henne till din kontaktlista?\n"
"Om du svarar nej, personen kommer att vara bannlyst."
-#: ../gtk/main.c:904
+#: ../gtk/main.c:893
#, c-format
msgid ""
"Please enter your password for username <i>%s</i>\n"
@@ -77,164 +94,220 @@ msgstr ""
"Mata in ditt lösenord för användaren <i>%s</i>\n"
"vid domänen <i>%s</i>:"
-#: ../gtk/main.c:1040
+#: ../gtk/main.c:993
+#, fuzzy
+msgid "Call error"
+msgstr "Samtalshistorik"
+
+#: ../gtk/main.c:996 ../coreapi/linphonecore.c:2406
+msgid "Call ended"
+msgstr "Samtalet slut"
+
+#: ../gtk/main.c:999 ../coreapi/linphonecore.c:199
+msgid "Incoming call"
+msgstr "Inkommande samtal"
+
+#: ../gtk/main.c:1001 ../gtk/incall_view.c:292 ../gtk/main.ui.h:20
+msgid "Answer"
+msgstr ""
+
+#: ../gtk/main.c:1003 ../gtk/main.ui.h:29
+msgid "Decline"
+msgstr "Avböj"
+
+#: ../gtk/main.c:1009
+#, fuzzy
+msgid "Call paused"
+msgstr "avbrytade"
+
+#: ../gtk/main.c:1009
+#, c-format
+msgid "<span size=\"large\">by %s</span>"
+msgstr ""
+
+#: ../gtk/main.c:1165
msgid "Website link"
msgstr "Webbsajt"
-#: ../gtk/main.c:1076
+#: ../gtk/main.c:1205
msgid "Linphone - a video internet phone"
msgstr "Linphone - en video Internet telefon"
-#: ../gtk/main.c:1095
+#: ../gtk/main.c:1295
#, c-format
msgid "%s (Default)"
msgstr "%s (Default)"
-#: ../gtk/main.c:1187
-msgid "Windows"
+#: ../gtk/main.c:1566 ../coreapi/callbacks.c:700
+#, c-format
+msgid "We are transferred to %s"
msgstr ""
-#: ../gtk/main.c:1364
+#: ../gtk/main.c:1576
msgid ""
"No sound cards have been detected on this computer.\n"
"You won't be able to send or receive audio calls."
msgstr ""
-#: ../gtk/main.c:1423
+#: ../gtk/main.c:1663
msgid "A free SIP video-phone"
msgstr "En gratis SIP video-telefon"
-#: ../gtk/friendlist.c:192 ../gtk/propertybox.c:271 ../gtk/contact.ui.h:3
+#: ../gtk/friendlist.c:203
+msgid "Add to addressbook"
+msgstr ""
+
+#: ../gtk/friendlist.c:258 ../gtk/propertybox.c:296 ../gtk/contact.ui.h:3
msgid "Name"
msgstr "Namn"
-#: ../gtk/friendlist.c:205
+#: ../gtk/friendlist.c:271
msgid "Presence status"
msgstr "Närvarostatus"
-#: ../gtk/friendlist.c:242
+#: ../gtk/friendlist.c:308
#, c-format
msgid "Search in %s directory"
msgstr "Sök i %s katalogen"
-#: ../gtk/friendlist.c:450
+#: ../gtk/friendlist.c:568
msgid "Invalid sip contact !"
msgstr "ogiltig SIP kontakt!"
-#: ../gtk/friendlist.c:495
+#: ../gtk/friendlist.c:613
#, c-format
msgid "Call %s"
msgstr "Ringer %s"
-#: ../gtk/friendlist.c:496
+#: ../gtk/friendlist.c:614
#, c-format
msgid "Send text to %s"
msgstr "Skicka text till %s"
-#: ../gtk/friendlist.c:497
+#: ../gtk/friendlist.c:615
#, c-format
msgid "Edit contact '%s'"
msgstr "Ändra kontakt '%s'"
-#: ../gtk/friendlist.c:498
+#: ../gtk/friendlist.c:616
#, c-format
msgid "Delete contact '%s'"
msgstr "Ta bort kontakt '%s'"
-#: ../gtk/friendlist.c:540
+#: ../gtk/friendlist.c:658
#, c-format
msgid "Add new contact from %s directory"
msgstr "Lägg till kontakt ifrån %s katalogen"
-#: ../gtk/propertybox.c:277
+#: ../gtk/propertybox.c:302
msgid "Rate (Hz)"
msgstr "Frekvens (Hz)"
-#: ../gtk/propertybox.c:283
+#: ../gtk/propertybox.c:308
msgid "Status"
msgstr "Status"
-#: ../gtk/propertybox.c:289
+#: ../gtk/propertybox.c:314
msgid "Min bitrate (kbit/s)"
msgstr "Min. datahastighet (kbit/s)"
-#: ../gtk/propertybox.c:296
+#: ../gtk/propertybox.c:321
msgid "Parameters"
msgstr "Parametrar"
-#: ../gtk/propertybox.c:326 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507
msgid "Enabled"
msgstr "PÃ¥"
-#: ../gtk/propertybox.c:327 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507
msgid "Disabled"
msgstr "Av"
-#: ../gtk/propertybox.c:510
+#: ../gtk/propertybox.c:553
msgid "Account"
msgstr "Konto"
-#: ../gtk/propertybox.c:650
+#: ../gtk/propertybox.c:693
msgid "English"
msgstr "Engelska"
-#: ../gtk/propertybox.c:651
+#: ../gtk/propertybox.c:694
msgid "French"
msgstr "Fransk"
-#: ../gtk/propertybox.c:652
+#: ../gtk/propertybox.c:695
msgid "Swedish"
msgstr "Svenska"
-#: ../gtk/propertybox.c:653
+#: ../gtk/propertybox.c:696
msgid "Italian"
msgstr "Italiensk"
-#: ../gtk/propertybox.c:654
+#: ../gtk/propertybox.c:697
msgid "Spanish"
msgstr "Spanska"
-#: ../gtk/propertybox.c:655
+#: ../gtk/propertybox.c:698
msgid "Brazilian Portugese"
msgstr "Portugisiska"
-#: ../gtk/propertybox.c:656
+#: ../gtk/propertybox.c:699
msgid "Polish"
msgstr "Polska"
-#: ../gtk/propertybox.c:657
+#: ../gtk/propertybox.c:700
msgid "German"
msgstr "Tyska"
-#: ../gtk/propertybox.c:658
+#: ../gtk/propertybox.c:701
msgid "Russian"
msgstr "Ryska"
-#: ../gtk/propertybox.c:659
+#: ../gtk/propertybox.c:702
msgid "Japanese"
msgstr "Japanska"
-#: ../gtk/propertybox.c:660
+#: ../gtk/propertybox.c:703
msgid "Dutch"
msgstr "Nederländksa"
-#: ../gtk/propertybox.c:661
+#: ../gtk/propertybox.c:704
msgid "Hungarian"
msgstr "Hungerska"
-#: ../gtk/propertybox.c:662
+#: ../gtk/propertybox.c:705
msgid "Czech"
msgstr "Tjekiska"
-#: ../gtk/propertybox.c:663
+#: ../gtk/propertybox.c:706
msgid "Chinese"
msgstr "Kinesiska"
-#: ../gtk/propertybox.c:720
+#: ../gtk/propertybox.c:707
+msgid "Traditional Chinese"
+msgstr ""
+
+#: ../gtk/propertybox.c:708
+msgid "Norwegian"
+msgstr ""
+
+#: ../gtk/propertybox.c:765
msgid ""
"You need to restart linphone for the new language selection to take effect."
msgstr "Du behöver starta om programmet för att det nya språket ska synas."
+#: ../gtk/propertybox.c:835
+msgid "None"
+msgstr ""
+
+#: ../gtk/propertybox.c:839
+msgid "SRTP"
+msgstr ""
+
+#: ../gtk/propertybox.c:845
+msgid "ZRTP"
+msgstr ""
+
#: ../gtk/update.c:80
#, c-format
msgid ""
@@ -352,75 +425,102 @@ msgstr "Skapar ditt konto"
msgid "Now ready !"
msgstr "Klar nu!"
-#: ../gtk/incall_view.c:61
+#: ../gtk/incall_view.c:69
#, fuzzy, c-format
msgid "Call #%i"
msgstr "Ringer %s"
-#: ../gtk/incall_view.c:87
+#: ../gtk/incall_view.c:127
#, c-format
msgid "Transfer to call #%i with %s"
msgstr ""
-#: ../gtk/incall_view.c:113
+#: ../gtk/incall_view.c:155
msgid "Transfer"
msgstr ""
-#: ../gtk/incall_view.c:187
+#: ../gtk/incall_view.c:271
msgid "<b>Calling...</b>"
msgstr "<b>Ringer...</b>"
-#: ../gtk/incall_view.c:190 ../gtk/incall_view.c:246
+#: ../gtk/incall_view.c:274 ../gtk/incall_view.c:482
msgid "00::00::00"
msgstr "00:00:00"
-#: ../gtk/incall_view.c:206
+#: ../gtk/incall_view.c:285
#, fuzzy
msgid "<b>Incoming call</b>"
msgstr "Inkommande samtal"
-#: ../gtk/incall_view.c:216
-msgid ""
-"Pause all calls\n"
-"and answer"
+#: ../gtk/incall_view.c:322
+msgid "good"
msgstr ""
-#: ../gtk/incall_view.c:217 ../gtk/main.ui.h:20
-msgid "Answer"
+#: ../gtk/incall_view.c:324
+msgid "average"
+msgstr ""
+
+#: ../gtk/incall_view.c:326
+msgid "poor"
+msgstr ""
+
+#: ../gtk/incall_view.c:328
+msgid "very poor"
msgstr ""
-#: ../gtk/incall_view.c:244
+#: ../gtk/incall_view.c:330
+msgid "too bad"
+msgstr ""
+
+#: ../gtk/incall_view.c:331 ../gtk/incall_view.c:347
+msgid "unavailable"
+msgstr ""
+
+#: ../gtk/incall_view.c:447
+msgid "Secured by SRTP"
+msgstr ""
+
+#: ../gtk/incall_view.c:453
+#, c-format
+msgid "Secured by ZRTP - [auth token: %s]"
+msgstr ""
+
+#: ../gtk/incall_view.c:459
+msgid "Set unverified"
+msgstr ""
+
+#: ../gtk/incall_view.c:459 ../gtk/main.ui.h:49
+msgid "Set verified"
+msgstr ""
+
+#: ../gtk/incall_view.c:480
+msgid "In conference"
+msgstr ""
+
+#: ../gtk/incall_view.c:480
#, fuzzy
msgid "<b>In call</b>"
msgstr "<b>I samtal med</b>"
-#: ../gtk/incall_view.c:260
+#: ../gtk/incall_view.c:499
#, fuzzy
msgid "<b>Paused call</b>"
msgstr "<b>Lägg på</b>"
-#: ../gtk/incall_view.c:272
+#: ../gtk/incall_view.c:511
#, c-format
msgid "%02i::%02i::%02i"
msgstr "%02i:%02i:%02i"
-#: ../gtk/incall_view.c:288
+#: ../gtk/incall_view.c:527
msgid "<b>Call ended.</b>"
msgstr "<b>Samtalet slut.</b>"
-#: ../gtk/incall_view.c:309
-msgid "Unmute"
-msgstr "Mikrofon på"
-
-#: ../gtk/incall_view.c:316 ../gtk/main.ui.h:42
-msgid "Mute"
-msgstr "Mikrofon av"
-
-#: ../gtk/incall_view.c:340
+#: ../gtk/incall_view.c:584
msgid "Resume"
msgstr ""
-#: ../gtk/incall_view.c:347 ../gtk/main.ui.h:46
+#: ../gtk/incall_view.c:591 ../gtk/main.ui.h:45
msgid "Pause"
msgstr ""
@@ -482,8 +582,9 @@ msgid "<b>Add contacts from directory</b>"
msgstr "<b>Lägg till kontakt ifrån katalogen</b>"
#: ../gtk/main.ui.h:14
-msgid "<b>Contact list</b>"
-msgstr "<b>Kontaktlista</b>"
+#, fuzzy
+msgid "<b>Callee name</b>"
+msgstr "<b>Samtalet slut.</b>"
#: ../gtk/main.ui.h:15
msgid "<b>Welcome !</b>"
@@ -507,26 +608,26 @@ msgid "All users"
msgstr ""
#: ../gtk/main.ui.h:21
-#, fuzzy
-msgid "Audio & video"
-msgstr "Audio & Video"
-
-#: ../gtk/main.ui.h:22
-msgid "Audio only"
-msgstr "Enbart audio"
-
-#: ../gtk/main.ui.h:23
msgid "Automatically log me in"
msgstr "Logga mig automatiskt"
-#: ../gtk/main.ui.h:24
+#: ../gtk/main.ui.h:22
msgid "B"
msgstr ""
-#: ../gtk/main.ui.h:25 ../gtk/parameters.ui.h:20
+#: ../gtk/main.ui.h:23 ../gtk/parameters.ui.h:21
msgid "C"
msgstr ""
+#: ../gtk/main.ui.h:24
+#, fuzzy
+msgid "Call"
+msgstr "Ringer %s"
+
+#: ../gtk/main.ui.h:25
+msgid "Call quality rating"
+msgstr ""
+
#: ../gtk/main.ui.h:26
#, fuzzy
msgid "Check _Updates"
@@ -541,10 +642,6 @@ msgstr "Kontaktar"
msgid "D"
msgstr ""
-#: ../gtk/main.ui.h:29
-msgid "Decline"
-msgstr "Avböj"
-
#: ../gtk/main.ui.h:30
#, fuzzy
msgid "Default"
@@ -555,13 +652,14 @@ msgid "Duration"
msgstr "Förlopp"
#: ../gtk/main.ui.h:32
-msgid "Duration:"
-msgstr "Förlopp:"
-
-#: ../gtk/main.ui.h:33
msgid "Enable self-view"
msgstr "Själv bild"
+#: ../gtk/main.ui.h:33
+#, fuzzy
+msgid "Enable video"
+msgstr "PÃ¥"
+
#: ../gtk/main.ui.h:34
msgid "Enter username, phone number, or full sip address"
msgstr "Mata in användarnamn, telefonnummer eller SIP adress"
@@ -597,21 +695,26 @@ msgstr "Login information"
msgid "Lookup:"
msgstr "Sök:"
-#: ../gtk/main.ui.h:43
+#: ../gtk/main.ui.h:42
msgid "My current identity:"
msgstr "Min nuvarande identitet"
-#: ../gtk/main.ui.h:44
+#: ../gtk/main.ui.h:43
#, fuzzy
msgid "Online users"
msgstr ""
"Alla användare\n"
"Online användare"
-#: ../gtk/main.ui.h:45
+#: ../gtk/main.ui.h:44
msgid "Password"
msgstr "Lösenord"
+#: ../gtk/main.ui.h:46
+#, fuzzy
+msgid "Recent calls"
+msgstr "I samtal"
+
#: ../gtk/main.ui.h:47
msgid "SIP address or phone number:"
msgstr "Användarnamn"
@@ -620,20 +723,15 @@ msgstr "Användarnamn"
msgid "Search"
msgstr "Sök"
-#: ../gtk/main.ui.h:49
+#: ../gtk/main.ui.h:50
#, fuzzy
msgid "Show debug window"
msgstr "Linphone debug fönster"
-#: ../gtk/main.ui.h:50
+#: ../gtk/main.ui.h:51
msgid "Username"
msgstr "Användarnamn"
-#: ../gtk/main.ui.h:51
-#, fuzzy
-msgid "_Call history"
-msgstr "Samtalshistorik"
-
#: ../gtk/main.ui.h:52
msgid "_Help"
msgstr ""
@@ -644,18 +742,14 @@ msgid "_Homepage"
msgstr "Hemsidan"
#: ../gtk/main.ui.h:54
-msgid "_Linphone"
-msgstr "_inphone"
-
-#: ../gtk/main.ui.h:55
msgid "_Options"
msgstr ""
-#: ../gtk/main.ui.h:56
+#: ../gtk/main.ui.h:55
msgid "in"
msgstr "i"
-#: ../gtk/main.ui.h:57
+#: ../gtk/main.ui.h:56
msgid "label"
msgstr "etikett"
@@ -702,15 +796,6 @@ msgstr "SIP Adress"
msgid "Show this contact presence status"
msgstr "Visa kontaktens närvarostatus"
-#: ../gtk/contact.ui.h:6
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "Kopplad"
-
-#: ../gtk/contact.ui.h:7
-msgid "gtk-ok"
-msgstr ""
-
#: ../gtk/log.ui.h:1
msgid "Linphone debug window"
msgstr "Linphone debug fönster"
@@ -766,8 +851,8 @@ msgid "Publish presence information"
msgstr "Publicera närvaro information"
#: ../gtk/sip_account.ui.h:6
-msgid "Register at startup"
-msgstr "Registrera vid start"
+msgid "Register"
+msgstr ""
#: ../gtk/sip_account.ui.h:7
msgid "Registration duration (sec):"
@@ -793,11 +878,6 @@ msgstr "sip:"
msgid "Send"
msgstr "Skicka"
-#: ../gtk/chatroom.ui.h:2
-#, fuzzy
-msgid "gtk-close"
-msgstr "Kopplad"
-
#: ../gtk/parameters.ui.h:1
msgid "0 stands for \"unlimited\""
msgstr "0 står för \"utan begränsning\""
@@ -831,8 +911,8 @@ msgid "<b>NAT and Firewall</b>"
msgstr "<b>NAT och Brandvägg</b>"
#: ../gtk/parameters.ui.h:9
-msgid "<b>Ports</b>"
-msgstr "<b>Portar</b>"
+msgid "<b>Network protocol and ports</b>"
+msgstr ""
#: ../gtk/parameters.ui.h:10
msgid "<b>Privacy</b>"
@@ -851,101 +931,115 @@ msgid "<b>Video</b>"
msgstr "<b>Video</b>"
#: ../gtk/parameters.ui.h:14
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:15
msgid "ALSA special device (optional):"
msgstr "ALSA speciell enhet (tillval):"
-#: ../gtk/parameters.ui.h:15
+#: ../gtk/parameters.ui.h:16
msgid "Add"
msgstr "Lägg till"
-#: ../gtk/parameters.ui.h:16
+#: ../gtk/parameters.ui.h:17
msgid "Audio RTP/UDP:"
msgstr ""
-#: ../gtk/parameters.ui.h:17
+#: ../gtk/parameters.ui.h:18
#, fuzzy
msgid "Audio codecs"
msgstr ""
"Audio codecs\n"
"Video codecs"
-#: ../gtk/parameters.ui.h:18
+#: ../gtk/parameters.ui.h:19
msgid "Behind NAT / Firewall (specify gateway IP below)"
msgstr "Bakom en NAT / brandvägg (specificera gatewap IP adress nedan)"
-#: ../gtk/parameters.ui.h:19
+#: ../gtk/parameters.ui.h:20
msgid "Behind NAT / Firewall (use STUN to resolve)"
msgstr "Bakom en NAT / brandvägg (använd STUN för att avgöra adressen)"
-#: ../gtk/parameters.ui.h:21
+#: ../gtk/parameters.ui.h:22
msgid "CIF"
msgstr ""
-#: ../gtk/parameters.ui.h:22
+#: ../gtk/parameters.ui.h:23
msgid "Capture device:"
msgstr "Mikrofon enhet:"
-#: ../gtk/parameters.ui.h:23
+#: ../gtk/parameters.ui.h:24
msgid "Codecs"
msgstr "Codecs"
-#: ../gtk/parameters.ui.h:24
+#: ../gtk/parameters.ui.h:25
msgid "Direct connection to the Internet"
msgstr "Direkt förbindelse till Internet"
-#: ../gtk/parameters.ui.h:25
+#: ../gtk/parameters.ui.h:26
msgid "Disable"
msgstr "Inaktivera"
-#: ../gtk/parameters.ui.h:26
+#: ../gtk/parameters.ui.h:27
msgid "Done"
msgstr "Klar"
-#: ../gtk/parameters.ui.h:27
+#: ../gtk/parameters.ui.h:28
msgid "Download speed limit in Kbit/sec:"
msgstr "Max downstream bandbreddshastighet i kbit/sek:"
-#: ../gtk/parameters.ui.h:28
+#: ../gtk/parameters.ui.h:29
msgid "Edit"
msgstr "Editera"
-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:30
msgid "Enable"
msgstr "Möjliggör"
-#: ../gtk/parameters.ui.h:30
+#: ../gtk/parameters.ui.h:31
+msgid "Enable adaptive rate control"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:32
msgid "Enable echo cancellation"
msgstr "Tillåta ekokancellering"
-#: ../gtk/parameters.ui.h:31
+#: ../gtk/parameters.ui.h:33
msgid "Erase all passwords"
msgstr "Glöm alla lösenord"
-#: ../gtk/parameters.ui.h:32
+#: ../gtk/parameters.ui.h:34
msgid "Manage SIP Accounts"
msgstr "Hantera SIP konton"
-#: ../gtk/parameters.ui.h:33
+#: ../gtk/parameters.ui.h:35
+msgid "Media encryption type"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:36
msgid "Multimedia settings"
msgstr "Multimedia inställningar"
-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:37
msgid "Network settings"
msgstr "Nätverksinställningar"
-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:38
msgid "Playback device:"
msgstr "Uppspelningsenhet:"
-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:39
msgid "Prefered video resolution:"
msgstr "Video upplösning:"
-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:40
msgid "Public IP address:"
msgstr "Publik IP adress:"
-#: ../gtk/parameters.ui.h:38
+#: ../gtk/parameters.ui.h:41
msgid ""
"Register to FONICS\n"
"virtual network !"
@@ -953,100 +1047,104 @@ msgstr ""
"Registrera hos FONICS\n"
"virtuella nätverk!"
-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:43
msgid "Remove"
msgstr "Ta bort"
-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:44
msgid "Ring device:"
msgstr "Ringning enhet:"
-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:45
msgid "Ring sound:"
msgstr "Ring signal:"
-#: ../gtk/parameters.ui.h:43
-msgid "SIP (TCP):"
+#: ../gtk/parameters.ui.h:46
+msgid "SIP (TCP)"
msgstr ""
-#: ../gtk/parameters.ui.h:44
-msgid "SIP (UDP):"
+#: ../gtk/parameters.ui.h:47
+msgid "SIP (TLS)"
msgstr ""
-#: ../gtk/parameters.ui.h:45
+#: ../gtk/parameters.ui.h:48
+msgid "SIP (UDP)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:49
msgid "Send DTMFs as SIP info"
msgstr "Kicka DTMF koder som SIP info"
-#: ../gtk/parameters.ui.h:46
+#: ../gtk/parameters.ui.h:50
msgid "Set Maximum Transmission Unit:"
msgstr "Välj MTU (Maximum Transmission Unit):"
-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:51
msgid "Settings"
msgstr "Inställningar"
-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:52
msgid "Show advanced settings"
msgstr "Visa avancerade inställningar"
-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:53
msgid "Stun server:"
msgstr "STUN server:"
-#: ../gtk/parameters.ui.h:50
+#: ../gtk/parameters.ui.h:54
msgid "This section defines your SIP address when not using a SIP account"
msgstr ""
"Denna sektion specificerar din SIP adress när du inte använder ett SIP konto"
-#: ../gtk/parameters.ui.h:51
+#: ../gtk/parameters.ui.h:55
msgid "Upload speed limit in Kbit/sec:"
msgstr "Max upstream bandbreddshastighet i kbit/sek:"
-#: ../gtk/parameters.ui.h:52
+#: ../gtk/parameters.ui.h:56
msgid "Use IPv6 instead of IPv4"
msgstr "Använd IPv6 istället av IPv4"
-#: ../gtk/parameters.ui.h:53
+#: ../gtk/parameters.ui.h:57
msgid "User interface"
msgstr "Användarinterface"
-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:58
msgid "Video RTP/UDP:"
msgstr ""
-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:59
#, fuzzy
msgid "Video codecs"
msgstr ""
"Audio codecs\n"
"Video codecs"
-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:60
msgid "Video input device:"
msgstr "Video ingångsenhet:"
-#: ../gtk/parameters.ui.h:57
+#: ../gtk/parameters.ui.h:61
msgid "Your display name (eg: John Doe):"
msgstr "Ditt synliga namn, e.g. Kalle Karlsson:"
-#: ../gtk/parameters.ui.h:58
+#: ../gtk/parameters.ui.h:62
msgid "Your resulting SIP address:"
msgstr "Din SIP adress:"
-#: ../gtk/parameters.ui.h:59
+#: ../gtk/parameters.ui.h:63
msgid "Your username:"
msgstr "Ditt användarnamn:"
-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:64
#, fuzzy
msgid "a sound card"
msgstr "ett ljud kort\n"
-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:65
msgid "default camera"
msgstr "default kamera"
-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:66
msgid "default soundcard"
msgstr "default ljudkort"
@@ -1070,26 +1168,19 @@ msgstr "Linphone"
msgid "Please wait"
msgstr "Vänta"
-#: ../coreapi/linphonecore.c:165
-#, c-format
-msgid "You have missed %i call."
-msgid_plural "You have missed %i calls."
-msgstr[0] "Du har %i missat samtal"
-msgstr[1] "Du har %i missade samtal"
-
-#: ../coreapi/linphonecore.c:206
+#: ../coreapi/linphonecore.c:187
msgid "aborted"
msgstr "avbrytade"
-#: ../coreapi/linphonecore.c:209
+#: ../coreapi/linphonecore.c:190
msgid "completed"
msgstr "avslutade"
-#: ../coreapi/linphonecore.c:212
+#: ../coreapi/linphonecore.c:193
msgid "missed"
msgstr "missade"
-#: ../coreapi/linphonecore.c:217
+#: ../coreapi/linphonecore.c:198
#, c-format
msgid ""
"%s at %s\n"
@@ -1104,27 +1195,23 @@ msgstr ""
"Status: %s\n"
"Längd: %i min %i sek\n"
-#: ../coreapi/linphonecore.c:218
-msgid "Incoming call"
-msgstr "Inkommande samtal"
-
-#: ../coreapi/linphonecore.c:218
+#: ../coreapi/linphonecore.c:199
msgid "Outgoing call"
msgstr "Utgående samtal"
-#: ../coreapi/linphonecore.c:998
+#: ../coreapi/linphonecore.c:1088
msgid "Ready"
msgstr "Redo"
-#: ../coreapi/linphonecore.c:1773
+#: ../coreapi/linphonecore.c:1831
msgid "Looking for telephone number destination..."
msgstr "Leta efter telefonnummer för destinationen..."
-#: ../coreapi/linphonecore.c:1776
+#: ../coreapi/linphonecore.c:1834
msgid "Could not resolve this number."
msgstr "Kan inte nå dett nummer."
-#: ../coreapi/linphonecore.c:1820
+#: ../coreapi/linphonecore.c:1878
msgid ""
"Could not parse given sip address. A sip url usually looks like sip:"
"user@domain"
@@ -1132,54 +1219,42 @@ msgstr ""
"Kan inte förstå angiven SIP adress. En SIP adress vanligen ser ut som sip:"
"användare@domänen"
-#: ../coreapi/linphonecore.c:1967
+#: ../coreapi/linphonecore.c:2025
msgid "Contacting"
msgstr "Kontaktar"
-#: ../coreapi/linphonecore.c:1974
+#: ../coreapi/linphonecore.c:2032
#, fuzzy
msgid "Could not call"
msgstr "Kunde inte ringa"
-#: ../coreapi/linphonecore.c:2081
-msgid "Sorry, you have to pause or stop the current call first !"
-msgstr ""
-
-#: ../coreapi/linphonecore.c:2086
+#: ../coreapi/linphonecore.c:2140
msgid "Sorry, we have reached the maximum number of simultaneous calls"
msgstr ""
-#: ../coreapi/linphonecore.c:2208
+#: ../coreapi/linphonecore.c:2270
msgid "Modifying call parameters..."
msgstr ""
-#: ../coreapi/linphonecore.c:2311
+#: ../coreapi/linphonecore.c:2366
msgid "Connected."
msgstr "Kopplad"
-#: ../coreapi/linphonecore.c:2334
+#: ../coreapi/linphonecore.c:2389
#, fuzzy
msgid "Call aborted"
msgstr "avbrytade"
-#: ../coreapi/linphonecore.c:2374
-msgid "Call ended"
-msgstr "Samtalet slut"
-
-#: ../coreapi/linphonecore.c:2456
+#: ../coreapi/linphonecore.c:2530
#, fuzzy
msgid "Could not pause the call"
msgstr "Kunde inte ringa"
-#: ../coreapi/linphonecore.c:2460
+#: ../coreapi/linphonecore.c:2535
#, fuzzy
msgid "Pausing the current call..."
msgstr "Nuvarande samtal"
-#: ../coreapi/linphonecore.c:2499
-msgid "There is already a call in process, pause or stop it first."
-msgstr ""
-
#: ../coreapi/misc.c:147
msgid ""
"Your computer appears to be using ALSA sound drivers.\n"
@@ -1256,7 +1331,7 @@ msgstr "Pågående"
msgid "Unknown-bug"
msgstr "Okänd bug"
-#: ../coreapi/proxy.c:187
+#: ../coreapi/proxy.c:192
msgid ""
"The sip proxy address you entered is invalid, it must start with \"sip:\" "
"followed by a hostname."
@@ -1264,7 +1339,7 @@ msgstr ""
"SIP proxy adressen som du matade in är inte rätt, adressen måste starta med "
"\"sip:\", följd av ett hostnamn"
-#: ../coreapi/proxy.c:193
+#: ../coreapi/proxy.c:198
msgid ""
"The sip identity you entered is invalid.\n"
"It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1272,142 +1347,190 @@ msgstr ""
"SIP adressen som du matade in är inte rätt. Adressen borde se ut som sip:"
"namn@domän, såsom sip:peter@exempel.se"
-#: ../coreapi/proxy.c:671
+#: ../coreapi/proxy.c:690
#, c-format
msgid "Could not login as %s"
msgstr "Kunde inte logga in som %s"
-#: ../coreapi/callbacks.c:170
+#: ../coreapi/callbacks.c:206
#, fuzzy
msgid "is contacting you"
msgstr "kontaktar dig."
-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207
msgid " and asked autoanswer."
msgstr ""
-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207
msgid "."
msgstr ""
-#: ../coreapi/callbacks.c:226
+#: ../coreapi/callbacks.c:266
msgid "Remote ringing."
msgstr "Ringer hos motparten."
-#: ../coreapi/callbacks.c:242
+#: ../coreapi/callbacks.c:282
#, fuzzy
msgid "Remote ringing..."
msgstr "Ringer hos motparten."
-#: ../coreapi/callbacks.c:253
+#: ../coreapi/callbacks.c:293
msgid "Early media."
msgstr "Tidig media"
-#: ../coreapi/callbacks.c:291
+#: ../coreapi/callbacks.c:331
#, fuzzy, c-format
msgid "Call with %s is paused."
msgstr "Samtal med %s"
-#: ../coreapi/callbacks.c:302
+#: ../coreapi/callbacks.c:342
#, c-format
msgid "Call answered by %s - on hold."
msgstr ""
-#: ../coreapi/callbacks.c:317
+#: ../coreapi/callbacks.c:357
#, fuzzy
msgid "Call resumed."
msgstr "Samtalet slut"
-#: ../coreapi/callbacks.c:322
+#: ../coreapi/callbacks.c:362
#, c-format
msgid "Call answered by %s."
msgstr ""
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:432
msgid "We are being paused..."
msgstr ""
-#: ../coreapi/callbacks.c:387
+#: ../coreapi/callbacks.c:436
msgid "We have been resumed..."
msgstr ""
-#: ../coreapi/callbacks.c:424
+#: ../coreapi/callbacks.c:441
+msgid "Call has been updated by remote..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:473
msgid "Call terminated."
msgstr "Samtalet slut."
-#: ../coreapi/callbacks.c:431
+#: ../coreapi/callbacks.c:480
msgid "User is busy."
msgstr "Användare upptagen."
-#: ../coreapi/callbacks.c:432
+#: ../coreapi/callbacks.c:481
msgid "User is temporarily unavailable."
msgstr "Användaren temporärt inte tillgänglig."
#. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:434
+#: ../coreapi/callbacks.c:483
msgid "User does not want to be disturbed."
msgstr "Användaren vill inte bli störd."
-#: ../coreapi/callbacks.c:435
+#: ../coreapi/callbacks.c:484
msgid "Call declined."
msgstr "Samtalet avböjdes."
-#: ../coreapi/callbacks.c:447
+#: ../coreapi/callbacks.c:496
#, fuzzy
msgid "No response."
msgstr "Inget svar inom angiven tid"
-#: ../coreapi/callbacks.c:451
+#: ../coreapi/callbacks.c:500
msgid "Protocol error."
msgstr ""
-#: ../coreapi/callbacks.c:467
+#: ../coreapi/callbacks.c:516
#, fuzzy
msgid "Redirected"
msgstr "Omdirigerat till %s..."
-#: ../coreapi/callbacks.c:477
+#: ../coreapi/callbacks.c:526
msgid "Not found"
msgstr ""
-#: ../coreapi/callbacks.c:487
+#: ../coreapi/callbacks.c:551
msgid "No common codecs"
msgstr ""
-#: ../coreapi/callbacks.c:493
+#: ../coreapi/callbacks.c:557
#, fuzzy
msgid "Call failed."
msgstr "Samtalet avböjdes."
-#: ../coreapi/callbacks.c:557
+#: ../coreapi/callbacks.c:631
#, c-format
msgid "Registration on %s successful."
msgstr "Registrering hos %s lyckades."
-#: ../coreapi/callbacks.c:558
+#: ../coreapi/callbacks.c:632
#, c-format
msgid "Unregistration on %s done."
msgstr "Avregistrering hos %s lyckades."
-#: ../coreapi/callbacks.c:574
+#: ../coreapi/callbacks.c:648
msgid "no response timeout"
msgstr "Inget svar inom angiven tid"
-#: ../coreapi/callbacks.c:577
+#: ../coreapi/callbacks.c:651
#, c-format
msgid "Registration on %s failed: %s"
msgstr "Registrering hos %s mislyckades: %s"
-#: ../coreapi/callbacks.c:619
-#, c-format
-msgid "We are transferred to %s"
-msgstr ""
-
-#: ../coreapi/sal_eXosip2.c:815 ../coreapi/sal_eXosip2.c:817
+#: ../coreapi/sal_eXosip2.c:873 ../coreapi/sal_eXosip2.c:875
#, fuzzy
msgid "Authentication failure"
msgstr "Linphone - Autentisering krävs"
+#: ../coreapi/linphonecall.c:128
+#, fuzzy, c-format
+msgid "Authentication token is %s"
+msgstr "Linphone - Autentisering krävs"
+
+#: ../coreapi/linphonecall.c:1560
+#, c-format
+msgid "You have missed %i call."
+msgid_plural "You have missed %i calls."
+msgstr[0] "Du har %i missat samtal"
+msgstr[1] "Du har %i missade samtal"
+
+#~ msgid "Unmute"
+#~ msgstr "Mikrofon på"
+
+#~ msgid "<b>Contact list</b>"
+#~ msgstr "<b>Kontaktlista</b>"
+
+#, fuzzy
+#~ msgid "Audio & video"
+#~ msgstr "Audio & Video"
+
+#~ msgid "Audio only"
+#~ msgstr "Enbart audio"
+
+#~ msgid "Duration:"
+#~ msgstr "Förlopp:"
+
+#, fuzzy
+#~ msgid "_Call history"
+#~ msgstr "Samtalshistorik"
+
+#~ msgid "_Linphone"
+#~ msgstr "_inphone"
+
+#, fuzzy
+#~ msgid "gtk-cancel"
+#~ msgstr "Kopplad"
+
+#~ msgid "Register at startup"
+#~ msgstr "Registrera vid start"
+
+#, fuzzy
+#~ msgid "gtk-close"
+#~ msgstr "Kopplad"
+
+#~ msgid "<b>Ports</b>"
+#~ msgstr "<b>Portar</b>"
+
#~ msgid "Alsa sound source"
#~ msgstr "Alsa ljud ingång"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ef2d044b7a2077ba1035f4058c7f6bc283427261..3b80d1747427d99d4b6766f4e4246d6e1bb78ba7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: linphone 3.3.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-08 22:32+0200\n"
+"POT-Creation-Date: 2011-12-02 16:47+0100\n"
"PO-Revision-Date: 2011-01-08 23:51+0800\n"
"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -18,6 +18,19 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ../gtk/calllogs.c:71
+msgid "n/a"
+msgstr ""
+
+#: ../gtk/conference.c:33 ../gtk/incall_view.c:183
+msgid "Conference"
+msgstr ""
+
+#: ../gtk/conference.c:41
+#, fuzzy
+msgid "Me"
+msgstr "é™éŸ³"
+
#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
#, c-format
msgid "Couldn't find pixmap file: %s"
@@ -28,34 +41,38 @@ msgstr "æ— æ³•æ‰“å¼€ä½å›¾æ–‡ä»¶ï¼š%s"
msgid "Chat with %s"
msgstr "与 %s 通è¯"
-#: ../gtk/main.c:74
+#: ../gtk/main.c:83
msgid "log to stdout some debug information while running."
msgstr "è¿è¡Œæ—¶å‘æ ‡å‡†è¾“å‡ºè®°å½•è°ƒè¯•ä¿¡æ¯ã€‚"
-#: ../gtk/main.c:81
+#: ../gtk/main.c:90
+msgid "path to a file to write logs into."
+msgstr ""
+
+#: ../gtk/main.c:97
msgid "Start only in the system tray, do not show the main interface."
msgstr "å¯åŠ¨åˆ°ç³»ç»Ÿæ‰˜ç›˜ï¼Œä¸æ˜¾ç¤ºä¸»ç•Œé¢ã€‚"
-#: ../gtk/main.c:88
+#: ../gtk/main.c:104
msgid "address to call right now"
msgstr "现在呼å«çš„地å€"
-#: ../gtk/main.c:95
+#: ../gtk/main.c:111
msgid "if set automatically answer incoming calls"
msgstr "是å¦è®¾ç½®å‘¼å«è‡ªåŠ¨åº”ç”"
-#: ../gtk/main.c:102
+#: ../gtk/main.c:118
msgid ""
"Specifiy a working directory (should be the base of the installation, eg: c:"
"\\Program Files\\Linphone)"
msgstr "指定工作目录(应为安装目录例如 C:\\Program Files\\Linphone)"
-#: ../gtk/main.c:442
+#: ../gtk/main.c:464
#, c-format
msgid "Call with %s"
msgstr "与 %s 通è¯"
-#: ../gtk/main.c:826
+#: ../gtk/main.c:815
#, c-format
msgid ""
"%s would like to add you to his contact list.\n"
@@ -67,31 +84,63 @@ msgstr ""
"您是å¦å…许他看到您的在线状æ€æˆ–è€…å°†å®ƒåŠ ä¸ºæ‚¨çš„è”系人å…许?\n"
"如果您回ç”å¦ï¼Œåˆ™ä¼šå°†è¯¥äººä¸´æ—¶æ€§çš„放入黑åå•"
-#: ../gtk/main.c:904
+#: ../gtk/main.c:893
#, c-format
msgid ""
"Please enter your password for username <i>%s</i>\n"
" at domain <i>%s</i>:"
msgstr "请输入 %s@%s 的密ç ："
-#: ../gtk/main.c:1040
+#: ../gtk/main.c:993
+#, fuzzy
+msgid "Call error"
+msgstr "呼å«åŽ†å²"
+
+#: ../gtk/main.c:996 ../coreapi/linphonecore.c:2406
+msgid "Call ended"
+msgstr "呼å«ç»“æŸ"
+
+#: ../gtk/main.c:999 ../coreapi/linphonecore.c:199
+msgid "Incoming call"
+msgstr "呼入"
+
+#: ../gtk/main.c:1001 ../gtk/incall_view.c:292 ../gtk/main.ui.h:20
+msgid "Answer"
+msgstr ""
+
+#: ../gtk/main.c:1003 ../gtk/main.ui.h:29
+msgid "Decline"
+msgstr "æ‹’ç»"
+
+#: ../gtk/main.c:1009
+#, fuzzy
+msgid "Call paused"
+msgstr "ä¸æ–"
+
+#: ../gtk/main.c:1009
+#, c-format
+msgid "<span size=\"large\">by %s</span>"
+msgstr ""
+
+#: ../gtk/main.c:1165
msgid "Website link"
msgstr "网站"
-#: ../gtk/main.c:1076
+#: ../gtk/main.c:1205
msgid "Linphone - a video internet phone"
msgstr "Linphone - 互è”网视频电è¯"
-#: ../gtk/main.c:1095
+#: ../gtk/main.c:1295
#, c-format
msgid "%s (Default)"
msgstr "%s (默认)"
-#: ../gtk/main.c:1187
-msgid "Windows"
+#: ../gtk/main.c:1566 ../coreapi/callbacks.c:700
+#, c-format
+msgid "We are transferred to %s"
msgstr ""
-#: ../gtk/main.c:1364
+#: ../gtk/main.c:1576
msgid ""
"No sound cards have been detected on this computer.\n"
"You won't be able to send or receive audio calls."
@@ -99,141 +148,165 @@ msgstr ""
"未在æ¤è®¡ç®—机上检测到声å¡ã€‚\n"
"æ‚¨æ— æ³•å‘é€æˆ–接收音频呼å«ã€‚"
-#: ../gtk/main.c:1423
+#: ../gtk/main.c:1663
msgid "A free SIP video-phone"
msgstr "å…费的 SIP 视频电è¯"
-#: ../gtk/friendlist.c:192 ../gtk/propertybox.c:271 ../gtk/contact.ui.h:3
+#: ../gtk/friendlist.c:203
+msgid "Add to addressbook"
+msgstr ""
+
+#: ../gtk/friendlist.c:258 ../gtk/propertybox.c:296 ../gtk/contact.ui.h:3
msgid "Name"
msgstr "å称"
-#: ../gtk/friendlist.c:205
+#: ../gtk/friendlist.c:271
msgid "Presence status"
msgstr "在线状æ€"
-#: ../gtk/friendlist.c:242
+#: ../gtk/friendlist.c:308
#, c-format
msgid "Search in %s directory"
msgstr "在 %s 目录ä¸æŸ¥æ‰¾ "
-#: ../gtk/friendlist.c:450
+#: ../gtk/friendlist.c:568
msgid "Invalid sip contact !"
msgstr "æ— æ•ˆçš„ SIP è”系人ï¼"
-#: ../gtk/friendlist.c:495
+#: ../gtk/friendlist.c:613
#, c-format
msgid "Call %s"
msgstr "å‘¼å« %s"
-#: ../gtk/friendlist.c:496
+#: ../gtk/friendlist.c:614
#, c-format
msgid "Send text to %s"
msgstr "å‘é€æ¶ˆæ¯ç»™ %s"
-#: ../gtk/friendlist.c:497
+#: ../gtk/friendlist.c:615
#, c-format
msgid "Edit contact '%s'"
msgstr "编辑è”系人 %s"
-#: ../gtk/friendlist.c:498
+#: ../gtk/friendlist.c:616
#, c-format
msgid "Delete contact '%s'"
msgstr "åˆ é™¤è”系人 %s"
-#: ../gtk/friendlist.c:540
+#: ../gtk/friendlist.c:658
#, c-format
msgid "Add new contact from %s directory"
msgstr "从 %s ç›®å½•å¢žåŠ è”系人 "
-#: ../gtk/propertybox.c:277
+#: ../gtk/propertybox.c:302
msgid "Rate (Hz)"
msgstr "é‡‡æ ·çŽ‡(Hz)"
-#: ../gtk/propertybox.c:283
+#: ../gtk/propertybox.c:308
msgid "Status"
msgstr "状æ€"
-#: ../gtk/propertybox.c:289
+#: ../gtk/propertybox.c:314
msgid "Min bitrate (kbit/s)"
msgstr "最å°æ¯”特率(kbit/s)"
-#: ../gtk/propertybox.c:296
+#: ../gtk/propertybox.c:321
msgid "Parameters"
msgstr "å‚æ•°"
-#: ../gtk/propertybox.c:326 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507
msgid "Enabled"
msgstr "å¯ç”¨"
-#: ../gtk/propertybox.c:327 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507
msgid "Disabled"
msgstr "ç¦ç”¨"
-#: ../gtk/propertybox.c:510
+#: ../gtk/propertybox.c:553
msgid "Account"
msgstr "å¸æˆ·"
-#: ../gtk/propertybox.c:650
+#: ../gtk/propertybox.c:693
msgid "English"
msgstr "英è¯"
-#: ../gtk/propertybox.c:651
+#: ../gtk/propertybox.c:694
msgid "French"
msgstr "法è¯"
-#: ../gtk/propertybox.c:652
+#: ../gtk/propertybox.c:695
msgid "Swedish"
msgstr "ç‘žå…¸è¯"
-#: ../gtk/propertybox.c:653
+#: ../gtk/propertybox.c:696
msgid "Italian"
msgstr "æ„大利è¯"
-#: ../gtk/propertybox.c:654
+#: ../gtk/propertybox.c:697
msgid "Spanish"
msgstr "西ç牙è¯"
-#: ../gtk/propertybox.c:655
+#: ../gtk/propertybox.c:698
msgid "Brazilian Portugese"
msgstr "巴西葡è„牙è¯"
-#: ../gtk/propertybox.c:656
+#: ../gtk/propertybox.c:699
msgid "Polish"
msgstr "波兰è¯"
-#: ../gtk/propertybox.c:657
+#: ../gtk/propertybox.c:700
msgid "German"
msgstr "å¾·è¯"
-#: ../gtk/propertybox.c:658
+#: ../gtk/propertybox.c:701
msgid "Russian"
msgstr "ä¿„è¯"
-#: ../gtk/propertybox.c:659
+#: ../gtk/propertybox.c:702
msgid "Japanese"
msgstr "æ—¥è¯"
-#: ../gtk/propertybox.c:660
+#: ../gtk/propertybox.c:703
msgid "Dutch"
msgstr "è·å…°è¯"
-#: ../gtk/propertybox.c:661
+#: ../gtk/propertybox.c:704
msgid "Hungarian"
msgstr "匈牙利è¯"
-#: ../gtk/propertybox.c:662
+#: ../gtk/propertybox.c:705
msgid "Czech"
msgstr "æ·å…‹è¯"
-#: ../gtk/propertybox.c:663
+#: ../gtk/propertybox.c:706
msgid "Chinese"
msgstr "ä¸æ–‡"
-#: ../gtk/propertybox.c:720
+#: ../gtk/propertybox.c:707
+msgid "Traditional Chinese"
+msgstr ""
+
+#: ../gtk/propertybox.c:708
+msgid "Norwegian"
+msgstr ""
+
+#: ../gtk/propertybox.c:765
msgid ""
"You need to restart linphone for the new language selection to take effect."
msgstr "您需è¦é‡å¯ linphone 以使è¯è¨€é€‰æ‹©ç”Ÿæ•ˆã€‚"
+#: ../gtk/propertybox.c:835
+msgid "None"
+msgstr ""
+
+#: ../gtk/propertybox.c:839
+msgid "SRTP"
+msgstr ""
+
+#: ../gtk/propertybox.c:845
+msgid "ZRTP"
+msgstr ""
+
#: ../gtk/update.c:80
#, c-format
msgid ""
@@ -350,75 +423,102 @@ msgstr "æ£åœ¨åˆ›å»ºæ‚¨çš„å¸æˆ·"
msgid "Now ready !"
msgstr "就绪ï¼"
-#: ../gtk/incall_view.c:61
+#: ../gtk/incall_view.c:69
#, fuzzy, c-format
msgid "Call #%i"
msgstr "å‘¼å« %s"
-#: ../gtk/incall_view.c:87
+#: ../gtk/incall_view.c:127
#, c-format
msgid "Transfer to call #%i with %s"
msgstr ""
-#: ../gtk/incall_view.c:113
+#: ../gtk/incall_view.c:155
msgid "Transfer"
msgstr ""
-#: ../gtk/incall_view.c:187
+#: ../gtk/incall_view.c:271
msgid "<b>Calling...</b>"
msgstr "<b>æ£åœ¨å‘¼å«...</b>"
-#: ../gtk/incall_view.c:190 ../gtk/incall_view.c:246
+#: ../gtk/incall_view.c:274 ../gtk/incall_view.c:482
msgid "00::00::00"
msgstr "00::00::00"
-#: ../gtk/incall_view.c:206
+#: ../gtk/incall_view.c:285
#, fuzzy
msgid "<b>Incoming call</b>"
msgstr "呼入"
-#: ../gtk/incall_view.c:216
-msgid ""
-"Pause all calls\n"
-"and answer"
+#: ../gtk/incall_view.c:322
+msgid "good"
msgstr ""
-#: ../gtk/incall_view.c:217 ../gtk/main.ui.h:20
-msgid "Answer"
+#: ../gtk/incall_view.c:324
+msgid "average"
+msgstr ""
+
+#: ../gtk/incall_view.c:326
+msgid "poor"
+msgstr ""
+
+#: ../gtk/incall_view.c:328
+msgid "very poor"
msgstr ""
-#: ../gtk/incall_view.c:244
+#: ../gtk/incall_view.c:330
+msgid "too bad"
+msgstr ""
+
+#: ../gtk/incall_view.c:331 ../gtk/incall_view.c:347
+msgid "unavailable"
+msgstr ""
+
+#: ../gtk/incall_view.c:447
+msgid "Secured by SRTP"
+msgstr ""
+
+#: ../gtk/incall_view.c:453
+#, c-format
+msgid "Secured by ZRTP - [auth token: %s]"
+msgstr ""
+
+#: ../gtk/incall_view.c:459
+msgid "Set unverified"
+msgstr ""
+
+#: ../gtk/incall_view.c:459 ../gtk/main.ui.h:49
+msgid "Set verified"
+msgstr ""
+
+#: ../gtk/incall_view.c:480
+msgid "In conference"
+msgstr ""
+
+#: ../gtk/incall_view.c:480
#, fuzzy
msgid "<b>In call</b>"
msgstr "<b>æ£åœ¨å‘¼å«</b>"
-#: ../gtk/incall_view.c:260
+#: ../gtk/incall_view.c:499
#, fuzzy
msgid "<b>Paused call</b>"
msgstr "<b>æ£åœ¨å‘¼å«</b>"
-#: ../gtk/incall_view.c:272
+#: ../gtk/incall_view.c:511
#, c-format
msgid "%02i::%02i::%02i"
msgstr "%02i::%02i::%02i"
-#: ../gtk/incall_view.c:288
+#: ../gtk/incall_view.c:527
msgid "<b>Call ended.</b>"
msgstr "<b>通è¯ç»“æŸã€‚</b>"
-#: ../gtk/incall_view.c:309
-msgid "Unmute"
-msgstr "å–消é™éŸ³"
-
-#: ../gtk/incall_view.c:316 ../gtk/main.ui.h:42
-msgid "Mute"
-msgstr "é™éŸ³"
-
-#: ../gtk/incall_view.c:340
+#: ../gtk/incall_view.c:584
msgid "Resume"
msgstr ""
-#: ../gtk/incall_view.c:347 ../gtk/main.ui.h:46
+#: ../gtk/incall_view.c:591 ../gtk/main.ui.h:45
msgid "Pause"
msgstr ""
@@ -480,8 +580,9 @@ msgid "<b>Add contacts from directory</b>"
msgstr "<b>ä»Žç›®å½•å¢žåŠ è”系人</b>"
#: ../gtk/main.ui.h:14
-msgid "<b>Contact list</b>"
-msgstr "<b>è”系人列表</b>"
+#, fuzzy
+msgid "<b>Callee name</b>"
+msgstr "<b>通è¯ç»“æŸã€‚</b>"
#: ../gtk/main.ui.h:15
msgid "<b>Welcome !</b>"
@@ -505,26 +606,26 @@ msgid "All users"
msgstr ""
#: ../gtk/main.ui.h:21
-#, fuzzy
-msgid "Audio & video"
-msgstr "音频和视频"
-
-#: ../gtk/main.ui.h:22
-msgid "Audio only"
-msgstr "音频"
-
-#: ../gtk/main.ui.h:23
msgid "Automatically log me in"
msgstr "自动登录"
-#: ../gtk/main.ui.h:24
+#: ../gtk/main.ui.h:22
msgid "B"
msgstr "B"
-#: ../gtk/main.ui.h:25 ../gtk/parameters.ui.h:20
+#: ../gtk/main.ui.h:23 ../gtk/parameters.ui.h:21
msgid "C"
msgstr "C"
+#: ../gtk/main.ui.h:24
+#, fuzzy
+msgid "Call"
+msgstr "å‘¼å« %s"
+
+#: ../gtk/main.ui.h:25
+msgid "Call quality rating"
+msgstr ""
+
#: ../gtk/main.ui.h:26
#, fuzzy
msgid "Check _Updates"
@@ -538,10 +639,6 @@ msgstr "è”系人"
msgid "D"
msgstr "D"
-#: ../gtk/main.ui.h:29
-msgid "Decline"
-msgstr "æ‹’ç»"
-
#: ../gtk/main.ui.h:30
msgid "Default"
msgstr "默认"
@@ -551,13 +648,14 @@ msgid "Duration"
msgstr "通è¯æ—¶é—´"
#: ../gtk/main.ui.h:32
-msgid "Duration:"
-msgstr "通è¯è®¡æ—¶ï¼š"
-
-#: ../gtk/main.ui.h:33
msgid "Enable self-view"
msgstr "å¯ç”¨è‡ªè§†"
+#: ../gtk/main.ui.h:33
+#, fuzzy
+msgid "Enable video"
+msgstr "å¯ç”¨"
+
#: ../gtk/main.ui.h:34
msgid "Enter username, phone number, or full sip address"
msgstr "请输入用户åã€ç”µè¯å·ç 或完整的 SIP 地å€"
@@ -593,21 +691,26 @@ msgstr "登录信æ¯"
msgid "Lookup:"
msgstr "查找："
-#: ../gtk/main.ui.h:43
+#: ../gtk/main.ui.h:42
msgid "My current identity:"
msgstr "当å‰åœ°å€ï¼š"
-#: ../gtk/main.ui.h:44
+#: ../gtk/main.ui.h:43
#, fuzzy
msgid "Online users"
msgstr ""
"全部用户\n"
"在线用户"
-#: ../gtk/main.ui.h:45
+#: ../gtk/main.ui.h:44
msgid "Password"
msgstr "密ç "
+#: ../gtk/main.ui.h:46
+#, fuzzy
+msgid "Recent calls"
+msgstr "呼入"
+
#: ../gtk/main.ui.h:47
msgid "SIP address or phone number:"
msgstr "SIP 地å€æˆ–电è¯å·ç ："
@@ -616,20 +719,15 @@ msgstr "SIP 地å€æˆ–电è¯å·ç ："
msgid "Search"
msgstr "æœç´¢"
-#: ../gtk/main.ui.h:49
+#: ../gtk/main.ui.h:50
#, fuzzy
msgid "Show debug window"
msgstr "Linphone 调试窗å£"
-#: ../gtk/main.ui.h:50
+#: ../gtk/main.ui.h:51
msgid "Username"
msgstr "用户å"
-#: ../gtk/main.ui.h:51
-#, fuzzy
-msgid "_Call history"
-msgstr "呼å«åŽ†å²"
-
#: ../gtk/main.ui.h:52
msgid "_Help"
msgstr ""
@@ -640,18 +738,14 @@ msgid "_Homepage"
msgstr "主页"
#: ../gtk/main.ui.h:54
-msgid "_Linphone"
-msgstr "_Linphone"
-
-#: ../gtk/main.ui.h:55
msgid "_Options"
msgstr ""
-#: ../gtk/main.ui.h:56
+#: ../gtk/main.ui.h:55
msgid "in"
msgstr "于"
-#: ../gtk/main.ui.h:57
+#: ../gtk/main.ui.h:56
msgid "label"
msgstr "æ ‡ç¾"
@@ -710,14 +804,6 @@ msgstr "SIP 地å€"
msgid "Show this contact presence status"
msgstr "显示该è”系人的在线状æ€"
-#: ../gtk/contact.ui.h:6
-msgid "gtk-cancel"
-msgstr ""
-
-#: ../gtk/contact.ui.h:7
-msgid "gtk-ok"
-msgstr ""
-
#: ../gtk/log.ui.h:1
msgid "Linphone debug window"
msgstr "Linphone 调试窗å£"
@@ -773,8 +859,8 @@ msgid "Publish presence information"
msgstr "å‘布在线状æ€"
#: ../gtk/sip_account.ui.h:6
-msgid "Register at startup"
-msgstr "在å¯åŠ¨æ—¶æ³¨å†Œ"
+msgid "Register"
+msgstr ""
#: ../gtk/sip_account.ui.h:7
msgid "Registration duration (sec):"
@@ -800,10 +886,6 @@ msgstr "sip:"
msgid "Send"
msgstr "å‘é€"
-#: ../gtk/chatroom.ui.h:2
-msgid "gtk-close"
-msgstr ""
-
#: ../gtk/parameters.ui.h:1
msgid "0 stands for \"unlimited\""
msgstr "0 表示 “没有é™åˆ¶â€"
@@ -837,8 +919,8 @@ msgid "<b>NAT and Firewall</b>"
msgstr "<b>NAT åŠé˜²ç«å¢™</b>"
#: ../gtk/parameters.ui.h:9
-msgid "<b>Ports</b>"
-msgstr "<b>端å£</b>"
+msgid "<b>Network protocol and ports</b>"
+msgstr ""
#: ../gtk/parameters.ui.h:10
msgid "<b>Privacy</b>"
@@ -857,101 +939,115 @@ msgid "<b>Video</b>"
msgstr "<b>视频</b>"
#: ../gtk/parameters.ui.h:14
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:15
msgid "ALSA special device (optional):"
msgstr "ALSA 特殊设备(å¯é€‰)："
-#: ../gtk/parameters.ui.h:15
+#: ../gtk/parameters.ui.h:16
msgid "Add"
msgstr "æ·»åŠ "
-#: ../gtk/parameters.ui.h:16
+#: ../gtk/parameters.ui.h:17
msgid "Audio RTP/UDP:"
msgstr "音频 RTP/UDP："
-#: ../gtk/parameters.ui.h:17
+#: ../gtk/parameters.ui.h:18
#, fuzzy
msgid "Audio codecs"
msgstr ""
"音频编解ç 器\n"
"视频编解ç 器"
-#: ../gtk/parameters.ui.h:18
+#: ../gtk/parameters.ui.h:19
msgid "Behind NAT / Firewall (specify gateway IP below)"
msgstr "在 NAT 或防ç«å¢™åŽ(填写网关 IP)"
-#: ../gtk/parameters.ui.h:19
+#: ../gtk/parameters.ui.h:20
msgid "Behind NAT / Firewall (use STUN to resolve)"
msgstr "在 NAT 或防ç«å¢™åŽ(使用 STUN 解决)"
-#: ../gtk/parameters.ui.h:21
+#: ../gtk/parameters.ui.h:22
msgid "CIF"
msgstr "CIF"
-#: ../gtk/parameters.ui.h:22
+#: ../gtk/parameters.ui.h:23
msgid "Capture device:"
msgstr "录音设备："
-#: ../gtk/parameters.ui.h:23
+#: ../gtk/parameters.ui.h:24
msgid "Codecs"
msgstr "编解ç 器"
-#: ../gtk/parameters.ui.h:24
+#: ../gtk/parameters.ui.h:25
msgid "Direct connection to the Internet"
msgstr "直接连接到互è”网"
-#: ../gtk/parameters.ui.h:25
+#: ../gtk/parameters.ui.h:26
msgid "Disable"
msgstr "ç¦ç”¨"
-#: ../gtk/parameters.ui.h:26
+#: ../gtk/parameters.ui.h:27
msgid "Done"
msgstr "完æˆ"
-#: ../gtk/parameters.ui.h:27
+#: ../gtk/parameters.ui.h:28
msgid "Download speed limit in Kbit/sec:"
msgstr "下载速率é™åˆ¶ kbit/s："
-#: ../gtk/parameters.ui.h:28
+#: ../gtk/parameters.ui.h:29
msgid "Edit"
msgstr "编辑"
-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:30
msgid "Enable"
msgstr "å¯ç”¨"
-#: ../gtk/parameters.ui.h:30
+#: ../gtk/parameters.ui.h:31
+msgid "Enable adaptive rate control"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:32
msgid "Enable echo cancellation"
msgstr "å¯ç”¨å›žå£°æŠ‘制"
-#: ../gtk/parameters.ui.h:31
+#: ../gtk/parameters.ui.h:33
msgid "Erase all passwords"
msgstr "清除所有密ç "
-#: ../gtk/parameters.ui.h:32
+#: ../gtk/parameters.ui.h:34
msgid "Manage SIP Accounts"
msgstr "SIP å¸æˆ·ç®¡ç†"
-#: ../gtk/parameters.ui.h:33
+#: ../gtk/parameters.ui.h:35
+msgid "Media encryption type"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:36
msgid "Multimedia settings"
msgstr "音视频设置"
-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:37
msgid "Network settings"
msgstr "网络设置"
-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:38
msgid "Playback device:"
msgstr "回放设备："
-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:39
msgid "Prefered video resolution:"
msgstr "视频分辨率："
-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:40
msgid "Public IP address:"
msgstr "公网 IP 地å€ï¼š"
-#: ../gtk/parameters.ui.h:38
+#: ../gtk/parameters.ui.h:41
msgid ""
"Register to FONICS\n"
"virtual network !"
@@ -959,100 +1055,106 @@ msgstr ""
"注册到 FONICS\n"
"虚拟网络!"
-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:43
msgid "Remove"
msgstr "移除"
-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:44
msgid "Ring device:"
msgstr "å“铃设备："
-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:45
msgid "Ring sound:"
msgstr "铃声文件："
-#: ../gtk/parameters.ui.h:43
+#: ../gtk/parameters.ui.h:46
#, fuzzy
-msgid "SIP (TCP):"
+msgid "SIP (TCP)"
msgstr "SIP (UDP)："
-#: ../gtk/parameters.ui.h:44
-msgid "SIP (UDP):"
+#: ../gtk/parameters.ui.h:47
+#, fuzzy
+msgid "SIP (TLS)"
msgstr "SIP (UDP)："
-#: ../gtk/parameters.ui.h:45
+#: ../gtk/parameters.ui.h:48
+#, fuzzy
+msgid "SIP (UDP)"
+msgstr "SIP (UDP)："
+
+#: ../gtk/parameters.ui.h:49
msgid "Send DTMFs as SIP info"
msgstr "以 SIP 消æ¯å‘é€ DTMF"
-#: ../gtk/parameters.ui.h:46
+#: ../gtk/parameters.ui.h:50
msgid "Set Maximum Transmission Unit:"
msgstr "è®¾ç½®æœ€å¤§ä¼ è¾“å•å…ƒ(MTU)："
-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:51
msgid "Settings"
msgstr "设置"
-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:52
msgid "Show advanced settings"
msgstr "显示高级设置"
-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:53
msgid "Stun server:"
msgstr "Stun æœåŠ¡å™¨ï¼š"
-#: ../gtk/parameters.ui.h:50
+#: ../gtk/parameters.ui.h:54
msgid "This section defines your SIP address when not using a SIP account"
msgstr "该段在您ä¸ä½¿ç”¨SIPå¸æˆ·æ—¶çš„SIP地å€"
-#: ../gtk/parameters.ui.h:51
+#: ../gtk/parameters.ui.h:55
msgid "Upload speed limit in Kbit/sec:"
msgstr "ä¸Šä¼ é€ŸçŽ‡é™åˆ¶ kbit/s："
-#: ../gtk/parameters.ui.h:52
+#: ../gtk/parameters.ui.h:56
msgid "Use IPv6 instead of IPv4"
msgstr "使用 IPv6 è€Œéž IPv4"
-#: ../gtk/parameters.ui.h:53
+#: ../gtk/parameters.ui.h:57
msgid "User interface"
msgstr "用户界é¢"
-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:58
msgid "Video RTP/UDP:"
msgstr "视频 RTP/UDP："
-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:59
#, fuzzy
msgid "Video codecs"
msgstr ""
"音频编解ç 器\n"
"视频编解ç 器"
-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:60
msgid "Video input device:"
msgstr "视频输入设备："
-#: ../gtk/parameters.ui.h:57
+#: ../gtk/parameters.ui.h:61
msgid "Your display name (eg: John Doe):"
msgstr "您的显示å："
-#: ../gtk/parameters.ui.h:58
+#: ../gtk/parameters.ui.h:62
msgid "Your resulting SIP address:"
msgstr "您的 SIP 地å€ç»“果："
-#: ../gtk/parameters.ui.h:59
+#: ../gtk/parameters.ui.h:63
msgid "Your username:"
msgstr "您的用户å："
-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:64
#, fuzzy
msgid "a sound card"
msgstr "声å¡\n"
-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:65
msgid "default camera"
msgstr "默认摄åƒå¤´"
-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:66
msgid "default soundcard"
msgstr "默认声å¡"
@@ -1076,25 +1178,19 @@ msgstr "Linphone"
msgid "Please wait"
msgstr "请ç¨å€™"
-#: ../coreapi/linphonecore.c:165
-#, c-format
-msgid "You have missed %i call."
-msgid_plural "You have missed %i calls."
-msgstr[0] "您错过了 %i 个呼å«ã€‚"
-
-#: ../coreapi/linphonecore.c:206
+#: ../coreapi/linphonecore.c:187
msgid "aborted"
msgstr "ä¸æ–"
-#: ../coreapi/linphonecore.c:209
+#: ../coreapi/linphonecore.c:190
msgid "completed"
msgstr "完æˆ"
-#: ../coreapi/linphonecore.c:212
+#: ../coreapi/linphonecore.c:193
msgid "missed"
msgstr "丢失"
-#: ../coreapi/linphonecore.c:217
+#: ../coreapi/linphonecore.c:198
#, c-format
msgid ""
"%s at %s\n"
@@ -1109,27 +1205,23 @@ msgstr ""
"状æ€ï¼š%s\n"
"状æ€ï¼š%i 分 %i 秒\n"
-#: ../coreapi/linphonecore.c:218
-msgid "Incoming call"
-msgstr "呼入"
-
-#: ../coreapi/linphonecore.c:218
+#: ../coreapi/linphonecore.c:199
msgid "Outgoing call"
msgstr "呼出"
-#: ../coreapi/linphonecore.c:998
+#: ../coreapi/linphonecore.c:1088
msgid "Ready"
msgstr "就绪"
-#: ../coreapi/linphonecore.c:1773
+#: ../coreapi/linphonecore.c:1831
msgid "Looking for telephone number destination..."
msgstr "查询电è¯å·ç 目的地..."
-#: ../coreapi/linphonecore.c:1776
+#: ../coreapi/linphonecore.c:1834
msgid "Could not resolve this number."
msgstr "该å·ç æ— æ³•è§£æžã€‚"
-#: ../coreapi/linphonecore.c:1820
+#: ../coreapi/linphonecore.c:1878
msgid ""
"Could not parse given sip address. A sip url usually looks like sip:"
"user@domain"
@@ -1137,53 +1229,41 @@ msgstr ""
"æ— æ³•è§£æžç»™å®šçš„ SIP 地å€ï¼ŒSIP 地å€åº”æœ‰å¦‚ä¸‹æ ¼å¼ï¼š\n"
"sip:用户å@域å"
-#: ../coreapi/linphonecore.c:1967
+#: ../coreapi/linphonecore.c:2025
msgid "Contacting"
msgstr "è”ç³»ä¸"
-#: ../coreapi/linphonecore.c:1974
+#: ../coreapi/linphonecore.c:2032
#, fuzzy
msgid "Could not call"
msgstr "æ— æ³•å‘¼å«"
-#: ../coreapi/linphonecore.c:2081
-msgid "Sorry, you have to pause or stop the current call first !"
-msgstr ""
-
-#: ../coreapi/linphonecore.c:2086
+#: ../coreapi/linphonecore.c:2140
msgid "Sorry, we have reached the maximum number of simultaneous calls"
msgstr ""
-#: ../coreapi/linphonecore.c:2208
+#: ../coreapi/linphonecore.c:2270
msgid "Modifying call parameters..."
msgstr ""
-#: ../coreapi/linphonecore.c:2311
+#: ../coreapi/linphonecore.c:2366
msgid "Connected."
msgstr "已连接。"
-#: ../coreapi/linphonecore.c:2334
+#: ../coreapi/linphonecore.c:2389
#, fuzzy
msgid "Call aborted"
msgstr "ä¸æ–"
-#: ../coreapi/linphonecore.c:2374
-msgid "Call ended"
-msgstr "呼å«ç»“æŸ"
-
-#: ../coreapi/linphonecore.c:2456
+#: ../coreapi/linphonecore.c:2530
#, fuzzy
msgid "Could not pause the call"
msgstr "æ— æ³•å‘¼å«"
-#: ../coreapi/linphonecore.c:2460
+#: ../coreapi/linphonecore.c:2535
msgid "Pausing the current call..."
msgstr ""
-#: ../coreapi/linphonecore.c:2499
-msgid "There is already a call in process, pause or stop it first."
-msgstr ""
-
#: ../coreapi/misc.c:147
msgid ""
"Your computer appears to be using ALSA sound drivers.\n"
@@ -1258,13 +1338,13 @@ msgstr "挂起"
msgid "Unknown-bug"
msgstr "未知错误"
-#: ../coreapi/proxy.c:187
+#: ../coreapi/proxy.c:192
msgid ""
"The sip proxy address you entered is invalid, it must start with \"sip:\" "
"followed by a hostname."
msgstr "您输入的 SIP 代ç†åœ°å€æ— 效，它必须是以“sip:â€å¼€å¤´ï¼Œå¹¶ç´§éšä¸€ä¸ªä¸»æœºå。"
-#: ../coreapi/proxy.c:193
+#: ../coreapi/proxy.c:198
msgid ""
"The sip identity you entered is invalid.\n"
"It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1272,138 +1352,177 @@ msgstr ""
"您输入的地å€æ— 效。\n"
"它应具有“sip:用户å@代ç†åŸŸâ€çš„å½¢å¼ï¼Œä¾‹å¦‚ sip:alice@example.net"
-#: ../coreapi/proxy.c:671
+#: ../coreapi/proxy.c:690
#, c-format
msgid "Could not login as %s"
msgstr "æ— æ³•ç™»å½•ä¸º %s"
-#: ../coreapi/callbacks.c:170
+#: ../coreapi/callbacks.c:206
msgid "is contacting you"
msgstr "æ£åœ¨è”系您"
-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207
msgid " and asked autoanswer."
msgstr " 并询问了自动回ç”。"
-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207
msgid "."
msgstr "."
-#: ../coreapi/callbacks.c:226
+#: ../coreapi/callbacks.c:266
msgid "Remote ringing."
msgstr "å“铃。"
-#: ../coreapi/callbacks.c:242
+#: ../coreapi/callbacks.c:282
#, fuzzy
msgid "Remote ringing..."
msgstr "å“铃。"
-#: ../coreapi/callbacks.c:253
+#: ../coreapi/callbacks.c:293
msgid "Early media."
msgstr ""
-#: ../coreapi/callbacks.c:291
+#: ../coreapi/callbacks.c:331
#, fuzzy, c-format
msgid "Call with %s is paused."
msgstr "与 %s 通è¯"
-#: ../coreapi/callbacks.c:302
+#: ../coreapi/callbacks.c:342
#, c-format
msgid "Call answered by %s - on hold."
msgstr ""
-#: ../coreapi/callbacks.c:317
+#: ../coreapi/callbacks.c:357
#, fuzzy
msgid "Call resumed."
msgstr "呼å«ç»“æŸ"
-#: ../coreapi/callbacks.c:322
+#: ../coreapi/callbacks.c:362
#, c-format
msgid "Call answered by %s."
msgstr ""
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:432
msgid "We are being paused..."
msgstr ""
-#: ../coreapi/callbacks.c:387
+#: ../coreapi/callbacks.c:436
msgid "We have been resumed..."
msgstr ""
-#: ../coreapi/callbacks.c:424
+#: ../coreapi/callbacks.c:441
+msgid "Call has been updated by remote..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:473
msgid "Call terminated."
msgstr "通è¯ç»“æŸã€‚"
-#: ../coreapi/callbacks.c:431
+#: ../coreapi/callbacks.c:480
msgid "User is busy."
msgstr "被å«æ£å¿™ã€‚"
-#: ../coreapi/callbacks.c:432
+#: ../coreapi/callbacks.c:481
msgid "User is temporarily unavailable."
msgstr "您呼å«çš„ç”¨æˆ·æš‚æ—¶æ— æ³•æŽ¥é€šã€‚"
#. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:434
+#: ../coreapi/callbacks.c:483
msgid "User does not want to be disturbed."
msgstr "用户已开å¯å…打扰功能。"
-#: ../coreapi/callbacks.c:435
+#: ../coreapi/callbacks.c:484
msgid "Call declined."
msgstr "呼å«è¢«æ‹’ç»ã€‚"
-#: ../coreapi/callbacks.c:447
+#: ../coreapi/callbacks.c:496
msgid "No response."
msgstr "没有å“应。"
-#: ../coreapi/callbacks.c:451
+#: ../coreapi/callbacks.c:500
msgid "Protocol error."
msgstr "å议错误。"
-#: ../coreapi/callbacks.c:467
+#: ../coreapi/callbacks.c:516
msgid "Redirected"
msgstr "å·²é‡å®šå‘"
-#: ../coreapi/callbacks.c:477
+#: ../coreapi/callbacks.c:526
msgid "Not found"
msgstr "未找到"
-#: ../coreapi/callbacks.c:487
+#: ../coreapi/callbacks.c:551
msgid "No common codecs"
msgstr "未找到常用编解ç 器"
-#: ../coreapi/callbacks.c:493
+#: ../coreapi/callbacks.c:557
msgid "Call failed."
msgstr "呼å«å¤±è´¥ã€‚"
-#: ../coreapi/callbacks.c:557
+#: ../coreapi/callbacks.c:631
#, c-format
msgid "Registration on %s successful."
msgstr "æˆåŠŸæ³¨å†Œåˆ° %s"
-#: ../coreapi/callbacks.c:558
+#: ../coreapi/callbacks.c:632
#, c-format
msgid "Unregistration on %s done."
msgstr "已在 %s 解除注册。"
-#: ../coreapi/callbacks.c:574
+#: ../coreapi/callbacks.c:648
msgid "no response timeout"
msgstr "没有å“应，超时"
-#: ../coreapi/callbacks.c:577
+#: ../coreapi/callbacks.c:651
#, c-format
msgid "Registration on %s failed: %s"
msgstr "注册到 %s 失败: %s"
-#: ../coreapi/callbacks.c:619
-#, c-format
-msgid "We are transferred to %s"
-msgstr ""
-
-#: ../coreapi/sal_eXosip2.c:815 ../coreapi/sal_eXosip2.c:817
+#: ../coreapi/sal_eXosip2.c:873 ../coreapi/sal_eXosip2.c:875
#, fuzzy
msgid "Authentication failure"
msgstr "Linphone - 需è¦è®¤è¯"
+#: ../coreapi/linphonecall.c:128
+#, fuzzy, c-format
+msgid "Authentication token is %s"
+msgstr "Linphone - 需è¦è®¤è¯"
+
+#: ../coreapi/linphonecall.c:1560
+#, c-format
+msgid "You have missed %i call."
+msgid_plural "You have missed %i calls."
+msgstr[0] "您错过了 %i 个呼å«ã€‚"
+
+#~ msgid "Unmute"
+#~ msgstr "å–消é™éŸ³"
+
+#~ msgid "<b>Contact list</b>"
+#~ msgstr "<b>è”系人列表</b>"
+
+#, fuzzy
+#~ msgid "Audio & video"
+#~ msgstr "音频和视频"
+
+#~ msgid "Audio only"
+#~ msgstr "音频"
+
+#~ msgid "Duration:"
+#~ msgstr "通è¯è®¡æ—¶ï¼š"
+
+#, fuzzy
+#~ msgid "_Call history"
+#~ msgstr "呼å«åŽ†å²"
+
+#~ msgid "_Linphone"
+#~ msgstr "_Linphone"
+
+#~ msgid "Register at startup"
+#~ msgstr "在å¯åŠ¨æ—¶æ³¨å†Œ"
+
+#~ msgid "<b>Ports</b>"
+#~ msgstr "<b>端å£</b>"
+
#~ msgid "ITU-G.711 alaw encoder"
#~ msgstr "ITU-G.711 alaw ç¼–ç 器"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 0c16dafc191bbb03c59f9858977ced2b9f66e987..c3d603036562d714b4a85b6bc8823969fad25dde 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: linphone 3.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-06 14:41+0800\n"
+"POT-Creation-Date: 2011-12-02 16:47+0100\n"
"PO-Revision-Date: 2011-04-06 21:24+0800\n"
"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
"Language-Team: \n"
@@ -17,9 +17,20 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../gtk/support.c:49
-#: ../gtk/support.c:73
-#: ../gtk/support.c:102
+#: ../gtk/calllogs.c:71
+msgid "n/a"
+msgstr ""
+
+#: ../gtk/conference.c:33 ../gtk/incall_view.c:183
+msgid "Conference"
+msgstr ""
+
+#: ../gtk/conference.c:41
+#, fuzzy
+msgid "Me"
+msgstr "éœéŸ³"
+
+#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
#, c-format
msgid "Couldn't find pixmap file: %s"
msgstr "找ä¸åˆ° pixmap 檔：%s"
@@ -29,43 +40,51 @@ msgstr "找ä¸åˆ° pixmap 檔：%s"
msgid "Chat with %s"
msgstr "å’Œ %s èŠå¤©"
-#: ../gtk/main.c:74
+#: ../gtk/main.c:83
msgid "log to stdout some debug information while running."
msgstr "執行時將一些除錯資訊記錄到標準輸出。"
-#: ../gtk/main.c:81
+#: ../gtk/main.c:90
+msgid "path to a file to write logs into."
+msgstr ""
+
+#: ../gtk/main.c:97
msgid "Start only in the system tray, do not show the main interface."
msgstr "åªåœ¨ç³»çµ±åŒ£å•Ÿå‹•ï¼Œä¸è¦é¡¯ç¤ºä¸»è¦ä»‹é¢ã€‚"
-#: ../gtk/main.c:88
+#: ../gtk/main.c:104
msgid "address to call right now"
msgstr "ç¾åœ¨è¦æ‰“電話的ä½å€"
-#: ../gtk/main.c:95
+#: ../gtk/main.c:111
msgid "if set automatically answer incoming calls"
msgstr "如啟用æ¤é …，將會自動接è½ä¾†é›»"
-#: ../gtk/main.c:102
-msgid "Specifiy a working directory (should be the base of the installation, eg: c:\\Program Files\\Linphone)"
-msgstr "指定一個工作目錄（應該為安è£çš„æ ¹ç›®éŒ„ï¼Œä¾‹å¦‚ï¼šc:\\Program Files\\Linphone）"
+#: ../gtk/main.c:118
+msgid ""
+"Specifiy a working directory (should be the base of the installation, eg: c:"
+"\\Program Files\\Linphone)"
+msgstr ""
+"指定一個工作目錄（應該為安è£çš„æ ¹ç›®éŒ„ï¼Œä¾‹å¦‚ï¼šc:\\Program Files\\Linphone）"
-#: ../gtk/main.c:442
+#: ../gtk/main.c:464
#, c-format
msgid "Call with %s"
msgstr "和 %s 通話"
-#: ../gtk/main.c:825
+#: ../gtk/main.c:815
#, c-format
msgid ""
"%s would like to add you to his contact list.\n"
-"Would you allow him to see your presence status or add him to your contact list ?\n"
+"Would you allow him to see your presence status or add him to your contact "
+"list ?\n"
"If you answer no, this person will be temporarily blacklisted."
msgstr ""
"%s 想è¦åŠ æ‚¨åŠ å…¥ä»–çš„é€£çµ¡äººæ¸…å–®ã€‚\n"
"您是å¦è¦å…è¨±ä»–çœ‹è¦‹æ‚¨çš„ä¸Šç·šç‹€æ…‹æˆ–å°‡ä»–åŠ å…¥æ‚¨çš„é€£çµ¡äººæ¸…å–®ï¼Ÿ\n"
"如果您回ç”å¦ï¼Œé€™å€‹äººæœƒè¢«æš«æ™‚列入黑å單。"
-#: ../gtk/main.c:903
+#: ../gtk/main.c:893
#, c-format
msgid ""
"Please enter your password for username <i>%s</i>\n"
@@ -74,24 +93,56 @@ msgstr ""
"請輸入您使用者å稱 <i>%s</i>\n"
"於網域 <i>%s</i> 的密碼："
-#: ../gtk/main.c:1039
+#: ../gtk/main.c:993
+#, fuzzy
+msgid "Call error"
+msgstr "通話紀錄"
+
+#: ../gtk/main.c:996 ../coreapi/linphonecore.c:2406
+msgid "Call ended"
+msgstr "通話已çµæŸ"
+
+#: ../gtk/main.c:999 ../coreapi/linphonecore.c:199
+msgid "Incoming call"
+msgstr "來電"
+
+#: ../gtk/main.c:1001 ../gtk/incall_view.c:292 ../gtk/main.ui.h:20
+msgid "Answer"
+msgstr "接è½"
+
+#: ../gtk/main.c:1003 ../gtk/main.ui.h:29
+msgid "Decline"
+msgstr "拒接"
+
+#: ../gtk/main.c:1009
+#, fuzzy
+msgid "Call paused"
+msgstr "通話已放棄"
+
+#: ../gtk/main.c:1009
+#, c-format
+msgid "<span size=\"large\">by %s</span>"
+msgstr ""
+
+#: ../gtk/main.c:1165
msgid "Website link"
msgstr "網站連çµ"
-#: ../gtk/main.c:1075
+#: ../gtk/main.c:1205
msgid "Linphone - a video internet phone"
msgstr "Linphone - 網路視訊電話"
-#: ../gtk/main.c:1094
+#: ../gtk/main.c:1295
#, c-format
msgid "%s (Default)"
msgstr "%s （é è¨å€¼ï¼‰"
-#: ../gtk/main.c:1186
-msgid "Windows"
-msgstr "視窗"
+#: ../gtk/main.c:1566 ../coreapi/callbacks.c:700
+#, c-format
+msgid "We are transferred to %s"
+msgstr "我們被轉接到 %s"
-#: ../gtk/main.c:1363
+#: ../gtk/main.c:1576
msgid ""
"No sound cards have been detected on this computer.\n"
"You won't be able to send or receive audio calls."
@@ -99,144 +150,165 @@ msgstr ""
"在這臺電腦ä¸åµæ¸¬ä¸åˆ°éŸ³æ•ˆå¡ã€‚\n"
"您將無法傳é€æˆ–接收語音電話。"
-#: ../gtk/main.c:1422
+#: ../gtk/main.c:1663
msgid "A free SIP video-phone"
msgstr "自由的 SIP 視訊電話"
-#: ../gtk/friendlist.c:192
-#: ../gtk/propertybox.c:271
-#: ../gtk/contact.ui.h:3
+#: ../gtk/friendlist.c:203
+msgid "Add to addressbook"
+msgstr ""
+
+#: ../gtk/friendlist.c:258 ../gtk/propertybox.c:296 ../gtk/contact.ui.h:3
msgid "Name"
msgstr "å稱"
-#: ../gtk/friendlist.c:205
+#: ../gtk/friendlist.c:271
msgid "Presence status"
msgstr "上線狀態"
-#: ../gtk/friendlist.c:242
+#: ../gtk/friendlist.c:308
#, c-format
msgid "Search in %s directory"
msgstr "在 %s 目錄ä¸æœå°‹"
-#: ../gtk/friendlist.c:450
+#: ../gtk/friendlist.c:568
msgid "Invalid sip contact !"
msgstr "無效的 sip 連絡人ï¼"
-#: ../gtk/friendlist.c:495
+#: ../gtk/friendlist.c:613
#, c-format
msgid "Call %s"
msgstr "æ’打給 %s"
-#: ../gtk/friendlist.c:496
+#: ../gtk/friendlist.c:614
#, c-format
msgid "Send text to %s"
msgstr "傳é€æ–‡å—給 %s"
-#: ../gtk/friendlist.c:497
+#: ../gtk/friendlist.c:615
#, c-format
msgid "Edit contact '%s'"
msgstr "編輯連絡人「%sã€"
-#: ../gtk/friendlist.c:498
+#: ../gtk/friendlist.c:616
#, c-format
msgid "Delete contact '%s'"
msgstr "刪除連絡人「%sã€"
-#: ../gtk/friendlist.c:540
+#: ../gtk/friendlist.c:658
#, c-format
msgid "Add new contact from %s directory"
msgstr "從 %s ç›®éŒ„åŠ å…¥æ–°çš„é€£çµ¡äºº"
-#: ../gtk/propertybox.c:277
+#: ../gtk/propertybox.c:302
msgid "Rate (Hz)"
msgstr "é »çŽ‡ (Hz)"
-#: ../gtk/propertybox.c:283
+#: ../gtk/propertybox.c:308
msgid "Status"
msgstr "狀態"
-#: ../gtk/propertybox.c:289
+#: ../gtk/propertybox.c:314
msgid "Min bitrate (kbit/s)"
msgstr "最å°é »å¯¬ (kbit/s)"
-#: ../gtk/propertybox.c:296
+#: ../gtk/propertybox.c:321
msgid "Parameters"
msgstr "åƒæ•¸"
-#: ../gtk/propertybox.c:326
-#: ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507
msgid "Enabled"
msgstr "已啟用"
-#: ../gtk/propertybox.c:327
-#: ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507
msgid "Disabled"
msgstr "å·²åœç”¨"
-#: ../gtk/propertybox.c:510
+#: ../gtk/propertybox.c:553
msgid "Account"
msgstr "帳號"
-#: ../gtk/propertybox.c:650
+#: ../gtk/propertybox.c:693
msgid "English"
msgstr "英語"
-#: ../gtk/propertybox.c:651
+#: ../gtk/propertybox.c:694
msgid "French"
msgstr "法語"
-#: ../gtk/propertybox.c:652
+#: ../gtk/propertybox.c:695
msgid "Swedish"
msgstr "瑞典語"
-#: ../gtk/propertybox.c:653
+#: ../gtk/propertybox.c:696
msgid "Italian"
msgstr "義大利語"
-#: ../gtk/propertybox.c:654
+#: ../gtk/propertybox.c:697
msgid "Spanish"
msgstr "西ç牙語"
-#: ../gtk/propertybox.c:655
+#: ../gtk/propertybox.c:698
msgid "Brazilian Portugese"
msgstr "巴西葡è„牙語"
-#: ../gtk/propertybox.c:656
+#: ../gtk/propertybox.c:699
msgid "Polish"
msgstr "æ³¢è˜èªž"
-#: ../gtk/propertybox.c:657
+#: ../gtk/propertybox.c:700
msgid "German"
msgstr "德語"
-#: ../gtk/propertybox.c:658
+#: ../gtk/propertybox.c:701
msgid "Russian"
msgstr "俄語"
-#: ../gtk/propertybox.c:659
+#: ../gtk/propertybox.c:702
msgid "Japanese"
msgstr "日語"
-#: ../gtk/propertybox.c:660
+#: ../gtk/propertybox.c:703
msgid "Dutch"
msgstr "è·è˜èªž"
-#: ../gtk/propertybox.c:661
+#: ../gtk/propertybox.c:704
msgid "Hungarian"
msgstr "匈牙利語"
-#: ../gtk/propertybox.c:662
+#: ../gtk/propertybox.c:705
msgid "Czech"
msgstr "æ·å…‹èªž"
-#: ../gtk/propertybox.c:663
+#: ../gtk/propertybox.c:706
msgid "Chinese"
msgstr "ä¸æ–‡"
-#: ../gtk/propertybox.c:720
-msgid "You need to restart linphone for the new language selection to take effect."
+#: ../gtk/propertybox.c:707
+msgid "Traditional Chinese"
+msgstr ""
+
+#: ../gtk/propertybox.c:708
+msgid "Norwegian"
+msgstr ""
+
+#: ../gtk/propertybox.c:765
+msgid ""
+"You need to restart linphone for the new language selection to take effect."
msgstr "您需è¦é‡æ–°å•Ÿå‹• linphone æ‰èƒ½è®“æ–°é¸æ“‡çš„語言生效。"
+#: ../gtk/propertybox.c:835
+msgid "None"
+msgstr ""
+
+#: ../gtk/propertybox.c:839
+msgid "SRTP"
+msgstr ""
+
+#: ../gtk/propertybox.c:845
+msgid "ZRTP"
+msgstr ""
+
#: ../gtk/update.c:80
#, c-format
msgid ""
@@ -305,8 +377,7 @@ msgstr "使用者å稱："
msgid "Checking if '%s' is available..."
msgstr "檢查「%sã€æ˜¯å¦å¯ç”¨â€¦"
-#: ../gtk/setupwizard.c:97
-#: ../gtk/setupwizard.c:164
+#: ../gtk/setupwizard.c:97 ../gtk/setupwizard.c:164
msgid "Please wait..."
msgstr "è«‹ç¨å€™..."
@@ -314,13 +385,11 @@ msgstr "è«‹ç¨å€™..."
msgid "Sorry this username already exists. Please try a new one."
msgstr "很抱æ‰é€™å€‹ä½¿ç”¨è€…å稱已經å˜åœ¨ã€‚請嘗試新的å稱。"
-#: ../gtk/setupwizard.c:103
-#: ../gtk/setupwizard.c:168
+#: ../gtk/setupwizard.c:103 ../gtk/setupwizard.c:168
msgid "Ok !"
msgstr "確定ï¼"
-#: ../gtk/setupwizard.c:106
-#: ../gtk/setupwizard.c:171
+#: ../gtk/setupwizard.c:106 ../gtk/setupwizard.c:171
msgid "Communication problem, please try again later."
msgstr "連線å•é¡Œï¼Œè«‹ç¨å¾Œå†è©¦ä¸€æ¬¡ã€‚"
@@ -356,68 +425,99 @@ msgstr "æ£åœ¨å»ºç«‹æ‚¨çš„帳號"
msgid "Now ready !"
msgstr "ç¾åœ¨å·²å°±ç·’ï¼"
-#: ../gtk/incall_view.c:113
+#: ../gtk/incall_view.c:69
+#, fuzzy, c-format
+msgid "Call #%i"
+msgstr "æ’打給 %s"
+
+#: ../gtk/incall_view.c:127
+#, c-format
+msgid "Transfer to call #%i with %s"
+msgstr ""
+
+#: ../gtk/incall_view.c:155
msgid "Transfer"
msgstr "轉接"
-#: ../gtk/incall_view.c:187
+#: ../gtk/incall_view.c:271
msgid "<b>Calling...</b>"
msgstr "<b>æ’打...</b>"
-#: ../gtk/incall_view.c:190
-#: ../gtk/incall_view.c:246
+#: ../gtk/incall_view.c:274 ../gtk/incall_view.c:482
msgid "00::00::00"
msgstr "00::00::00"
-#: ../gtk/incall_view.c:206
+#: ../gtk/incall_view.c:285
msgid "<b>Incoming call</b>"
msgstr "<b>來電</b>"
-#: ../gtk/incall_view.c:216
-msgid ""
-"Pause all calls\n"
-"and answer"
+#: ../gtk/incall_view.c:322
+msgid "good"
msgstr ""
-"æš«åœæ‰€æœ‰æ’打\n"
-"與接è½"
-#: ../gtk/incall_view.c:217
-#: ../gtk/main.ui.h:20
-msgid "Answer"
-msgstr "接è½"
+#: ../gtk/incall_view.c:324
+msgid "average"
+msgstr ""
+
+#: ../gtk/incall_view.c:326
+msgid "poor"
+msgstr ""
+
+#: ../gtk/incall_view.c:328
+msgid "very poor"
+msgstr ""
+
+#: ../gtk/incall_view.c:330
+msgid "too bad"
+msgstr ""
+
+#: ../gtk/incall_view.c:331 ../gtk/incall_view.c:347
+msgid "unavailable"
+msgstr ""
+
+#: ../gtk/incall_view.c:447
+msgid "Secured by SRTP"
+msgstr ""
+
+#: ../gtk/incall_view.c:453
+#, c-format
+msgid "Secured by ZRTP - [auth token: %s]"
+msgstr ""
+
+#: ../gtk/incall_view.c:459
+msgid "Set unverified"
+msgstr ""
+
+#: ../gtk/incall_view.c:459 ../gtk/main.ui.h:49
+msgid "Set verified"
+msgstr ""
+
+#: ../gtk/incall_view.c:480
+msgid "In conference"
+msgstr ""
-#: ../gtk/incall_view.c:244
+#: ../gtk/incall_view.c:480
msgid "<b>In call</b>"
msgstr "<b>通話ä¸</b>"
-#: ../gtk/incall_view.c:260
+#: ../gtk/incall_view.c:499
msgid "<b>Paused call</b>"
msgstr "<b>æš«åœé€šè©±</b>"
-#: ../gtk/incall_view.c:272
+#: ../gtk/incall_view.c:511
#, c-format
msgid "%02i::%02i::%02i"
msgstr "%02i::%02i::%02i"
-#: ../gtk/incall_view.c:288
+#: ../gtk/incall_view.c:527
msgid "<b>Call ended.</b>"
msgstr "<b>通話çµæŸã€‚</b>"
-#: ../gtk/incall_view.c:309
-msgid "Unmute"
-msgstr "å–消éœéŸ³"
-
-#: ../gtk/incall_view.c:316
-#: ../gtk/main.ui.h:42
-msgid "Mute"
-msgstr "éœéŸ³"
-
-#: ../gtk/incall_view.c:340
+#: ../gtk/incall_view.c:584
msgid "Resume"
msgstr "繼續"
-#: ../gtk/incall_view.c:347
-#: ../gtk/main.ui.h:46
+#: ../gtk/incall_view.c:591 ../gtk/main.ui.h:45
msgid "Pause"
msgstr "æš«åœ"
@@ -479,8 +579,9 @@ msgid "<b>Add contacts from directory</b>"
msgstr "<b>å¾žç›®éŒ„åŠ å…¥é€£çµ¡äºº</b>"
#: ../gtk/main.ui.h:14
-msgid "<b>Contact list</b>"
-msgstr "<b>連絡人清單</b> "
+#, fuzzy
+msgid "<b>Callee name</b>"
+msgstr "<b>通話çµæŸã€‚</b>"
#: ../gtk/main.ui.h:15
msgid "<b>Welcome !</b>"
@@ -503,26 +604,26 @@ msgid "All users"
msgstr "所有使用者"
#: ../gtk/main.ui.h:21
-msgid "Audio & video"
-msgstr "語音 & 視訊"
-
-#: ../gtk/main.ui.h:22
-msgid "Audio only"
-msgstr "åªæœ‰èªžéŸ³"
-
-#: ../gtk/main.ui.h:23
msgid "Automatically log me in"
msgstr "將我自動登入"
-#: ../gtk/main.ui.h:24
+#: ../gtk/main.ui.h:22
msgid "B"
msgstr "B"
-#: ../gtk/main.ui.h:25
-#: ../gtk/parameters.ui.h:20
+#: ../gtk/main.ui.h:23 ../gtk/parameters.ui.h:21
msgid "C"
msgstr "C"
+#: ../gtk/main.ui.h:24
+#, fuzzy
+msgid "Call"
+msgstr "æ’打給 %s"
+
+#: ../gtk/main.ui.h:25
+msgid "Call quality rating"
+msgstr ""
+
#: ../gtk/main.ui.h:26
msgid "Check _Updates"
msgstr "檢查更新(_U)"
@@ -535,10 +636,6 @@ msgstr "連絡人"
msgid "D"
msgstr "D"
-#: ../gtk/main.ui.h:29
-msgid "Decline"
-msgstr "拒接"
-
#: ../gtk/main.ui.h:30
msgid "Default"
msgstr "é è¨å€¼"
@@ -548,13 +645,14 @@ msgid "Duration"
msgstr "時間長度"
#: ../gtk/main.ui.h:32
-msgid "Duration:"
-msgstr "時間長度："
-
-#: ../gtk/main.ui.h:33
msgid "Enable self-view"
msgstr "啟用自æ‹æª¢è¦–"
+#: ../gtk/main.ui.h:33
+#, fuzzy
+msgid "Enable video"
+msgstr "已啟用"
+
#: ../gtk/main.ui.h:34
msgid "Enter username, phone number, or full sip address"
msgstr "輸入使用者å稱ã€é›»è©±è™Ÿç¢¼æˆ–完整的 sip ä½å€"
@@ -587,18 +685,23 @@ msgstr "登入資訊"
msgid "Lookup:"
msgstr "查詢："
-#: ../gtk/main.ui.h:43
+#: ../gtk/main.ui.h:42
msgid "My current identity:"
msgstr "我目å‰çš„使用者è˜åˆ¥ï¼š"
-#: ../gtk/main.ui.h:44
+#: ../gtk/main.ui.h:43
msgid "Online users"
msgstr "線上使用者"
-#: ../gtk/main.ui.h:45
+#: ../gtk/main.ui.h:44
msgid "Password"
msgstr "密碼"
+#: ../gtk/main.ui.h:46
+#, fuzzy
+msgid "Recent calls"
+msgstr "通話ä¸"
+
#: ../gtk/main.ui.h:47
msgid "SIP address or phone number:"
msgstr "SIP ä½å€æˆ–電話號碼："
@@ -607,18 +710,14 @@ msgstr "SIP ä½å€æˆ–電話號碼："
msgid "Search"
msgstr "æœå°‹"
-#: ../gtk/main.ui.h:49
+#: ../gtk/main.ui.h:50
msgid "Show debug window"
msgstr "顯示除錯視窗"
-#: ../gtk/main.ui.h:50
+#: ../gtk/main.ui.h:51
msgid "Username"
msgstr "使用者å稱"
-#: ../gtk/main.ui.h:51
-msgid "_Call history"
-msgstr "通話紀錄(_C)"
-
#: ../gtk/main.ui.h:52
msgid "_Help"
msgstr "求助(_H)"
@@ -628,18 +727,14 @@ msgid "_Homepage"
msgstr "官方網é (_H)"
#: ../gtk/main.ui.h:54
-msgid "_Linphone"
-msgstr "_Linphone"
-
-#: ../gtk/main.ui.h:55
msgid "_Options"
msgstr "é¸é …(_O)"
-#: ../gtk/main.ui.h:56
+#: ../gtk/main.ui.h:55
msgid "in"
msgstr "æ–¼"
-#: ../gtk/main.ui.h:57
+#: ../gtk/main.ui.h:56
msgid "label"
msgstr "標籤"
@@ -697,16 +792,6 @@ msgstr "SIP ä½å€"
msgid "Show this contact presence status"
msgstr "顯示這個連絡人的上線狀態"
-#: ../gtk/contact.ui.h:6
-#: ../gtk/password.ui.h:5
-msgid "gtk-cancel"
-msgstr "gtk-cancel"
-
-#: ../gtk/contact.ui.h:7
-#: ../gtk/password.ui.h:6
-msgid "gtk-ok"
-msgstr "gtk-ok"
-
#: ../gtk/log.ui.h:1
msgid "Linphone debug window"
msgstr "Linphone 除錯視窗"
@@ -760,8 +845,8 @@ msgid "Publish presence information"
msgstr "發布上線資訊"
#: ../gtk/sip_account.ui.h:6
-msgid "Register at startup"
-msgstr "啟動時註冊"
+msgid "Register"
+msgstr ""
#: ../gtk/sip_account.ui.h:7
msgid "Registration duration (sec):"
@@ -787,10 +872,6 @@ msgstr "sip:"
msgid "Send"
msgstr "傳é€"
-#: ../gtk/chatroom.ui.h:2
-msgid "gtk-close"
-msgstr "gtk-close"
-
#: ../gtk/parameters.ui.h:1
msgid "0 stands for \"unlimited\""
msgstr "0 表示「ä¸é™åˆ¶ã€"
@@ -824,8 +905,8 @@ msgid "<b>NAT and Firewall</b>"
msgstr "<b>NAT 與防ç«ç‰†</b>"
#: ../gtk/parameters.ui.h:9
-msgid "<b>Ports</b>"
-msgstr "<b>é€£æŽ¥åŸ </b>"
+msgid "<b>Network protocol and ports</b>"
+msgstr ""
#: ../gtk/parameters.ui.h:10
msgid "<b>Privacy</b>"
@@ -844,98 +925,112 @@ msgid "<b>Video</b>"
msgstr "<b>視訊</b>"
#: ../gtk/parameters.ui.h:14
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:15
msgid "ALSA special device (optional):"
msgstr "ALSA 特殊è£ç½® (é¸æ“‡æ€§)："
-#: ../gtk/parameters.ui.h:15
+#: ../gtk/parameters.ui.h:16
msgid "Add"
msgstr "åŠ å…¥"
-#: ../gtk/parameters.ui.h:16
+#: ../gtk/parameters.ui.h:17
msgid "Audio RTP/UDP:"
msgstr "音效 RTP/UDP:"
-#: ../gtk/parameters.ui.h:17
+#: ../gtk/parameters.ui.h:18
msgid "Audio codecs"
msgstr "音訊編碼解碼器"
-#: ../gtk/parameters.ui.h:18
+#: ../gtk/parameters.ui.h:19
msgid "Behind NAT / Firewall (specify gateway IP below)"
msgstr "在 NAT / 防ç«ç‰†ä¹‹å¾Œ (在下é¢æŒ‡å®šé–˜é“器 IP)"
-#: ../gtk/parameters.ui.h:19
+#: ../gtk/parameters.ui.h:20
msgid "Behind NAT / Firewall (use STUN to resolve)"
msgstr "在 NAT / 防ç«ç‰†ä¹‹å¾Œ (使用 STUN 解æž)"
-#: ../gtk/parameters.ui.h:21
+#: ../gtk/parameters.ui.h:22
msgid "CIF"
msgstr "CIF"
-#: ../gtk/parameters.ui.h:22
+#: ../gtk/parameters.ui.h:23
msgid "Capture device:"
msgstr "æ•æ‰è£ç½®:"
-#: ../gtk/parameters.ui.h:23
+#: ../gtk/parameters.ui.h:24
msgid "Codecs"
msgstr "編碼解碼器"
-#: ../gtk/parameters.ui.h:24
+#: ../gtk/parameters.ui.h:25
msgid "Direct connection to the Internet"
msgstr "直接連線到網際網路"
-#: ../gtk/parameters.ui.h:25
+#: ../gtk/parameters.ui.h:26
msgid "Disable"
msgstr "åœç”¨"
-#: ../gtk/parameters.ui.h:26
+#: ../gtk/parameters.ui.h:27
msgid "Done"
msgstr "完æˆ"
-#: ../gtk/parameters.ui.h:27
+#: ../gtk/parameters.ui.h:28
msgid "Download speed limit in Kbit/sec:"
msgstr "下載速度é™åˆ¶æ–¼ Kbit/sec:"
-#: ../gtk/parameters.ui.h:28
+#: ../gtk/parameters.ui.h:29
msgid "Edit"
msgstr "編輯"
-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:30
msgid "Enable"
msgstr "啟用"
-#: ../gtk/parameters.ui.h:30
+#: ../gtk/parameters.ui.h:31
+msgid "Enable adaptive rate control"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:32
msgid "Enable echo cancellation"
msgstr "啟用回音消除"
-#: ../gtk/parameters.ui.h:31
+#: ../gtk/parameters.ui.h:33
msgid "Erase all passwords"
msgstr "消除所有的密碼"
-#: ../gtk/parameters.ui.h:32
+#: ../gtk/parameters.ui.h:34
msgid "Manage SIP Accounts"
msgstr "ç®¡ç† SIP 帳號"
-#: ../gtk/parameters.ui.h:33
+#: ../gtk/parameters.ui.h:35
+msgid "Media encryption type"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:36
msgid "Multimedia settings"
msgstr "多媒體è¨å®šå€¼"
-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:37
msgid "Network settings"
msgstr "網路è¨å®šå€¼"
-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:38
msgid "Playback device:"
msgstr "æ’放è£ç½®"
-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:39
msgid "Prefered video resolution:"
msgstr "å好的視訊解æžåº¦:"
-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:40
msgid "Public IP address:"
msgstr "公共 IP 地å€:"
-#: ../gtk/parameters.ui.h:38
+#: ../gtk/parameters.ui.h:41
msgid ""
"Register to FONICS\n"
"virtual network !"
@@ -943,95 +1038,102 @@ msgstr ""
"註冊到 FONICS\n"
"虛擬網路ï¼"
-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:43
msgid "Remove"
msgstr "移除"
-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:44
msgid "Ring device:"
msgstr "響鈴è£ç½®:"
-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:45
msgid "Ring sound:"
msgstr "鈴è²éŸ³æ•ˆ:"
-#: ../gtk/parameters.ui.h:43
-msgid "SIP (TCP):"
+#: ../gtk/parameters.ui.h:46
+#, fuzzy
+msgid "SIP (TCP)"
msgstr "SIP (TCP):"
-#: ../gtk/parameters.ui.h:44
-msgid "SIP (UDP):"
+#: ../gtk/parameters.ui.h:47
+#, fuzzy
+msgid "SIP (TLS)"
+msgstr "SIP (TCP):"
+
+#: ../gtk/parameters.ui.h:48
+#, fuzzy
+msgid "SIP (UDP)"
msgstr "SIP (UDP):"
-#: ../gtk/parameters.ui.h:45
+#: ../gtk/parameters.ui.h:49
msgid "Send DTMFs as SIP info"
msgstr "å‚³é€ DTMFs 為 SIP 資訊"
-#: ../gtk/parameters.ui.h:46
+#: ../gtk/parameters.ui.h:50
msgid "Set Maximum Transmission Unit:"
msgstr "è¨å®šæœ€å¤§å‚³è¼¸å–®ä½:"
-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:51
msgid "Settings"
msgstr "è¨å®šå€¼"
-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:52
msgid "Show advanced settings"
msgstr "顯示進階è¨å®šå€¼"
-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:53
msgid "Stun server:"
msgstr "Stun 伺æœå™¨:"
-#: ../gtk/parameters.ui.h:50
+#: ../gtk/parameters.ui.h:54
msgid "This section defines your SIP address when not using a SIP account"
msgstr "這一å€åœ¨ä¸ä½¿ç”¨ SIP 帳號時定義您的 SIP ä½å€"
-#: ../gtk/parameters.ui.h:51
+#: ../gtk/parameters.ui.h:55
msgid "Upload speed limit in Kbit/sec:"
msgstr "上傳速度é™åˆ¶æ–¼ Kbit/sec:"
-#: ../gtk/parameters.ui.h:52
+#: ../gtk/parameters.ui.h:56
msgid "Use IPv6 instead of IPv4"
msgstr "使用 IPv6 代替 IPv4"
-#: ../gtk/parameters.ui.h:53
+#: ../gtk/parameters.ui.h:57
msgid "User interface"
msgstr "使用者介é¢"
-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:58
msgid "Video RTP/UDP:"
msgstr "視訊 RTP/UDP:"
-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:59
msgid "Video codecs"
msgstr "視訊編碼解碼器"
-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:60
msgid "Video input device:"
msgstr "視訊輸入è£ç½®:"
-#: ../gtk/parameters.ui.h:57
+#: ../gtk/parameters.ui.h:61
msgid "Your display name (eg: John Doe):"
msgstr "您的顯示å稱 (例如: John Doe):"
-#: ../gtk/parameters.ui.h:58
+#: ../gtk/parameters.ui.h:62
msgid "Your resulting SIP address:"
msgstr "您組æˆçš„ SIP ä½å€:"
-#: ../gtk/parameters.ui.h:59
+#: ../gtk/parameters.ui.h:63
msgid "Your username:"
msgstr "您的使用者å稱:"
-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:64
msgid "a sound card"
msgstr "音效å¡"
-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:65
msgid "default camera"
msgstr "é è¨çš„æ”影機"
-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:66
msgid "default soundcard"
msgstr "é è¨çš„音效å¡"
@@ -1055,25 +1157,19 @@ msgstr "Linphone"
msgid "Please wait"
msgstr "è«‹ç¨å€™"
-#: ../coreapi/linphonecore.c:165
-#, c-format
-msgid "You have missed %i call."
-msgid_plural "You have missed %i calls."
-msgstr[0] "您有 %i 通未接來電。"
-
-#: ../coreapi/linphonecore.c:206
+#: ../coreapi/linphonecore.c:187
msgid "aborted"
msgstr "已放棄"
-#: ../coreapi/linphonecore.c:209
+#: ../coreapi/linphonecore.c:190
msgid "completed"
msgstr "已完æˆ"
-#: ../coreapi/linphonecore.c:212
+#: ../coreapi/linphonecore.c:193
msgid "missed"
msgstr "未接"
-#: ../coreapi/linphonecore.c:217
+#: ../coreapi/linphonecore.c:198
#, c-format
msgid ""
"%s at %s\n"
@@ -1088,74 +1184,60 @@ msgstr ""
"狀態：%s\n"
"æŒçºŒæ™‚間：%i 分 %i 秒\n"
-#: ../coreapi/linphonecore.c:218
-msgid "Incoming call"
-msgstr "來電"
-
-#: ../coreapi/linphonecore.c:218
+#: ../coreapi/linphonecore.c:199
msgid "Outgoing call"
msgstr "去電"
-#: ../coreapi/linphonecore.c:998
+#: ../coreapi/linphonecore.c:1088
msgid "Ready"
msgstr "準備就緒"
-#: ../coreapi/linphonecore.c:1773
+#: ../coreapi/linphonecore.c:1831
msgid "Looking for telephone number destination..."
msgstr "尋找電話號碼目的端..."
-#: ../coreapi/linphonecore.c:1776
+#: ../coreapi/linphonecore.c:1834
msgid "Could not resolve this number."
msgstr "無法解æžé€™å€‹è™Ÿç¢¼ã€‚"
-#: ../coreapi/linphonecore.c:1820
-msgid "Could not parse given sip address. A sip url usually looks like sip:user@domain"
+#: ../coreapi/linphonecore.c:1878
+msgid ""
+"Could not parse given sip address. A sip url usually looks like sip:"
+"user@domain"
msgstr "無法解æžæŒ‡å®šçš„ sip ä½å€ã€‚sip 網å€é€šå¸¸çœ‹èµ·ä¾†åƒ sip:user@domain"
-#: ../coreapi/linphonecore.c:1967
+#: ../coreapi/linphonecore.c:2025
msgid "Contacting"
msgstr "æ£åœ¨é€£çµ¡"
-#: ../coreapi/linphonecore.c:1974
+#: ../coreapi/linphonecore.c:2032
msgid "Could not call"
msgstr "無法通話"
-#: ../coreapi/linphonecore.c:2081
-msgid "Sorry, you have to pause or stop the current call first !"
-msgstr "抱æ‰ï¼Œæ‚¨å¿…é ˆå…ˆæš«åœæˆ–åœæ¢ç›®å‰çš„通話ï¼"
-
-#: ../coreapi/linphonecore.c:2086
+#: ../coreapi/linphonecore.c:2140
msgid "Sorry, we have reached the maximum number of simultaneous calls"
msgstr "抱æ‰ï¼Œæˆ‘們已é”ç€åŒæ¥é€šè©±çš„最大數目"
-#: ../coreapi/linphonecore.c:2208
+#: ../coreapi/linphonecore.c:2270
msgid "Modifying call parameters..."
msgstr "修改通話åƒæ•¸..."
-#: ../coreapi/linphonecore.c:2311
+#: ../coreapi/linphonecore.c:2366
msgid "Connected."
msgstr "已連線。"
-#: ../coreapi/linphonecore.c:2334
+#: ../coreapi/linphonecore.c:2389
msgid "Call aborted"
msgstr "通話已放棄"
-#: ../coreapi/linphonecore.c:2374
-msgid "Call ended"
-msgstr "通話已çµæŸ"
-
-#: ../coreapi/linphonecore.c:2456
+#: ../coreapi/linphonecore.c:2530
msgid "Could not pause the call"
msgstr "無法暫åœé€šè©±"
-#: ../coreapi/linphonecore.c:2460
+#: ../coreapi/linphonecore.c:2535
msgid "Pausing the current call..."
msgstr "æš«åœç›®å‰çš„通話..."
-#: ../coreapi/linphonecore.c:2499
-msgid "There is already a call in process, pause or stop it first."
-msgstr "已經有通話在進行ä¸ï¼Œè«‹å…ˆæš«åœæˆ–åœæ¢å®ƒã€‚"
-
#: ../coreapi/misc.c:147
msgid ""
"Your computer appears to be using ALSA sound drivers.\n"
@@ -1232,11 +1314,14 @@ msgstr "ç‰å¾…ä¸"
msgid "Unknown-bug"
msgstr "ä¸æ˜ŽéŒ¯èª¤"
-#: ../coreapi/proxy.c:187
-msgid "The sip proxy address you entered is invalid, it must start with \"sip:\" followed by a hostname."
-msgstr "您輸入的 sip 代ç†ä½å€æ˜¯ç„¡æ•ˆçš„ï¼Œå®ƒå¿…é ˆè¦ä»¥ã€Œsip:ã€é–‹é ，後é¢æŽ¥ä¸»æ©Ÿå稱。"
+#: ../coreapi/proxy.c:192
+msgid ""
+"The sip proxy address you entered is invalid, it must start with \"sip:\" "
+"followed by a hostname."
+msgstr ""
+"您輸入的 sip 代ç†ä½å€æ˜¯ç„¡æ•ˆçš„ï¼Œå®ƒå¿…é ˆè¦ä»¥ã€Œsip:ã€é–‹é ，後é¢æŽ¥ä¸»æ©Ÿå稱。"
-#: ../coreapi/proxy.c:193
+#: ../coreapi/proxy.c:198
msgid ""
"The sip identity you entered is invalid.\n"
"It should look like sip:username@proxydomain, such as sip:alice@example.net"
@@ -1244,136 +1329,197 @@ msgstr ""
"您輸入的 sip 身分是無效的。\n"
"å®ƒæ‡‰è©²çœ‹èµ·ä¾†åƒ sip:使用者å稱@代ç†ç¶²åŸŸï¼Œåƒæ˜¯ sip:alice@example.net"
-#: ../coreapi/proxy.c:671
+#: ../coreapi/proxy.c:690
#, c-format
msgid "Could not login as %s"
msgstr "無法以 %s 登入"
-#: ../coreapi/callbacks.c:170
+#: ../coreapi/callbacks.c:206
msgid "is contacting you"
msgstr "æ£åœ¨é€£çµ¡æ‚¨"
-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207
msgid " and asked autoanswer."
msgstr "並è¦æ±‚自動接è½ã€‚"
-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207
msgid "."
msgstr "."
-#: ../coreapi/callbacks.c:226
+#: ../coreapi/callbacks.c:266
msgid "Remote ringing."
msgstr "é 端響鈴。"
-#: ../coreapi/callbacks.c:242
+#: ../coreapi/callbacks.c:282
msgid "Remote ringing..."
msgstr "é 端響鈴..."
-#: ../coreapi/callbacks.c:253
+#: ../coreapi/callbacks.c:293
msgid "Early media."
msgstr "早期媒體。"
-#: ../coreapi/callbacks.c:291
+#: ../coreapi/callbacks.c:331
#, c-format
msgid "Call with %s is paused."
msgstr "å’Œ %s 的通話已暫åœã€‚"
-#: ../coreapi/callbacks.c:302
+#: ../coreapi/callbacks.c:342
#, c-format
msgid "Call answered by %s - on hold."
msgstr "通話由 %s æŽ¥è½ - ä¿ç•™ä¸ã€‚"
-#: ../coreapi/callbacks.c:317
+#: ../coreapi/callbacks.c:357
msgid "Call resumed."
msgstr "通話已繼續。"
-#: ../coreapi/callbacks.c:322
+#: ../coreapi/callbacks.c:362
#, c-format
msgid "Call answered by %s."
msgstr "通話由 %s 接è½ã€‚"
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:432
msgid "We are being paused..."
msgstr "我們被暫åœäº†..."
-#: ../coreapi/callbacks.c:387
+#: ../coreapi/callbacks.c:436
msgid "We have been resumed..."
msgstr "我們è¦ç¹¼çºŒäº†..."
-#: ../coreapi/callbacks.c:424
+#: ../coreapi/callbacks.c:441
+msgid "Call has been updated by remote..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:473
msgid "Call terminated."
msgstr "通話已終æ¢ã€‚"
-#: ../coreapi/callbacks.c:431
+#: ../coreapi/callbacks.c:480
msgid "User is busy."
msgstr "使用者ç¾æ£å¿™ç¢Œã€‚"
-#: ../coreapi/callbacks.c:432
+#: ../coreapi/callbacks.c:481
msgid "User is temporarily unavailable."
msgstr "使用者暫時無法è¯ç¹«ã€‚"
#. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:434
+#: ../coreapi/callbacks.c:483
msgid "User does not want to be disturbed."
msgstr "使用者ä¸æƒ³è¦è¢«æ‰“擾。"
-#: ../coreapi/callbacks.c:435
+#: ../coreapi/callbacks.c:484
msgid "Call declined."
msgstr "通話被拒接。"
-#: ../coreapi/callbacks.c:447
+#: ../coreapi/callbacks.c:496
msgid "No response."
msgstr "沒有回應。"
-#: ../coreapi/callbacks.c:451
+#: ../coreapi/callbacks.c:500
msgid "Protocol error."
msgstr "通訊å”定錯誤。"
-#: ../coreapi/callbacks.c:467
+#: ../coreapi/callbacks.c:516
msgid "Redirected"
msgstr "å·²é‡æ–°å°Žå‘"
-#: ../coreapi/callbacks.c:477
+#: ../coreapi/callbacks.c:526
msgid "Not found"
msgstr "找ä¸åˆ°"
-#: ../coreapi/callbacks.c:487
+#: ../coreapi/callbacks.c:551
msgid "No common codecs"
msgstr "沒有通用的編碼解碼器"
-#: ../coreapi/callbacks.c:493
+#: ../coreapi/callbacks.c:557
msgid "Call failed."
msgstr "通話失敗。"
-#: ../coreapi/callbacks.c:557
+#: ../coreapi/callbacks.c:631
#, c-format
msgid "Registration on %s successful."
msgstr "在 %s 註冊æˆåŠŸã€‚"
-#: ../coreapi/callbacks.c:558
+#: ../coreapi/callbacks.c:632
#, c-format
msgid "Unregistration on %s done."
msgstr "在 %s å–消註冊完æˆã€‚"
-#: ../coreapi/callbacks.c:574
+#: ../coreapi/callbacks.c:648
msgid "no response timeout"
msgstr "沒有回應逾時"
-#: ../coreapi/callbacks.c:577
+#: ../coreapi/callbacks.c:651
#, c-format
msgid "Registration on %s failed: %s"
msgstr "在 %s 註冊失敗：%s"
-#: ../coreapi/callbacks.c:619
-#, c-format
-msgid "We are transferred to %s"
-msgstr "我們被轉接到 %s"
-
-#: ../coreapi/sal_eXosip2.c:814
-#: ../coreapi/sal_eXosip2.c:816
+#: ../coreapi/sal_eXosip2.c:873 ../coreapi/sal_eXosip2.c:875
msgid "Authentication failure"
msgstr "é©—è‰å¤±æ•—"
+#: ../coreapi/linphonecall.c:128
+#, fuzzy, c-format
+msgid "Authentication token is %s"
+msgstr "é©—è‰å¤±æ•—"
+
+#: ../coreapi/linphonecall.c:1560
+#, c-format
+msgid "You have missed %i call."
+msgid_plural "You have missed %i calls."
+msgstr[0] "您有 %i 通未接來電。"
+
+#~ msgid "Windows"
+#~ msgstr "視窗"
+
+#~ msgid ""
+#~ "Pause all calls\n"
+#~ "and answer"
+#~ msgstr ""
+#~ "æš«åœæ‰€æœ‰æ’打\n"
+#~ "與接è½"
+
+#~ msgid "Unmute"
+#~ msgstr "å–消éœéŸ³"
+
+#~ msgid "<b>Contact list</b>"
+#~ msgstr "<b>連絡人清單</b> "
+
+#~ msgid "Audio & video"
+#~ msgstr "語音 & 視訊"
+
+#~ msgid "Audio only"
+#~ msgstr "åªæœ‰èªžéŸ³"
+
+#~ msgid "Duration:"
+#~ msgstr "時間長度："
+
+#~ msgid "_Call history"
+#~ msgstr "通話紀錄(_C)"
+
+#~ msgid "_Linphone"
+#~ msgstr "_Linphone"
+
+#~ msgid "gtk-cancel"
+#~ msgstr "gtk-cancel"
+
+#~ msgid "gtk-ok"
+#~ msgstr "gtk-ok"
+
+#~ msgid "Register at startup"
+#~ msgstr "啟動時註冊"
+
+#~ msgid "gtk-close"
+#~ msgstr "gtk-close"
+
+#~ msgid "<b>Ports</b>"
+#~ msgstr "<b>é€£æŽ¥åŸ </b>"
+
+#~ msgid "Sorry, you have to pause or stop the current call first !"
+#~ msgstr "抱æ‰ï¼Œæ‚¨å¿…é ˆå…ˆæš«åœæˆ–åœæ¢ç›®å‰çš„通話ï¼"
+
+#~ msgid "There is already a call in process, pause or stop it first."
+#~ msgstr "已經有通話在進行ä¸ï¼Œè«‹å…ˆæš«åœæˆ–åœæ¢å®ƒã€‚"
+
#~ msgid ""
#~ "Your machine appears to be connected to an IPv6 network. By default "
#~ "linphone always uses IPv4. Please update your configuration if you want "