update german and french translation, update ms2

diff --git a/gtk/main.ui b/gtk/main.ui
index d64634c8b75524bf40ea24122c8b5372ca58d4a2..a94f5e55f06cae5cb2913d38d1e827561c996833 100644 (file)
--- a/gtk/main.ui
+++ b/gtk/main.ui
@@ -1009,7 +1009,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="call_back_button">
                                 </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>
                                     <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 (file)
--- 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 -->
 <?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>
   <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">
     <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">
         <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>
             <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="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>
                           </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="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>
                           </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="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>
                           </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="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>
                             <property name="adjustment">adjustment1</property>
                           </object>
                           <packing>


@@ -224,7 +215,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="register">
                     </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>
                         <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 (submodule)
--- 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 (file)
--- 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"
 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"
 "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 "–"
 
 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"
 
 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"
 
 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."
 
 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."
 
 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."
 
 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"
 
 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"
 
 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)"
 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)"
 
 "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"
 
 #, 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"
 #, 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."
 
 "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"
 #, 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>:"
 
 "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"
 
 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"
 
 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"
 
 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"
 
 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"
 
 msgid "Decline"
 msgstr "Odmítnout"
 

-#: ../gtk/main.c:1003
+#: ../gtk/main.c:1009

 msgid "Call paused"
 msgstr "Hovor odložen"
 
 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>"
 
 #, 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"
 
 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"
 
 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í)"
 
 #, 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"
 
 #, 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."
 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."
 
 "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
 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"
 
 msgid "Name"
 msgstr "Jméno"
 


@@ -229,7 +234,7 @@ msgstr "Povoleno"
 msgid "Disabled"
 msgstr "Zakázáno"
 
 msgid "Disabled"
 msgstr "Zakázáno"
 

-#: ../gtk/propertybox.c:533
+#: ../gtk/propertybox.c:553

 msgid "Account"
 msgstr "Účet"
 
 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."
 
 "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"
 
 msgid "SRTP"
 msgstr "SRTP"
 

-#: ../gtk/propertybox.c:830
+#: ../gtk/propertybox.c:845

 msgid "ZRTP"
 msgstr "ZRTP"
 
 msgid "ZRTP"
 msgstr "ZRTP"
 


@@ -433,77 +442,94 @@ msgstr "Připraveno!"
 msgid "Call #%i"
 msgstr "Hovor č. %i"
 
 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"
 
 #, 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"
 
 msgid "Transfer"
 msgstr "Přepojit"
 

-#: ../gtk/incall_view.c:266
+#: ../gtk/incall_view.c:271

 msgid "<b>Calling...</b>"
 msgstr "<b>Volá se…</b>"
 
 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"
 
 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>"
 
 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á"
 
 msgid "good"
 msgstr "dobrá"
 

-#: ../gtk/incall_view.c:319
+#: ../gtk/incall_view.c:324

 msgid "average"
 msgstr "průměrná"
 
 msgid "average"
 msgstr "průměrná"
 

-#: ../gtk/incall_view.c:321
+#: ../gtk/incall_view.c:326

 msgid "poor"
 msgstr "slabá"
 
 msgid "poor"
 msgstr "slabá"
 

-#: ../gtk/incall_view.c:323
+#: ../gtk/incall_view.c:328

 msgid "very poor"
 msgstr "velmi slabá"
 
 msgid "very poor"
 msgstr "velmi slabá"
 

-#: ../gtk/incall_view.c:325
+#: ../gtk/incall_view.c:330

 msgid "too bad"
 msgstr "příliš špatná"
 
 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á"
 
 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"
 
 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>"
 
 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>"
 
 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"
 
 #, 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>"
 
 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"
 
 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"
 
 msgid "Pause"
 msgstr "Odložit"
 


@@ -600,9 +626,10 @@ msgstr "B"
 msgid "C"
 msgstr "C"
 
 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"
 
 #: ../gtk/main.ui.h:25
 msgid "Call quality rating"


@@ -692,32 +719,32 @@ msgstr "SIP adresa nebo telefonní číslo:"
 msgid "Search"
 msgstr "Hledat"
 
 msgid "Search"
 msgstr "Hledat"
 

-#: ../gtk/main.ui.h:49
+#: ../gtk/main.ui.h:50

 msgid "Show debug window"
 msgstr "Zobrazit ladicí okno"
 
 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"
 
 msgid "Username"
 msgstr "Uživatelské jméno"
 

-#: ../gtk/main.ui.h:51
+#: ../gtk/main.ui.h:52

 msgid "_Help"
 msgstr "Nápo_věda"
 
 msgid "_Help"
 msgstr "Nápo_věda"
 

-#: ../gtk/main.ui.h:52
+#: ../gtk/main.ui.h:53

 msgid "_Homepage"
 msgstr "_Domovská stránka"
 
 msgid "_Homepage"
 msgstr "_Domovská stránka"
 

-#: ../gtk/main.ui.h:53
+#: ../gtk/main.ui.h:54

 msgid "_Options"
 msgstr "V_olby"
 
 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
 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 ""
 
 msgid "label"
 msgstr ""
 


@@ -795,6 +822,10 @@ msgstr "Prosím, zadejte heslo pro doménu"
 msgid "UserID"
 msgstr "Identifikátor uživatele"
 
 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í"
 #: ../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
 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):"
 
 #: ../gtk/sip_account.ui.h:7
 msgid "Registration duration (sec):"


@@ -1166,54 +1197,54 @@ msgstr ""
 msgid "Outgoing call"
 msgstr "Odchozí hovor"
 
 msgid "Outgoing call"
 msgstr "Odchozí hovor"
 

-#: ../coreapi/linphonecore.c:1082
+#: ../coreapi/linphonecore.c:1088

 msgid "Ready"
 msgstr "Připraven."
 
 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…"
 
 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."
 
 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>"
 
 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"
 
 msgid "Contacting"
 msgstr "Kontaktuji"
 

-#: ../coreapi/linphonecore.c:2023
+#: ../coreapi/linphonecore.c:2032

 msgid "Could not call"
 msgstr "Nelze volat"
 
 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ů."
 
 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…"
 
 msgid "Modifying call parameters..."
 msgstr "Upravují se parametry hovoru…"
 

-#: ../coreapi/linphonecore.c:2356
+#: ../coreapi/linphonecore.c:2366

 msgid "Connected."
 msgstr "Připojeno."
 
 msgid "Connected."
 msgstr "Připojeno."
 

-#: ../coreapi/linphonecore.c:2379
+#: ../coreapi/linphonecore.c:2389

 msgid "Call aborted"
 msgstr "Hovor přerušen"
 
 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"
 
 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á…"
 
 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"
 
 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á"
 
 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í."
 
 msgid " and asked autoanswer."
 msgstr " a požaduje automatickou zvednutí."
 

-#: ../coreapi/callbacks.c:206
+#: ../coreapi/callbacks.c:207

 msgid "."
 msgstr "."
 
 msgid "."
 msgstr "."
 

-#: ../coreapi/callbacks.c:265
+#: ../coreapi/callbacks.c:266

 msgid "Remote ringing."
 msgstr "Vyzvání na druhé straně."
 
 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ě…"
 
 msgid "Remote ringing..."
 msgstr "Vyzvání na druhé straně…"
 

-#: ../coreapi/callbacks.c:292
+#: ../coreapi/callbacks.c:293

 msgid "Early media."
 msgstr "Časná média."
 
 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."
 
 #, 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."
 
 #, 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."
 
 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."
 
 #, 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…"
 
 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…"
 
 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…"
 
 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."
 
 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."
 
 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).");
 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."
 
 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."
 
 msgid "Call declined."
 msgstr "Volání odmítnuto."
 

-#: ../coreapi/callbacks.c:495
+#: ../coreapi/callbacks.c:496

 msgid "No response."
 msgstr "Žádná odpověď."
 
 msgid "No response."
 msgstr "Žádná odpověď."
 

-#: ../coreapi/callbacks.c:499
+#: ../coreapi/callbacks.c:500

 msgid "Protocol error."
 msgstr "Chyba protokolu."
 
 msgid "Protocol error."
 msgstr "Chyba protokolu."
 

-#: ../coreapi/callbacks.c:515
+#: ../coreapi/callbacks.c:516

 msgid "Redirected"
 msgstr "Přesměrováno"
 
 msgid "Redirected"
 msgstr "Přesměrováno"
 

-#: ../coreapi/callbacks.c:525
+#: ../coreapi/callbacks.c:526

 msgid "Not found"
 msgstr "Nenalezeno"
 
 msgid "Not found"
 msgstr "Nenalezeno"
 

-#: ../coreapi/callbacks.c:550
+#: ../coreapi/callbacks.c:551

 msgid "No common codecs"
 msgstr "Žádný společný formát"
 
 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."
 
 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á."
 
 #, 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."
 
 #, 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"
 
 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"
 
 #, 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"
 
 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"
 
 #, 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."
 #, 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ů."
 
 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"
 
 #~ msgid "Windows"
 #~ msgstr "Okna"
 


@@ -1875,9 +1909,6 @@ msgstr[2] "Máte %i zmeškaných hovorů."
 #~ msgid "Exit"
 #~ msgstr "Ukončit"
 
 #~ msgid "Exit"
 #~ msgstr "Ukončit"
 

-#~ msgid "Shows the address book"
-#~ msgstr "Zobrazit adresář"
-

 #~ msgid "..."
 #~ msgstr "…"
 
 #~ 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 "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"
 
 #~ msgid "Wait"
 #~ msgstr "Zdržet"
 

diff --git a/po/de.po b/po/de.po
index d826a1ff9c4ee74c9eeedb442c03acd4b7084a07..12924c98b91a49437748d36b5771670544b4ca10 100644 (file)
--- 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"
 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"
 "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"
 
 "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"
 #: ../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"
 
 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"
 
 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."
 
 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"
 
 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"
 
 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)"
 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)"
 
 "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"
 
 #, 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"
 #, 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."
 
 "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"
 #, 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:"
 
 "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"
 
 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"
 
 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)"
 
 #, 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."
 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."
 
 "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"
 
 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"
 
 msgid "Name"
 msgstr "Name"
 

-#: ../gtk/friendlist.c:205
+#: ../gtk/friendlist.c:271

 msgid "Presence status"
 msgstr "Anwesenheitsstatus"
 
 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"
 
 #, 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!"
 
 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"
 
 #, 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"
 
 #, 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"
 
 #, 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"
 
 #, 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"
 
 #, 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)"
 
 msgid "Rate (Hz)"
 msgstr "Rate (Hz)"
 

-#: ../gtk/propertybox.c:283
+#: ../gtk/propertybox.c:308

 msgid "Status"
 msgstr "Status"
 
 msgid "Status"
 msgstr "Status"
 

-#: ../gtk/propertybox.c:289
+#: ../gtk/propertybox.c:314

 msgid "Min bitrate (kbit/s)"
 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"
 
 msgid "Parameters"
 msgstr "Parameter"
 

-#: ../gtk/propertybox.c:326 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507

 msgid "Enabled"
 msgstr "Freigegeben"
 
 msgid "Enabled"
 msgstr "Freigegeben"
 

-#: ../gtk/propertybox.c:327 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507

 msgid "Disabled"
 msgstr "Gesperrt"
 
 msgid "Disabled"
 msgstr "Gesperrt"
 

-#: ../gtk/propertybox.c:510
+#: ../gtk/propertybox.c:553

 msgid "Account"
 msgstr "Konto"
 
 msgid "Account"
 msgstr "Konto"
 

-#: ../gtk/propertybox.c:650
+#: ../gtk/propertybox.c:693

 msgid "English"
 msgstr "Englisch"
 
 msgid "English"
 msgstr "Englisch"
 

-#: ../gtk/propertybox.c:651
+#: ../gtk/propertybox.c:694

 msgid "French"
 msgstr "Französisch"
 
 msgid "French"
 msgstr "Französisch"
 

-#: ../gtk/propertybox.c:652
+#: ../gtk/propertybox.c:695

 msgid "Swedish"
 msgstr "Schwedisch"
 
 msgid "Swedish"
 msgstr "Schwedisch"
 

-#: ../gtk/propertybox.c:653
+#: ../gtk/propertybox.c:696

 msgid "Italian"
 msgstr "Italienisch"
 
 msgid "Italian"
 msgstr "Italienisch"
 

-#: ../gtk/propertybox.c:654
+#: ../gtk/propertybox.c:697

 msgid "Spanish"
 msgstr "Spanisch"
 
 msgid "Spanish"
 msgstr "Spanisch"
 

-#: ../gtk/propertybox.c:655
+#: ../gtk/propertybox.c:698

 msgid "Brazilian Portugese"
 msgstr "Brasilianisches Portugiesisch"
 
 msgid "Brazilian Portugese"
 msgstr "Brasilianisches Portugiesisch"
 

-#: ../gtk/propertybox.c:656
+#: ../gtk/propertybox.c:699

 msgid "Polish"
 msgstr "Polnisch"
 
 msgid "Polish"
 msgstr "Polnisch"
 

-#: ../gtk/propertybox.c:657
+#: ../gtk/propertybox.c:700

 msgid "German"
 msgstr "Deutsch"
 
 msgid "German"
 msgstr "Deutsch"
 

-#: ../gtk/propertybox.c:658
+#: ../gtk/propertybox.c:701

 msgid "Russian"
 msgstr "Russisch"
 
 msgid "Russian"
 msgstr "Russisch"
 

-#: ../gtk/propertybox.c:659
+#: ../gtk/propertybox.c:702

 msgid "Japanese"
 msgstr "Japanisch"
 
 msgid "Japanese"
 msgstr "Japanisch"
 

-#: ../gtk/propertybox.c:660
+#: ../gtk/propertybox.c:703

 msgid "Dutch"
 msgstr "Niederländisch"
 
 msgid "Dutch"
 msgstr "Niederländisch"
 

-#: ../gtk/propertybox.c:661
+#: ../gtk/propertybox.c:704

 msgid "Hungarian"
 msgstr "Ungarisch"
 
 msgid "Hungarian"
 msgstr "Ungarisch"
 

-#: ../gtk/propertybox.c:662
+#: ../gtk/propertybox.c:705

 msgid "Czech"
 msgstr "Tschechisch"
 
 msgid "Czech"
 msgstr "Tschechisch"
 

-#: ../gtk/propertybox.c:663
+#: ../gtk/propertybox.c:706

 msgid "Chinese"
 msgstr "Chinesisch"
 
 msgid "Chinese"
 msgstr "Chinesisch"
 

-#: ../gtk/propertybox.c:664
+#: ../gtk/propertybox.c:707

 msgid "Traditional Chinese"
 msgstr "Traditionelles Chinesisch"
 
 msgid "Traditional Chinese"
 msgstr "Traditionelles Chinesisch"
 

-#: ../gtk/propertybox.c:665
+#: ../gtk/propertybox.c:708

 msgid "Norwegian"
 msgstr "Norwegisch"
 
 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."
 
 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 ""
 #: ../gtk/update.c:80
 #, c-format
 msgid ""


@@ -371,74 +433,99 @@ msgstr "Erstellen Ihres Kontos"
 msgid "Now ready !"
 msgstr "Fertig!"
 
 msgid "Now ready !"
 msgstr "Fertig!"
 

-#: ../gtk/incall_view.c:61
+#: ../gtk/incall_view.c:69

 #, c-format
 msgid "Call #%i"
 msgstr "Anruf #%i"
 
 #, 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"
 
 #, 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"
 
 msgid "Transfer"
 msgstr "Vermittlung"
 

-#: ../gtk/incall_view.c:187
+#: ../gtk/incall_view.c:271

 msgid "<b>Calling...</b>"
 msgstr "<b>Verbindungsaufbau...</b>"
 
 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 ""
 
 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>"
 
 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>"
 
 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>"
 
 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 ""
 
 #, 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>"
 
 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"
 
 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"
 
 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
 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>"
 
 #: ../gtk/main.ui.h:15
 msgid "<b>Welcome !</b>"


@@ -524,25 +611,26 @@ msgid "All users"
 msgstr "Alle Teilnehmer"
 
 #: ../gtk/main.ui.h:21
 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"
 
 msgid "Automatically log me in"
 msgstr "Automatisch anmelden"
 

-#: ../gtk/main.ui.h:24
+#: ../gtk/main.ui.h:22

 msgid "B"
 msgstr ""
 
 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 ""
 
 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"
 #: ../gtk/main.ui.h:26
 msgid "Check _Updates"
 msgstr "Auf _Aktualisierungen überprüfen"


@@ -555,10 +643,6 @@ msgstr "Kontakte"
 msgid "D"
 msgstr ""
 
 msgid "D"
 msgstr ""
 

-#: ../gtk/main.ui.h:29
-msgid "Decline"
-msgstr "Abweisen"
-

 #: ../gtk/main.ui.h:30
 msgid "Default"
 msgstr "Vorgabe"
 #: ../gtk/main.ui.h:30
 msgid "Default"
 msgstr "Vorgabe"


@@ -568,13 +652,13 @@ msgid "Duration"
 msgstr "Dauer"
 
 #: ../gtk/main.ui.h:32
 msgstr "Dauer"
 
 #: ../gtk/main.ui.h:32

-msgid "Duration:"
-msgstr "Dauer:"
-
-#: ../gtk/main.ui.h:33

 msgid "Enable self-view"
 msgstr "Selbstansicht ein"
 
 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"
 #: ../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:"
 
 msgid "Lookup:"
 msgstr "Suchen:"
 

-#: ../gtk/main.ui.h:43
+#: ../gtk/main.ui.h:42

 msgid "My current identity:"
 msgstr "Aktuelle Identität:"
 
 msgid "My current identity:"
 msgstr "Aktuelle Identität:"
 

-#: ../gtk/main.ui.h:44
+#: ../gtk/main.ui.h:43

 msgid "Online users"
 msgstr "Angemeldete Teilnehmer"
 
 msgid "Online users"
 msgstr "Angemeldete Teilnehmer"
 

-#: ../gtk/main.ui.h:45
+#: ../gtk/main.ui.h:44

 msgid "Password"
 msgstr "Passwort"
 
 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:"
 #: ../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"
 
 msgid "Search"
 msgstr "Suchen"
 

-#: ../gtk/main.ui.h:49
+#: ../gtk/main.ui.h:50

 msgid "Show debug window"
 msgstr "Debug-Fenster anzeigen"
 
 msgid "Show debug window"
 msgstr "Debug-Fenster anzeigen"
 

-#: ../gtk/main.ui.h:50
+#: ../gtk/main.ui.h:51

 msgid "Username"
 msgstr "Benutzername"
 
 msgid "Username"
 msgstr "Benutzername"
 

-#: ../gtk/main.ui.h:51
-msgid "_Call history"
-msgstr "Anrufchronik"
-

 #: ../gtk/main.ui.h:52
 msgid "_Help"
 msgstr "_Hilfe"
 #: ../gtk/main.ui.h:52
 msgid "_Help"
 msgstr "_Hilfe"


@@ -648,18 +732,14 @@ msgid "_Homepage"
 msgstr ""
 
 #: ../gtk/main.ui.h:54
 msgstr ""
 
 #: ../gtk/main.ui.h:54

-msgid "_Linphone"
-msgstr ""
-
-#: ../gtk/main.ui.h:55

 msgid "_Options"
 msgstr "_Optionen"
 
 msgid "_Options"
 msgstr "_Optionen"
 

-#: ../gtk/main.ui.h:56
+#: ../gtk/main.ui.h:55

 msgid "in"
 msgstr "in"
 
 msgid "in"
 msgstr "in"
 

-#: ../gtk/main.ui.h:57
+#: ../gtk/main.ui.h:56

 msgid "label"
 msgstr ""
 
 msgid "label"
 msgstr ""
 


@@ -720,14 +800,6 @@ msgstr "SIP-Adresse"
 msgid "Show this contact presence status"
 msgstr "Anwesenheitsstatus dieses Kontakts zeigen"
 
 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"
 #: ../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"
 
 #: ../gtk/call_logs.ui.h:1
 msgid "Call back"

-msgstr "Zurückrufen"
+msgstr "Anrufen"

 
 #: ../gtk/call_logs.ui.h:2
 msgid "Call history"
 
 #: ../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
 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):"
 
 #: ../gtk/sip_account.ui.h:7
 msgid "Registration duration (sec):"


@@ -808,10 +880,6 @@ msgstr "sip:"
 msgid "Send"
 msgstr "Senden"
 
 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“"
 #: ../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
 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>"
 
 #: ../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
 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):"
 
 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"
 
 msgid "Add"
 msgstr "Hinzufügen"
 

-#: ../gtk/parameters.ui.h:16
+#: ../gtk/parameters.ui.h:17

 msgid "Audio RTP/UDP:"
 msgstr ""
 
 msgid "Audio RTP/UDP:"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:17
+#: ../gtk/parameters.ui.h:18

 msgid "Audio codecs"
 msgstr "Audio-Codecs"
 
 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)"
 
 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)"
 
 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 ""
 
 msgid "CIF"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:22
+#: ../gtk/parameters.ui.h:23

 msgid "Capture device:"
 msgstr "Aufnahmegerät:"
 
 msgid "Capture device:"
 msgstr "Aufnahmegerät:"
 

-#: ../gtk/parameters.ui.h:23
+#: ../gtk/parameters.ui.h:24

 msgid "Codecs"
 msgstr "Codecs"
 
 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"
 
 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"
 
 msgid "Disable"
 msgstr "Sperren"
 

-#: ../gtk/parameters.ui.h:26
+#: ../gtk/parameters.ui.h:27

 msgid "Done"
 msgstr "Fertig"
 
 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):"
 
 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"
 
 msgid "Edit"
 msgstr "Bearbeiten"
 

-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:30

 msgid "Enable"
 msgstr "Freigeben"
 
 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"
 
 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"
 
 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"
 
 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"
 
 msgid "Multimedia settings"
 msgstr "Multimedia-Einstellungen"
 

-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:37

 msgid "Network settings"
 msgstr "Netzwerkeinstellungen"
 
 msgid "Network settings"
 msgstr "Netzwerkeinstellungen"
 

-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:38

 msgid "Playback device:"
 msgstr "Wiedergabegerät:"
 
 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:"
 
 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:"
 
 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 !"
 msgid ""
 "Register to FONICS\n"
 "virtual network !"


@@ -964,97 +1048,101 @@ msgstr ""
 "Am virtuellen FONICS\n"
 "Netzwerk anmelden!"
 
 "Am virtuellen FONICS\n"
 "Netzwerk anmelden!"
 

-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:43

 msgid "Remove"
 msgstr "Entfernen"
 
 msgid "Remove"
 msgstr "Entfernen"
 

-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:44

 msgid "Ring device:"
 msgstr "Gerät für Klingelton:"
 
 msgid "Ring device:"
 msgstr "Gerät für Klingelton:"
 

-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:45

 msgid "Ring sound:"
 msgstr "Klingelton:"
 
 msgid "Ring sound:"
 msgstr "Klingelton:"
 

-#: ../gtk/parameters.ui.h:43
-msgid "SIP (TCP):"
+#: ../gtk/parameters.ui.h:46
+msgid "SIP (TCP)"

 msgstr ""
 
 msgstr ""
 

-#: ../gtk/parameters.ui.h:44
-msgid "SIP (UDP):"
+#: ../gtk/parameters.ui.h:47
+msgid "SIP (TLS)"

 msgstr ""
 
 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"
 
 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:"
 
 msgid "Set Maximum Transmission Unit:"
 msgstr "Maximum Transmission Unit setzen:"
 

-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:51

 msgid "Settings"
 msgstr "Einstellungen"
 
 msgid "Settings"
 msgstr "Einstellungen"
 

-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:52

 msgid "Show advanced settings"
 msgstr "Fortgeschrittene Einstellungen anzeigen"
 
 msgid "Show advanced settings"
 msgstr "Fortgeschrittene Einstellungen anzeigen"
 

-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:53

 msgid "Stun server:"
 msgstr "STUN-Server:"
 
 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."
 
 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):"
 
 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"
 
 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"
 
 msgid "User interface"
 msgstr "Benutzeroberfläche"
 

-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:58

 msgid "Video RTP/UDP:"
 msgstr ""
 
 msgid "Video RTP/UDP:"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:59

 msgid "Video codecs"
 msgstr "Video-Codecs"
 
 msgid "Video codecs"
 msgstr "Video-Codecs"
 

-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:60

 msgid "Video input device:"
 msgstr "Video-Aufnahmegerät:"
 
 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):"
 
 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:"
 
 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:"
 
 msgid "Your username:"
 msgstr "Ihr Benutzername:"
 

-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:64

 msgid "a sound card"
 msgstr "eine Soundkarte"
 
 msgid "a sound card"
 msgstr "eine Soundkarte"
 

-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:65

 msgid "default camera"
 msgstr "Standard-Kamera"
 
 msgid "default camera"
 msgstr "Standard-Kamera"
 

-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:66

 msgid "default soundcard"
 msgstr "Standard-Soundkarte"
 
 msgid "default soundcard"
 msgstr "Standard-Soundkarte"
 


@@ -1078,26 +1166,19 @@ msgstr "Linphone"
 msgid "Please wait"
 msgstr "Bitte warten"
 
 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"
 
 msgid "aborted"
 msgstr "abgebrochen"
 

-#: ../coreapi/linphonecore.c:209
+#: ../coreapi/linphonecore.c:190

 msgid "completed"
 msgstr "beendet"
 
 msgid "completed"
 msgstr "beendet"
 

-#: ../coreapi/linphonecore.c:212
+#: ../coreapi/linphonecore.c:193

 msgid "missed"
 msgstr "entgangen"
 
 msgid "missed"
 msgstr "entgangen"
 

-#: ../coreapi/linphonecore.c:217
+#: ../coreapi/linphonecore.c:198

 #, c-format
 msgid ""
 "%s at %s\n"
 #, c-format
 msgid ""
 "%s at %s\n"


@@ -1112,27 +1193,23 @@ msgstr ""
 "Status: %s\n"
 "Dauer: %i min %i sec\n"
 
 "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"
 
 msgid "Outgoing call"
 msgstr "Abgehender Anruf"
 

-#: ../coreapi/linphonecore.c:998
+#: ../coreapi/linphonecore.c:1088

 msgid "Ready"
 msgstr "Bereit"
 
 msgid "Ready"
 msgstr "Bereit"
 

-#: ../coreapi/linphonecore.c:1773
+#: ../coreapi/linphonecore.c:1831

 msgid "Looking for telephone number destination..."
 msgstr "Telefonnummernziel wird gesucht..."
 
 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."
 
 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"
 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>"
 
 "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"
 
 msgid "Contacting"
 msgstr "Verbindungsaufbau"
 

-#: ../coreapi/linphonecore.c:1974
+#: ../coreapi/linphonecore.c:2032

 msgid "Could not call"
 msgstr "Anruf kann nicht getätigt werden."
 
 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."
 
 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..."
 
 msgid "Modifying call parameters..."
 msgstr "Die Anrufparameter werden verändert..."
 

-#: ../coreapi/linphonecore.c:2311
+#: ../coreapi/linphonecore.c:2366

 msgid "Connected."
 msgstr "Verbunden."
 
 msgid "Connected."
 msgstr "Verbunden."
 

-#: ../coreapi/linphonecore.c:2334
+#: ../coreapi/linphonecore.c:2389

 msgid "Call aborted"
 msgstr "Anruf abgebrochen"
 
 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"
 
 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..."
 
 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"
 #: ../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"
 
 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."
 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."
 
 "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"
 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"
 
 "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"
 
 #, 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"
 
 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."
 
 msgid " and asked autoanswer."
 msgstr " und fragt nach automatischer Antwort."
 

-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207

 msgid "."
 msgstr ""
 
 msgid "."
 msgstr ""
 

-#: ../coreapi/callbacks.c:226
+#: ../coreapi/callbacks.c:266

 msgid "Remote ringing."
 msgstr "Klingeln bei der Gegenseite."
 
 msgid "Remote ringing."
 msgstr "Klingeln bei der Gegenseite."
 

-#: ../coreapi/callbacks.c:242
+#: ../coreapi/callbacks.c:282

 msgid "Remote ringing..."
 msgstr "Klingeln bei der Gegenseite..."
 
 msgid "Remote ringing..."
 msgstr "Klingeln bei der Gegenseite..."
 

-#: ../coreapi/callbacks.c:253
+#: ../coreapi/callbacks.c:293

 msgid "Early media."
 msgstr ""
 
 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."
 
 #, 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."
 
 #, 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."
 
 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."
 
 #, 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..."
 
 msgid "We are being paused..."
 msgstr "Anruf wird gehalten..."
 

-#: ../coreapi/callbacks.c:387
+#: ../coreapi/callbacks.c:436

 msgid "We have been resumed..."
 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."
 
 msgid "Call terminated."
 msgstr "Anruf beendet."
 

-#: ../coreapi/callbacks.c:431
+#: ../coreapi/callbacks.c:480

 msgid "User is busy."
 msgstr "Teilnehmer ist besetzt."
 
 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).");
 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."
 
 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"
 
 msgid "Call declined."
 msgstr "Anruf abgewiesen"
 

-#: ../coreapi/callbacks.c:447
+#: ../coreapi/callbacks.c:496

 msgid "No response."
 msgstr "Keine Antwort."
 
 msgid "No response."
 msgstr "Keine Antwort."
 

-#: ../coreapi/callbacks.c:451
+#: ../coreapi/callbacks.c:500

 msgid "Protocol error."
 msgstr "Protokollfehler"
 
 msgid "Protocol error."
 msgstr "Protokollfehler"
 

-#: ../coreapi/callbacks.c:467
+#: ../coreapi/callbacks.c:516

 msgid "Redirected"
 msgstr "Umgeleitet"
 
 msgid "Redirected"
 msgstr "Umgeleitet"
 

-#: ../coreapi/callbacks.c:477
+#: ../coreapi/callbacks.c:526

 msgid "Not found"
 msgstr "Nicht gefunden"
 
 msgid "Not found"
 msgstr "Nicht gefunden"
 

-#: ../coreapi/callbacks.c:487
+#: ../coreapi/callbacks.c:551

 msgid "No common codecs"
 msgstr "Keine gemeinsamen Codecs"
 
 msgid "No common codecs"
 msgstr "Keine gemeinsamen Codecs"
 

-#: ../coreapi/callbacks.c:493
+#: ../coreapi/callbacks.c:557

 msgid "Call failed."
 msgstr "Anruf fehlgeschlagen."
 
 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."
 
 #, 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."
 
 #, 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"
 
 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"
 
 #, 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"
 
 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"
 
 #~ 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 "Authentication required for realm %s"
 #~ msgstr "Authentifikation erforderlich für Bereich %s"
 

-#~ msgid "None"
-#~ msgstr "Keinen"
-

 #~ msgid "Wait"
 #~ msgstr "Warten"
 
 #~ msgid "Wait"
 #~ msgstr "Warten"
 


@@ -2112,12 +2222,6 @@ msgstr "Authentifikation fehlgeschlagen"
 #~ msgid "Timeout..."
 #~ msgstr "Zeitüberschreitung..."
 
 #~ 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."
 #~ 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 (file)
--- 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"
 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"
 "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"
 
 "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"
 #: ../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 ""
 
 msgid "Chat with %s"
 msgstr ""
 

-#: ../gtk/main.c:74
+#: ../gtk/main.c:83

 msgid "log to stdout some debug information while running."
 msgstr ""
 
 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 ""
 
 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 ""
 
 msgid "address to call right now"
 msgstr ""
 

-#: ../gtk/main.c:95
+#: ../gtk/main.c:111

 msgid "if set automatically answer incoming calls"
 msgstr ""
 
 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 ""
 
 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 ""
 
 #, 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"
 #, 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 ""
 
 "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 ""
 
 #, 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 ""
 
 msgid "Website link"
 msgstr ""
 

-#: ../gtk/main.c:1076
+#: ../gtk/main.c:1205

 msgid "Linphone - a video internet phone"
 msgstr ""
 
 msgid "Linphone - a video internet phone"
 msgstr ""
 

-#: ../gtk/main.c:1095
+#: ../gtk/main.c:1295

 #, c-format
 msgid "%s (Default)"
 msgstr ""
 
 #, 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 ""
 
 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 ""
 
 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 ""
 
 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"
 
 msgid "Name"
 msgstr "Nombre"
 

-#: ../gtk/friendlist.c:205
+#: ../gtk/friendlist.c:271

 #, fuzzy
 msgid "Presence status"
 msgstr "Estado"
 
 #, fuzzy
 msgid "Presence status"
 msgstr "Estado"
 

-#: ../gtk/friendlist.c:242
+#: ../gtk/friendlist.c:308

 #, c-format
 msgid "Search in %s directory"
 msgstr ""
 
 #, c-format
 msgid "Search in %s directory"
 msgstr ""
 

-#: ../gtk/friendlist.c:450
+#: ../gtk/friendlist.c:568

 msgid "Invalid sip contact !"
 msgstr ""
 
 msgid "Invalid sip contact !"
 msgstr ""
 

-#: ../gtk/friendlist.c:495
+#: ../gtk/friendlist.c:613

 #, c-format
 msgid "Call %s"
 msgstr ""
 
 #, c-format
 msgid "Call %s"
 msgstr ""
 

-#: ../gtk/friendlist.c:496
+#: ../gtk/friendlist.c:614

 #, c-format
 msgid "Send text to %s"
 msgstr ""
 
 #, 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 !)"
 
 #, 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 ""
 
 #, 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 ""
 
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr ""
 

-#: ../gtk/propertybox.c:277
+#: ../gtk/propertybox.c:302

 msgid "Rate (Hz)"
 msgstr ""
 
 msgid "Rate (Hz)"
 msgstr ""
 

-#: ../gtk/propertybox.c:283
+#: ../gtk/propertybox.c:308

 msgid "Status"
 msgstr "Estado"
 
 msgid "Status"
 msgstr "Estado"
 

-#: ../gtk/propertybox.c:289
+#: ../gtk/propertybox.c:314

 msgid "Min bitrate (kbit/s)"
 msgstr ""
 
 msgid "Min bitrate (kbit/s)"
 msgstr ""
 

-#: ../gtk/propertybox.c:296
+#: ../gtk/propertybox.c:321

 msgid "Parameters"
 msgstr "Parametros"
 
 msgid "Parameters"
 msgstr "Parametros"
 

-#: ../gtk/propertybox.c:326 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507

 msgid "Enabled"
 msgstr "Activado"
 
 msgid "Enabled"
 msgstr "Activado"
 

-#: ../gtk/propertybox.c:327 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507

 msgid "Disabled"
 msgstr "Desactivado"
 
 msgid "Disabled"
 msgstr "Desactivado"
 

-#: ../gtk/propertybox.c:510
+#: ../gtk/propertybox.c:553

 msgid "Account"
 msgstr ""
 
 msgid "Account"
 msgstr ""
 

-#: ../gtk/propertybox.c:650
+#: ../gtk/propertybox.c:693

 msgid "English"
 msgstr ""
 
 msgid "English"
 msgstr ""
 

-#: ../gtk/propertybox.c:651
+#: ../gtk/propertybox.c:694

 msgid "French"
 msgstr ""
 
 msgid "French"
 msgstr ""
 

-#: ../gtk/propertybox.c:652
+#: ../gtk/propertybox.c:695

 msgid "Swedish"
 msgstr ""
 
 msgid "Swedish"
 msgstr ""
 

-#: ../gtk/propertybox.c:653
+#: ../gtk/propertybox.c:696

 msgid "Italian"
 msgstr ""
 
 msgid "Italian"
 msgstr ""
 

-#: ../gtk/propertybox.c:654
+#: ../gtk/propertybox.c:697

 msgid "Spanish"
 msgstr ""
 
 msgid "Spanish"
 msgstr ""
 

-#: ../gtk/propertybox.c:655
+#: ../gtk/propertybox.c:698

 msgid "Brazilian Portugese"
 msgstr ""
 
 msgid "Brazilian Portugese"
 msgstr ""
 

-#: ../gtk/propertybox.c:656
+#: ../gtk/propertybox.c:699

 msgid "Polish"
 msgstr ""
 
 msgid "Polish"
 msgstr ""
 

-#: ../gtk/propertybox.c:657
+#: ../gtk/propertybox.c:700

 msgid "German"
 msgstr ""
 
 msgid "German"
 msgstr ""
 

-#: ../gtk/propertybox.c:658
+#: ../gtk/propertybox.c:701

 msgid "Russian"
 msgstr ""
 
 msgid "Russian"
 msgstr ""
 

-#: ../gtk/propertybox.c:659
+#: ../gtk/propertybox.c:702

 msgid "Japanese"
 msgstr ""
 
 msgid "Japanese"
 msgstr ""
 

-#: ../gtk/propertybox.c:660
+#: ../gtk/propertybox.c:703

 msgid "Dutch"
 msgstr ""
 
 msgid "Dutch"
 msgstr ""
 

-#: ../gtk/propertybox.c:661
+#: ../gtk/propertybox.c:704

 msgid "Hungarian"
 msgstr ""
 
 msgid "Hungarian"
 msgstr ""
 

-#: ../gtk/propertybox.c:662
+#: ../gtk/propertybox.c:705

 msgid "Czech"
 msgstr ""
 
 msgid "Czech"
 msgstr ""
 

-#: ../gtk/propertybox.c:663
+#: ../gtk/propertybox.c:706

 msgid "Chinese"
 msgstr ""
 
 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 ""
 
 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 ""
 #: ../gtk/update.c:80
 #, c-format
 msgid ""


@@ -345,77 +421,104 @@ msgstr ""
 msgid "Now ready !"
 msgstr ""
 
 msgid "Now ready !"
 msgstr ""
 

-#: ../gtk/incall_view.c:61
+#: ../gtk/incall_view.c:69

 #, fuzzy, c-format
 msgid "Call #%i"
 msgstr "Llamada cancelada."
 
 #, 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 ""
 
 #, c-format
 msgid "Transfer to call #%i with %s"
 msgstr ""
 

-#: ../gtk/incall_view.c:113
+#: ../gtk/incall_view.c:155

 msgid "Transfer"
 msgstr ""
 
 msgid "Transfer"
 msgstr ""
 

-#: ../gtk/incall_view.c:187
+#: ../gtk/incall_view.c:271

 #, fuzzy
 msgid "<b>Calling...</b>"
 msgstr "Contactando "
 
 #, 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 ""
 
 msgid "00::00::00"
 msgstr ""
 

-#: ../gtk/incall_view.c:206
+#: ../gtk/incall_view.c:285

 #, fuzzy
 msgid "<b>Incoming call</b>"
 msgstr "Contactando "
 
 #, 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 ""
 
 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 ""
 
 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 "
 
 #, 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 "
 
 #, 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 ""
 
 #, 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."
 
 #, 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 ""
 
 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 ""
 
 msgid "Pause"
 msgstr ""
 


@@ -479,8 +582,8 @@ msgstr "Informacion de codec"
 
 #: ../gtk/main.ui.h:14
 #, fuzzy
 
 #: ../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
 
 #: ../gtk/main.ui.h:15
 #, fuzzy


@@ -505,27 +608,26 @@ msgid "All users"
 msgstr ""
 
 #: ../gtk/main.ui.h:21
 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 ""
 
 msgid "Automatically log me in"
 msgstr ""
 

-#: ../gtk/main.ui.h:24
+#: ../gtk/main.ui.h:22

 msgid "B"
 msgstr ""
 
 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 ""
 
 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 ""
 #: ../gtk/main.ui.h:26
 msgid "Check _Updates"
 msgstr ""


@@ -539,11 +641,6 @@ msgstr "Contactando "
 msgid "D"
 msgstr ""
 
 msgid "D"
 msgstr ""
 

-#: ../gtk/main.ui.h:29
-#, fuzzy
-msgid "Decline"
-msgstr "linea"
-

 #: ../gtk/main.ui.h:30
 #, fuzzy
 msgid "Default"
 #: ../gtk/main.ui.h:30
 #, fuzzy
 msgid "Default"


@@ -556,12 +653,12 @@ msgstr "Informacion"
 
 #: ../gtk/main.ui.h:32
 #, fuzzy
 
 #: ../gtk/main.ui.h:32
 #, fuzzy

-msgid "Duration:"
-msgstr "Informacion"
+msgid "Enable self-view"
+msgstr "Activado"

 
 #: ../gtk/main.ui.h:33
 #, fuzzy
 
 #: ../gtk/main.ui.h:33
 #, fuzzy

-msgid "Enable self-view"
+msgid "Enable video"

 msgstr "Activado"
 
 #: ../gtk/main.ui.h:34
 msgstr "Activado"
 
 #: ../gtk/main.ui.h:34


@@ -598,21 +695,26 @@ msgstr "Informacion de codec"
 msgid "Lookup:"
 msgstr ""
 
 msgid "Lookup:"
 msgstr ""
 

-#: ../gtk/main.ui.h:43
+#: ../gtk/main.ui.h:42

 #, fuzzy
 msgid "My current identity:"
 msgstr "Identidad"
 
 #, fuzzy
 msgid "My current identity:"
 msgstr "Identidad"
 

-#: ../gtk/main.ui.h:44
+#: ../gtk/main.ui.h:43

 #, fuzzy
 msgid "Online users"
 msgstr "linea"
 
 #, fuzzy
 msgid "Online users"
 msgstr "linea"
 

-#: ../gtk/main.ui.h:45
+#: ../gtk/main.ui.h:44

 #, fuzzy
 msgid "Password"
 msgstr "Tu Contraseña:"
 
 #, 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:"
 #: ../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 ""
 
 msgid "Search"
 msgstr ""
 

-#: ../gtk/main.ui.h:49
+#: ../gtk/main.ui.h:50

 #, fuzzy
 msgid "Show debug window"
 msgstr "Linphone esta terminando..."
 
 #, 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"
 
 #, fuzzy
 msgid "Username"
 msgstr "Manual de Usuario"
 

-#: ../gtk/main.ui.h:51
-msgid "_Call history"
-msgstr ""
-

 #: ../gtk/main.ui.h:52
 msgid "_Help"
 msgstr ""
 #: ../gtk/main.ui.h:52
 msgid "_Help"
 msgstr ""


@@ -645,19 +743,14 @@ msgid "_Homepage"
 msgstr ""
 
 #: ../gtk/main.ui.h:54
 msgstr ""
 
 #: ../gtk/main.ui.h:54

-#, fuzzy
-msgid "_Linphone"
-msgstr "linphone"
-
-#: ../gtk/main.ui.h:55

 msgid "_Options"
 msgstr ""
 
 msgid "_Options"
 msgstr ""
 

-#: ../gtk/main.ui.h:56
+#: ../gtk/main.ui.h:55

 msgid "in"
 msgstr ""
 
 msgid "in"
 msgstr ""
 

-#: ../gtk/main.ui.h:57
+#: ../gtk/main.ui.h:56

 msgid "label"
 msgstr ""
 
 msgid "label"
 msgstr ""
 


@@ -707,16 +800,6 @@ msgstr "Direccion"
 msgid "Show this contact presence status"
 msgstr ""
 
 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"
 #: ../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
 msgstr "Informacion de codec"
 
 #: ../gtk/sip_account.ui.h:6

-msgid "Register at startup"
+msgid "Register"

 msgstr ""
 
 #: ../gtk/sip_account.ui.h:7
 msgstr ""
 
 #: ../gtk/sip_account.ui.h:7


@@ -805,11 +888,6 @@ msgstr "SIP:"
 msgid "Send"
 msgstr "Sonido"
 
 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 ""
 #: ../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
 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
 
 #: ../gtk/parameters.ui.h:10
 #, fuzzy


@@ -874,207 +951,225 @@ msgid "<b>Video</b>"
 msgstr "Contactando "
 
 #: ../gtk/parameters.ui.h:14
 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
 msgstr ""
 
 #: ../gtk/parameters.ui.h:15

+msgid "ALSA special device (optional):"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:16

 msgid "Add"
 msgstr "Añadir"
 
 msgid "Add"
 msgstr "Añadir"
 

-#: ../gtk/parameters.ui.h:16
+#: ../gtk/parameters.ui.h:17

 msgid "Audio RTP/UDP:"
 msgstr ""
 
 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"
 
 #, 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 ""
 
 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 ""
 
 msgid "Behind NAT / Firewall (use STUN to resolve)"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:21
+#: ../gtk/parameters.ui.h:22

 msgid "CIF"
 msgstr ""
 
 msgid "CIF"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:22
+#: ../gtk/parameters.ui.h:23

 #, fuzzy
 msgid "Capture device:"
 msgstr "Usar dispositivo de sonido:"
 
 #, fuzzy
 msgid "Capture device:"
 msgstr "Usar dispositivo de sonido:"
 

-#: ../gtk/parameters.ui.h:23
+#: ../gtk/parameters.ui.h:24

 #, fuzzy
 msgid "Codecs"
 msgstr "Codecs"
 
 #, fuzzy
 msgid "Codecs"
 msgstr "Codecs"
 

-#: ../gtk/parameters.ui.h:24
+#: ../gtk/parameters.ui.h:25

 msgid "Direct connection to the Internet"
 msgstr ""
 
 msgid "Direct connection to the Internet"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:25
+#: ../gtk/parameters.ui.h:26

 msgid "Disable"
 msgstr "Desactivado"
 
 msgid "Disable"
 msgstr "Desactivado"
 

-#: ../gtk/parameters.ui.h:26
+#: ../gtk/parameters.ui.h:27

 #, fuzzy
 msgid "Done"
 msgstr "Ninguno."
 
 #, fuzzy
 msgid "Done"
 msgstr "Ninguno."
 

-#: ../gtk/parameters.ui.h:27
+#: ../gtk/parameters.ui.h:28

 msgid "Download speed limit in Kbit/sec:"
 msgstr ""
 
 msgid "Download speed limit in Kbit/sec:"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:28
+#: ../gtk/parameters.ui.h:29

 msgid "Edit"
 msgstr ""
 
 msgid "Edit"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:30

 msgid "Enable"
 msgstr "Activado"
 
 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 ""
 
 msgid "Enable echo cancellation"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:31
+#: ../gtk/parameters.ui.h:33

 msgid "Erase all passwords"
 msgstr ""
 
 msgid "Erase all passwords"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:32
+#: ../gtk/parameters.ui.h:34

 msgid "Manage SIP Accounts"
 msgstr ""
 
 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 ""
 
 msgid "Multimedia settings"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:37

 #, fuzzy
 msgid "Network settings"
 msgstr "Red"
 
 #, 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:"
 
 #, fuzzy
 msgid "Playback device:"
 msgstr "Usar dispositivo de sonido:"
 

-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:39

 msgid "Prefered video resolution:"
 msgstr ""
 
 msgid "Prefered video resolution:"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:40

 #, fuzzy
 msgid "Public IP address:"
 msgstr "Direccion SIP"
 
 #, 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 ""
 
 msgid ""
 "Register to FONICS\n"
 "virtual network !"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:43

 msgid "Remove"
 msgstr "Borrar"
 
 msgid "Remove"
 msgstr "Borrar"
 

-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:44

 #, fuzzy
 msgid "Ring device:"
 msgstr "Usar dispositivo de sonido:"
 
 #, 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:"
 
 #, 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 ""
 
 msgstr ""
 

-#: ../gtk/parameters.ui.h:44
-msgid "SIP (UDP):"
+#: ../gtk/parameters.ui.h:47
+msgid "SIP (TLS)"

 msgstr ""
 
 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 ""
 
 msgid "Send DTMFs as SIP info"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:46
+#: ../gtk/parameters.ui.h:50

 msgid "Set Maximum Transmission Unit:"
 msgstr ""
 
 msgid "Set Maximum Transmission Unit:"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:51

 msgid "Settings"
 msgstr ""
 
 msgid "Settings"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:52

 msgid "Show advanced settings"
 msgstr ""
 
 msgid "Show advanced settings"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:53

 #, fuzzy
 msgid "Stun server:"
 msgstr "Servidor de Redireccionamiento"
 
 #, 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 ""
 
 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 ""
 
 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 ""
 
 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"
 
 #, fuzzy
 msgid "User interface"
 msgstr "Manual de Usuario"
 

-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:58

 msgid "Video RTP/UDP:"
 msgstr ""
 
 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"
 
 #, 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:"
 
 #, 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 ""
 
 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:"
 
 #, 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"
 
 #, fuzzy
 msgid "Your username:"
 msgstr "Manual de Usuario"
 

-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:64

 msgid "a sound card"
 msgstr ""
 
 msgid "a sound card"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:65

 msgid "default camera"
 msgstr ""
 
 msgid "default camera"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:66

 msgid "default soundcard"
 msgstr ""
 
 msgid "default soundcard"
 msgstr ""
 


@@ -1101,26 +1196,19 @@ msgstr "linphone"
 msgid "Please wait"
 msgstr ""
 
 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 ""
 
 msgid "aborted"
 msgstr ""
 

-#: ../coreapi/linphonecore.c:209
+#: ../coreapi/linphonecore.c:190

 msgid "completed"
 msgstr ""
 
 msgid "completed"
 msgstr ""
 

-#: ../coreapi/linphonecore.c:212
+#: ../coreapi/linphonecore.c:193

 msgid "missed"
 msgstr ""
 
 msgid "missed"
 msgstr ""
 

-#: ../coreapi/linphonecore.c:217
+#: ../coreapi/linphonecore.c:198

 #, c-format
 msgid ""
 "%s at %s\n"
 #, c-format
 msgid ""
 "%s at %s\n"


@@ -1130,28 +1218,24 @@ msgid ""
 "Duration: %i mn %i sec\n"
 msgstr ""
 
 "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 ""
 
 msgid "Outgoing call"
 msgstr ""
 

-#: ../coreapi/linphonecore.c:998
+#: ../coreapi/linphonecore.c:1088

 #, fuzzy
 msgid "Ready"
 msgstr "Preparado."
 
 #, fuzzy
 msgid "Ready"
 msgstr "Preparado."
 

-#: ../coreapi/linphonecore.c:1773
+#: ../coreapi/linphonecore.c:1831

 msgid "Looking for telephone number destination..."
 msgstr ""
 
 msgid "Looking for telephone number destination..."
 msgstr ""
 

-#: ../coreapi/linphonecore.c:1776
+#: ../coreapi/linphonecore.c:1834

 msgid "Could not resolve this number."
 msgstr ""
 
 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:"
 #, 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>"
 
 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 "
 
 #, 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"
 
 #, 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 ""
 
 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 ""
 
 msgid "Modifying call parameters..."
 msgstr ""
 

-#: ../coreapi/linphonecore.c:2311
+#: ../coreapi/linphonecore.c:2366

 msgid "Connected."
 msgstr "Conectado."
 
 msgid "Connected."
 msgstr "Conectado."
 

-#: ../coreapi/linphonecore.c:2334
+#: ../coreapi/linphonecore.c:2389

 #, fuzzy
 msgid "Call aborted"
 msgstr "Llamada cancelada."
 
 #, 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 ""
 
 msgid "Could not pause the call"
 msgstr ""
 

-#: ../coreapi/linphonecore.c:2460
+#: ../coreapi/linphonecore.c:2535

 msgid "Pausing the current call..."
 msgstr ""
 
 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"
 #: ../coreapi/misc.c:147
 msgid ""
 "Your computer appears to be using ALSA sound drivers.\n"


@@ -1287,156 +1358,203 @@ msgstr ""
 msgid "Unknown-bug"
 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 ""
 
 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 ""
 
 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"
 
 #, 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."
 
 #, fuzzy
 msgid "is contacting you"
 msgstr "le esta llamando."
 

-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207

 msgid " and asked autoanswer."
 msgstr ""
 
 msgid " and asked autoanswer."
 msgstr ""
 

-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207

 msgid "."
 msgstr ""
 
 msgid "."
 msgstr ""
 

-#: ../coreapi/callbacks.c:226
+#: ../coreapi/callbacks.c:266

 #, fuzzy
 msgid "Remote ringing."
 msgstr "Registrando..."
 
 #, fuzzy
 msgid "Remote ringing."
 msgstr "Registrando..."
 

-#: ../coreapi/callbacks.c:242
+#: ../coreapi/callbacks.c:282

 #, fuzzy
 msgid "Remote ringing..."
 msgstr "Registrando..."
 
 #, fuzzy
 msgid "Remote ringing..."
 msgstr "Registrando..."
 

-#: ../coreapi/callbacks.c:253
+#: ../coreapi/callbacks.c:293

 msgid "Early media."
 msgstr ""
 
 msgid "Early media."
 msgstr ""
 

-#: ../coreapi/callbacks.c:291
+#: ../coreapi/callbacks.c:331

 #, c-format
 msgid "Call with %s is paused."
 msgstr ""
 
 #, 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 ""
 
 #, 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."
 
 #, 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"
 
 #, 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 ""
 
 msgid "We are being paused..."
 msgstr ""
 

-#: ../coreapi/callbacks.c:387
+#: ../coreapi/callbacks.c:436

 msgid "We have been resumed..."
 msgstr ""
 
 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."
 
 #, fuzzy
 msgid "Call terminated."
 msgstr "Llamada cancelada."
 

-#: ../coreapi/callbacks.c:431
+#: ../coreapi/callbacks.c:480

 msgid "User is busy."
 msgstr "El usuario esta ocupado."
 
 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).");
 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."
 
 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."
 
 msgid "Call declined."
 msgstr "Llamada cancelada."
 

-#: ../coreapi/callbacks.c:447
+#: ../coreapi/callbacks.c:496

 msgid "No response."
 msgstr ""
 
 msgid "No response."
 msgstr ""
 

-#: ../coreapi/callbacks.c:451
+#: ../coreapi/callbacks.c:500

 msgid "Protocol error."
 msgstr ""
 
 msgid "Protocol error."
 msgstr ""
 

-#: ../coreapi/callbacks.c:467
+#: ../coreapi/callbacks.c:516

 msgid "Redirected"
 msgstr ""
 
 msgid "Redirected"
 msgstr ""
 

-#: ../coreapi/callbacks.c:477
+#: ../coreapi/callbacks.c:526

 msgid "Not found"
 msgstr ""
 
 msgid "Not found"
 msgstr ""
 

-#: ../coreapi/callbacks.c:487
+#: ../coreapi/callbacks.c:551

 msgid "No common codecs"
 msgstr ""
 
 msgid "No common codecs"
 msgstr ""
 

-#: ../coreapi/callbacks.c:493
+#: ../coreapi/callbacks.c:557

 #, fuzzy
 msgid "Call failed."
 msgstr "Llamada cancelada."
 
 #, 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."
 
 #, 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."
 
 #, 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 ""
 
 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."
 
 #, 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"
 
 #, 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"
 #, fuzzy
 #~ msgid "_Modes"
 #~ msgstr "Codecs"


@@ -1649,10 +1767,6 @@ msgstr "Informacion de codec"
 #~ msgid "Name:"
 #~ msgstr "Nombre"
 
 #~ msgid "Name:"
 #~ msgstr "Nombre"
 

-#, fuzzy
-#~ msgid "None"
-#~ msgstr "Ninguno."
-

 #, fuzzy
 #~ msgid "Bad sip address: a sip address looks like sip:user@domain"
 #~ msgstr ""
 #, 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."
 
 #~ 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."
 
 #~ 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 (file)
--- 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"
 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"
 "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"
 
 "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"
 #: ../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"
 
 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"
 
 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."
 
 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"
 
 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"
 
 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)"
 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)"
 
 "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"
 
 #, 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"
 #, 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."
 
 "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"
 #, 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>:"
 
 "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"
 
 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"
 
 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)"
 
 #, 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."
 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."
 
 "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"
 
 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"
 
 msgid "Name"
 msgstr "Nom"
 

-#: ../gtk/friendlist.c:205
+#: ../gtk/friendlist.c:271

 msgid "Presence status"
 msgstr "Info de présence"
 
 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"
 
 #, 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 !"
 
 msgid "Invalid sip contact !"
 msgstr "Contact sip invalide !"
 

-#: ../gtk/friendlist.c:495
+#: ../gtk/friendlist.c:613

 #, c-format
 msgid "Call %s"
 msgstr "Appeler %s"
 
 #, 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"
 
 #, 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'"
 
 #, 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'"
 
 #, 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"
 
 #, 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)"
 
 msgid "Rate (Hz)"
 msgstr "Fréquence (Hz)"
 

-#: ../gtk/propertybox.c:283
+#: ../gtk/propertybox.c:308

 msgid "Status"
 msgstr "Etat"
 
 msgid "Status"
 msgstr "Etat"
 

-#: ../gtk/propertybox.c:289
+#: ../gtk/propertybox.c:314

 msgid "Min bitrate (kbit/s)"
 msgstr "Débit min. (kbit/s)"
 
 msgid "Min bitrate (kbit/s)"
 msgstr "Débit min. (kbit/s)"
 

-#: ../gtk/propertybox.c:296
+#: ../gtk/propertybox.c:321

 msgid "Parameters"
 msgstr "Paramètres"
 
 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é"
 
 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é"
 
 msgid "Disabled"
 msgstr "Désactivé"
 

-#: ../gtk/propertybox.c:510
+#: ../gtk/propertybox.c:553

 msgid "Account"
 msgstr "Compte"
 
 msgid "Account"
 msgstr "Compte"
 

-#: ../gtk/propertybox.c:650
+#: ../gtk/propertybox.c:693

 msgid "English"
 msgstr ""
 
 msgid "English"
 msgstr ""
 

-#: ../gtk/propertybox.c:651
+#: ../gtk/propertybox.c:694

 msgid "French"
 msgstr "Français"
 
 msgid "French"
 msgstr "Français"
 

-#: ../gtk/propertybox.c:652
+#: ../gtk/propertybox.c:695

 msgid "Swedish"
 msgstr ""
 
 msgid "Swedish"
 msgstr ""
 

-#: ../gtk/propertybox.c:653
+#: ../gtk/propertybox.c:696

 msgid "Italian"
 msgstr ""
 
 msgid "Italian"
 msgstr ""
 

-#: ../gtk/propertybox.c:654
+#: ../gtk/propertybox.c:697

 msgid "Spanish"
 msgstr ""
 
 msgid "Spanish"
 msgstr ""
 

-#: ../gtk/propertybox.c:655
+#: ../gtk/propertybox.c:698

 msgid "Brazilian Portugese"
 msgstr ""
 
 msgid "Brazilian Portugese"
 msgstr ""
 

-#: ../gtk/propertybox.c:656
+#: ../gtk/propertybox.c:699

 msgid "Polish"
 msgstr ""
 
 msgid "Polish"
 msgstr ""
 

-#: ../gtk/propertybox.c:657
+#: ../gtk/propertybox.c:700

 msgid "German"
 msgstr ""
 
 msgid "German"
 msgstr ""
 

-#: ../gtk/propertybox.c:658
+#: ../gtk/propertybox.c:701

 msgid "Russian"
 msgstr ""
 
 msgid "Russian"
 msgstr ""
 

-#: ../gtk/propertybox.c:659
+#: ../gtk/propertybox.c:702

 msgid "Japanese"
 msgstr "日本語"
 
 msgid "Japanese"
 msgstr "日本語"
 

-#: ../gtk/propertybox.c:660
+#: ../gtk/propertybox.c:703

 msgid "Dutch"
 msgstr ""
 
 msgid "Dutch"
 msgstr ""
 

-#: ../gtk/propertybox.c:661
+#: ../gtk/propertybox.c:704

 msgid "Hungarian"
 msgstr ""
 
 msgid "Hungarian"
 msgstr ""
 

-#: ../gtk/propertybox.c:662
+#: ../gtk/propertybox.c:705

 msgid "Czech"
 msgstr ""
 
 msgid "Czech"
 msgstr ""
 

-#: ../gtk/propertybox.c:663
+#: ../gtk/propertybox.c:706

 msgid "Chinese"
 msgstr "简体中文"
 
 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."
 
 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 ""
 #: ../gtk/update.c:80
 #, c-format
 msgid ""


@@ -333,9 +403,8 @@ msgid "Account setup assistant"
 msgstr ""
 
 #: ../gtk/setupwizard.c:236
 msgstr ""
 
 #: ../gtk/setupwizard.c:236

-#, fuzzy

 msgid "Choosing a username"
 msgid "Choosing a username"

-msgstr "Votre nom d'utilisateur"
+msgstr "Choix du nom d'utilisateur"

 
 #: ../gtk/setupwizard.c:240
 msgid "Verifying"
 
 #: ../gtk/setupwizard.c:240
 msgid "Verifying"


@@ -354,74 +423,99 @@ msgstr ""
 msgid "Now ready !"
 msgstr ""
 
 msgid "Now ready !"
 msgstr ""
 

-#: ../gtk/incall_view.c:61
-#, fuzzy, c-format
+#: ../gtk/incall_view.c:69
+#, c-format

 msgid "Call #%i"
 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"
 #, 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"
 
 msgid "Transfer"
 msgstr "Transfert"
 

-#: ../gtk/incall_view.c:187
+#: ../gtk/incall_view.c:271

 msgid "<b>Calling...</b>"
 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 ""
 
 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>"
 
 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>"
 
 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>"
 
 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 ""
 
 #, 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>"
 
 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"
 
 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"
 
 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
 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>"
 
 #: ../gtk/main.ui.h:15
 msgid "<b>Welcome !</b>"


@@ -507,25 +601,25 @@ msgid "All users"
 msgstr "Tous"
 
 #: ../gtk/main.ui.h:21
 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"
 
 msgid "Automatically log me in"
 msgstr "Me connecter automatiquement"
 

-#: ../gtk/main.ui.h:24
+#: ../gtk/main.ui.h:22

 msgid "B"
 msgstr ""
 
 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 ""
 
 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 ""
 #: ../gtk/main.ui.h:26
 msgid "Check _Updates"
 msgstr ""


@@ -538,10 +632,6 @@ msgstr "Contacts"
 msgid "D"
 msgstr ""
 
 msgid "D"
 msgstr ""
 

-#: ../gtk/main.ui.h:29
-msgid "Decline"
-msgstr "Refuser"
-

 #: ../gtk/main.ui.h:30
 msgid "Default"
 msgstr "Par défaut"
 #: ../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
 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"
 
 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 ""
 #: ../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:"
 
 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"
 
 msgid "Online users"
 msgstr "En ligne"
 

-#: ../gtk/main.ui.h:45
+#: ../gtk/main.ui.h:44

 msgid "Password"
 msgstr "Mot de passe"
 
 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"
 #: ../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"
 
 msgid "Search"
 msgstr "Rechercher"
 

-#: ../gtk/main.ui.h:49
+#: ../gtk/main.ui.h:50

 msgid "Show debug window"
 msgstr "Fenêtre de débogage"
 
 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"
 
 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"
 #: ../gtk/main.ui.h:52
 msgid "_Help"
 msgstr "_Aide"


@@ -633,18 +722,14 @@ msgid "_Homepage"
 msgstr "_Site web"
 
 #: ../gtk/main.ui.h:54
 msgstr "_Site web"
 
 #: ../gtk/main.ui.h:54

-msgid "_Linphone"
-msgstr "_Linphone"
-
-#: ../gtk/main.ui.h:55

 msgid "_Options"
 msgstr ""
 
 msgid "_Options"
 msgstr ""
 

-#: ../gtk/main.ui.h:56
+#: ../gtk/main.ui.h:55

 msgid "in"
 msgstr "dans"
 
 msgid "in"
 msgstr "dans"
 

-#: ../gtk/main.ui.h:57
+#: ../gtk/main.ui.h:56

 msgid "label"
 msgstr ""
 
 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"
 
 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"
 #: ../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
 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):"
 
 #: ../gtk/sip_account.ui.h:7
 msgid "Registration duration (sec):"


@@ -779,10 +856,6 @@ msgstr ""
 msgid "Send"
 msgstr "Envoyer"
 
 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"
 #: ../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
 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>"
 
 #: ../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
 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 ""
 
 msgid "ALSA special device (optional):"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:15
+#: ../gtk/parameters.ui.h:16

 msgid "Add"
 msgstr "Ajouter"
 
 msgid "Add"
 msgstr "Ajouter"
 

-#: ../gtk/parameters.ui.h:16
+#: ../gtk/parameters.ui.h:17

 msgid "Audio RTP/UDP:"
 msgstr ""
 
 msgid "Audio RTP/UDP:"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:17
+#: ../gtk/parameters.ui.h:18

 msgid "Audio codecs"
 msgstr "Codecs audio"
 
 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)"
 
 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)"
 
 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 ""
 
 msgid "CIF"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:22
+#: ../gtk/parameters.ui.h:23

 msgid "Capture device:"
 msgstr "Périphérique de capture:"
 
 msgid "Capture device:"
 msgstr "Périphérique de capture:"
 

-#: ../gtk/parameters.ui.h:23
+#: ../gtk/parameters.ui.h:24

 msgid "Codecs"
 msgstr ""
 
 msgid "Codecs"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:24
+#: ../gtk/parameters.ui.h:25

 msgid "Direct connection to the Internet"
 msgstr "Connection directe à l'Internet"
 
 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"
 
 msgid "Disable"
 msgstr "Désactiver"
 

-#: ../gtk/parameters.ui.h:26
+#: ../gtk/parameters.ui.h:27

 msgid "Done"
 msgstr "Fermer"
 
 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:"
 
 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"
 
 msgid "Edit"
 msgstr "Editer"
 

-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:30

 msgid "Enable"
 msgstr "Activer"
 
 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"
 
 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"
 
 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"
 
 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"
 
 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"
 
 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:"
 
 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:"
 
 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:"
 
 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 ""
 
 msgid ""
 "Register to FONICS\n"
 "virtual network !"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:43

 msgid "Remove"
 msgstr "Enlever"
 
 msgid "Remove"
 msgstr "Enlever"
 

-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:44

 msgid "Ring device:"
 msgstr "Périphérique de sonnerie:"
 
 msgid "Ring device:"
 msgstr "Périphérique de sonnerie:"
 

-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:45

 msgid "Ring sound:"
 msgstr "Sonnerie:"
 
 msgid "Ring sound:"
 msgstr "Sonnerie:"
 

-#: ../gtk/parameters.ui.h:43
-msgid "SIP (TCP):"
+#: ../gtk/parameters.ui.h:46
+msgid "SIP (TCP)"

 msgstr ""
 
 msgstr ""
 

-#: ../gtk/parameters.ui.h:44
-msgid "SIP (UDP):"
+#: ../gtk/parameters.ui.h:47
+msgid "SIP (TLS)"

 msgstr ""
 
 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"
 
 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"
 
 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"
 
 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"
 
 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:"
 
 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"
 
 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:"
 
 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"
 
 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"
 
 msgid "User interface"
 msgstr "Interface utilisateur"
 

-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:58

 msgid "Video RTP/UDP:"
 msgstr ""
 
 msgid "Video RTP/UDP:"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:59

 msgid "Video codecs"
 msgstr "Codecs video"
 
 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"
 
 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)"
 
 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:"
 
 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:"
 
 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"
 
 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"
 
 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"
 
 msgid "default soundcard"
 msgstr "Carte son par défaut"
 


@@ -1047,26 +1138,19 @@ msgstr "Linphone"
 msgid "Please wait"
 msgstr "En attente"
 
 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é"
 
 msgid "aborted"
 msgstr "abandonné"
 

-#: ../coreapi/linphonecore.c:209
+#: ../coreapi/linphonecore.c:190

 msgid "completed"
 msgstr "terminé"
 
 msgid "completed"
 msgstr "terminé"
 

-#: ../coreapi/linphonecore.c:212
+#: ../coreapi/linphonecore.c:193

 msgid "missed"
 msgstr "manqué"
 
 msgid "missed"
 msgstr "manqué"
 

-#: ../coreapi/linphonecore.c:217
+#: ../coreapi/linphonecore.c:198

 #, c-format
 msgid ""
 "%s at %s\n"
 #, c-format
 msgid ""
 "%s at %s\n"


@@ -1081,79 +1165,61 @@ msgstr ""
 "Etat: %s\n"
 "Durée: %i mn %i sec\n"
 
 "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"
 
 msgid "Outgoing call"
 msgstr "Appel sortant"
 

-#: ../coreapi/linphonecore.c:998
+#: ../coreapi/linphonecore.c:1088

 msgid "Ready"
 msgstr "Prêt."
 
 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..."
 
 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."
 
 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>"
 
 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"
 
 msgid "Contacting"
 msgstr "Appel de"
 

-#: ../coreapi/linphonecore.c:1974
+#: ../coreapi/linphonecore.c:2032

 msgid "Could not call"
 msgstr "Echec de l'appel"
 
 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"
 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..."
 
 msgid "Modifying call parameters..."
 msgstr "Modifications des paramètres d'appels..."
 

-#: ../coreapi/linphonecore.c:2311
+#: ../coreapi/linphonecore.c:2366

 msgid "Connected."
 msgstr "En ligne."
 
 msgid "Connected."
 msgstr "En ligne."
 

-#: ../coreapi/linphonecore.c:2334
+#: ../coreapi/linphonecore.c:2389

 msgid "Call aborted"
 msgstr "Appel abandonné"
 
 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é"
 
 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..."
 
 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"
 #: ../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"
 
 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."
 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."
 
 "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"
 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"
 
 "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"
 
 #, 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"
 
 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."
 
 msgid " and asked autoanswer."
 msgstr "et sollicite un décrochage automatique."
 

-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207

 msgid "."
 msgstr ""
 
 msgid "."
 msgstr ""
 

-#: ../coreapi/callbacks.c:226
+#: ../coreapi/callbacks.c:266

 msgid "Remote ringing."
 msgstr "Sonnerie distante."
 
 msgid "Remote ringing."
 msgstr "Sonnerie distante."
 

-#: ../coreapi/callbacks.c:242
+#: ../coreapi/callbacks.c:282

 msgid "Remote ringing..."
 msgstr "Sonnerie distante..."
 
 msgid "Remote ringing..."
 msgstr "Sonnerie distante..."
 

-#: ../coreapi/callbacks.c:253
+#: ../coreapi/callbacks.c:293

 msgid "Early media."
 msgstr "Prise d'appel anticipée"
 
 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."
 
 #, 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"
 
 #, 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."
 
 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."
 
 #, 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..."
 
 msgid "We are being paused..."
 msgstr "Mise en attente..."
 

-#: ../coreapi/callbacks.c:387
+#: ../coreapi/callbacks.c:436

 msgid "We have been resumed..."
 msgstr "Reprise..."
 
 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é."
 
 msgid "Call terminated."
 msgstr "Appel terminé."
 

-#: ../coreapi/callbacks.c:431
+#: ../coreapi/callbacks.c:480

 msgid "User is busy."
 msgstr "Occupé..."
 
 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).");
 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é"
 
 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é."
 
 msgid "Call declined."
 msgstr "Appel décliné."
 

-#: ../coreapi/callbacks.c:447
+#: ../coreapi/callbacks.c:496

 msgid "No response."
 msgstr "Pas de réponse."
 
 msgid "No response."
 msgstr "Pas de réponse."
 

-#: ../coreapi/callbacks.c:451
+#: ../coreapi/callbacks.c:500

 msgid "Protocol error."
 msgstr "Erreur de protocole"
 
 msgid "Protocol error."
 msgstr "Erreur de protocole"
 

-#: ../coreapi/callbacks.c:467
+#: ../coreapi/callbacks.c:516

 msgid "Redirected"
 msgstr "Redirection"
 
 msgid "Redirected"
 msgstr "Redirection"
 

-#: ../coreapi/callbacks.c:477
+#: ../coreapi/callbacks.c:526

 msgid "Not found"
 msgstr "Non trouvé"
 
 msgid "Not found"
 msgstr "Non trouvé"
 

-#: ../coreapi/callbacks.c:487
+#: ../coreapi/callbacks.c:551

 msgid "No common codecs"
 msgstr "Pas de codecs commun"
 
 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é."
 
 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é."
 
 #, 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é."
 
 #, 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"
 
 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"
 
 #, 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"
 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 (file)
--- 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"
 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"
 "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"
 
 "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"
 #: ../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"
 
 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 ""
 
 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 ""
 
 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 ""
 
 msgid "address to call right now"
 msgstr ""
 

-#: ../gtk/main.c:95
+#: ../gtk/main.c:111

 msgid "if set automatically answer incoming calls"
 msgstr ""
 
 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 ""
 
 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"
 
 #, 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"
 #, 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 ""
 
 "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 ""
 
 #, 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 ""
 
 msgid "Website link"
 msgstr ""
 

-#: ../gtk/main.c:1076
+#: ../gtk/main.c:1205

 msgid "Linphone - a video internet phone"
 msgstr ""
 
 msgid "Linphone - a video internet phone"
 msgstr ""
 

-#: ../gtk/main.c:1095
+#: ../gtk/main.c:1295

 #, c-format
 msgid "%s (Default)"
 msgstr ""
 
 #, 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 ""
 
 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 ""
 
 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"
 
 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"
 
 msgid "Name"
 msgstr "Név"
 

-#: ../gtk/friendlist.c:205
+#: ../gtk/friendlist.c:271

 msgid "Presence status"
 msgstr "Jelenlét státusz"
 
 msgid "Presence status"
 msgstr "Jelenlét státusz"
 

-#: ../gtk/friendlist.c:242
+#: ../gtk/friendlist.c:308

 #, c-format
 msgid "Search in %s directory"
 msgstr ""
 
 #, c-format
 msgid "Search in %s directory"
 msgstr ""
 

-#: ../gtk/friendlist.c:450
+#: ../gtk/friendlist.c:568

 msgid "Invalid sip contact !"
 msgstr ""
 
 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"
 
 #, 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 ""
 
 #, 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"
 
 #, 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 ""
 
 #, 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 ""
 
 #, 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)"
 
 msgid "Rate (Hz)"
 msgstr "Érték (Hz)"
 

-#: ../gtk/propertybox.c:283
+#: ../gtk/propertybox.c:308

 msgid "Status"
 msgstr "Állapot"
 
 msgid "Status"
 msgstr "Állapot"
 

-#: ../gtk/propertybox.c:289
+#: ../gtk/propertybox.c:314

 msgid "Min bitrate (kbit/s)"
 msgstr "Min bitrate (kbit/s)"
 
 msgid "Min bitrate (kbit/s)"
 msgstr "Min bitrate (kbit/s)"
 

-#: ../gtk/propertybox.c:296
+#: ../gtk/propertybox.c:321

 msgid "Parameters"
 msgstr "Paraméterek"
 
 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"
 
 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"
 
 msgid "Disabled"
 msgstr "Tiltva"
 

-#: ../gtk/propertybox.c:510
+#: ../gtk/propertybox.c:553

 msgid "Account"
 msgstr "Hozzáférés"
 
 msgid "Account"
 msgstr "Hozzáférés"
 

-#: ../gtk/propertybox.c:650
+#: ../gtk/propertybox.c:693

 msgid "English"
 msgstr ""
 
 msgid "English"
 msgstr ""
 

-#: ../gtk/propertybox.c:651
+#: ../gtk/propertybox.c:694

 msgid "French"
 msgstr ""
 
 msgid "French"
 msgstr ""
 

-#: ../gtk/propertybox.c:652
+#: ../gtk/propertybox.c:695

 msgid "Swedish"
 msgstr ""
 
 msgid "Swedish"
 msgstr ""
 

-#: ../gtk/propertybox.c:653
+#: ../gtk/propertybox.c:696

 msgid "Italian"
 msgstr ""
 
 msgid "Italian"
 msgstr ""
 

-#: ../gtk/propertybox.c:654
+#: ../gtk/propertybox.c:697

 msgid "Spanish"
 msgstr ""
 
 msgid "Spanish"
 msgstr ""
 

-#: ../gtk/propertybox.c:655
+#: ../gtk/propertybox.c:698

 msgid "Brazilian Portugese"
 msgstr ""
 
 msgid "Brazilian Portugese"
 msgstr ""
 

-#: ../gtk/propertybox.c:656
+#: ../gtk/propertybox.c:699

 msgid "Polish"
 msgstr ""
 
 msgid "Polish"
 msgstr ""
 

-#: ../gtk/propertybox.c:657
+#: ../gtk/propertybox.c:700

 msgid "German"
 msgstr ""
 
 msgid "German"
 msgstr ""
 

-#: ../gtk/propertybox.c:658
+#: ../gtk/propertybox.c:701

 msgid "Russian"
 msgstr ""
 
 msgid "Russian"
 msgstr ""
 

-#: ../gtk/propertybox.c:659
+#: ../gtk/propertybox.c:702

 msgid "Japanese"
 msgstr ""
 
 msgid "Japanese"
 msgstr ""
 

-#: ../gtk/propertybox.c:660
+#: ../gtk/propertybox.c:703

 msgid "Dutch"
 msgstr ""
 
 msgid "Dutch"
 msgstr ""
 

-#: ../gtk/propertybox.c:661
+#: ../gtk/propertybox.c:704

 msgid "Hungarian"
 msgstr ""
 
 msgid "Hungarian"
 msgstr ""
 

-#: ../gtk/propertybox.c:662
+#: ../gtk/propertybox.c:705

 msgid "Czech"
 msgstr ""
 
 msgid "Czech"
 msgstr ""
 

-#: ../gtk/propertybox.c:663
+#: ../gtk/propertybox.c:706

 msgid "Chinese"
 msgstr ""
 
 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 ""
 
 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 ""
 #: ../gtk/update.c:80
 #, c-format
 msgid ""


@@ -345,78 +419,104 @@ msgstr ""
 msgid "Now ready !"
 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"
 
 #, 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 ""
 
 #, c-format
 msgid "Transfer to call #%i with %s"
 msgstr ""
 

-#: ../gtk/incall_view.c:113
+#: ../gtk/incall_view.c:155

 msgid "Transfer"
 msgstr ""
 
 msgid "Transfer"
 msgstr ""
 

-#: ../gtk/incall_view.c:187
+#: ../gtk/incall_view.c:271

 #, fuzzy
 msgid "<b>Calling...</b>"
 msgstr "Kapcsolatilista"
 
 #, 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 ""
 
 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"
 
 #, 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 ""
 
 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 ""
 
 msgstr ""
 

-#: ../gtk/incall_view.c:244
+#: ../gtk/incall_view.c:480

 #, fuzzy
 msgid "<b>In call</b>"
 msgstr "Kapcsolatilista"
 
 #, 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"
 
 #, 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 ""
 
 #, 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"
 
 #, 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 ""
 
 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 ""
 
 msgid "Pause"
 msgstr ""
 


@@ -480,8 +580,8 @@ msgstr "Kapcsolatiinformáció"
 
 #: ../gtk/main.ui.h:14
 #, fuzzy
 
 #: ../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
 
 #: ../gtk/main.ui.h:15
 #, fuzzy


@@ -507,27 +607,26 @@ msgstr ""
 
 #: ../gtk/main.ui.h:21
 #, fuzzy
 
 #: ../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"
 
 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 ""
 
 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 ""
 
 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 ""
 #: ../gtk/main.ui.h:26
 msgid "Check _Updates"
 msgstr ""


@@ -541,11 +640,6 @@ msgstr "Kapcsolódás"
 msgid "D"
 msgstr ""
 
 msgid "D"
 msgstr ""
 

-#: ../gtk/main.ui.h:29
-#, fuzzy
-msgid "Decline"
-msgstr "line"
-

 #: ../gtk/main.ui.h:30
 #, fuzzy
 msgid "Default"
 #: ../gtk/main.ui.h:30
 #, fuzzy
 msgid "Default"


@@ -558,13 +652,13 @@ msgstr "Információk"
 
 #: ../gtk/main.ui.h:32
 #, fuzzy
 
 #: ../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
 
 #: ../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"
 
 #: ../gtk/main.ui.h:34
 msgid "Enter username, phone number, or full sip address"


@@ -600,21 +694,26 @@ msgstr "Kapcsolatiinformáció"
 msgid "Lookup:"
 msgstr ""
 
 msgid "Lookup:"
 msgstr ""
 

-#: ../gtk/main.ui.h:43
+#: ../gtk/main.ui.h:42

 #, fuzzy
 msgid "My current identity:"
 msgstr "SIP azonosító:"
 
 #, 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ő"
 
 #, fuzzy
 msgid "Online users"
 msgstr "Elérhető"
 

-#: ../gtk/main.ui.h:45
+#: ../gtk/main.ui.h:44

 #, fuzzy
 msgid "Password"
 msgstr "jelszó:"
 
 #, 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:"
 #: ../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 ""
 
 msgid "Search"
 msgstr ""
 

-#: ../gtk/main.ui.h:49
+#: ../gtk/main.ui.h:50

 msgid "Show debug window"
 msgstr ""
 
 msgid "Show debug window"
 msgstr ""
 

-#: ../gtk/main.ui.h:50
+#: ../gtk/main.ui.h:51

 #, fuzzy
 msgid "Username"
 msgstr "felhasználónév:"
 
 #, 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"
 #: ../gtk/main.ui.h:52
 #, fuzzy
 msgid "_Help"


@@ -648,19 +742,14 @@ msgid "_Homepage"
 msgstr ""
 
 #: ../gtk/main.ui.h:54
 msgstr ""
 
 #: ../gtk/main.ui.h:54

-#, fuzzy
-msgid "_Linphone"
-msgstr "Linphone"
-
-#: ../gtk/main.ui.h:55

 msgid "_Options"
 msgstr ""
 
 msgid "_Options"
 msgstr ""
 

-#: ../gtk/main.ui.h:56
+#: ../gtk/main.ui.h:55

 msgid "in"
 msgstr ""
 
 msgid "in"
 msgstr ""
 

-#: ../gtk/main.ui.h:57
+#: ../gtk/main.ui.h:56

 msgid "label"
 msgstr ""
 
 msgid "label"
 msgstr ""
 


@@ -710,16 +799,6 @@ msgstr "Sip cím:"
 msgid "Show this contact presence status"
 msgstr ""
 
 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 ""
 #: ../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
 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
 msgstr ""
 
 #: ../gtk/sip_account.ui.h:7


@@ -809,11 +888,6 @@ msgstr "sip:"
 msgid "Send"
 msgstr "Hang"
 
 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 ""
 #: ../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
 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
 
 #: ../gtk/parameters.ui.h:10
 #, fuzzy


@@ -878,209 +951,227 @@ msgid "<b>Video</b>"
 msgstr "Kapcsolatilista"
 
 #: ../gtk/parameters.ui.h:14
 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
 msgstr ""
 
 #: ../gtk/parameters.ui.h:15

-msgid "Add"
+msgid "ALSA special device (optional):"

 msgstr ""
 
 #: ../gtk/parameters.ui.h:16
 msgstr ""
 
 #: ../gtk/parameters.ui.h:16

-msgid "Audio RTP/UDP:"
+msgid "Add"

 msgstr ""
 
 #: ../gtk/parameters.ui.h:17
 msgstr ""
 
 #: ../gtk/parameters.ui.h:17

+msgid "Audio RTP/UDP:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:18

 #, fuzzy
 msgid "Audio codecs"
 msgstr "Audio kodekek"
 
 #, 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 ""
 
 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 ""
 
 msgid "Behind NAT / Firewall (use STUN to resolve)"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:21
+#: ../gtk/parameters.ui.h:22

 msgid "CIF"
 msgstr ""
 
 msgid "CIF"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:22
+#: ../gtk/parameters.ui.h:23

 #, fuzzy
 msgid "Capture device:"
 msgstr "Felvevő hang eszköz:"
 
 #, fuzzy
 msgid "Capture device:"
 msgstr "Felvevő hang eszköz:"
 

-#: ../gtk/parameters.ui.h:23
+#: ../gtk/parameters.ui.h:24

 #, fuzzy
 msgid "Codecs"
 msgstr "Kodekek"
 
 #, fuzzy
 msgid "Codecs"
 msgstr "Kodekek"
 

-#: ../gtk/parameters.ui.h:24
+#: ../gtk/parameters.ui.h:25

 msgid "Direct connection to the Internet"
 msgstr ""
 
 msgid "Direct connection to the Internet"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:25
+#: ../gtk/parameters.ui.h:26

 msgid "Disable"
 msgstr "Tiltás"
 
 msgid "Disable"
 msgstr "Tiltás"
 

-#: ../gtk/parameters.ui.h:26
+#: ../gtk/parameters.ui.h:27

 #, fuzzy
 msgid "Done"
 msgstr "Elveszítve"
 
 #, 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):"
 
 #, 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"
 
 msgid "Edit"
 msgstr "Szerkesztés"
 

-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:30

 msgid "Enable"
 msgstr "Engedélyezés"
 
 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 ""
 
 msgid "Enable echo cancellation"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:31
+#: ../gtk/parameters.ui.h:33

 msgid "Erase all passwords"
 msgstr ""
 
 msgid "Erase all passwords"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:32
+#: ../gtk/parameters.ui.h:34

 msgid "Manage SIP Accounts"
 msgstr ""
 
 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 ""
 
 msgid "Multimedia settings"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:37

 #, fuzzy
 msgid "Network settings"
 msgstr "Hálózat"
 
 #, 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:"
 
 #, 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 ""
 
 msgid "Prefered video resolution:"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:40

 #, fuzzy
 msgid "Public IP address:"
 msgstr "Sip cím:"
 
 #, 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 ""
 
 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"
 
 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:"
 
 #, 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:"
 
 #, fuzzy
 msgid "Ring sound:"
 msgstr "Csengőhang:"
 

-#: ../gtk/parameters.ui.h:43
-msgid "SIP (TCP):"
+#: ../gtk/parameters.ui.h:46
+msgid "SIP (TCP)"

 msgstr ""
 
 msgstr ""
 

-#: ../gtk/parameters.ui.h:44
-msgid "SIP (UDP):"
+#: ../gtk/parameters.ui.h:47
+msgid "SIP (TLS)"

 msgstr ""
 
 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 ""
 
 msgid "Send DTMFs as SIP info"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:46
+#: ../gtk/parameters.ui.h:50

 msgid "Set Maximum Transmission Unit:"
 msgstr ""
 
 msgid "Set Maximum Transmission Unit:"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:51

 msgid "Settings"
 msgstr ""
 
 msgid "Settings"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:52

 msgid "Show advanced settings"
 msgstr ""
 
 msgid "Show advanced settings"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:53

 #, fuzzy
 msgid "Stun server:"
 msgstr "Hang eszköz"
 
 #, 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 ""
 
 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):"
 
 #, 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 ""
 
 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:"
 
 #, fuzzy
 msgid "User interface"
 msgstr "felhasználónév:"
 

-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:58

 msgid "Video RTP/UDP:"
 msgstr ""
 
 msgid "Video RTP/UDP:"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:59

 #, fuzzy
 msgid "Video codecs"
 msgstr "Audio kodekek"
 
 #, 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"
 
 #, 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 ""
 
 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:"
 
 #, 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:"
 
 #, fuzzy
 msgid "Your username:"
 msgstr "felhasználónév:"
 

-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:64

 msgid "a sound card"
 msgstr ""
 
 msgid "a sound card"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:65

 msgid "default camera"
 msgstr ""
 
 msgid "default camera"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:66

 msgid "default soundcard"
 msgstr ""
 
 msgid "default soundcard"
 msgstr ""
 


@@ -1106,26 +1197,19 @@ msgstr "Linphone"
 msgid "Please wait"
 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] "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"
 
 msgid "aborted"
 msgstr "megszakítva"
 

-#: ../coreapi/linphonecore.c:209
+#: ../coreapi/linphonecore.c:190

 msgid "completed"
 msgstr "befejezve"
 
 msgid "completed"
 msgstr "befejezve"
 

-#: ../coreapi/linphonecore.c:212
+#: ../coreapi/linphonecore.c:193

 msgid "missed"
 msgstr "elhibázva"
 
 msgid "missed"
 msgstr "elhibázva"
 

-#: ../coreapi/linphonecore.c:217
+#: ../coreapi/linphonecore.c:198

 #, c-format
 msgid ""
 "%s at %s\n"
 #, c-format
 msgid ""
 "%s at %s\n"


@@ -1140,81 +1224,65 @@ msgstr ""
 "Állapot: %s\n"
 "Időtartam: %i perc %i másodperc\n"
 
 "Á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"
 
 msgid "Outgoing call"
 msgstr "Kimenő hívás"
 

-#: ../coreapi/linphonecore.c:998
+#: ../coreapi/linphonecore.c:1088

 msgid "Ready"
 msgstr "Kész"
 
 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..."
 
 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."
 
 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"
 
 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"
 
 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"
 
 #, 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 ""
 
 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 ""
 
 msgid "Modifying call parameters..."
 msgstr ""
 

-#: ../coreapi/linphonecore.c:2311
+#: ../coreapi/linphonecore.c:2366

 msgid "Connected."
 msgstr "Kapcsolódva."
 
 msgid "Connected."
 msgstr "Kapcsolódva."
 

-#: ../coreapi/linphonecore.c:2334
+#: ../coreapi/linphonecore.c:2389

 #, fuzzy
 msgid "Call aborted"
 msgstr "megszakítva"
 
 #, 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"
 
 #, 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"
 
 #, 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"
 #: ../coreapi/misc.c:147
 msgid ""
 "Your computer appears to be using ALSA sound drivers.\n"


@@ -1296,157 +1364,212 @@ msgstr ""
 msgid "Unknown-bug"
 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 ""
 
 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 ""
 
 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"
 
 #, 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."
 
 #, fuzzy
 msgid "is contacting you"
 msgstr "kapcsolatba lép veled."
 

-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207

 msgid " and asked autoanswer."
 msgstr ""
 
 msgid " and asked autoanswer."
 msgstr ""
 

-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207

 msgid "."
 msgstr ""
 
 msgid "."
 msgstr ""
 

-#: ../coreapi/callbacks.c:226
+#: ../coreapi/callbacks.c:266

 #, fuzzy
 msgid "Remote ringing."
 msgstr "Távoli szolgáltatások"
 
 #, 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"
 
 #, 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."
 
 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"
 
 #, 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 ""
 
 #, 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"
 
 #, 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"
 
 #, 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 ""
 
 msgid "We are being paused..."
 msgstr ""
 

-#: ../coreapi/callbacks.c:387
+#: ../coreapi/callbacks.c:436

 msgid "We have been resumed..."
 msgstr ""
 
 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."
 
 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."
 
 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).");
 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."
 
 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"
 
 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"
 
 #, 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 ""
 
 msgid "Protocol error."
 msgstr ""
 

-#: ../coreapi/callbacks.c:467
+#: ../coreapi/callbacks.c:516

 #, fuzzy
 msgid "Redirected"
 msgstr "Átirányítva idw %s..."
 
 #, fuzzy
 msgid "Redirected"
 msgstr "Átirányítva idw %s..."
 

-#: ../coreapi/callbacks.c:477
+#: ../coreapi/callbacks.c:526

 msgid "Not found"
 msgstr ""
 
 msgid "Not found"
 msgstr ""
 

-#: ../coreapi/callbacks.c:487
+#: ../coreapi/callbacks.c:551

 msgid "No common codecs"
 msgstr ""
 
 msgid "No common codecs"
 msgstr ""
 

-#: ../coreapi/callbacks.c:493
+#: ../coreapi/callbacks.c:557

 #, fuzzy
 msgid "Call failed."
 msgstr "Hívás elutasítva"
 
 #, 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."
 
 #, 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."
 
 #, 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"
 
 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"
 
 #, 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ó"
 
 #, 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 "
 #~ 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 "Go"
 #~ msgstr "Ugrás"
 

-#~ msgid "Address book"
-#~ msgstr "Címjegyzék"
-

 #~ msgid "Exit"
 #~ msgstr "Kilépés"
 
 #~ 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 "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"
 
 #~ msgid "Wait"
 #~ msgstr "Várakozás"
 

diff --git a/po/it.po b/po/it.po
index cd3e0e5f2557709eca2bf462f43667b1152af78b..f0f1fc46ea8d0b2f970eeaf382dc10643f5c2ad4 100644 (file)
--- 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"
 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"
 "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"
 
 "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"
 #: ../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"
 
 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 ""
 
 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 ""
 
 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 ""
 
 msgid "address to call right now"
 msgstr ""
 

-#: ../gtk/main.c:95
+#: ../gtk/main.c:111

 msgid "if set automatically answer incoming calls"
 msgstr ""
 
 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 ""
 
 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"
 
 #, 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"
 #, 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."
 
 "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>"
 
 #, 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 ""
 
 msgid "Website link"
 msgstr ""
 

-#: ../gtk/main.c:1076
+#: ../gtk/main.c:1205

 msgid "Linphone - a video internet phone"
 msgstr ""
 
 msgid "Linphone - a video internet phone"
 msgstr ""
 

-#: ../gtk/main.c:1095
+#: ../gtk/main.c:1295

 #, c-format
 msgid "%s (Default)"
 msgstr "%s (Default)"
 
 #, 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 ""
 
 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 ""
 
 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 ""
 
 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"
 
 msgid "Name"
 msgstr "Nome"
 

-#: ../gtk/friendlist.c:205
+#: ../gtk/friendlist.c:271

 msgid "Presence status"
 msgstr "Presenza"
 
 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"
 
 #, 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"
 
 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"
 
 #, 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"
 
 #, 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"
 
 #, 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"
 
 #, 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"
 
 #, 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 ""
 
 msgid "Rate (Hz)"
 msgstr ""
 

-#: ../gtk/propertybox.c:283
+#: ../gtk/propertybox.c:308

 msgid "Status"
 msgstr "Stato"
 
 msgid "Status"
 msgstr "Stato"
 

-#: ../gtk/propertybox.c:289
+#: ../gtk/propertybox.c:314

 msgid "Min bitrate (kbit/s)"
 msgstr "Bitrate Min (kbit/s)"
 
 msgid "Min bitrate (kbit/s)"
 msgstr "Bitrate Min (kbit/s)"
 

-#: ../gtk/propertybox.c:296
+#: ../gtk/propertybox.c:321

 msgid "Parameters"
 msgstr "Parametri"
 
 msgid "Parameters"
 msgstr "Parametri"
 

-#: ../gtk/propertybox.c:326 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507

 msgid "Enabled"
 msgstr "Attivato"
 
 msgid "Enabled"
 msgstr "Attivato"
 

-#: ../gtk/propertybox.c:327 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507

 msgid "Disabled"
 msgstr "Disattivato"
 
 msgid "Disabled"
 msgstr "Disattivato"
 

-#: ../gtk/propertybox.c:510
+#: ../gtk/propertybox.c:553

 msgid "Account"
 msgstr "Account"
 
 msgid "Account"
 msgstr "Account"
 

-#: ../gtk/propertybox.c:650
+#: ../gtk/propertybox.c:693

 msgid "English"
 msgstr "Inglese"
 
 msgid "English"
 msgstr "Inglese"
 

-#: ../gtk/propertybox.c:651
+#: ../gtk/propertybox.c:694

 msgid "French"
 msgstr "Francese"
 
 msgid "French"
 msgstr "Francese"
 

-#: ../gtk/propertybox.c:652
+#: ../gtk/propertybox.c:695

 msgid "Swedish"
 msgstr "Svedese"
 
 msgid "Swedish"
 msgstr "Svedese"
 

-#: ../gtk/propertybox.c:653
+#: ../gtk/propertybox.c:696

 msgid "Italian"
 msgstr "Italiano"
 
 msgid "Italian"
 msgstr "Italiano"
 

-#: ../gtk/propertybox.c:654
+#: ../gtk/propertybox.c:697

 msgid "Spanish"
 msgstr "Spagnolo"
 
 msgid "Spanish"
 msgstr "Spagnolo"
 

-#: ../gtk/propertybox.c:655
+#: ../gtk/propertybox.c:698

 msgid "Brazilian Portugese"
 msgstr ""
 
 msgid "Brazilian Portugese"
 msgstr ""
 

-#: ../gtk/propertybox.c:656
+#: ../gtk/propertybox.c:699

 msgid "Polish"
 msgstr "Polacco"
 
 msgid "Polish"
 msgstr "Polacco"
 

-#: ../gtk/propertybox.c:657
+#: ../gtk/propertybox.c:700

 msgid "German"
 msgstr "Tedesco"
 
 msgid "German"
 msgstr "Tedesco"
 

-#: ../gtk/propertybox.c:658
+#: ../gtk/propertybox.c:701

 msgid "Russian"
 msgstr "Russo"
 
 msgid "Russian"
 msgstr "Russo"
 

-#: ../gtk/propertybox.c:659
+#: ../gtk/propertybox.c:702

 msgid "Japanese"
 msgstr "Giapponese"
 
 msgid "Japanese"
 msgstr "Giapponese"
 

-#: ../gtk/propertybox.c:660
+#: ../gtk/propertybox.c:703

 msgid "Dutch"
 msgstr "Olandese"
 
 msgid "Dutch"
 msgstr "Olandese"
 

-#: ../gtk/propertybox.c:661
+#: ../gtk/propertybox.c:704

 msgid "Hungarian"
 msgstr "Ungherese"
 
 msgid "Hungarian"
 msgstr "Ungherese"
 

-#: ../gtk/propertybox.c:662
+#: ../gtk/propertybox.c:705

 msgid "Czech"
 msgstr "Ceco"
 
 msgid "Czech"
 msgstr "Ceco"
 

-#: ../gtk/propertybox.c:663
+#: ../gtk/propertybox.c:706

 msgid "Chinese"
 msgstr ""
 
 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"
 
 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 ""
 #: ../gtk/update.c:80
 #, c-format
 msgid ""


@@ -346,80 +421,103 @@ msgstr "Creazione account"
 msgid "Now ready !"
 msgstr "Pronto !"
 
 msgid "Now ready !"
 msgstr "Pronto !"
 

-#: ../gtk/incall_view.c:61
+#: ../gtk/incall_view.c:69

 #, fuzzy, c-format
 msgid "Call #%i"
 msgstr "Chiamata %s"
 
 #, 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 ""
 
 #, c-format
 msgid "Transfer to call #%i with %s"
 msgstr ""
 

-#: ../gtk/incall_view.c:113
+#: ../gtk/incall_view.c:155

 msgid "Transfer"
 msgstr ""
 
 msgid "Transfer"
 msgstr ""
 

-#: ../gtk/incall_view.c:187
+#: ../gtk/incall_view.c:271

 #, fuzzy
 msgid "<b>Calling...</b>"
 msgstr "<b>Linguaggio</b>"
 
 #, 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 ""
 
 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"
 
 #, 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 ""
 
 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 ""
 
 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>"
 
 #, 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>"
 
 #, 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 ""
 
 #, 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>"
 
 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 ""
 
 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 ""
 
 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
 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>"
 
 #: ../gtk/main.ui.h:15
 msgid "<b>Welcome !</b>"


@@ -507,26 +606,26 @@ msgid "All users"
 msgstr ""
 
 #: ../gtk/main.ui.h:21
 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"
 
 msgid "Automatically log me in"
 msgstr "Login Automatico"
 

-#: ../gtk/main.ui.h:24
+#: ../gtk/main.ui.h:22

 msgid "B"
 msgstr "B"
 
 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"
 
 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 ""
 #: ../gtk/main.ui.h:26
 msgid "Check _Updates"
 msgstr ""


@@ -540,10 +639,6 @@ msgstr "In connessione"
 msgid "D"
 msgstr "D"
 
 msgid "D"
 msgstr "D"
 

-#: ../gtk/main.ui.h:29
-msgid "Decline"
-msgstr "Rifiuta"
-

 #: ../gtk/main.ui.h:30
 msgid "Default"
 msgstr "Default"
 #: ../gtk/main.ui.h:30
 msgid "Default"
 msgstr "Default"


@@ -553,13 +648,14 @@ msgid "Duration"
 msgstr "Durata"
 
 #: ../gtk/main.ui.h:32
 msgstr "Durata"
 
 #: ../gtk/main.ui.h:32

-msgid "Duration:"
-msgstr "Durata:"
-
-#: ../gtk/main.ui.h:33

 msgid "Enable self-view"
 msgstr "Self-view abilitato"
 
 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"
 #: ../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 ""
 
 msgid "Lookup:"
 msgstr ""
 

-#: ../gtk/main.ui.h:43
+#: ../gtk/main.ui.h:42

 msgid "My current identity:"
 msgstr "Identità corrente"
 
 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"
 
 #, 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"
 
 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."
 #: ../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 ""
 
 msgid "Search"
 msgstr ""
 

-#: ../gtk/main.ui.h:49
+#: ../gtk/main.ui.h:50

 #, fuzzy
 msgid "Show debug window"
 msgstr "Linphone debug window"
 
 #, fuzzy
 msgid "Show debug window"
 msgstr "Linphone debug window"
 

-#: ../gtk/main.ui.h:50
+#: ../gtk/main.ui.h:51

 msgid "Username"
 msgstr "Username"
 
 msgid "Username"
 msgstr "Username"
 

-#: ../gtk/main.ui.h:51
-#, fuzzy
-msgid "_Call history"
-msgstr "Cronologia"
-

 #: ../gtk/main.ui.h:52
 msgid "_Help"
 msgstr ""
 #: ../gtk/main.ui.h:52
 msgid "_Help"
 msgstr ""


@@ -641,18 +737,14 @@ msgid "_Homepage"
 msgstr ""
 
 #: ../gtk/main.ui.h:54
 msgstr ""
 
 #: ../gtk/main.ui.h:54

-msgid "_Linphone"
-msgstr "_Linphone"
-
-#: ../gtk/main.ui.h:55

 msgid "_Options"
 msgstr ""
 
 msgid "_Options"
 msgstr ""
 

-#: ../gtk/main.ui.h:56
+#: ../gtk/main.ui.h:55

 msgid "in"
 msgstr "in"
 
 msgid "in"
 msgstr "in"
 

-#: ../gtk/main.ui.h:57
+#: ../gtk/main.ui.h:56

 msgid "label"
 msgstr "etichetta"
 
 msgid "label"
 msgstr "etichetta"
 


@@ -700,14 +792,6 @@ msgstr "Rubrica"
 msgid "Show this contact presence status"
 msgstr "Mostra lo stato di presenza del contatto"
 
 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"
 #: ../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
 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):"
 
 #: ../gtk/sip_account.ui.h:7
 msgid "Registration duration (sec):"


@@ -790,10 +874,6 @@ msgstr "sip:"
 msgid "Send"
 msgstr "Invia"
 
 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"
 #: ../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
 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>"
 
 #: ../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
 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):"
 
 msgid "ALSA special device (optional):"
 msgstr "Dispositivo ALSA (optional):"
 

-#: ../gtk/parameters.ui.h:15
+#: ../gtk/parameters.ui.h:16

 msgid "Add"
 msgstr "Aggiungi"
 
 msgid "Add"
 msgstr "Aggiungi"
 

-#: ../gtk/parameters.ui.h:16
+#: ../gtk/parameters.ui.h:17

 msgid "Audio RTP/UDP:"
 msgstr "Audio RTP/UDP:"
 
 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"
 
 #, 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)"
 
 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)"
 
 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"
 
 msgid "CIF"
 msgstr "CIF"
 

-#: ../gtk/parameters.ui.h:22
+#: ../gtk/parameters.ui.h:23

 msgid "Capture device:"
 msgstr "Dispositivo microfono:"
 
 msgid "Capture device:"
 msgstr "Dispositivo microfono:"
 

-#: ../gtk/parameters.ui.h:23
+#: ../gtk/parameters.ui.h:24

 msgid "Codecs"
 msgstr "Codec"
 
 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"
 
 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"
 
 msgid "Disable"
 msgstr "Disattivato"
 

-#: ../gtk/parameters.ui.h:26
+#: ../gtk/parameters.ui.h:27

 msgid "Done"
 msgstr "Fatto"
 
 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"
 
 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"
 
 msgid "Edit"
 msgstr "Edita"
 

-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:30

 msgid "Enable"
 msgstr "Attivato"
 
 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"
 
 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"
 
 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"
 
 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"
 
 msgid "Multimedia settings"
 msgstr "Impostazioni multimediali"
 

-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:37

 msgid "Network settings"
 msgstr "Impostazioni di rete"
 
 msgid "Network settings"
 msgstr "Impostazioni di rete"
 

-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:38

 msgid "Playback device:"
 msgstr "Dispositivo uscita audio:"
 
 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"
 
 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:"
 
 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 !"
 msgid ""
 "Register to FONICS\n"
 "virtual network !"


@@ -950,101 +1044,107 @@ msgstr ""
 "Registrati a  FONICS\n"
 "virtual network !"
 
 "Registrati a  FONICS\n"
 "virtual network !"
 

-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:43

 msgid "Remove"
 msgstr "Rimuovi"
 
 msgid "Remove"
 msgstr "Rimuovi"
 

-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:44

 msgid "Ring device:"
 msgstr "Dispositivo squillo:"
 
 msgid "Ring device:"
 msgstr "Dispositivo squillo:"
 

-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:45

 msgid "Ring sound:"
 msgstr "Suoneria:"
 
 msgid "Ring sound:"
 msgstr "Suoneria:"
 

-#: ../gtk/parameters.ui.h:43
+#: ../gtk/parameters.ui.h:46

 #, fuzzy
 #, fuzzy

-msgid "SIP (TCP):"
+msgid "SIP (TCP)"

 msgstr "SIP (UDP)"
 
 msgstr "SIP (UDP)"
 

-#: ../gtk/parameters.ui.h:44
-msgid "SIP (UDP):"
+#: ../gtk/parameters.ui.h:47
+#, fuzzy
+msgid "SIP (TLS)"

 msgstr "SIP (UDP)"
 
 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"
 
 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:"
 
 msgid "Set Maximum Transmission Unit:"
 msgstr "Imposta Maximum Transmission Unit:"
 

-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:51

 msgid "Settings"
 msgstr "Preferenze"
 
 msgid "Settings"
 msgstr "Preferenze"
 

-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:52

 msgid "Show advanced settings"
 msgstr ""
 
 msgid "Show advanced settings"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:53

 msgid "Stun server:"
 msgstr "Stun server:"
 
 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"
 
 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:"
 
 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"
 
 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"
 
 msgid "User interface"
 msgstr "Interfaccia utente"
 

-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:58

 msgid "Video RTP/UDP:"
 msgstr "Video RTP/UDP"
 
 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"
 
 #, 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:"
 
 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):"
 
 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:"
 
 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"
 
 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"
 
 #, 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"
 
 msgid "default camera"
 msgstr "default videocamera"
 

-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:66

 msgid "default soundcard"
 msgstr "default scheda audio"
 
 msgid "default soundcard"
 msgstr "default scheda audio"
 


@@ -1068,26 +1168,19 @@ msgstr "Linphone"
 msgid "Please wait"
 msgstr "Prego attendere"
 
 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"
 
 msgid "aborted"
 msgstr "annullato"
 

-#: ../coreapi/linphonecore.c:209
+#: ../coreapi/linphonecore.c:190

 msgid "completed"
 msgstr "comletato"
 
 msgid "completed"
 msgstr "comletato"
 

-#: ../coreapi/linphonecore.c:212
+#: ../coreapi/linphonecore.c:193

 msgid "missed"
 msgstr "mancante"
 
 msgid "missed"
 msgstr "mancante"
 

-#: ../coreapi/linphonecore.c:217
+#: ../coreapi/linphonecore.c:198

 #, c-format
 msgid ""
 "%s at %s\n"
 #, c-format
 msgid ""
 "%s at %s\n"


@@ -1102,27 +1195,23 @@ msgstr ""
 "Stato: %s\n"
 "Durata: %i mn %i sec\n"
 
 "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"
 
 msgid "Outgoing call"
 msgstr "Chiamata in uscita"
 

-#: ../coreapi/linphonecore.c:998
+#: ../coreapi/linphonecore.c:1088

 msgid "Ready"
 msgstr "Pronto"
 
 msgid "Ready"
 msgstr "Pronto"
 

-#: ../coreapi/linphonecore.c:1773
+#: ../coreapi/linphonecore.c:1831

 msgid "Looking for telephone number destination..."
 msgstr "Ricerca numero destinazione..."
 
 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."
 
 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"
 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"
 
 "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"
 
 msgid "Contacting"
 msgstr "In connessione"
 

-#: ../coreapi/linphonecore.c:1974
+#: ../coreapi/linphonecore.c:2032

 #, fuzzy
 msgid "Could not call"
 msgstr "chiamata fallita"
 
 #, 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 ""
 
 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 ""
 
 msgid "Modifying call parameters..."
 msgstr ""
 

-#: ../coreapi/linphonecore.c:2311
+#: ../coreapi/linphonecore.c:2366

 msgid "Connected."
 msgstr "Connessione"
 
 msgid "Connected."
 msgstr "Connessione"
 

-#: ../coreapi/linphonecore.c:2334
+#: ../coreapi/linphonecore.c:2389

 #, fuzzy
 msgid "Call aborted"
 msgstr "annullato"
 
 #, 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"
 
 #, 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"
 
 #, 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"
 #: ../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"
 
 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."
 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."
 
 "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"
 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"
 
 "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"
 
 #, 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."
 
 #, fuzzy
 msgid "is contacting you"
 msgstr "ti sta conttatando."
 

-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207

 msgid " and asked autoanswer."
 msgstr ""
 
 msgid " and asked autoanswer."
 msgstr ""
 

-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207

 msgid "."
 msgstr ""
 
 msgid "."
 msgstr ""
 

-#: ../coreapi/callbacks.c:226
+#: ../coreapi/callbacks.c:266

 msgid "Remote ringing."
 msgstr ""
 
 msgid "Remote ringing."
 msgstr ""
 

-#: ../coreapi/callbacks.c:242
+#: ../coreapi/callbacks.c:282

 msgid "Remote ringing..."
 msgstr ""
 
 msgid "Remote ringing..."
 msgstr ""
 

-#: ../coreapi/callbacks.c:253
+#: ../coreapi/callbacks.c:293

 msgid "Early media."
 msgstr ""
 
 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"
 
 #, 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 ""
 
 #, 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"
 
 #, fuzzy
 msgid "Call resumed."
 msgstr "Chiamata terminata"
 

-#: ../coreapi/callbacks.c:322
+#: ../coreapi/callbacks.c:362

 #, c-format
 msgid "Call answered by %s."
 msgstr ""
 
 #, c-format
 msgid "Call answered by %s."
 msgstr ""
 

-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:432

 msgid "We are being paused..."
 msgstr ""
 
 msgid "We are being paused..."
 msgstr ""
 

-#: ../coreapi/callbacks.c:387
+#: ../coreapi/callbacks.c:436

 msgid "We have been resumed..."
 msgstr ""
 
 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."
 
 msgid "Call terminated."
 msgstr "Chiamata terminata."
 

-#: ../coreapi/callbacks.c:431
+#: ../coreapi/callbacks.c:480

 msgid "User is busy."
 msgstr "Utente occupato"
 
 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).");
 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"
 
 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"
 
 msgid "Call declined."
 msgstr "Chiamata rifiutata"
 

-#: ../coreapi/callbacks.c:447
+#: ../coreapi/callbacks.c:496

 #, fuzzy
 msgid "No response."
 msgstr "timeout no risposta"
 
 #, fuzzy
 msgid "No response."
 msgstr "timeout no risposta"
 

-#: ../coreapi/callbacks.c:451
+#: ../coreapi/callbacks.c:500

 msgid "Protocol error."
 msgstr ""
 
 msgid "Protocol error."
 msgstr ""
 

-#: ../coreapi/callbacks.c:467
+#: ../coreapi/callbacks.c:516

 #, fuzzy
 msgid "Redirected"
 msgstr "Rediretto verso %s..."
 
 #, fuzzy
 msgid "Redirected"
 msgstr "Rediretto verso %s..."
 

-#: ../coreapi/callbacks.c:477
+#: ../coreapi/callbacks.c:526

 msgid "Not found"
 msgstr ""
 
 msgid "Not found"
 msgstr ""
 

-#: ../coreapi/callbacks.c:487
+#: ../coreapi/callbacks.c:551

 msgid "No common codecs"
 msgstr ""
 
 msgid "No common codecs"
 msgstr ""
 

-#: ../coreapi/callbacks.c:493
+#: ../coreapi/callbacks.c:557

 #, fuzzy
 msgid "Call failed."
 msgstr "Chiamata rifiutata"
 
 #, 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"
 
 #, 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"
 
 #, 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"
 
 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"
 
 #, 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"
 
 #, 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"
 
 #~ 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 (file)
--- 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"
 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"
 "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"
 
 "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"
 #: ../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 ""
 
 msgid "Chat with %s"
 msgstr ""
 

-#: ../gtk/main.c:74
+#: ../gtk/main.c:83

 msgid "log to stdout some debug information while running."
 msgstr ""
 
 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 ""
 
 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 ""
 
 msgid "address to call right now"
 msgstr ""
 

-#: ../gtk/main.c:95
+#: ../gtk/main.c:111

 msgid "if set automatically answer incoming calls"
 msgstr ""
 
 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 ""
 
 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 ""
 
 #, 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"
 #, 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 ""
 
 "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 ""
 
 #, 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 ""
 
 msgid "Website link"
 msgstr ""
 

-#: ../gtk/main.c:1076
+#: ../gtk/main.c:1205

 msgid "Linphone - a video internet phone"
 msgstr ""
 
 msgid "Linphone - a video internet phone"
 msgstr ""
 

-#: ../gtk/main.c:1095
+#: ../gtk/main.c:1295

 #, c-format
 msgid "%s (Default)"
 msgstr ""
 
 #, 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 ""
 
 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 ""
 
 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 ""
 
 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 "名前"
 
 msgid "Name"
 msgstr "名前"
 

-#: ../gtk/friendlist.c:205
+#: ../gtk/friendlist.c:271

 #, fuzzy
 msgid "Presence status"
 msgstr "状態"
 
 #, fuzzy
 msgid "Presence status"
 msgstr "状態"
 

-#: ../gtk/friendlist.c:242
+#: ../gtk/friendlist.c:308

 #, c-format
 msgid "Search in %s directory"
 msgstr ""
 
 #, c-format
 msgid "Search in %s directory"
 msgstr ""
 

-#: ../gtk/friendlist.c:450
+#: ../gtk/friendlist.c:568

 msgid "Invalid sip contact !"
 msgstr ""
 
 msgid "Invalid sip contact !"
 msgstr ""
 

-#: ../gtk/friendlist.c:495
+#: ../gtk/friendlist.c:613

 #, c-format
 msgid "Call %s"
 msgstr ""
 
 #, c-format
 msgid "Call %s"
 msgstr ""
 

-#: ../gtk/friendlist.c:496
+#: ../gtk/friendlist.c:614

 #, c-format
 msgid "Send text to %s"
 msgstr ""
 
 #, c-format
 msgid "Send text to %s"
 msgstr ""
 

-#: ../gtk/friendlist.c:497
+#: ../gtk/friendlist.c:615

 #, fuzzy, c-format
 msgid "Edit contact '%s'"
 msgstr "(接続するための情報がありません!)"
 
 #, fuzzy, c-format
 msgid "Edit contact '%s'"
 msgstr "(接続するための情報がありません!)"
 

-#: ../gtk/friendlist.c:498
+#: ../gtk/friendlist.c:616

 #, c-format
 msgid "Delete contact '%s'"
 msgstr ""
 
 #, 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 ""
 
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr ""
 

-#: ../gtk/propertybox.c:277
+#: ../gtk/propertybox.c:302

 msgid "Rate (Hz)"
 msgstr ""
 
 msgid "Rate (Hz)"
 msgstr ""
 

-#: ../gtk/propertybox.c:283
+#: ../gtk/propertybox.c:308

 msgid "Status"
 msgstr "状態"
 
 msgid "Status"
 msgstr "状態"
 

-#: ../gtk/propertybox.c:289
+#: ../gtk/propertybox.c:314

 msgid "Min bitrate (kbit/s)"
 msgstr "最低限のビットレート (kbit/s)"
 
 msgid "Min bitrate (kbit/s)"
 msgstr "最低限のビットレート (kbit/s)"
 

-#: ../gtk/propertybox.c:296
+#: ../gtk/propertybox.c:321

 msgid "Parameters"
 msgstr "パラメーター"
 
 msgid "Parameters"
 msgstr "パラメーター"
 

-#: ../gtk/propertybox.c:326 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507

 msgid "Enabled"
 msgstr "使用する"
 
 msgid "Enabled"
 msgstr "使用する"
 

-#: ../gtk/propertybox.c:327 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507

 msgid "Disabled"
 msgstr "使用しない"
 
 msgid "Disabled"
 msgstr "使用しない"
 

-#: ../gtk/propertybox.c:510
+#: ../gtk/propertybox.c:553

 msgid "Account"
 msgstr ""
 
 msgid "Account"
 msgstr ""
 

-#: ../gtk/propertybox.c:650
+#: ../gtk/propertybox.c:693

 msgid "English"
 msgstr ""
 
 msgid "English"
 msgstr ""
 

-#: ../gtk/propertybox.c:651
+#: ../gtk/propertybox.c:694

 msgid "French"
 msgstr "Français"
 
 msgid "French"
 msgstr "Français"
 

-#: ../gtk/propertybox.c:652
+#: ../gtk/propertybox.c:695

 msgid "Swedish"
 msgstr ""
 
 msgid "Swedish"
 msgstr ""
 

-#: ../gtk/propertybox.c:653
+#: ../gtk/propertybox.c:696

 msgid "Italian"
 msgstr ""
 
 msgid "Italian"
 msgstr ""
 

-#: ../gtk/propertybox.c:654
+#: ../gtk/propertybox.c:697

 msgid "Spanish"
 msgstr ""
 
 msgid "Spanish"
 msgstr ""
 

-#: ../gtk/propertybox.c:655
+#: ../gtk/propertybox.c:698

 msgid "Brazilian Portugese"
 msgstr ""
 
 msgid "Brazilian Portugese"
 msgstr ""
 

-#: ../gtk/propertybox.c:656
+#: ../gtk/propertybox.c:699

 msgid "Polish"
 msgstr ""
 
 msgid "Polish"
 msgstr ""
 

-#: ../gtk/propertybox.c:657
+#: ../gtk/propertybox.c:700

 msgid "German"
 msgstr ""
 
 msgid "German"
 msgstr ""
 

-#: ../gtk/propertybox.c:658
+#: ../gtk/propertybox.c:701

 msgid "Russian"
 msgstr ""
 
 msgid "Russian"
 msgstr ""
 

-#: ../gtk/propertybox.c:659
+#: ../gtk/propertybox.c:702

 msgid "Japanese"
 msgstr "日本語"
 
 msgid "Japanese"
 msgstr "日本語"
 

-#: ../gtk/propertybox.c:660
+#: ../gtk/propertybox.c:703

 msgid "Dutch"
 msgstr ""
 
 msgid "Dutch"
 msgstr ""
 

-#: ../gtk/propertybox.c:661
+#: ../gtk/propertybox.c:704

 msgid "Hungarian"
 msgstr "Magyar"
 
 msgid "Hungarian"
 msgstr "Magyar"
 

-#: ../gtk/propertybox.c:662
+#: ../gtk/propertybox.c:705

 msgid "Czech"
 msgstr "čeština"
 
 msgid "Czech"
 msgstr "čeština"
 

-#: ../gtk/propertybox.c:663
+#: ../gtk/propertybox.c:706

 msgid "Chinese"
 msgstr "简体中文"
 
 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 ""
 
 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 ""
 #: ../gtk/update.c:80
 #, c-format
 msgid ""


@@ -346,77 +422,104 @@ msgstr ""
 msgid "Now ready !"
 msgstr ""
 
 msgid "Now ready !"
 msgstr ""
 

-#: ../gtk/incall_view.c:61
+#: ../gtk/incall_view.c:69

 #, fuzzy, c-format
 msgid "Call #%i"
 msgstr "通話はキャンセルされました。"
 
 #, 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 ""
 
 #, c-format
 msgid "Transfer to call #%i with %s"
 msgstr ""
 

-#: ../gtk/incall_view.c:113
+#: ../gtk/incall_view.c:155

 msgid "Transfer"
 msgstr ""
 
 msgid "Transfer"
 msgstr ""
 

-#: ../gtk/incall_view.c:187
+#: ../gtk/incall_view.c:271

 #, fuzzy
 msgid "<b>Calling...</b>"
 msgstr "接続中"
 
 #, 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 ""
 
 msgid "00::00::00"
 msgstr ""
 

-#: ../gtk/incall_view.c:206
+#: ../gtk/incall_view.c:285

 #, fuzzy
 msgid "<b>Incoming call</b>"
 msgstr "接続中"
 
 #, 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 ""
 
 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 ""
 
 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 "接続中"
 
 #, fuzzy
 msgid "<b>In call</b>"
 msgstr "接続中"
 

-#: ../gtk/incall_view.c:260
+#: ../gtk/incall_view.c:499

 #, fuzzy
 msgid "<b>Paused call</b>"
 msgstr "接続中"
 
 #, fuzzy
 msgid "<b>Paused call</b>"
 msgstr "接続中"
 

-#: ../gtk/incall_view.c:272
+#: ../gtk/incall_view.c:511

 #, c-format
 msgid "%02i::%02i::%02i"
 msgstr ""
 
 #, c-format
 msgid "%02i::%02i::%02i"
 msgstr ""
 

-#: ../gtk/incall_view.c:288
+#: ../gtk/incall_view.c:527

 #, fuzzy
 msgid "<b>Call ended.</b>"
 msgstr "通話は拒否されました。"
 
 #, 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 ""
 
 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 ""
 
 msgid "Pause"
 msgstr ""
 


@@ -480,8 +583,8 @@ msgstr "コーデックの情報"
 
 #: ../gtk/main.ui.h:14
 #, fuzzy
 
 #: ../gtk/main.ui.h:14
 #, fuzzy

-msgid "<b>Contact list</b>"
-msgstr "接続中"
+msgid "<b>Callee name</b>"
+msgstr "通話は拒否されました。"

 
 #: ../gtk/main.ui.h:15
 #, fuzzy
 
 #: ../gtk/main.ui.h:15
 #, fuzzy


@@ -506,27 +609,26 @@ msgid "All users"
 msgstr ""
 
 #: ../gtk/main.ui.h:21
 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 ""
 
 msgid "Automatically log me in"
 msgstr ""
 

-#: ../gtk/main.ui.h:24
+#: ../gtk/main.ui.h:22

 msgid "B"
 msgstr ""
 
 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 ""
 
 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 ""
 #: ../gtk/main.ui.h:26
 msgid "Check _Updates"
 msgstr ""


@@ -540,11 +642,6 @@ msgstr "接続中"
 msgid "D"
 msgstr ""
 
 msgid "D"
 msgstr ""
 

-#: ../gtk/main.ui.h:29
-#, fuzzy
-msgid "Decline"
-msgstr "ライン入力"
-

 #: ../gtk/main.ui.h:30
 #, fuzzy
 msgid "Default"
 #: ../gtk/main.ui.h:30
 #, fuzzy
 msgid "Default"


@@ -557,12 +654,12 @@ msgstr "情報"
 
 #: ../gtk/main.ui.h:32
 #, fuzzy
 
 #: ../gtk/main.ui.h:32
 #, fuzzy

-msgid "Duration:"
-msgstr "情報"
+msgid "Enable self-view"
+msgstr "使用する"

 
 #: ../gtk/main.ui.h:33
 #, fuzzy
 
 #: ../gtk/main.ui.h:33
 #, fuzzy

-msgid "Enable self-view"
+msgid "Enable video"

 msgstr "使用する"
 
 #: ../gtk/main.ui.h:34
 msgstr "使用する"
 
 #: ../gtk/main.ui.h:34


@@ -599,21 +696,26 @@ msgstr "コーデックの情報"
 msgid "Lookup:"
 msgstr ""
 
 msgid "Lookup:"
 msgstr ""
 

-#: ../gtk/main.ui.h:43
+#: ../gtk/main.ui.h:42

 #, fuzzy
 msgid "My current identity:"
 msgstr "個人情報"
 
 #, fuzzy
 msgid "My current identity:"
 msgstr "個人情報"
 

-#: ../gtk/main.ui.h:44
+#: ../gtk/main.ui.h:43

 #, fuzzy
 msgid "Online users"
 msgstr "ライン入力"
 
 #, fuzzy
 msgid "Online users"
 msgstr "ライン入力"
 

-#: ../gtk/main.ui.h:45
+#: ../gtk/main.ui.h:44

 #, fuzzy
 msgid "Password"
 msgstr "パスワード"
 
 #, 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:"
 #: ../gtk/main.ui.h:47
 #, fuzzy
 msgid "SIP address or phone number:"


@@ -623,19 +725,15 @@ msgstr "レジストラサーバーのSIPアドレス"
 msgid "Search"
 msgstr ""
 
 msgid "Search"
 msgstr ""
 

-#: ../gtk/main.ui.h:49
+#: ../gtk/main.ui.h:50

 msgid "Show debug window"
 msgstr ""
 
 msgid "Show debug window"
 msgstr ""
 

-#: ../gtk/main.ui.h:50
+#: ../gtk/main.ui.h:51

 #, fuzzy
 msgid "Username"
 msgstr "ユーザーマニュアル"
 
 #, fuzzy
 msgid "Username"
 msgstr "ユーザーマニュアル"
 

-#: ../gtk/main.ui.h:51
-msgid "_Call history"
-msgstr ""
-

 #: ../gtk/main.ui.h:52
 msgid "_Help"
 msgstr ""
 #: ../gtk/main.ui.h:52
 msgid "_Help"
 msgstr ""


@@ -645,19 +743,14 @@ msgid "_Homepage"
 msgstr ""
 
 #: ../gtk/main.ui.h:54
 msgstr ""
 
 #: ../gtk/main.ui.h:54

-#, fuzzy
-msgid "_Linphone"
-msgstr "Linphone"
-
-#: ../gtk/main.ui.h:55

 msgid "_Options"
 msgstr ""
 
 msgid "_Options"
 msgstr ""
 

-#: ../gtk/main.ui.h:56
+#: ../gtk/main.ui.h:55

 msgid "in"
 msgstr ""
 
 msgid "in"
 msgstr ""
 

-#: ../gtk/main.ui.h:57
+#: ../gtk/main.ui.h:56

 msgid "label"
 msgstr ""
 
 msgid "label"
 msgstr ""
 


@@ -707,16 +800,6 @@ msgstr "アドレス"
 msgid "Show this contact presence status"
 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 ""
 #: ../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
 msgstr "コーデックの情報"
 
 #: ../gtk/sip_account.ui.h:6

-msgid "Register at startup"
+msgid "Register"

 msgstr ""
 
 #: ../gtk/sip_account.ui.h:7
 msgstr ""
 
 #: ../gtk/sip_account.ui.h:7


@@ -804,11 +887,6 @@ msgstr "sip:"
 msgid "Send"
 msgstr "サウンド"
 
 msgid "Send"
 msgstr "サウンド"
 

-#: ../gtk/chatroom.ui.h:2
-#, fuzzy
-msgid "gtk-close"
-msgstr "接続しました。"
-

 #: ../gtk/parameters.ui.h:1
 msgid "0 stands for \"unlimited\""
 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
 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
 
 #: ../gtk/parameters.ui.h:10
 #, fuzzy


@@ -873,207 +950,225 @@ msgid "<b>Video</b>"
 msgstr "接続中"
 
 #: ../gtk/parameters.ui.h:14
 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
 msgstr ""
 
 #: ../gtk/parameters.ui.h:15

+msgid "ALSA special device (optional):"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:16

 msgid "Add"
 msgstr "追加する"
 
 msgid "Add"
 msgstr "追加する"
 

-#: ../gtk/parameters.ui.h:16
+#: ../gtk/parameters.ui.h:17

 msgid "Audio RTP/UDP:"
 msgstr ""
 
 msgid "Audio RTP/UDP:"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:17
+#: ../gtk/parameters.ui.h:18

 #, fuzzy
 msgid "Audio codecs"
 msgstr "オーディオコーデックのプロパティー"
 
 #, fuzzy
 msgid "Audio codecs"
 msgstr "オーディオコーデックのプロパティー"
 

-#: ../gtk/parameters.ui.h:18
+#: ../gtk/parameters.ui.h:19

 msgid "Behind NAT / Firewall (specify gateway IP below)"
 msgstr ""
 
 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 ""
 
 msgid "Behind NAT / Firewall (use STUN to resolve)"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:21
+#: ../gtk/parameters.ui.h:22

 msgid "CIF"
 msgstr ""
 
 msgid "CIF"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:22
+#: ../gtk/parameters.ui.h:23

 #, fuzzy
 msgid "Capture device:"
 msgstr "使用するサウンドデバイス"
 
 #, fuzzy
 msgid "Capture device:"
 msgstr "使用するサウンドデバイス"
 

-#: ../gtk/parameters.ui.h:23
+#: ../gtk/parameters.ui.h:24

 #, fuzzy
 msgid "Codecs"
 msgstr "コーデック"
 
 #, fuzzy
 msgid "Codecs"
 msgstr "コーデック"
 

-#: ../gtk/parameters.ui.h:24
+#: ../gtk/parameters.ui.h:25

 msgid "Direct connection to the Internet"
 msgstr ""
 
 msgid "Direct connection to the Internet"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:25
+#: ../gtk/parameters.ui.h:26

 msgid "Disable"
 msgstr "使用しない"
 
 msgid "Disable"
 msgstr "使用しない"
 

-#: ../gtk/parameters.ui.h:26
+#: ../gtk/parameters.ui.h:27

 #, fuzzy
 msgid "Done"
 msgstr "ありません。"
 
 #, fuzzy
 msgid "Done"
 msgstr "ありません。"
 

-#: ../gtk/parameters.ui.h:27
+#: ../gtk/parameters.ui.h:28

 msgid "Download speed limit in Kbit/sec:"
 msgstr ""
 
 msgid "Download speed limit in Kbit/sec:"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:28
+#: ../gtk/parameters.ui.h:29

 msgid "Edit"
 msgstr ""
 
 msgid "Edit"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:30

 msgid "Enable"
 msgstr "使用する"
 
 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 ""
 
 msgid "Enable echo cancellation"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:31
+#: ../gtk/parameters.ui.h:33

 msgid "Erase all passwords"
 msgstr ""
 
 msgid "Erase all passwords"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:32
+#: ../gtk/parameters.ui.h:34

 msgid "Manage SIP Accounts"
 msgstr ""
 
 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 ""
 
 msgid "Multimedia settings"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:37

 #, fuzzy
 msgid "Network settings"
 msgstr "ネットワーク"
 
 #, fuzzy
 msgid "Network settings"
 msgstr "ネットワーク"
 

-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:38

 #, fuzzy
 msgid "Playback device:"
 msgstr "使用するサウンドデバイス"
 
 #, fuzzy
 msgid "Playback device:"
 msgstr "使用するサウンドデバイス"
 

-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:39

 msgid "Prefered video resolution:"
 msgstr ""
 
 msgid "Prefered video resolution:"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:40

 #, fuzzy
 msgid "Public IP address:"
 msgstr "Sipアドレス:"
 
 #, 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 ""
 
 msgid ""
 "Register to FONICS\n"
 "virtual network !"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:43

 msgid "Remove"
 msgstr "削除する"
 
 msgid "Remove"
 msgstr "削除する"
 

-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:44

 #, fuzzy
 msgid "Ring device:"
 msgstr "使用するサウンドデバイス"
 
 #, fuzzy
 msgid "Ring device:"
 msgstr "使用するサウンドデバイス"
 

-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:45

 #, fuzzy
 msgid "Ring sound:"
 msgstr "録音する音源"
 
 #, fuzzy
 msgid "Ring sound:"
 msgstr "録音する音源"
 

-#: ../gtk/parameters.ui.h:43
-msgid "SIP (TCP):"
+#: ../gtk/parameters.ui.h:46
+msgid "SIP (TCP)"

 msgstr ""
 
 msgstr ""
 

-#: ../gtk/parameters.ui.h:44
-msgid "SIP (UDP):"
+#: ../gtk/parameters.ui.h:47
+msgid "SIP (TLS)"

 msgstr ""
 
 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 ""
 
 msgid "Send DTMFs as SIP info"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:46
+#: ../gtk/parameters.ui.h:50

 msgid "Set Maximum Transmission Unit:"
 msgstr ""
 
 msgid "Set Maximum Transmission Unit:"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:51

 msgid "Settings"
 msgstr ""
 
 msgid "Settings"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:52

 msgid "Show advanced settings"
 msgstr ""
 
 msgid "Show advanced settings"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:53

 #, fuzzy
 msgid "Stun server:"
 msgstr "使用するサウンドデバイス"
 
 #, 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 ""
 
 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 ""
 
 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 ""
 
 msgid "Use IPv6 instead of IPv4"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:53
+#: ../gtk/parameters.ui.h:57

 #, fuzzy
 msgid "User interface"
 msgstr "ユーザーマニュアル"
 
 #, fuzzy
 msgid "User interface"
 msgstr "ユーザーマニュアル"
 

-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:58

 msgid "Video RTP/UDP:"
 msgstr ""
 
 msgid "Video RTP/UDP:"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:59

 #, fuzzy
 msgid "Video codecs"
 msgstr "オーディオコーデックのプロパティー"
 
 #, fuzzy
 msgid "Video codecs"
 msgstr "オーディオコーデックのプロパティー"
 

-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:60

 #, fuzzy
 msgid "Video input device:"
 msgstr "使用するサウンドデバイス"
 
 #, fuzzy
 msgid "Video input device:"
 msgstr "使用するサウンドデバイス"
 

-#: ../gtk/parameters.ui.h:57
+#: ../gtk/parameters.ui.h:61

 msgid "Your display name (eg: John Doe):"
 msgstr ""
 
 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アドレス"
 
 #, fuzzy
 msgid "Your resulting SIP address:"
 msgstr "あなたのSIPアドレス"
 

-#: ../gtk/parameters.ui.h:59
+#: ../gtk/parameters.ui.h:63

 #, fuzzy
 msgid "Your username:"
 msgstr "ユーザーマニュアル"
 
 #, fuzzy
 msgid "Your username:"
 msgstr "ユーザーマニュアル"
 

-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:64

 msgid "a sound card"
 msgstr ""
 
 msgid "a sound card"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:65

 msgid "default camera"
 msgstr ""
 
 msgid "default camera"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:66

 msgid "default soundcard"
 msgstr ""
 
 msgid "default soundcard"
 msgstr ""
 


@@ -1100,26 +1195,19 @@ msgstr "Linphone"
 msgid "Please wait"
 msgstr ""
 
 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 ""
 
 msgid "aborted"
 msgstr ""
 

-#: ../coreapi/linphonecore.c:209
+#: ../coreapi/linphonecore.c:190

 msgid "completed"
 msgstr ""
 
 msgid "completed"
 msgstr ""
 

-#: ../coreapi/linphonecore.c:212
+#: ../coreapi/linphonecore.c:193

 msgid "missed"
 msgstr ""
 
 msgid "missed"
 msgstr ""
 

-#: ../coreapi/linphonecore.c:217
+#: ../coreapi/linphonecore.c:198

 #, c-format
 msgid ""
 "%s at %s\n"
 #, c-format
 msgid ""
 "%s at %s\n"


@@ -1129,28 +1217,24 @@ msgid ""
 "Duration: %i mn %i sec\n"
 msgstr ""
 
 "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 ""
 
 msgid "Outgoing call"
 msgstr ""
 

-#: ../coreapi/linphonecore.c:998
+#: ../coreapi/linphonecore.c:1088

 #, fuzzy
 msgid "Ready"
 msgstr "準備完了。"
 
 #, fuzzy
 msgid "Ready"
 msgstr "準備完了。"
 

-#: ../coreapi/linphonecore.c:1773
+#: ../coreapi/linphonecore.c:1831

 msgid "Looking for telephone number destination..."
 msgstr ""
 
 msgid "Looking for telephone number destination..."
 msgstr ""
 

-#: ../coreapi/linphonecore.c:1776
+#: ../coreapi/linphonecore.c:1834

 msgid "Could not resolve this number."
 msgstr ""
 
 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:"
 #, 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>のような"
 "形式です。"
 
 "SIPアドレスの形式エラーです。SIPアドレスは、<sip:username@domainname>のような"
 "形式です。"
 

-#: ../coreapi/linphonecore.c:1967
+#: ../coreapi/linphonecore.c:2025

 #, fuzzy
 msgid "Contacting"
 msgstr "接続中"
 
 #, fuzzy
 msgid "Contacting"
 msgstr "接続中"
 

-#: ../coreapi/linphonecore.c:1974
+#: ../coreapi/linphonecore.c:2032

 #, fuzzy
 msgid "Could not call"
 msgstr "pixmapファイルが見つかりません %s"
 
 #, 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 ""
 
 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 ""
 
 msgid "Modifying call parameters..."
 msgstr ""
 

-#: ../coreapi/linphonecore.c:2311
+#: ../coreapi/linphonecore.c:2366

 msgid "Connected."
 msgstr "接続しました。"
 
 msgid "Connected."
 msgstr "接続しました。"
 

-#: ../coreapi/linphonecore.c:2334
+#: ../coreapi/linphonecore.c:2389

 #, fuzzy
 msgid "Call aborted"
 msgstr "通話はキャンセルされました。"
 
 #, 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 ""
 
 msgid "Could not pause the call"
 msgstr ""
 

-#: ../coreapi/linphonecore.c:2460
+#: ../coreapi/linphonecore.c:2535

 msgid "Pausing the current call..."
 msgstr ""
 
 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"
 #: ../coreapi/misc.c:147
 msgid ""
 "Your computer appears to be using ALSA sound drivers.\n"


@@ -1287,156 +1358,203 @@ msgstr ""
 msgid "Unknown-bug"
 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 ""
 
 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 ""
 
 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"
 
 #, 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 "から電話です。"
 
 #, fuzzy
 msgid "is contacting you"
 msgstr "から電話です。"
 

-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207

 msgid " and asked autoanswer."
 msgstr ""
 
 msgid " and asked autoanswer."
 msgstr ""
 

-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207

 msgid "."
 msgstr ""
 
 msgid "."
 msgstr ""
 

-#: ../coreapi/callbacks.c:226
+#: ../coreapi/callbacks.c:266

 #, fuzzy
 msgid "Remote ringing."
 msgstr "登録中……"
 
 #, fuzzy
 msgid "Remote ringing."
 msgstr "登録中……"
 

-#: ../coreapi/callbacks.c:242
+#: ../coreapi/callbacks.c:282

 #, fuzzy
 msgid "Remote ringing..."
 msgstr "登録中……"
 
 #, fuzzy
 msgid "Remote ringing..."
 msgstr "登録中……"
 

-#: ../coreapi/callbacks.c:253
+#: ../coreapi/callbacks.c:293

 msgid "Early media."
 msgstr ""
 
 msgid "Early media."
 msgstr ""
 

-#: ../coreapi/callbacks.c:291
+#: ../coreapi/callbacks.c:331

 #, c-format
 msgid "Call with %s is paused."
 msgstr ""
 
 #, 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 ""
 
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr ""
 

-#: ../coreapi/callbacks.c:317
+#: ../coreapi/callbacks.c:357

 #, fuzzy
 msgid "Call resumed."
 msgstr "通話は拒否されました。"
 
 #, fuzzy
 msgid "Call resumed."
 msgstr "通話は拒否されました。"
 

-#: ../coreapi/callbacks.c:322
+#: ../coreapi/callbacks.c:362

 #, fuzzy, c-format
 msgid "Call answered by %s."
 msgstr ""
 "電話をかける\n"
 "電話に出る"
 
 #, fuzzy, c-format
 msgid "Call answered by %s."
 msgstr ""
 "電話をかける\n"
 "電話に出る"
 

-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:432

 msgid "We are being paused..."
 msgstr ""
 
 msgid "We are being paused..."
 msgstr ""
 

-#: ../coreapi/callbacks.c:387
+#: ../coreapi/callbacks.c:436

 msgid "We have been resumed..."
 msgstr ""
 
 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 "通話は拒否されました。"
 
 #, fuzzy
 msgid "Call terminated."
 msgstr "通話は拒否されました。"
 

-#: ../coreapi/callbacks.c:431
+#: ../coreapi/callbacks.c:480

 msgid "User is busy."
 msgstr "ユーザーはビジーです"
 
 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).");
 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 "ユーザーは手が離せないようです。"
 
 msgid "User does not want to be disturbed."
 msgstr "ユーザーは手が離せないようです。"
 

-#: ../coreapi/callbacks.c:435
+#: ../coreapi/callbacks.c:484

 msgid "Call declined."
 msgstr "通話は拒否されました。"
 
 msgid "Call declined."
 msgstr "通話は拒否されました。"
 

-#: ../coreapi/callbacks.c:447
+#: ../coreapi/callbacks.c:496

 msgid "No response."
 msgstr ""
 
 msgid "No response."
 msgstr ""
 

-#: ../coreapi/callbacks.c:451
+#: ../coreapi/callbacks.c:500

 msgid "Protocol error."
 msgstr ""
 
 msgid "Protocol error."
 msgstr ""
 

-#: ../coreapi/callbacks.c:467
+#: ../coreapi/callbacks.c:516

 msgid "Redirected"
 msgstr ""
 
 msgid "Redirected"
 msgstr ""
 

-#: ../coreapi/callbacks.c:477
+#: ../coreapi/callbacks.c:526

 msgid "Not found"
 msgstr ""
 
 msgid "Not found"
 msgstr ""
 

-#: ../coreapi/callbacks.c:487
+#: ../coreapi/callbacks.c:551

 msgid "No common codecs"
 msgstr ""
 
 msgid "No common codecs"
 msgstr ""
 

-#: ../coreapi/callbacks.c:493
+#: ../coreapi/callbacks.c:557

 #, fuzzy
 msgid "Call failed."
 msgstr "通話はキャンセルされました。"
 
 #, fuzzy
 msgid "Call failed."
 msgstr "通話はキャンセルされました。"
 

-#: ../coreapi/callbacks.c:557
+#: ../coreapi/callbacks.c:631

 #, fuzzy, c-format
 msgid "Registration on %s successful."
 msgstr "登録しました。"
 
 #, 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 "登録しました。"
 
 #, fuzzy, c-format
 msgid "Unregistration on %s done."
 msgstr "登録しました。"
 

-#: ../coreapi/callbacks.c:574
+#: ../coreapi/callbacks.c:648

 msgid "no response timeout"
 msgstr ""
 
 msgid "no response timeout"
 msgstr ""
 

-#: ../coreapi/callbacks.c:577
+#: ../coreapi/callbacks.c:651

 #, fuzzy, c-format
 msgid "Registration on %s failed: %s"
 msgstr "登録しました。"
 
 #, 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 "コーデックの情報"
 
 #, 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 "コーデック"
 #, fuzzy
 #~ msgid "_Modes"
 #~ msgstr "コーデック"


@@ -1630,10 +1748,6 @@ msgstr "コーデックの情報"
 #~ msgid "Name:"
 #~ msgstr "名前"
 
 #~ msgid "Name:"
 #~ msgstr "名前"
 

-#, fuzzy
-#~ msgid "None"
-#~ msgstr "ありません。"
-

 #, fuzzy
 #~ msgid "Bad sip address: a sip address looks like sip:user@domain"
 #~ msgstr ""
 #, fuzzy
 #~ msgid "Bad sip address: a sip address looks like sip:user@domain"
 #~ msgstr ""


@@ -1690,12 +1804,6 @@ msgstr "コーデックの情報"
 #~ msgid "Timeout..."
 #~ 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 "リモートサーバーに登録するときは、チェックして下さい。"
 
 #~ 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 (file)
--- 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"
 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"
 "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"
 
 "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"
 #: ../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"
 
 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"
 
 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."
 
 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å"
 
 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"
 
 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)"
 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)"
 
 "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"
 
 #, 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"
 #, 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."
 
 "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"
 #, 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>:"
 
 "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"
 
 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"
 
 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)"
 
 #, 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."
 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."
 
 "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"
 
 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"
 
 msgid "Name"
 msgstr "Navn"
 

-#: ../gtk/friendlist.c:205
+#: ../gtk/friendlist.c:271

 msgid "Presence status"
 msgstr "Tilstedestatus"
 
 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"
 
 #, 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 !"
 
 msgid "Invalid sip contact !"
 msgstr "Ugyldig SIP kontakt !"
 

-#: ../gtk/friendlist.c:495
+#: ../gtk/friendlist.c:613

 #, c-format
 msgid "Call %s"
 msgstr "Ring %s"
 
 #, 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"
 
 #, 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'"
 
 #, 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'"
 
 #, 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"
 
 #, 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)"
 
 msgid "Rate (Hz)"
 msgstr "Frekvens (Hz)"
 

-#: ../gtk/propertybox.c:283
+#: ../gtk/propertybox.c:308

 msgid "Status"
 msgstr "Status"
 
 msgid "Status"
 msgstr "Status"
 

-#: ../gtk/propertybox.c:289
+#: ../gtk/propertybox.c:314

 msgid "Min bitrate (kbit/s)"
 msgstr "Min. datahastighet (kbit/s)"
 
 msgid "Min bitrate (kbit/s)"
 msgstr "Min. datahastighet (kbit/s)"
 

-#: ../gtk/propertybox.c:296
+#: ../gtk/propertybox.c:321

 msgid "Parameters"
 msgstr "Parametere"
 
 msgid "Parameters"
 msgstr "Parametere"
 

-#: ../gtk/propertybox.c:326 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507

 msgid "Enabled"
 msgstr "På"
 
 msgid "Enabled"
 msgstr "På"
 

-#: ../gtk/propertybox.c:327 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507

 msgid "Disabled"
 msgstr "Av"
 
 msgid "Disabled"
 msgstr "Av"
 

-#: ../gtk/propertybox.c:510
+#: ../gtk/propertybox.c:553

 msgid "Account"
 msgstr "Konto"
 
 msgid "Account"
 msgstr "Konto"
 

-#: ../gtk/propertybox.c:650
+#: ../gtk/propertybox.c:693

 msgid "English"
 msgstr "Engelsk"
 
 msgid "English"
 msgstr "Engelsk"
 

-#: ../gtk/propertybox.c:651
+#: ../gtk/propertybox.c:694

 msgid "French"
 msgstr "Fransk"
 
 msgid "French"
 msgstr "Fransk"
 

-#: ../gtk/propertybox.c:652
+#: ../gtk/propertybox.c:695

 msgid "Swedish"
 msgstr "Svensk"
 
 msgid "Swedish"
 msgstr "Svensk"
 

-#: ../gtk/propertybox.c:653
+#: ../gtk/propertybox.c:696

 msgid "Italian"
 msgstr "Italisensk"
 
 msgid "Italian"
 msgstr "Italisensk"
 

-#: ../gtk/propertybox.c:654
+#: ../gtk/propertybox.c:697

 msgid "Spanish"
 msgstr "Spansk"
 
 msgid "Spanish"
 msgstr "Spansk"
 

-#: ../gtk/propertybox.c:655
+#: ../gtk/propertybox.c:698

 msgid "Brazilian Portugese"
 msgstr "Portugisisk"
 
 msgid "Brazilian Portugese"
 msgstr "Portugisisk"
 

-#: ../gtk/propertybox.c:656
+#: ../gtk/propertybox.c:699

 msgid "Polish"
 msgstr "Polsk"
 
 msgid "Polish"
 msgstr "Polsk"
 

-#: ../gtk/propertybox.c:657
+#: ../gtk/propertybox.c:700

 msgid "German"
 msgstr "Tysk"
 
 msgid "German"
 msgstr "Tysk"
 

-#: ../gtk/propertybox.c:658
+#: ../gtk/propertybox.c:701

 msgid "Russian"
 msgstr "Russisk"
 
 msgid "Russian"
 msgstr "Russisk"
 

-#: ../gtk/propertybox.c:659
+#: ../gtk/propertybox.c:702

 msgid "Japanese"
 msgstr "Japansk"
 
 msgid "Japanese"
 msgstr "Japansk"
 

-#: ../gtk/propertybox.c:660
+#: ../gtk/propertybox.c:703

 msgid "Dutch"
 msgstr "Nederlandsk"
 
 msgid "Dutch"
 msgstr "Nederlandsk"
 

-#: ../gtk/propertybox.c:661
+#: ../gtk/propertybox.c:704

 msgid "Hungarian"
 msgstr "Ungarsk"
 
 msgid "Hungarian"
 msgstr "Ungarsk"
 

-#: ../gtk/propertybox.c:662
+#: ../gtk/propertybox.c:705

 msgid "Czech"
 msgstr "Tjekkisk"
 
 msgid "Czech"
 msgstr "Tjekkisk"
 

-#: ../gtk/propertybox.c:663
+#: ../gtk/propertybox.c:706

 msgid "Chinese"
 msgstr "Kinesisk"
 
 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."
 
 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 ""
 #: ../gtk/update.c:80
 #, c-format
 msgid ""


@@ -355,74 +428,99 @@ msgstr "Lager brukerkontoen din"
 msgid "Now ready !"
 msgstr "Klar nå!"
 
 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"
 
 #, 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 ""
 
 #, 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"
 
 msgid "Transfer"
 msgstr "Overfører"
 

-#: ../gtk/incall_view.c:187
+#: ../gtk/incall_view.c:271

 msgid "<b>Calling...</b>"
 msgstr "<b>Ringer...</b>"
 
 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"
 
 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"
 
 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 ""
 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>"
 
 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>"
 
 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"
 
 #, 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>"
 
 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"
 
 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"
 
 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
 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>"
 
 #: ../gtk/main.ui.h:15
 msgid "<b>Welcome !</b>"


@@ -508,25 +607,26 @@ msgid "All users"
 msgstr "Alle brukere"
 
 #: ../gtk/main.ui.h:21
 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"
 
 msgid "Automatically log me in"
 msgstr "Logg meg på automatisk"
 

-#: ../gtk/main.ui.h:24
+#: ../gtk/main.ui.h:22

 msgid "B"
 msgstr "B"
 
 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"
 
 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"
 #: ../gtk/main.ui.h:26
 msgid "Check _Updates"
 msgstr "Sjekk _Oppdateringer"


@@ -539,10 +639,6 @@ msgstr "Kontakter"
 msgid "D"
 msgstr "D"
 
 msgid "D"
 msgstr "D"
 

-#: ../gtk/main.ui.h:29
-msgid "Decline"
-msgstr "Avvis"
-

 #: ../gtk/main.ui.h:30
 msgid "Default"
 msgstr "Standard"
 #: ../gtk/main.ui.h:30
 msgid "Default"
 msgstr "Standard"


@@ -552,13 +648,14 @@ msgid "Duration"
 msgstr "Varighet"
 
 #: ../gtk/main.ui.h:32
 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"
 
 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"
 #: ../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:"
 
 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:"
 
 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"
 
 msgid "Online users"
 msgstr "Tilkoblede brukere"
 

-#: ../gtk/main.ui.h:45
+#: ../gtk/main.ui.h:44

 msgid "Password"
 msgstr "Passord"
 
 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:"
 #: ../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"
 
 msgid "Search"
 msgstr "Søk"
 

-#: ../gtk/main.ui.h:49
+#: ../gtk/main.ui.h:50

 msgid "Show debug window"
 msgstr "Vis avlusningsvindu"
 
 msgid "Show debug window"
 msgstr "Vis avlusningsvindu"
 

-#: ../gtk/main.ui.h:50
+#: ../gtk/main.ui.h:51

 msgid "Username"
 msgstr "Brukernavn"
 
 msgid "Username"
 msgstr "Brukernavn"
 

-#: ../gtk/main.ui.h:51
-#, fuzzy
-msgid "_Call history"
-msgstr "Samtalehistorikk"
-

 #: ../gtk/main.ui.h:52
 msgid "_Help"
 msgstr "_Hjelp"
 #: ../gtk/main.ui.h:52
 msgid "_Help"
 msgstr "_Hjelp"


@@ -633,18 +730,14 @@ msgid "_Homepage"
 msgstr "H_jemmeside"
 
 #: ../gtk/main.ui.h:54
 msgstr "H_jemmeside"
 
 #: ../gtk/main.ui.h:54

-msgid "_Linphone"
-msgstr "_Linphone"
-
-#: ../gtk/main.ui.h:55

 msgid "_Options"
 msgstr "_Alternativer"
 
 msgid "_Options"
 msgstr "_Alternativer"
 

-#: ../gtk/main.ui.h:56
+#: ../gtk/main.ui.h:55

 msgid "in"
 msgstr "i"
 
 msgid "in"
 msgstr "i"
 

-#: ../gtk/main.ui.h:57
+#: ../gtk/main.ui.h:56

 msgid "label"
 msgstr "etikett"
 
 msgid "label"
 msgstr "etikett"
 


@@ -704,14 +797,6 @@ msgstr "SIP Addresse"
 msgid "Show this contact presence status"
 msgstr "Vis kontaktens tilstedestatus"
 
 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"
 #: ../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
 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):"
 
 #: ../gtk/sip_account.ui.h:7
 msgid "Registration duration (sec):"


@@ -792,10 +877,6 @@ msgstr "sip:"
 msgid "Send"
 msgstr "Send"
 
 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\""
 #: ../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
 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>"
 
 #: ../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
 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):"
 
 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"
 
 msgid "Add"
 msgstr "Legg til"
 

-#: ../gtk/parameters.ui.h:16
+#: ../gtk/parameters.ui.h:17

 msgid "Audio RTP/UDP:"
 msgstr "Lyd RTP/UDP:"
 
 msgid "Audio RTP/UDP:"
 msgstr "Lyd RTP/UDP:"
 

-#: ../gtk/parameters.ui.h:17
+#: ../gtk/parameters.ui.h:18

 msgid "Audio codecs"
 msgstr "Lyd kodek"
 
 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)"
 
 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)"
 
 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"
 
 msgid "CIF"
 msgstr "CIF"
 

-#: ../gtk/parameters.ui.h:22
+#: ../gtk/parameters.ui.h:23

 msgid "Capture device:"
 msgstr "Mikrofonenhet:"
 
 msgid "Capture device:"
 msgstr "Mikrofonenhet:"
 

-#: ../gtk/parameters.ui.h:23
+#: ../gtk/parameters.ui.h:24

 msgid "Codecs"
 msgstr "Kodek"
 
 msgid "Codecs"
 msgstr "Kodek"
 

-#: ../gtk/parameters.ui.h:24
+#: ../gtk/parameters.ui.h:25

 msgid "Direct connection to the Internet"
 msgstr "Tilkoblet Internett direkte"
 
 msgid "Direct connection to the Internet"
 msgstr "Tilkoblet Internett direkte"
 

-#: ../gtk/parameters.ui.h:25
+#: ../gtk/parameters.ui.h:26

 msgid "Disable"
 msgstr "Deaktiver"
 
 msgid "Disable"
 msgstr "Deaktiver"
 

-#: ../gtk/parameters.ui.h:26
+#: ../gtk/parameters.ui.h:27

 msgid "Done"
 msgstr "Ferdig"
 
 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:"
 
 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"
 
 msgid "Edit"
 msgstr "Rediger"
 

-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:30

 msgid "Enable"
 msgstr "Aktiver"
 
 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"
 
 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"
 
 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"
 
 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"
 
 msgid "Multimedia settings"
 msgstr "Multimediainnstillinger"
 

-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:37

 msgid "Network settings"
 msgstr "Nettverksinnstillinger"
 
 msgid "Network settings"
 msgstr "Nettverksinnstillinger"
 

-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:38

 msgid "Playback device:"
 msgstr "Avspillingsenhet:"
 
 msgid "Playback device:"
 msgstr "Avspillingsenhet:"
 

-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:39

 msgid "Prefered video resolution:"
 msgstr "Foretrukke video-oppløsning:"
 
 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:"
 
 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 !"
 msgid ""
 "Register to FONICS\n"
 "virtual network !"


@@ -948,95 +1043,102 @@ msgstr ""
 "Registrer hos FONICS\n"
 "virtuelle nettverk !"
 
 "Registrer hos FONICS\n"
 "virtuelle nettverk !"
 

-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:43

 msgid "Remove"
 msgstr "Fjern"
 
 msgid "Remove"
 msgstr "Fjern"
 

-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:44

 msgid "Ring device:"
 msgstr "Ringe-enhet:"
 
 msgid "Ring device:"
 msgstr "Ringe-enhet:"
 

-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:45

 msgid "Ring sound:"
 msgstr "Ringelyd:"
 
 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):"
 
 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):"
 
 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"
 
 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):"
 
 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"
 
 msgid "Settings"
 msgstr "Innstillinger"
 

-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:52

 msgid "Show advanced settings"
 msgstr "Vis avanserte innstillinger"
 
 msgid "Show advanced settings"
 msgstr "Vis avanserte innstillinger"
 

-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:53

 msgid "Stun server:"
 msgstr "STUN tjener:"
 
 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"
 
 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:"
 
 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"
 
 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"
 
 msgid "User interface"
 msgstr "Brukergrensesnitt"
 

-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:58

 msgid "Video RTP/UDP:"
 msgstr "Video RTP/UDP:"
 
 msgid "Video RTP/UDP:"
 msgstr "Video RTP/UDP:"
 

-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:59

 msgid "Video codecs"
 msgstr "Video kodek"
 
 msgid "Video codecs"
 msgstr "Video kodek"
 

-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:60

 msgid "Video input device:"
 msgstr "Videoenhet:"
 
 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):"
 
 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:"
 
 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:"
 
 msgid "Your username:"
 msgstr "Ditt brukernavn:"
 

-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:64

 msgid "a sound card"
 msgstr "ett lydkort"
 
 msgid "a sound card"
 msgstr "ett lydkort"
 

-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:65

 msgid "default camera"
 msgstr "standard kamera"
 
 msgid "default camera"
 msgstr "standard kamera"
 

-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:66

 msgid "default soundcard"
 msgstr "standard lydkort"
 
 msgid "default soundcard"
 msgstr "standard lydkort"
 


@@ -1060,26 +1162,19 @@ msgstr "Linphone"
 msgid "Please wait"
 msgstr "Vennligst vent"
 
 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"
 
 msgid "aborted"
 msgstr "avbrutt"
 

-#: ../coreapi/linphonecore.c:209
+#: ../coreapi/linphonecore.c:190

 msgid "completed"
 msgstr "Fullført"
 
 msgid "completed"
 msgstr "Fullført"
 

-#: ../coreapi/linphonecore.c:212
+#: ../coreapi/linphonecore.c:193

 msgid "missed"
 msgstr "ubesvart"
 
 msgid "missed"
 msgstr "ubesvart"
 

-#: ../coreapi/linphonecore.c:217
+#: ../coreapi/linphonecore.c:198

 #, c-format
 msgid ""
 "%s at %s\n"
 #, c-format
 msgid ""
 "%s at %s\n"


@@ -1094,27 +1189,23 @@ msgstr ""
 "Status: %s\n"
 "Lengde: %i min %i sek\n"
 
 "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"
 
 msgid "Outgoing call"
 msgstr "Utgående samtale"
 

-#: ../coreapi/linphonecore.c:998
+#: ../coreapi/linphonecore.c:1088

 msgid "Ready"
 msgstr "Klar"
 
 msgid "Ready"
 msgstr "Klar"
 

-#: ../coreapi/linphonecore.c:1773
+#: ../coreapi/linphonecore.c:1831

 msgid "Looking for telephone number destination..."
 msgstr "Ser etter telefonnummer for destinasjonen..."
 
 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."
 
 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"
 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"
 
 "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"
 
 msgid "Contacting"
 msgstr "Tilknytter"
 

-#: ../coreapi/linphonecore.c:1974
+#: ../coreapi/linphonecore.c:2032

 msgid "Could not call"
 msgstr "Kunne ikke ringe"
 
 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"
 
 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..."
 
 msgid "Modifying call parameters..."
 msgstr "Endrer ringeparametre..."
 

-#: ../coreapi/linphonecore.c:2311
+#: ../coreapi/linphonecore.c:2366

 msgid "Connected."
 msgstr "Tilkoblet"
 
 msgid "Connected."
 msgstr "Tilkoblet"
 

-#: ../coreapi/linphonecore.c:2334
+#: ../coreapi/linphonecore.c:2389

 msgid "Call aborted"
 msgstr "Samtale avbrutt"
 
 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"
 
 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"
 
 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"
 #: ../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"
 
 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."
 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."
 
 "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"
 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"
 
 "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"
 
 #, 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."
 
 msgid "is contacting you"
 msgstr "Kontakter deg."
 

-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207

 msgid " and asked autoanswer."
 msgstr " og ba om autosvar."
 
 msgid " and asked autoanswer."
 msgstr " og ba om autosvar."
 

-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207

 msgid "."
 msgstr "."
 
 msgid "."
 msgstr "."
 

-#: ../coreapi/callbacks.c:226
+#: ../coreapi/callbacks.c:266

 msgid "Remote ringing."
 msgstr "Ringer hos motparten."
 
 msgid "Remote ringing."
 msgstr "Ringer hos motparten."
 

-#: ../coreapi/callbacks.c:242
+#: ../coreapi/callbacks.c:282

 #, fuzzy
 msgid "Remote ringing..."
 msgstr "Ringer hos motparten."
 
 #, fuzzy
 msgid "Remote ringing..."
 msgstr "Ringer hos motparten."
 

-#: ../coreapi/callbacks.c:253
+#: ../coreapi/callbacks.c:293

 msgid "Early media."
 msgstr "Tidlig media"
 
 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."
 
 #, 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."
 
 #, 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."
 
 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."
 
 #, 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..."
 
 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..."
 
 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."
 
 msgid "Call terminated."
 msgstr "Samtale avsluttet."
 

-#: ../coreapi/callbacks.c:431
+#: ../coreapi/callbacks.c:480

 msgid "User is busy."
 msgstr "Brukeren er opptatt."
 
 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).");
 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."
 
 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."
 
 msgid "Call declined."
 msgstr "Samtale avvist."
 

-#: ../coreapi/callbacks.c:447
+#: ../coreapi/callbacks.c:496

 msgid "No response."
 msgstr "Ikke noe svar."
 
 msgid "No response."
 msgstr "Ikke noe svar."
 

-#: ../coreapi/callbacks.c:451
+#: ../coreapi/callbacks.c:500

 msgid "Protocol error."
 msgstr "Protokollfeil."
 
 msgid "Protocol error."
 msgstr "Protokollfeil."
 

-#: ../coreapi/callbacks.c:467
+#: ../coreapi/callbacks.c:516

 msgid "Redirected"
 msgstr "Omdirigert"
 
 msgid "Redirected"
 msgstr "Omdirigert"
 

-#: ../coreapi/callbacks.c:477
+#: ../coreapi/callbacks.c:526

 msgid "Not found"
 msgstr "Ikke funnet"
 
 msgid "Not found"
 msgstr "Ikke funnet"
 

-#: ../coreapi/callbacks.c:487
+#: ../coreapi/callbacks.c:551

 msgid "No common codecs"
 msgstr "Ingen felles kodek"
 
 msgid "No common codecs"
 msgstr "Ingen felles kodek"
 

-#: ../coreapi/callbacks.c:493
+#: ../coreapi/callbacks.c:557

 msgid "Call failed."
 msgstr "Samtale feilet."
 
 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."
 
 #, 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."
 
 #, 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"
 
 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"
 
 #, 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"
 
 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"
 
 #~ 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 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nl\n"
 "Report-Msgid-Bugs-To: \n"
 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"
 "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"
 
 "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"
 #: ../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"
 
 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 ""
 
 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 ""
 
 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 ""
 
 msgid "address to call right now"
 msgstr ""
 

-#: ../gtk/main.c:95
+#: ../gtk/main.c:111

 msgid "if set automatically answer incoming calls"
 msgstr ""
 
 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 ""
 
 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"
 
 #, 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"
 #, 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 ""
 
 "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 ""
 
 #, 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 ""
 
 msgid "Website link"
 msgstr ""
 

-#: ../gtk/main.c:1076
+#: ../gtk/main.c:1205

 msgid "Linphone - a video internet phone"
 msgstr ""
 
 msgid "Linphone - a video internet phone"
 msgstr ""
 

-#: ../gtk/main.c:1095
+#: ../gtk/main.c:1295

 #, c-format
 msgid "%s (Default)"
 msgstr ""
 
 #, 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 ""
 
 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 ""
 
 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"
 
 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"
 
 msgid "Name"
 msgstr "Naam"
 

-#: ../gtk/friendlist.c:205
+#: ../gtk/friendlist.c:271

 msgid "Presence status"
 msgstr "Aanwezigheidsstatus"
 
 msgid "Presence status"
 msgstr "Aanwezigheidsstatus"
 

-#: ../gtk/friendlist.c:242
+#: ../gtk/friendlist.c:308

 #, c-format
 msgid "Search in %s directory"
 msgstr ""
 
 #, c-format
 msgid "Search in %s directory"
 msgstr ""
 

-#: ../gtk/friendlist.c:450
+#: ../gtk/friendlist.c:568

 msgid "Invalid sip contact !"
 msgstr ""
 
 msgid "Invalid sip contact !"
 msgstr ""
 

-#: ../gtk/friendlist.c:495
+#: ../gtk/friendlist.c:613

 #, fuzzy, c-format
 msgid "Call %s"
 msgstr "Oproepgeschiedenis"
 
 #, fuzzy, c-format
 msgid "Call %s"
 msgstr "Oproepgeschiedenis"
 

-#: ../gtk/friendlist.c:496
+#: ../gtk/friendlist.c:614

 #, c-format
 msgid "Send text to %s"
 msgstr ""
 
 #, 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"
 
 #, 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 ""
 
 #, 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 ""
 
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr ""
 

-#: ../gtk/propertybox.c:277
+#: ../gtk/propertybox.c:302

 msgid "Rate (Hz)"
 msgstr "Frequentie (Hz)"
 
 msgid "Rate (Hz)"
 msgstr "Frequentie (Hz)"
 

-#: ../gtk/propertybox.c:283
+#: ../gtk/propertybox.c:308

 msgid "Status"
 msgstr "Status"
 
 msgid "Status"
 msgstr "Status"
 

-#: ../gtk/propertybox.c:289
+#: ../gtk/propertybox.c:314

 msgid "Min bitrate (kbit/s)"
 msgstr "Minimale bitrate (kbit/s)"
 
 msgid "Min bitrate (kbit/s)"
 msgstr "Minimale bitrate (kbit/s)"
 

-#: ../gtk/propertybox.c:296
+#: ../gtk/propertybox.c:321

 msgid "Parameters"
 msgstr "Parameters"
 
 msgid "Parameters"
 msgstr "Parameters"
 

-#: ../gtk/propertybox.c:326 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507

 msgid "Enabled"
 msgstr "Aan"
 
 msgid "Enabled"
 msgstr "Aan"
 

-#: ../gtk/propertybox.c:327 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507

 msgid "Disabled"
 msgstr "Uit"
 
 msgid "Disabled"
 msgstr "Uit"
 

-#: ../gtk/propertybox.c:510
+#: ../gtk/propertybox.c:553

 msgid "Account"
 msgstr "Account"
 
 msgid "Account"
 msgstr "Account"
 

-#: ../gtk/propertybox.c:650
+#: ../gtk/propertybox.c:693

 msgid "English"
 msgstr ""
 
 msgid "English"
 msgstr ""
 

-#: ../gtk/propertybox.c:651
+#: ../gtk/propertybox.c:694

 msgid "French"
 msgstr ""
 
 msgid "French"
 msgstr ""
 

-#: ../gtk/propertybox.c:652
+#: ../gtk/propertybox.c:695

 msgid "Swedish"
 msgstr ""
 
 msgid "Swedish"
 msgstr ""
 

-#: ../gtk/propertybox.c:653
+#: ../gtk/propertybox.c:696

 msgid "Italian"
 msgstr ""
 
 msgid "Italian"
 msgstr ""
 

-#: ../gtk/propertybox.c:654
+#: ../gtk/propertybox.c:697

 msgid "Spanish"
 msgstr ""
 
 msgid "Spanish"
 msgstr ""
 

-#: ../gtk/propertybox.c:655
+#: ../gtk/propertybox.c:698

 msgid "Brazilian Portugese"
 msgstr ""
 
 msgid "Brazilian Portugese"
 msgstr ""
 

-#: ../gtk/propertybox.c:656
+#: ../gtk/propertybox.c:699

 msgid "Polish"
 msgstr ""
 
 msgid "Polish"
 msgstr ""
 

-#: ../gtk/propertybox.c:657
+#: ../gtk/propertybox.c:700

 msgid "German"
 msgstr ""
 
 msgid "German"
 msgstr ""
 

-#: ../gtk/propertybox.c:658
+#: ../gtk/propertybox.c:701

 msgid "Russian"
 msgstr ""
 
 msgid "Russian"
 msgstr ""
 

-#: ../gtk/propertybox.c:659
+#: ../gtk/propertybox.c:702

 msgid "Japanese"
 msgstr ""
 
 msgid "Japanese"
 msgstr ""
 

-#: ../gtk/propertybox.c:660
+#: ../gtk/propertybox.c:703

 msgid "Dutch"
 msgstr ""
 
 msgid "Dutch"
 msgstr ""
 

-#: ../gtk/propertybox.c:661
+#: ../gtk/propertybox.c:704

 msgid "Hungarian"
 msgstr ""
 
 msgid "Hungarian"
 msgstr ""
 

-#: ../gtk/propertybox.c:662
+#: ../gtk/propertybox.c:705

 msgid "Czech"
 msgstr ""
 
 msgid "Czech"
 msgstr ""
 

-#: ../gtk/propertybox.c:663
+#: ../gtk/propertybox.c:706

 msgid "Chinese"
 msgstr ""
 
 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 ""
 
 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 ""
 #: ../gtk/update.c:80
 #, c-format
 msgid ""


@@ -348,78 +422,104 @@ msgstr ""
 msgid "Now ready !"
 msgstr ""
 
 msgid "Now ready !"
 msgstr ""
 

-#: ../gtk/incall_view.c:61
+#: ../gtk/incall_view.c:69

 #, fuzzy, c-format
 msgid "Call #%i"
 msgstr "Oproepgeschiedenis"
 
 #, 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 ""
 
 #, c-format
 msgid "Transfer to call #%i with %s"
 msgstr ""
 

-#: ../gtk/incall_view.c:113
+#: ../gtk/incall_view.c:155

 msgid "Transfer"
 msgstr ""
 
 msgid "Transfer"
 msgstr ""
 

-#: ../gtk/incall_view.c:187
+#: ../gtk/incall_view.c:271

 #, fuzzy
 msgid "<b>Calling...</b>"
 msgstr "Contactlijst"
 
 #, 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 ""
 
 msgid "00::00::00"
 msgstr ""
 

-#: ../gtk/incall_view.c:206
+#: ../gtk/incall_view.c:285

 #, fuzzy
 msgid "<b>Incoming call</b>"
 msgstr "Inkomende oproep"
 
 #, 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 ""
 
 msgstr ""
 

-#: ../gtk/incall_view.c:217 ../gtk/main.ui.h:20
-msgid "Answer"
+#: ../gtk/incall_view.c:324
+msgid "average"

 msgstr ""
 
 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"
 
 #, 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"
 
 #, 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 ""
 
 #, 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"
 
 #, 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 ""
 
 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 ""
 
 msgid "Pause"
 msgstr ""
 


@@ -483,8 +583,8 @@ msgstr "Contact informatie"
 
 #: ../gtk/main.ui.h:14
 #, fuzzy
 
 #: ../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
 
 #: ../gtk/main.ui.h:15
 #, fuzzy


@@ -510,27 +610,26 @@ msgstr ""
 
 #: ../gtk/main.ui.h:21
 #, fuzzy
 
 #: ../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"
 
 msgid "Automatically log me in"
 msgstr "Automatisch een geldige hostnaam raden"
 

-#: ../gtk/main.ui.h:24
+#: ../gtk/main.ui.h:22

 msgid "B"
 msgstr ""
 
 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 ""
 
 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 ""
 #: ../gtk/main.ui.h:26
 msgid "Check _Updates"
 msgstr ""


@@ -544,11 +643,6 @@ msgstr "Verbinden"
 msgid "D"
 msgstr ""
 
 msgid "D"
 msgstr ""
 

-#: ../gtk/main.ui.h:29
-#, fuzzy
-msgid "Decline"
-msgstr "lijn"
-

 #: ../gtk/main.ui.h:30
 #, fuzzy
 msgid "Default"
 #: ../gtk/main.ui.h:30
 #, fuzzy
 msgid "Default"


@@ -561,13 +655,13 @@ msgstr "Informatie"
 
 #: ../gtk/main.ui.h:32
 #, fuzzy
 
 #: ../gtk/main.ui.h:32
 #, fuzzy

-msgid "Duration:"
-msgstr "Informatie"
+msgid "Enable self-view"
+msgstr "Video aan"

 
 #: ../gtk/main.ui.h:33
 #, fuzzy
 
 #: ../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"
 
 #: ../gtk/main.ui.h:34
 msgid "Enter username, phone number, or full sip address"


@@ -603,21 +697,26 @@ msgstr "Contact informatie"
 msgid "Lookup:"
 msgstr ""
 
 msgid "Lookup:"
 msgstr ""
 

-#: ../gtk/main.ui.h:43
+#: ../gtk/main.ui.h:42

 #, fuzzy
 msgid "My current identity:"
 msgstr "SIP-identiteit:"
 
 #, fuzzy
 msgid "My current identity:"
 msgstr "SIP-identiteit:"
 

-#: ../gtk/main.ui.h:44
+#: ../gtk/main.ui.h:43

 #, fuzzy
 msgid "Online users"
 msgstr "Aanwezig"
 
 #, fuzzy
 msgid "Online users"
 msgstr "Aanwezig"
 

-#: ../gtk/main.ui.h:45
+#: ../gtk/main.ui.h:44

 #, fuzzy
 msgid "Password"
 msgstr "wachtwoord:"
 
 #, 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:"
 #: ../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 ""
 
 msgid "Search"
 msgstr ""
 

-#: ../gtk/main.ui.h:49
+#: ../gtk/main.ui.h:50

 msgid "Show debug window"
 msgstr ""
 
 msgid "Show debug window"
 msgstr ""
 

-#: ../gtk/main.ui.h:50
+#: ../gtk/main.ui.h:51

 #, fuzzy
 msgid "Username"
 msgstr "gebruikersnaam:"
 
 #, 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"
 #: ../gtk/main.ui.h:52
 #, fuzzy
 msgid "_Help"


@@ -651,19 +745,14 @@ msgid "_Homepage"
 msgstr ""
 
 #: ../gtk/main.ui.h:54
 msgstr ""
 
 #: ../gtk/main.ui.h:54

-#, fuzzy
-msgid "_Linphone"
-msgstr "linphone"
-
-#: ../gtk/main.ui.h:55

 msgid "_Options"
 msgstr ""
 
 msgid "_Options"
 msgstr ""
 

-#: ../gtk/main.ui.h:56
+#: ../gtk/main.ui.h:55

 msgid "in"
 msgstr ""
 
 msgid "in"
 msgstr ""
 

-#: ../gtk/main.ui.h:57
+#: ../gtk/main.ui.h:56

 msgid "label"
 msgstr ""
 
 msgid "label"
 msgstr ""
 


@@ -713,16 +802,6 @@ msgstr "Adres"
 msgid "Show this contact presence status"
 msgstr ""
 
 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 ""
 #: ../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
 msgstr "Toon informatie over aanwezigheid:"
 
 #: ../gtk/sip_account.ui.h:6

-msgid "Register at startup"
+msgid "Register"

 msgstr ""
 
 #: ../gtk/sip_account.ui.h:7
 msgstr ""
 
 #: ../gtk/sip_account.ui.h:7


@@ -812,11 +891,6 @@ msgstr "sip:"
 msgid "Send"
 msgstr "Geluid"
 
 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 ""
 #: ../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
 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
 
 #: ../gtk/parameters.ui.h:10
 #, fuzzy


@@ -881,210 +954,228 @@ msgid "<b>Video</b>"
 msgstr "Contactlijst"
 
 #: ../gtk/parameters.ui.h:14
 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
 msgstr ""
 
 #: ../gtk/parameters.ui.h:15

+msgid "ALSA special device (optional):"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:16

 #, fuzzy
 msgid "Add"
 msgstr "Adres"
 
 #, fuzzy
 msgid "Add"
 msgstr "Adres"
 

-#: ../gtk/parameters.ui.h:16
+#: ../gtk/parameters.ui.h:17

 msgid "Audio RTP/UDP:"
 msgstr ""
 
 msgid "Audio RTP/UDP:"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:17
+#: ../gtk/parameters.ui.h:18

 #, fuzzy
 msgid "Audio codecs"
 msgstr "Video codecs"
 
 #, 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 ""
 
 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 ""
 
 msgid "Behind NAT / Firewall (use STUN to resolve)"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:21
+#: ../gtk/parameters.ui.h:22

 msgid "CIF"
 msgstr ""
 
 msgid "CIF"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:22
+#: ../gtk/parameters.ui.h:23

 #, fuzzy
 msgid "Capture device:"
 msgstr "Geluidsapparaat gebruiken:"
 
 #, fuzzy
 msgid "Capture device:"
 msgstr "Geluidsapparaat gebruiken:"
 

-#: ../gtk/parameters.ui.h:23
+#: ../gtk/parameters.ui.h:24

 #, fuzzy
 msgid "Codecs"
 msgstr "Codecs"
 
 #, fuzzy
 msgid "Codecs"
 msgstr "Codecs"
 

-#: ../gtk/parameters.ui.h:24
+#: ../gtk/parameters.ui.h:25

 msgid "Direct connection to the Internet"
 msgstr ""
 
 msgid "Direct connection to the Internet"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:25
+#: ../gtk/parameters.ui.h:26

 msgid "Disable"
 msgstr "Uit"
 
 msgid "Disable"
 msgstr "Uit"
 

-#: ../gtk/parameters.ui.h:26
+#: ../gtk/parameters.ui.h:27

 #, fuzzy
 msgid "Done"
 msgstr "Weg"
 
 #, 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):"
 
 #, 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"
 
 msgid "Edit"
 msgstr "Bewerken"
 

-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:30

 msgid "Enable"
 msgstr "Aan"
 
 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 ""
 
 msgid "Enable echo cancellation"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:31
+#: ../gtk/parameters.ui.h:33

 msgid "Erase all passwords"
 msgstr ""
 
 msgid "Erase all passwords"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:32
+#: ../gtk/parameters.ui.h:34

 msgid "Manage SIP Accounts"
 msgstr ""
 
 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 ""
 
 msgid "Multimedia settings"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:37

 #, fuzzy
 msgid "Network settings"
 msgstr "Netwerk"
 
 #, fuzzy
 msgid "Network settings"
 msgstr "Netwerk"
 

-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:38

 #, fuzzy
 msgid "Playback device:"
 msgstr "Geluidsapparaat gebruiken:"
 
 #, fuzzy
 msgid "Playback device:"
 msgstr "Geluidsapparaat gebruiken:"
 

-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:39

 msgid "Prefered video resolution:"
 msgstr ""
 
 msgid "Prefered video resolution:"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:40

 #, fuzzy
 msgid "Public IP address:"
 msgstr "SIP-adres:"
 
 #, 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 ""
 
 msgid ""
 "Register to FONICS\n"
 "virtual network !"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:43

 msgid "Remove"
 msgstr "Verwijderen"
 
 msgid "Remove"
 msgstr "Verwijderen"
 

-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:44

 #, fuzzy
 msgid "Ring device:"
 msgstr "Geluidsapparaat gebruiken:"
 
 #, fuzzy
 msgid "Ring device:"
 msgstr "Geluidsapparaat gebruiken:"
 

-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:45

 #, fuzzy
 msgid "Ring sound:"
 msgstr "Belgeluid:"
 
 #, fuzzy
 msgid "Ring sound:"
 msgstr "Belgeluid:"
 

-#: ../gtk/parameters.ui.h:43
-msgid "SIP (TCP):"
+#: ../gtk/parameters.ui.h:46
+msgid "SIP (TCP)"

 msgstr ""
 
 msgstr ""
 

-#: ../gtk/parameters.ui.h:44
-msgid "SIP (UDP):"
+#: ../gtk/parameters.ui.h:47
+msgid "SIP (TLS)"

 msgstr ""
 
 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 ""
 
 msgid "Send DTMFs as SIP info"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:46
+#: ../gtk/parameters.ui.h:50

 msgid "Set Maximum Transmission Unit:"
 msgstr ""
 
 msgid "Set Maximum Transmission Unit:"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:51

 msgid "Settings"
 msgstr ""
 
 msgid "Settings"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:52

 msgid "Show advanced settings"
 msgstr ""
 
 msgid "Show advanced settings"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:53

 #, fuzzy
 msgid "Stun server:"
 msgstr "Geluidsapparaat"
 
 #, 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 ""
 
 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):"
 
 #, 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 ""
 
 msgid "Use IPv6 instead of IPv4"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:53
+#: ../gtk/parameters.ui.h:57

 #, fuzzy
 msgid "User interface"
 msgstr "gebruikersnaam:"
 
 #, fuzzy
 msgid "User interface"
 msgstr "gebruikersnaam:"
 

-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:58

 msgid "Video RTP/UDP:"
 msgstr ""
 
 msgid "Video RTP/UDP:"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:59

 #, fuzzy
 msgid "Video codecs"
 msgstr "Video codecs"
 
 #, fuzzy
 msgid "Video codecs"
 msgstr "Video codecs"
 

-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:60

 #, fuzzy
 msgid "Video input device:"
 msgstr "Geluidsapparaat"
 
 #, 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 ""
 
 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:"
 
 #, 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:"
 
 #, fuzzy
 msgid "Your username:"
 msgstr "gebruikersnaam:"
 

-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:64

 msgid "a sound card"
 msgstr ""
 
 msgid "a sound card"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:65

 msgid "default camera"
 msgstr ""
 
 msgid "default camera"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:66

 msgid "default soundcard"
 msgstr ""
 
 msgid "default soundcard"
 msgstr ""
 


@@ -1111,26 +1202,19 @@ msgstr "linphone"
 msgid "Please wait"
 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] "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"
 
 msgid "aborted"
 msgstr "afgebroken"
 

-#: ../coreapi/linphonecore.c:209
+#: ../coreapi/linphonecore.c:190

 msgid "completed"
 msgstr "voltooid"
 
 msgid "completed"
 msgstr "voltooid"
 

-#: ../coreapi/linphonecore.c:212
+#: ../coreapi/linphonecore.c:193

 msgid "missed"
 msgstr "gemist"
 
 msgid "missed"
 msgstr "gemist"
 

-#: ../coreapi/linphonecore.c:217
+#: ../coreapi/linphonecore.c:198

 #, c-format
 msgid ""
 "%s at %s\n"
 #, c-format
 msgid ""
 "%s at %s\n"


@@ -1145,27 +1229,23 @@ msgstr ""
 "Status: %s\n"
 "Tijdsduur: %i mins %i secs\n"
 
 "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"
 
 msgid "Outgoing call"
 msgstr "Uitgaande oproep"
 

-#: ../coreapi/linphonecore.c:998
+#: ../coreapi/linphonecore.c:1088

 msgid "Ready"
 msgstr "Gereed."
 
 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..."
 
 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."
 
 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"
 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"
 
 "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"
 
 msgid "Contacting"
 msgstr "Verbinden"
 

-#: ../coreapi/linphonecore.c:1974
+#: ../coreapi/linphonecore.c:2032

 #, fuzzy
 msgid "Could not call"
 msgstr "Kon niet oproepen"
 
 #, 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 ""
 
 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 ""
 
 msgid "Modifying call parameters..."
 msgstr ""
 

-#: ../coreapi/linphonecore.c:2311
+#: ../coreapi/linphonecore.c:2366

 msgid "Connected."
 msgstr "Verbonden."
 
 msgid "Connected."
 msgstr "Verbonden."
 

-#: ../coreapi/linphonecore.c:2334
+#: ../coreapi/linphonecore.c:2389

 #, fuzzy
 msgid "Call aborted"
 msgstr "afgebroken"
 
 #, 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"
 
 #, 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"
 
 #, 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"
 #: ../coreapi/misc.c:147
 msgid ""
 "Your computer appears to be using ALSA sound drivers.\n"


@@ -1302,156 +1370,211 @@ msgstr ""
 msgid "Unknown-bug"
 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 ""
 
 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 ""
 
 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"
 
 #, 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."
 
 #, fuzzy
 msgid "is contacting you"
 msgstr "belt u."
 

-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207

 msgid " and asked autoanswer."
 msgstr ""
 
 msgid " and asked autoanswer."
 msgstr ""
 

-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207

 msgid "."
 msgstr ""
 
 msgid "."
 msgstr ""
 

-#: ../coreapi/callbacks.c:226
+#: ../coreapi/callbacks.c:266

 #, fuzzy
 msgid "Remote ringing."
 msgstr "Externe diensten"
 
 #, fuzzy
 msgid "Remote ringing."
 msgstr "Externe diensten"
 

-#: ../coreapi/callbacks.c:242
+#: ../coreapi/callbacks.c:282

 #, fuzzy
 msgid "Remote ringing..."
 msgstr "Externe diensten"
 
 #, fuzzy
 msgid "Remote ringing..."
 msgstr "Externe diensten"
 

-#: ../coreapi/callbacks.c:253
+#: ../coreapi/callbacks.c:293

 msgid "Early media."
 msgstr ""
 
 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"
 
 #, 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 ""
 
 #, 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"
 
 #, 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"
 
 #, 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 ""
 
 msgid "We are being paused..."
 msgstr ""
 

-#: ../coreapi/callbacks.c:387
+#: ../coreapi/callbacks.c:436

 msgid "We have been resumed..."
 msgstr ""
 
 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."
 
 msgid "Call terminated."
 msgstr "Oproep beeindigd."
 

-#: ../coreapi/callbacks.c:431
+#: ../coreapi/callbacks.c:480

 msgid "User is busy."
 msgstr "Gebruiker is bezet."
 
 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).");
 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."
 
 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."
 
 msgid "Call declined."
 msgstr "Oproep geweigerd."
 

-#: ../coreapi/callbacks.c:447
+#: ../coreapi/callbacks.c:496

 msgid "No response."
 msgstr ""
 
 msgid "No response."
 msgstr ""
 

-#: ../coreapi/callbacks.c:451
+#: ../coreapi/callbacks.c:500

 msgid "Protocol error."
 msgstr ""
 
 msgid "Protocol error."
 msgstr ""
 

-#: ../coreapi/callbacks.c:467
+#: ../coreapi/callbacks.c:516

 #, fuzzy
 msgid "Redirected"
 msgstr "Doorgeschakeld naar %s..."
 
 #, fuzzy
 msgid "Redirected"
 msgstr "Doorgeschakeld naar %s..."
 

-#: ../coreapi/callbacks.c:477
+#: ../coreapi/callbacks.c:526

 msgid "Not found"
 msgstr ""
 
 msgid "Not found"
 msgstr ""
 

-#: ../coreapi/callbacks.c:487
+#: ../coreapi/callbacks.c:551

 msgid "No common codecs"
 msgstr ""
 
 msgid "No common codecs"
 msgstr ""
 

-#: ../coreapi/callbacks.c:493
+#: ../coreapi/callbacks.c:557

 #, fuzzy
 msgid "Call failed."
 msgstr "Oproep geannuleerd."
 
 #, 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."
 
 #, 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."
 
 #, 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 ""
 
 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)."
 
 #, 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"
 
 #, 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 "
 #~ 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 "Go"
 #~ msgstr "Ga"
 

-#~ msgid "Address book"
-#~ msgstr "Adresboek"
-

 #~ msgid "Exit"
 #~ msgstr "Einde"
 
 #~ msgid "Exit"
 #~ msgstr "Einde"
 


@@ -1915,9 +2035,6 @@ msgstr "Authorisatie gegevens"
 #~ msgid "Authentication required for realm %s"
 #~ msgstr "Authorisatie benodigd voor gebied %s"
 
 #~ msgid "Authentication required for realm %s"
 #~ msgstr "Authorisatie benodigd voor gebied %s"
 

-#~ msgid "None"
-#~ msgstr "Geen"
-

 #~ msgid "Wait"
 #~ msgstr "Wachten"
 
 #~ msgid "Wait"
 #~ msgstr "Wachten"
 

diff --git a/po/pl.po b/po/pl.po
index f52259199349dcf699d823f3a936285e7725d06e..88772c47a01eb6f503d843f356c889f32531f995 100644 (file)
--- 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"
 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"
 "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"
 
 "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"
 #: ../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 ""
 
 msgid "Chat with %s"
 msgstr ""
 

-#: ../gtk/main.c:74
+#: ../gtk/main.c:83

 msgid "log to stdout some debug information while running."
 msgstr ""
 
 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 ""
 
 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 ""
 
 msgid "address to call right now"
 msgstr ""
 

-#: ../gtk/main.c:95
+#: ../gtk/main.c:111

 msgid "if set automatically answer incoming calls"
 msgstr ""
 
 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 ""
 
 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 ""
 
 #, 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"
 #, 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 ""
 
 "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 ""
 
 #, 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 ""
 
 msgid "Website link"
 msgstr ""
 

-#: ../gtk/main.c:1076
+#: ../gtk/main.c:1205

 msgid "Linphone - a video internet phone"
 msgstr ""
 
 msgid "Linphone - a video internet phone"
 msgstr ""
 

-#: ../gtk/main.c:1095
+#: ../gtk/main.c:1295

 #, c-format
 msgid "%s (Default)"
 msgstr ""
 
 #, 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 ""
 
 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 ""
 
 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 ""
 
 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"
 
 msgid "Name"
 msgstr "Nazwa"
 

-#: ../gtk/friendlist.c:205
+#: ../gtk/friendlist.c:271

 #, fuzzy
 msgid "Presence status"
 msgstr "Obecność"
 
 #, fuzzy
 msgid "Presence status"
 msgstr "Obecność"
 

-#: ../gtk/friendlist.c:242
+#: ../gtk/friendlist.c:308

 #, c-format
 msgid "Search in %s directory"
 msgstr ""
 
 #, c-format
 msgid "Search in %s directory"
 msgstr ""
 

-#: ../gtk/friendlist.c:450
+#: ../gtk/friendlist.c:568

 msgid "Invalid sip contact !"
 msgstr ""
 
 msgid "Invalid sip contact !"
 msgstr ""
 

-#: ../gtk/friendlist.c:495
+#: ../gtk/friendlist.c:613

 #, c-format
 msgid "Call %s"
 msgstr ""
 
 #, c-format
 msgid "Call %s"
 msgstr ""
 

-#: ../gtk/friendlist.c:496
+#: ../gtk/friendlist.c:614

 #, c-format
 msgid "Send text to %s"
 msgstr ""
 
 #, 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 !)"
 
 #, 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 ""
 
 #, 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 ""
 
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr ""
 

-#: ../gtk/propertybox.c:277
+#: ../gtk/propertybox.c:302

 msgid "Rate (Hz)"
 msgstr "Jakość (Hz)"
 
 msgid "Rate (Hz)"
 msgstr "Jakość (Hz)"
 

-#: ../gtk/propertybox.c:283
+#: ../gtk/propertybox.c:308

 msgid "Status"
 msgstr "Status"
 
 msgid "Status"
 msgstr "Status"
 

-#: ../gtk/propertybox.c:289
+#: ../gtk/propertybox.c:314

 msgid "Min bitrate (kbit/s)"
 msgstr "Min przepustowość (kbit/s)"
 
 msgid "Min bitrate (kbit/s)"
 msgstr "Min przepustowość (kbit/s)"
 

-#: ../gtk/propertybox.c:296
+#: ../gtk/propertybox.c:321

 msgid "Parameters"
 msgstr "Parametr"
 
 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"
 
 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"
 
 msgid "Disabled"
 msgstr "Wyłączone"
 

-#: ../gtk/propertybox.c:510
+#: ../gtk/propertybox.c:553

 msgid "Account"
 msgstr ""
 
 msgid "Account"
 msgstr ""
 

-#: ../gtk/propertybox.c:650
+#: ../gtk/propertybox.c:693

 msgid "English"
 msgstr ""
 
 msgid "English"
 msgstr ""
 

-#: ../gtk/propertybox.c:651
+#: ../gtk/propertybox.c:694

 msgid "French"
 msgstr ""
 
 msgid "French"
 msgstr ""
 

-#: ../gtk/propertybox.c:652
+#: ../gtk/propertybox.c:695

 msgid "Swedish"
 msgstr ""
 
 msgid "Swedish"
 msgstr ""
 

-#: ../gtk/propertybox.c:653
+#: ../gtk/propertybox.c:696

 msgid "Italian"
 msgstr ""
 
 msgid "Italian"
 msgstr ""
 

-#: ../gtk/propertybox.c:654
+#: ../gtk/propertybox.c:697

 msgid "Spanish"
 msgstr ""
 
 msgid "Spanish"
 msgstr ""
 

-#: ../gtk/propertybox.c:655
+#: ../gtk/propertybox.c:698

 msgid "Brazilian Portugese"
 msgstr ""
 
 msgid "Brazilian Portugese"
 msgstr ""
 

-#: ../gtk/propertybox.c:656
+#: ../gtk/propertybox.c:699

 msgid "Polish"
 msgstr ""
 
 msgid "Polish"
 msgstr ""
 

-#: ../gtk/propertybox.c:657
+#: ../gtk/propertybox.c:700

 msgid "German"
 msgstr ""
 
 msgid "German"
 msgstr ""
 

-#: ../gtk/propertybox.c:658
+#: ../gtk/propertybox.c:701

 msgid "Russian"
 msgstr ""
 
 msgid "Russian"
 msgstr ""
 

-#: ../gtk/propertybox.c:659
+#: ../gtk/propertybox.c:702

 msgid "Japanese"
 msgstr ""
 
 msgid "Japanese"
 msgstr ""
 

-#: ../gtk/propertybox.c:660
+#: ../gtk/propertybox.c:703

 msgid "Dutch"
 msgstr ""
 
 msgid "Dutch"
 msgstr ""
 

-#: ../gtk/propertybox.c:661
+#: ../gtk/propertybox.c:704

 msgid "Hungarian"
 msgstr ""
 
 msgid "Hungarian"
 msgstr ""
 

-#: ../gtk/propertybox.c:662
+#: ../gtk/propertybox.c:705

 msgid "Czech"
 msgstr ""
 
 msgid "Czech"
 msgstr ""
 

-#: ../gtk/propertybox.c:663
+#: ../gtk/propertybox.c:706

 msgid "Chinese"
 msgstr ""
 
 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 ""
 
 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 ""
 #: ../gtk/update.c:80
 #, c-format
 msgid ""


@@ -344,77 +420,104 @@ msgstr ""
 msgid "Now ready !"
 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."
 
 #, 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 ""
 
 #, c-format
 msgid "Transfer to call #%i with %s"
 msgstr ""
 

-#: ../gtk/incall_view.c:113
+#: ../gtk/incall_view.c:155

 msgid "Transfer"
 msgstr ""
 
 msgid "Transfer"
 msgstr ""
 

-#: ../gtk/incall_view.c:187
+#: ../gtk/incall_view.c:271

 #, fuzzy
 msgid "<b>Calling...</b>"
 msgstr "Dzwonie do "
 
 #, 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 ""
 
 msgid "00::00::00"
 msgstr ""
 

-#: ../gtk/incall_view.c:206
+#: ../gtk/incall_view.c:285

 #, fuzzy
 msgid "<b>Incoming call</b>"
 msgstr "Dzwonie do "
 
 #, 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 ""
 
 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 ""
 
 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 "
 
 #, 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 "
 
 #, 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 ""
 
 #, 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."
 
 #, 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 ""
 
 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 ""
 
 msgid "Pause"
 msgstr ""
 


@@ -478,8 +581,8 @@ msgstr "Informacje o kodeku"
 
 #: ../gtk/main.ui.h:14
 #, fuzzy
 
 #: ../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
 
 #: ../gtk/main.ui.h:15
 #, fuzzy


@@ -504,27 +607,26 @@ msgid "All users"
 msgstr ""
 
 #: ../gtk/main.ui.h:21
 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 ""
 
 msgid "Automatically log me in"
 msgstr ""
 

-#: ../gtk/main.ui.h:24
+#: ../gtk/main.ui.h:22

 msgid "B"
 msgstr ""
 
 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 ""
 
 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 ""
 #: ../gtk/main.ui.h:26
 msgid "Check _Updates"
 msgstr ""


@@ -538,11 +640,6 @@ msgstr "Dzwonie do "
 msgid "D"
 msgstr ""
 
 msgid "D"
 msgstr ""
 

-#: ../gtk/main.ui.h:29
-#, fuzzy
-msgid "Decline"
-msgstr "linia"
-

 #: ../gtk/main.ui.h:30
 #, fuzzy
 msgid "Default"
 #: ../gtk/main.ui.h:30
 #, fuzzy
 msgid "Default"


@@ -555,12 +652,12 @@ msgstr "Informacja"
 
 #: ../gtk/main.ui.h:32
 #, fuzzy
 
 #: ../gtk/main.ui.h:32
 #, fuzzy

-msgid "Duration:"
-msgstr "Informacja"
+msgid "Enable self-view"
+msgstr "Włączone"

 
 #: ../gtk/main.ui.h:33
 #, fuzzy
 
 #: ../gtk/main.ui.h:33
 #, fuzzy

-msgid "Enable self-view"
+msgid "Enable video"

 msgstr "Włączone"
 
 #: ../gtk/main.ui.h:34
 msgstr "Włączone"
 
 #: ../gtk/main.ui.h:34


@@ -597,21 +694,26 @@ msgstr "Informacje o kodeku"
 msgid "Lookup:"
 msgstr ""
 
 msgid "Lookup:"
 msgstr ""
 

-#: ../gtk/main.ui.h:43
+#: ../gtk/main.ui.h:42

 #, fuzzy
 msgid "My current identity:"
 msgstr "Tożsamość"
 
 #, fuzzy
 msgid "My current identity:"
 msgstr "Tożsamość"
 

-#: ../gtk/main.ui.h:44
+#: ../gtk/main.ui.h:43

 #, fuzzy
 msgid "Online users"
 msgstr "linia"
 
 #, fuzzy
 msgid "Online users"
 msgstr "linia"
 

-#: ../gtk/main.ui.h:45
+#: ../gtk/main.ui.h:44

 #, fuzzy
 msgid "Password"
 msgstr "Twoje hasło:"
 
 #, 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:"
 #: ../gtk/main.ui.h:47
 #, fuzzy
 msgid "SIP address or phone number:"


@@ -621,19 +723,15 @@ msgstr "Adres serwera rejestracji sip"
 msgid "Search"
 msgstr ""
 
 msgid "Search"
 msgstr ""
 

-#: ../gtk/main.ui.h:49
+#: ../gtk/main.ui.h:50

 msgid "Show debug window"
 msgstr ""
 
 msgid "Show debug window"
 msgstr ""
 

-#: ../gtk/main.ui.h:50
+#: ../gtk/main.ui.h:51

 #, fuzzy
 msgid "Username"
 msgstr "Podręcznik"
 
 #, fuzzy
 msgid "Username"
 msgstr "Podręcznik"
 

-#: ../gtk/main.ui.h:51
-msgid "_Call history"
-msgstr ""
-

 #: ../gtk/main.ui.h:52
 msgid "_Help"
 msgstr ""
 #: ../gtk/main.ui.h:52
 msgid "_Help"
 msgstr ""


@@ -643,19 +741,14 @@ msgid "_Homepage"
 msgstr ""
 
 #: ../gtk/main.ui.h:54
 msgstr ""
 
 #: ../gtk/main.ui.h:54

-#, fuzzy
-msgid "_Linphone"
-msgstr "linphone"
-
-#: ../gtk/main.ui.h:55

 msgid "_Options"
 msgstr ""
 
 msgid "_Options"
 msgstr ""
 

-#: ../gtk/main.ui.h:56
+#: ../gtk/main.ui.h:55

 msgid "in"
 msgstr ""
 
 msgid "in"
 msgstr ""
 

-#: ../gtk/main.ui.h:57
+#: ../gtk/main.ui.h:56

 msgid "label"
 msgstr ""
 
 msgid "label"
 msgstr ""
 


@@ -705,15 +798,6 @@ msgstr "Adres"
 msgid "Show this contact presence status"
 msgstr ""
 
 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 ""
 #: ../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
 msgstr "Informacje o kodeku"
 
 #: ../gtk/sip_account.ui.h:6

-msgid "Register at startup"
+msgid "Register"

 msgstr ""
 
 #: ../gtk/sip_account.ui.h:7
 msgstr ""
 
 #: ../gtk/sip_account.ui.h:7


@@ -801,11 +885,6 @@ msgstr "sip:"
 msgid "Send"
 msgstr "Dźwięk"
 
 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 ""
 #: ../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
 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
 
 #: ../gtk/parameters.ui.h:10
 #, fuzzy


@@ -870,208 +948,226 @@ msgid "<b>Video</b>"
 msgstr "Dzwonie do "
 
 #: ../gtk/parameters.ui.h:14
 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
 msgstr ""
 
 #: ../gtk/parameters.ui.h:15

+msgid "ALSA special device (optional):"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:16

 #, fuzzy
 msgid "Add"
 msgstr "Adres"
 
 #, fuzzy
 msgid "Add"
 msgstr "Adres"
 

-#: ../gtk/parameters.ui.h:16
+#: ../gtk/parameters.ui.h:17

 msgid "Audio RTP/UDP:"
 msgstr ""
 
 msgid "Audio RTP/UDP:"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:17
+#: ../gtk/parameters.ui.h:18

 #, fuzzy
 msgid "Audio codecs"
 msgstr "Kodeki audio"
 
 #, 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 ""
 
 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 ""
 
 msgid "Behind NAT / Firewall (use STUN to resolve)"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:21
+#: ../gtk/parameters.ui.h:22

 msgid "CIF"
 msgstr ""
 
 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:"
 
 #, 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"
 
 #, fuzzy
 msgid "Codecs"
 msgstr "Kodeki"
 

-#: ../gtk/parameters.ui.h:24
+#: ../gtk/parameters.ui.h:25

 msgid "Direct connection to the Internet"
 msgstr ""
 
 msgid "Direct connection to the Internet"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:25
+#: ../gtk/parameters.ui.h:26

 msgid "Disable"
 msgstr "Wyłącz"
 
 msgid "Disable"
 msgstr "Wyłącz"
 

-#: ../gtk/parameters.ui.h:26
+#: ../gtk/parameters.ui.h:27

 #, fuzzy
 msgid "Done"
 msgstr "Brak."
 
 #, fuzzy
 msgid "Done"
 msgstr "Brak."
 

-#: ../gtk/parameters.ui.h:27
+#: ../gtk/parameters.ui.h:28

 msgid "Download speed limit in Kbit/sec:"
 msgstr ""
 
 msgid "Download speed limit in Kbit/sec:"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:28
+#: ../gtk/parameters.ui.h:29

 msgid "Edit"
 msgstr ""
 
 msgid "Edit"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:30

 msgid "Enable"
 msgstr "Włączony"
 
 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 ""
 
 msgid "Enable echo cancellation"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:31
+#: ../gtk/parameters.ui.h:33

 msgid "Erase all passwords"
 msgstr ""
 
 msgid "Erase all passwords"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:32
+#: ../gtk/parameters.ui.h:34

 msgid "Manage SIP Accounts"
 msgstr ""
 
 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 ""
 
 msgid "Multimedia settings"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:37

 #, fuzzy
 msgid "Network settings"
 msgstr "Sieć"
 
 #, 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:"
 
 #, 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 ""
 
 msgid "Prefered video resolution:"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:40

 #, fuzzy
 msgid "Public IP address:"
 msgstr "Adres sip:"
 
 #, 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 ""
 
 msgid ""
 "Register to FONICS\n"
 "virtual network !"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:43

 msgid "Remove"
 msgstr ""
 
 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:"
 
 #, 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:"
 
 #, 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 ""
 
 msgstr ""
 

-#: ../gtk/parameters.ui.h:44
-msgid "SIP (UDP):"
+#: ../gtk/parameters.ui.h:47
+msgid "SIP (TLS)"

 msgstr ""
 
 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 ""
 
 msgid "Send DTMFs as SIP info"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:46
+#: ../gtk/parameters.ui.h:50

 msgid "Set Maximum Transmission Unit:"
 msgstr ""
 
 msgid "Set Maximum Transmission Unit:"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:51

 msgid "Settings"
 msgstr ""
 
 msgid "Settings"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:52

 msgid "Show advanced settings"
 msgstr ""
 
 msgid "Show advanced settings"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:53

 #, fuzzy
 msgid "Stun server:"
 msgstr "Dźwięk"
 
 #, 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 ""
 
 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 ""
 
 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 ""
 
 msgid "Use IPv6 instead of IPv4"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:53
+#: ../gtk/parameters.ui.h:57

 #, fuzzy
 msgid "User interface"
 msgstr "Podręcznik"
 
 #, fuzzy
 msgid "User interface"
 msgstr "Podręcznik"
 

-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:58

 msgid "Video RTP/UDP:"
 msgstr ""
 
 msgid "Video RTP/UDP:"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:59

 #, fuzzy
 msgid "Video codecs"
 msgstr "Kodeki audio"
 
 #, 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"
 
 #, 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 ""
 
 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:"
 
 #, 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"
 
 #, fuzzy
 msgid "Your username:"
 msgstr "Podręcznik"
 

-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:64

 msgid "a sound card"
 msgstr ""
 
 msgid "a sound card"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:65

 msgid "default camera"
 msgstr ""
 
 msgid "default camera"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:66

 msgid "default soundcard"
 msgstr ""
 
 msgid "default soundcard"
 msgstr ""
 


@@ -1098,26 +1194,19 @@ msgstr "linphone"
 msgid "Please wait"
 msgstr ""
 
 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 ""
 
 msgid "aborted"
 msgstr ""
 

-#: ../coreapi/linphonecore.c:209
+#: ../coreapi/linphonecore.c:190

 msgid "completed"
 msgstr ""
 
 msgid "completed"
 msgstr ""
 

-#: ../coreapi/linphonecore.c:212
+#: ../coreapi/linphonecore.c:193

 msgid "missed"
 msgstr ""
 
 msgid "missed"
 msgstr ""
 

-#: ../coreapi/linphonecore.c:217
+#: ../coreapi/linphonecore.c:198

 #, c-format
 msgid ""
 "%s at %s\n"
 #, c-format
 msgid ""
 "%s at %s\n"


@@ -1127,82 +1216,65 @@ msgid ""
 "Duration: %i mn %i sec\n"
 msgstr ""
 
 "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 ""
 
 msgid "Outgoing call"
 msgstr ""
 

-#: ../coreapi/linphonecore.c:998
+#: ../coreapi/linphonecore.c:1088

 #, fuzzy
 msgid "Ready"
 msgstr "Gotowy."
 
 #, fuzzy
 msgid "Ready"
 msgstr "Gotowy."
 

-#: ../coreapi/linphonecore.c:1773
+#: ../coreapi/linphonecore.c:1831

 msgid "Looking for telephone number destination..."
 msgstr ""
 
 msgid "Looking for telephone number destination..."
 msgstr ""
 

-#: ../coreapi/linphonecore.c:1776
+#: ../coreapi/linphonecore.c:1834

 msgid "Could not resolve this number."
 msgstr ""
 
 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>"
 
 #, 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 "
 
 #, 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"
 
 #, 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 ""
 
 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 ""
 
 msgid "Modifying call parameters..."
 msgstr ""
 

-#: ../coreapi/linphonecore.c:2311
+#: ../coreapi/linphonecore.c:2366

 msgid "Connected."
 msgstr "Połączony"
 
 msgid "Connected."
 msgstr "Połączony"
 

-#: ../coreapi/linphonecore.c:2334
+#: ../coreapi/linphonecore.c:2389

 #, fuzzy
 msgid "Call aborted"
 msgstr "Połączenie odwołane."
 
 #, 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 ""
 
 msgid "Could not pause the call"
 msgstr ""
 

-#: ../coreapi/linphonecore.c:2460
+#: ../coreapi/linphonecore.c:2535

 msgid "Pausing the current call..."
 msgstr ""
 
 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"
 #: ../coreapi/misc.c:147
 msgid ""
 "Your computer appears to be using ALSA sound drivers.\n"


@@ -1283,156 +1355,199 @@ msgstr ""
 msgid "Unknown-bug"
 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 ""
 
 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 ""
 
 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"
 
 #, 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."
 
 #, fuzzy
 msgid "is contacting you"
 msgstr "dzwoni do Ciebie."
 

-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207

 msgid " and asked autoanswer."
 msgstr ""
 
 msgid " and asked autoanswer."
 msgstr ""
 

-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207

 msgid "."
 msgstr ""
 
 msgid "."
 msgstr ""
 

-#: ../coreapi/callbacks.c:226
+#: ../coreapi/callbacks.c:266

 #, fuzzy
 msgid "Remote ringing."
 msgstr "Rejestruje..."
 
 #, fuzzy
 msgid "Remote ringing."
 msgstr "Rejestruje..."
 

-#: ../coreapi/callbacks.c:242
+#: ../coreapi/callbacks.c:282

 #, fuzzy
 msgid "Remote ringing..."
 msgstr "Rejestruje..."
 
 #, fuzzy
 msgid "Remote ringing..."
 msgstr "Rejestruje..."
 

-#: ../coreapi/callbacks.c:253
+#: ../coreapi/callbacks.c:293

 msgid "Early media."
 msgstr ""
 
 msgid "Early media."
 msgstr ""
 

-#: ../coreapi/callbacks.c:291
+#: ../coreapi/callbacks.c:331

 #, c-format
 msgid "Call with %s is paused."
 msgstr ""
 
 #, 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 ""
 
 #, 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."
 
 #, 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"
 
 #, 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 ""
 
 msgid "We are being paused..."
 msgstr ""
 

-#: ../coreapi/callbacks.c:387
+#: ../coreapi/callbacks.c:436

 msgid "We have been resumed..."
 msgstr ""
 
 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."
 
 #, fuzzy
 msgid "Call terminated."
 msgstr "Rozmowa odrzucona."
 

-#: ../coreapi/callbacks.c:431
+#: ../coreapi/callbacks.c:480

 msgid "User is busy."
 msgstr "Osoba jest zajęta."
 
 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).");
 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ć."
 
 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."
 
 msgid "Call declined."
 msgstr "Rozmowa odrzucona."
 

-#: ../coreapi/callbacks.c:447
+#: ../coreapi/callbacks.c:496

 msgid "No response."
 msgstr ""
 
 msgid "No response."
 msgstr ""
 

-#: ../coreapi/callbacks.c:451
+#: ../coreapi/callbacks.c:500

 msgid "Protocol error."
 msgstr ""
 
 msgid "Protocol error."
 msgstr ""
 

-#: ../coreapi/callbacks.c:467
+#: ../coreapi/callbacks.c:516

 msgid "Redirected"
 msgstr ""
 
 msgid "Redirected"
 msgstr ""
 

-#: ../coreapi/callbacks.c:477
+#: ../coreapi/callbacks.c:526

 msgid "Not found"
 msgstr ""
 
 msgid "Not found"
 msgstr ""
 

-#: ../coreapi/callbacks.c:487
+#: ../coreapi/callbacks.c:551

 msgid "No common codecs"
 msgstr ""
 
 msgid "No common codecs"
 msgstr ""
 

-#: ../coreapi/callbacks.c:493
+#: ../coreapi/callbacks.c:557

 #, fuzzy
 msgid "Call failed."
 msgstr "Połączenie odwołane."
 
 #, 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ę."
 
 #, 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ę."
 
 #, 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 ""
 
 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ę."
 
 #, 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"
 
 #, 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"
 #, fuzzy
 #~ msgid "_Modes"
 #~ msgstr "Kodeki"


@@ -1637,10 +1752,6 @@ msgstr "Informacje o kodeku"
 #~ msgid "Name:"
 #~ msgstr "Nazwa"
 
 #~ 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>"
 #, 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."
 
 #~ 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."
 
 #~ 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 (file)
--- 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"
 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"
 "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"
 
 "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"
 #: ../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"
 
 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 ""
 
 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 ""
 
 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 ""
 
 msgid "address to call right now"
 msgstr ""
 

-#: ../gtk/main.c:95
+#: ../gtk/main.c:111

 msgid "if set automatically answer incoming calls"
 msgstr ""
 
 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 ""
 
 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"
 
 #, 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"
 #, 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 ""
 
 "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 ""
 
 #, 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 ""
 
 msgid "Website link"
 msgstr ""
 

-#: ../gtk/main.c:1076
+#: ../gtk/main.c:1205

 msgid "Linphone - a video internet phone"
 msgstr ""
 
 msgid "Linphone - a video internet phone"
 msgstr ""
 

-#: ../gtk/main.c:1095
+#: ../gtk/main.c:1295

 #, c-format
 msgid "%s (Default)"
 msgstr ""
 
 #, 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 ""
 
 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 ""
 
 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 ""
 
 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"
 
 msgid "Name"
 msgstr "Nome"
 

-#: ../gtk/friendlist.c:205
+#: ../gtk/friendlist.c:271

 msgid "Presence status"
 msgstr "Status de presença"
 
 msgid "Presence status"
 msgstr "Status de presença"
 

-#: ../gtk/friendlist.c:242
+#: ../gtk/friendlist.c:308

 #, c-format
 msgid "Search in %s directory"
 msgstr ""
 
 #, c-format
 msgid "Search in %s directory"
 msgstr ""
 

-#: ../gtk/friendlist.c:450
+#: ../gtk/friendlist.c:568

 msgid "Invalid sip contact !"
 msgstr ""
 
 msgid "Invalid sip contact !"
 msgstr ""
 

-#: ../gtk/friendlist.c:495
+#: ../gtk/friendlist.c:613

 #, fuzzy, c-format
 msgid "Call %s"
 msgstr "Histórico de chamadas"
 
 #, 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 ""
 
 #, 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"
 
 #, 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 ""
 
 #, 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 ""
 
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr ""
 

-#: ../gtk/propertybox.c:277
+#: ../gtk/propertybox.c:302

 msgid "Rate (Hz)"
 msgstr "Taxa (Hz)"
 
 msgid "Rate (Hz)"
 msgstr "Taxa (Hz)"
 

-#: ../gtk/propertybox.c:283
+#: ../gtk/propertybox.c:308

 msgid "Status"
 msgstr ""
 
 msgid "Status"
 msgstr ""
 

-#: ../gtk/propertybox.c:289
+#: ../gtk/propertybox.c:314

 msgid "Min bitrate (kbit/s)"
 msgstr "Bitrate mínimo (kbits/s)"
 
 msgid "Min bitrate (kbit/s)"
 msgstr "Bitrate mínimo (kbits/s)"
 

-#: ../gtk/propertybox.c:296
+#: ../gtk/propertybox.c:321

 msgid "Parameters"
 msgstr "Parâmetros"
 
 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"
 
 msgid "Enabled"
 msgstr "Ativado"
 

-#: ../gtk/propertybox.c:327 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507

 msgid "Disabled"
 msgstr "Desativado"
 
 msgid "Disabled"
 msgstr "Desativado"
 

-#: ../gtk/propertybox.c:510
+#: ../gtk/propertybox.c:553

 #, fuzzy
 msgid "Account"
 msgstr "Aceitar"
 
 #, fuzzy
 msgid "Account"
 msgstr "Aceitar"
 

-#: ../gtk/propertybox.c:650
+#: ../gtk/propertybox.c:693

 msgid "English"
 msgstr ""
 
 msgid "English"
 msgstr ""
 

-#: ../gtk/propertybox.c:651
+#: ../gtk/propertybox.c:694

 msgid "French"
 msgstr ""
 
 msgid "French"
 msgstr ""
 

-#: ../gtk/propertybox.c:652
+#: ../gtk/propertybox.c:695

 msgid "Swedish"
 msgstr ""
 
 msgid "Swedish"
 msgstr ""
 

-#: ../gtk/propertybox.c:653
+#: ../gtk/propertybox.c:696

 msgid "Italian"
 msgstr ""
 
 msgid "Italian"
 msgstr ""
 

-#: ../gtk/propertybox.c:654
+#: ../gtk/propertybox.c:697

 msgid "Spanish"
 msgstr ""
 
 msgid "Spanish"
 msgstr ""
 

-#: ../gtk/propertybox.c:655
+#: ../gtk/propertybox.c:698

 msgid "Brazilian Portugese"
 msgstr ""
 
 msgid "Brazilian Portugese"
 msgstr ""
 

-#: ../gtk/propertybox.c:656
+#: ../gtk/propertybox.c:699

 msgid "Polish"
 msgstr ""
 
 msgid "Polish"
 msgstr ""
 

-#: ../gtk/propertybox.c:657
+#: ../gtk/propertybox.c:700

 msgid "German"
 msgstr ""
 
 msgid "German"
 msgstr ""
 

-#: ../gtk/propertybox.c:658
+#: ../gtk/propertybox.c:701

 msgid "Russian"
 msgstr ""
 
 msgid "Russian"
 msgstr ""
 

-#: ../gtk/propertybox.c:659
+#: ../gtk/propertybox.c:702

 msgid "Japanese"
 msgstr ""
 
 msgid "Japanese"
 msgstr ""
 

-#: ../gtk/propertybox.c:660
+#: ../gtk/propertybox.c:703

 msgid "Dutch"
 msgstr ""
 
 msgid "Dutch"
 msgstr ""
 

-#: ../gtk/propertybox.c:661
+#: ../gtk/propertybox.c:704

 msgid "Hungarian"
 msgstr ""
 
 msgid "Hungarian"
 msgstr ""
 

-#: ../gtk/propertybox.c:662
+#: ../gtk/propertybox.c:705

 msgid "Czech"
 msgstr ""
 
 msgid "Czech"
 msgstr ""
 

-#: ../gtk/propertybox.c:663
+#: ../gtk/propertybox.c:706

 msgid "Chinese"
 msgstr ""
 
 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 ""
 
 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 ""
 #: ../gtk/update.c:80
 #, c-format
 msgid ""


@@ -347,77 +422,104 @@ msgstr ""
 msgid "Now ready !"
 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"
 
 #, 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 ""
 
 #, c-format
 msgid "Transfer to call #%i with %s"
 msgstr ""
 

-#: ../gtk/incall_view.c:113
+#: ../gtk/incall_view.c:155

 msgid "Transfer"
 msgstr ""
 
 msgid "Transfer"
 msgstr ""
 

-#: ../gtk/incall_view.c:187
+#: ../gtk/incall_view.c:271

 #, fuzzy
 msgid "<b>Calling...</b>"
 msgstr "Contatando "
 
 #, 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 ""
 
 msgid "00::00::00"
 msgstr ""
 

-#: ../gtk/incall_view.c:206
+#: ../gtk/incall_view.c:285

 #, fuzzy
 msgid "<b>Incoming call</b>"
 msgstr "Camadas recebidas"
 
 #, 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 ""
 
 msgstr ""
 

-#: ../gtk/incall_view.c:217 ../gtk/main.ui.h:20
-msgid "Answer"
+#: ../gtk/incall_view.c:324
+msgid "average"

 msgstr ""
 
 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 "
 
 #, 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 "
 
 #, 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 ""
 
 #, 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."
 
 #, 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 ""
 
 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 ""
 
 msgid "Pause"
 msgstr ""
 


@@ -481,8 +583,8 @@ msgstr "Informação de contato"
 
 #: ../gtk/main.ui.h:14
 #, fuzzy
 
 #: ../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
 
 #: ../gtk/main.ui.h:15
 #, fuzzy


@@ -508,27 +610,26 @@ msgstr ""
 
 #: ../gtk/main.ui.h:21
 #, fuzzy
 
 #: ../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."
 
 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 ""
 
 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 ""
 
 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 ""
 #: ../gtk/main.ui.h:26
 msgid "Check _Updates"
 msgstr ""


@@ -542,11 +643,6 @@ msgstr "Contatando "
 msgid "D"
 msgstr ""
 
 msgid "D"
 msgstr ""
 

-#: ../gtk/main.ui.h:29
-#, fuzzy
-msgid "Decline"
-msgstr "linha"
-

 #: ../gtk/main.ui.h:30
 #, fuzzy
 msgid "Default"
 #: ../gtk/main.ui.h:30
 #, fuzzy
 msgid "Default"


@@ -559,12 +655,12 @@ msgstr "Informações"
 
 #: ../gtk/main.ui.h:32
 #, fuzzy
 
 #: ../gtk/main.ui.h:32
 #, fuzzy

-msgid "Duration:"
-msgstr "Informações"
+msgid "Enable self-view"
+msgstr "Ativado"

 
 #: ../gtk/main.ui.h:33
 #, fuzzy
 
 #: ../gtk/main.ui.h:33
 #, fuzzy

-msgid "Enable self-view"
+msgid "Enable video"

 msgstr "Ativado"
 
 #: ../gtk/main.ui.h:34
 msgstr "Ativado"
 
 #: ../gtk/main.ui.h:34


@@ -601,21 +697,26 @@ msgstr "Informação de contato"
 msgid "Lookup:"
 msgstr ""
 
 msgid "Lookup:"
 msgstr ""
 

-#: ../gtk/main.ui.h:43
+#: ../gtk/main.ui.h:42

 #, fuzzy
 msgid "My current identity:"
 msgstr "Identificação SIP:"
 
 #, 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"
 
 #, fuzzy
 msgid "Online users"
 msgstr "linha"
 

-#: ../gtk/main.ui.h:45
+#: ../gtk/main.ui.h:44

 #, fuzzy
 msgid "Password"
 msgstr "Senha:"
 
 #, 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 ""
 #: ../gtk/main.ui.h:47
 msgid "SIP address or phone number:"
 msgstr ""


@@ -624,20 +725,15 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
 msgid "Search"
 msgstr ""
 

-#: ../gtk/main.ui.h:49
+#: ../gtk/main.ui.h:50

 msgid "Show debug window"
 msgstr ""
 
 msgid "Show debug window"
 msgstr ""
 

-#: ../gtk/main.ui.h:50
+#: ../gtk/main.ui.h:51

 #, fuzzy
 msgid "Username"
 msgstr "Usuário"
 
 #, 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 ""
 #: ../gtk/main.ui.h:52
 msgid "_Help"
 msgstr ""


@@ -647,18 +743,14 @@ msgid "_Homepage"
 msgstr ""
 
 #: ../gtk/main.ui.h:54
 msgstr ""
 
 #: ../gtk/main.ui.h:54

-msgid "_Linphone"
-msgstr ""
-
-#: ../gtk/main.ui.h:55

 msgid "_Options"
 msgstr ""
 
 msgid "_Options"
 msgstr ""
 

-#: ../gtk/main.ui.h:56
+#: ../gtk/main.ui.h:55

 msgid "in"
 msgstr ""
 
 msgid "in"
 msgstr ""
 

-#: ../gtk/main.ui.h:57
+#: ../gtk/main.ui.h:56

 msgid "label"
 msgstr ""
 
 msgid "label"
 msgstr ""
 


@@ -707,16 +799,6 @@ msgstr "Endereço"
 msgid "Show this contact presence status"
 msgstr ""
 
 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 ""
 #: ../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
 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
 msgstr ""
 
 #: ../gtk/sip_account.ui.h:7


@@ -806,11 +888,6 @@ msgstr ""
 msgid "Send"
 msgstr "Som"
 
 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 ""
 #: ../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
 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
 
 #: ../gtk/parameters.ui.h:10
 #, fuzzy


@@ -875,208 +951,226 @@ msgid "<b>Video</b>"
 msgstr "Contatando "
 
 #: ../gtk/parameters.ui.h:14
 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
 msgstr ""
 
 #: ../gtk/parameters.ui.h:15

+msgid "ALSA special device (optional):"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:16

 #, fuzzy
 msgid "Add"
 msgstr "Endereço"
 
 #, fuzzy
 msgid "Add"
 msgstr "Endereço"
 

-#: ../gtk/parameters.ui.h:16
+#: ../gtk/parameters.ui.h:17

 msgid "Audio RTP/UDP:"
 msgstr ""
 
 msgid "Audio RTP/UDP:"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:17
+#: ../gtk/parameters.ui.h:18

 #, fuzzy
 msgid "Audio codecs"
 msgstr "Codec's de áudio"
 
 #, 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 ""
 
 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 ""
 
 msgid "Behind NAT / Firewall (use STUN to resolve)"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:21
+#: ../gtk/parameters.ui.h:22

 msgid "CIF"
 msgstr ""
 
 msgid "CIF"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:22
+#: ../gtk/parameters.ui.h:23

 #, fuzzy
 msgid "Capture device:"
 msgstr "Dispositivo de captura de som:"
 
 #, 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"
 
 #, 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 ""
 
 msgid "Direct connection to the Internet"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:25
+#: ../gtk/parameters.ui.h:26

 msgid "Disable"
 msgstr "Desativar"
 
 msgid "Disable"
 msgstr "Desativar"
 

-#: ../gtk/parameters.ui.h:26
+#: ../gtk/parameters.ui.h:27

 #, fuzzy
 msgid "Done"
 msgstr "Nenhum"
 
 #, fuzzy
 msgid "Done"
 msgstr "Nenhum"
 

-#: ../gtk/parameters.ui.h:27
+#: ../gtk/parameters.ui.h:28

 msgid "Download speed limit in Kbit/sec:"
 msgstr ""
 
 msgid "Download speed limit in Kbit/sec:"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:28
+#: ../gtk/parameters.ui.h:29

 msgid "Edit"
 msgstr "Editar"
 
 msgid "Edit"
 msgstr "Editar"
 

-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:30

 msgid "Enable"
 msgstr "Ativado"
 
 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 ""
 
 msgid "Enable echo cancellation"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:31
+#: ../gtk/parameters.ui.h:33

 msgid "Erase all passwords"
 msgstr ""
 
 msgid "Erase all passwords"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:32
+#: ../gtk/parameters.ui.h:34

 msgid "Manage SIP Accounts"
 msgstr ""
 
 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 ""
 
 msgid "Multimedia settings"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:37

 #, fuzzy
 msgid "Network settings"
 msgstr "Rede"
 
 #, fuzzy
 msgid "Network settings"
 msgstr "Rede"
 

-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:38

 #, fuzzy
 msgid "Playback device:"
 msgstr "Dispositivo de som:"
 
 #, fuzzy
 msgid "Playback device:"
 msgstr "Dispositivo de som:"
 

-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:39

 msgid "Prefered video resolution:"
 msgstr ""
 
 msgid "Prefered video resolution:"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:40

 #, fuzzy
 msgid "Public IP address:"
 msgstr "Endereço sip:"
 
 #, 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 ""
 
 msgid ""
 "Register to FONICS\n"
 "virtual network !"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:43

 msgid "Remove"
 msgstr "Remover"
 
 msgid "Remove"
 msgstr "Remover"
 

-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:44

 #, fuzzy
 msgid "Ring device:"
 msgstr "Dispositivo de som"
 
 #, 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:"
 
 #, 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 ""
 
 msgstr ""
 

-#: ../gtk/parameters.ui.h:44
-msgid "SIP (UDP):"
+#: ../gtk/parameters.ui.h:47
+msgid "SIP (TLS)"

 msgstr ""
 
 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 ""
 
 msgid "Send DTMFs as SIP info"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:46
+#: ../gtk/parameters.ui.h:50

 msgid "Set Maximum Transmission Unit:"
 msgstr ""
 
 msgid "Set Maximum Transmission Unit:"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:51

 msgid "Settings"
 msgstr ""
 
 msgid "Settings"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:52

 msgid "Show advanced settings"
 msgstr ""
 
 msgid "Show advanced settings"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:53

 #, fuzzy
 msgid "Stun server:"
 msgstr "Dispositivo de som"
 
 #, 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 ""
 
 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 ""
 
 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 ""
 
 msgid "Use IPv6 instead of IPv4"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:53
+#: ../gtk/parameters.ui.h:57

 #, fuzzy
 msgid "User interface"
 msgstr "Usuário"
 
 #, fuzzy
 msgid "User interface"
 msgstr "Usuário"
 

-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:58

 msgid "Video RTP/UDP:"
 msgstr ""
 
 msgid "Video RTP/UDP:"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:59

 #, fuzzy
 msgid "Video codecs"
 msgstr "Codec's de áudio"
 
 #, 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"
 
 #, 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 ""
 
 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:"
 
 #, 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"
 
 #, fuzzy
 msgid "Your username:"
 msgstr "Usuário"
 

-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:64

 msgid "a sound card"
 msgstr ""
 
 msgid "a sound card"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:65

 msgid "default camera"
 msgstr ""
 
 msgid "default camera"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:66

 msgid "default soundcard"
 msgstr ""
 
 msgid "default soundcard"
 msgstr ""
 


@@ -1102,26 +1196,19 @@ msgstr ""
 msgid "Please wait"
 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"
 
 msgid "aborted"
 msgstr "Abortado"
 

-#: ../coreapi/linphonecore.c:209
+#: ../coreapi/linphonecore.c:190

 msgid "completed"
 msgstr "Competado"
 
 msgid "completed"
 msgstr "Competado"
 

-#: ../coreapi/linphonecore.c:212
+#: ../coreapi/linphonecore.c:193

 msgid "missed"
 msgstr "Perdido"
 
 msgid "missed"
 msgstr "Perdido"
 

-#: ../coreapi/linphonecore.c:217
+#: ../coreapi/linphonecore.c:198

 #, fuzzy, c-format
 msgid ""
 "%s at %s\n"
 #, fuzzy, c-format
 msgid ""
 "%s at %s\n"


@@ -1135,81 +1222,64 @@ msgstr ""
 "Status: %s\n"
 "Duração: %i min %i seg\n"
 
 "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"
 
 msgid "Outgoing call"
 msgstr "Chamadas efetuadas"
 

-#: ../coreapi/linphonecore.c:998
+#: ../coreapi/linphonecore.c:1088

 #, fuzzy
 msgid "Ready"
 msgstr "Pronto."
 
 #, 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..."
 
 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."
 
 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 ""
 
 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 "
 
 #, 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"
 
 #, 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 ""
 
 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 ""
 
 msgid "Modifying call parameters..."
 msgstr ""
 

-#: ../coreapi/linphonecore.c:2311
+#: ../coreapi/linphonecore.c:2366

 msgid "Connected."
 msgstr "Conectado."
 
 msgid "Connected."
 msgstr "Conectado."
 

-#: ../coreapi/linphonecore.c:2334
+#: ../coreapi/linphonecore.c:2389

 #, fuzzy
 msgid "Call aborted"
 msgstr "Abortado"
 
 #, 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 ""
 
 msgid "Could not pause the call"
 msgstr ""
 

-#: ../coreapi/linphonecore.c:2460
+#: ../coreapi/linphonecore.c:2535

 msgid "Pausing the current call..."
 msgstr ""
 
 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"
 #: ../coreapi/misc.c:147
 msgid ""
 "Your computer appears to be using ALSA sound drivers.\n"


@@ -1280,156 +1350,203 @@ msgstr ""
 msgid "Unknown-bug"
 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 ""
 
 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 ""
 
 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"
 
 #, 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ê."
 
 #, fuzzy
 msgid "is contacting you"
 msgstr "está chamado você."
 

-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207

 msgid " and asked autoanswer."
 msgstr ""
 
 msgid " and asked autoanswer."
 msgstr ""
 

-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207

 msgid "."
 msgstr ""
 
 msgid "."
 msgstr ""
 

-#: ../coreapi/callbacks.c:226
+#: ../coreapi/callbacks.c:266

 #, fuzzy
 msgid "Remote ringing."
 msgstr "Serviços remotos"
 
 #, fuzzy
 msgid "Remote ringing."
 msgstr "Serviços remotos"
 

-#: ../coreapi/callbacks.c:242
+#: ../coreapi/callbacks.c:282

 #, fuzzy
 msgid "Remote ringing..."
 msgstr "Serviços remotos"
 
 #, fuzzy
 msgid "Remote ringing..."
 msgstr "Serviços remotos"
 

-#: ../coreapi/callbacks.c:253
+#: ../coreapi/callbacks.c:293

 msgid "Early media."
 msgstr ""
 
 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"
 
 #, 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 ""
 
 #, 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."
 
 #, 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"
 
 #, 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 ""
 
 msgid "We are being paused..."
 msgstr ""
 

-#: ../coreapi/callbacks.c:387
+#: ../coreapi/callbacks.c:436

 msgid "We have been resumed..."
 msgstr ""
 
 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 ""
 
 msgid "Call terminated."
 msgstr ""
 

-#: ../coreapi/callbacks.c:431
+#: ../coreapi/callbacks.c:480

 msgid "User is busy."
 msgstr "Usuário está ocupado."
 
 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).");
 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 ""
 
 msgid "User does not want to be disturbed."
 msgstr ""
 

-#: ../coreapi/callbacks.c:435
+#: ../coreapi/callbacks.c:484

 msgid "Call declined."
 msgstr ""
 
 msgid "Call declined."
 msgstr ""
 

-#: ../coreapi/callbacks.c:447
+#: ../coreapi/callbacks.c:496

 msgid "No response."
 msgstr ""
 
 msgid "No response."
 msgstr ""
 

-#: ../coreapi/callbacks.c:451
+#: ../coreapi/callbacks.c:500

 msgid "Protocol error."
 msgstr ""
 
 msgid "Protocol error."
 msgstr ""
 

-#: ../coreapi/callbacks.c:467
+#: ../coreapi/callbacks.c:516

 #, fuzzy
 msgid "Redirected"
 msgstr "Redirecionado para %s..."
 
 #, fuzzy
 msgid "Redirected"
 msgstr "Redirecionado para %s..."
 

-#: ../coreapi/callbacks.c:477
+#: ../coreapi/callbacks.c:526

 msgid "Not found"
 msgstr ""
 
 msgid "Not found"
 msgstr ""
 

-#: ../coreapi/callbacks.c:487
+#: ../coreapi/callbacks.c:551

 msgid "No common codecs"
 msgstr ""
 
 msgid "No common codecs"
 msgstr ""
 

-#: ../coreapi/callbacks.c:493
+#: ../coreapi/callbacks.c:557

 #, fuzzy
 msgid "Call failed."
 msgstr "Histórico de chamadas"
 
 #, 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."
 
 #, 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."
 
 #, 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 ""
 
 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)."
 
 #, 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"
 
 #, 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 "
 #~ 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 "Go"
 #~ msgstr "Ir"
 

-#~ msgid "Address book"
-#~ msgstr "Catálogo de endereços"
-

 #, fuzzy
 #~ msgid "Exit"
 #~ msgstr "Editar"
 #, 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 "linphone - receiving call from %s"
 #~ msgstr "Linphone - Recebendo chamada de %s"
 

-#~ msgid "None"
-#~ msgstr "Nenhum"
-

 #~ msgid "User manual"
 #~ msgstr "Manual do usuário"
 
 #~ msgid "User manual"
 #~ msgstr "Manual do usuário"
 

diff --git a/po/ru.po b/po/ru.po
index 9b3107602111cb2006f53296dc60ba5909d52de7..50c68d696af381854278019b61f16837353a6453 100644 (file)
--- 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"
 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"
 "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"
 
 "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"
 #: ../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"
 
 msgid "Chat with %s"
 msgstr "Обмен сообщениями с %s"
 

-#: ../gtk/main.c:74
+#: ../gtk/main.c:83

 msgid "log to stdout some debug information while running."
 msgstr ""
 "Вывод некоторой отладочной информации на устройство стандартного вывода во "
 "время работы "
 
 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 "Показывать только в системном лотке, не запуская главное окно"
 
 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 "адрес для звонка"
 
 msgid "address to call right now"
 msgstr "адрес для звонка"
 

-#: ../gtk/main.c:95
+#: ../gtk/main.c:111

 msgid "if set automatically answer incoming calls"
 msgstr "если установлен автоматический прием входящих вызовов"
 
 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)"
 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)"
 
 "Определить рабочий каталог (относительно каталога установки, например: c:"
 "\\Program Files\\Linphone)"
 

-#: ../gtk/main.c:442
+#: ../gtk/main.c:464

 #, fuzzy, c-format
 msgid "Call with %s"
 msgstr "Обмен сообщениями с %s"
 
 #, 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"
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"


@@ -69,7 +86,7 @@ msgstr ""
 "контактный лист?\n"
 "Если вы ответите Нет, эта персона будет временно заблокирована."
 
 "контактный лист?\n"
 "Если вы ответите Нет, эта персона будет временно заблокирована."
 

-#: ../gtk/main.c:904
+#: ../gtk/main.c:893

 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 #, 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>:"
 
 "Пожалуйста, введите пароль для пользователя <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 "Домашняя страница"
 
 msgid "Website link"
 msgstr "Домашняя страница"
 

-#: ../gtk/main.c:1076
+#: ../gtk/main.c:1205

 msgid "Linphone - a video internet phone"
 msgstr "Linphone - Интернет видео телефон"
 
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - Интернет видео телефон"
 

-#: ../gtk/main.c:1095
+#: ../gtk/main.c:1295

 #, c-format
 msgid "%s (Default)"
 msgstr "%s (По умолчанию)"
 
 #, 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 ""
 
 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 ""
 
 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 видео-телефон"
 
 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 "Имя"
 
 msgid "Name"
 msgstr "Имя"
 

-#: ../gtk/friendlist.c:205
+#: ../gtk/friendlist.c:271

 msgid "Presence status"
 msgstr "Статус присутствия"
 
 msgid "Presence status"
 msgstr "Статус присутствия"
 

-#: ../gtk/friendlist.c:242
+#: ../gtk/friendlist.c:308

 #, c-format
 msgid "Search in %s directory"
 msgstr "Поиск в директории %s"
 
 #, c-format
 msgid "Search in %s directory"
 msgstr "Поиск в директории %s"
 

-#: ../gtk/friendlist.c:450
+#: ../gtk/friendlist.c:568

 msgid "Invalid sip contact !"
 msgstr "Неверный sip контакт"
 
 msgid "Invalid sip contact !"
 msgstr "Неверный sip контакт"
 

-#: ../gtk/friendlist.c:495
+#: ../gtk/friendlist.c:613

 #, c-format
 msgid "Call %s"
 msgstr "Звонк %s"
 
 #, c-format
 msgid "Call %s"
 msgstr "Звонк %s"
 

-#: ../gtk/friendlist.c:496
+#: ../gtk/friendlist.c:614

 #, c-format
 msgid "Send text to %s"
 msgstr "Послать текст %s"
 
 #, 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'"
 
 #, c-format
 msgid "Edit contact '%s'"
 msgstr "Редактировать контакт '%s'"
 

-#: ../gtk/friendlist.c:498
+#: ../gtk/friendlist.c:616

 #, c-format
 msgid "Delete contact '%s'"
 msgstr "Удалить контакт '%s'"
 
 #, 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'"
 
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr "Добавить новый контакт из директории '%s'"
 

-#: ../gtk/propertybox.c:277
+#: ../gtk/propertybox.c:302

 msgid "Rate (Hz)"
 msgstr "Частота (Hz)"
 
 msgid "Rate (Hz)"
 msgstr "Частота (Hz)"
 

-#: ../gtk/propertybox.c:283
+#: ../gtk/propertybox.c:308

 msgid "Status"
 msgstr "Статус"
 
 msgid "Status"
 msgstr "Статус"
 

-#: ../gtk/propertybox.c:289
+#: ../gtk/propertybox.c:314

 msgid "Min bitrate (kbit/s)"
 msgstr "Минимальный битрейт (kbit/s)"
 
 msgid "Min bitrate (kbit/s)"
 msgstr "Минимальный битрейт (kbit/s)"
 

-#: ../gtk/propertybox.c:296
+#: ../gtk/propertybox.c:321

 msgid "Parameters"
 msgstr "Параметры"
 
 msgid "Parameters"
 msgstr "Параметры"
 

-#: ../gtk/propertybox.c:326 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507

 msgid "Enabled"
 msgstr "Включен"
 
 msgid "Enabled"
 msgstr "Включен"
 

-#: ../gtk/propertybox.c:327 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507

 msgid "Disabled"
 msgstr "Отключен"
 
 msgid "Disabled"
 msgstr "Отключен"
 

-#: ../gtk/propertybox.c:510
+#: ../gtk/propertybox.c:553

 msgid "Account"
 msgstr "Учетная запись"
 
 msgid "Account"
 msgstr "Учетная запись"
 

-#: ../gtk/propertybox.c:650
+#: ../gtk/propertybox.c:693

 msgid "English"
 msgstr "Английский"
 
 msgid "English"
 msgstr "Английский"
 

-#: ../gtk/propertybox.c:651
+#: ../gtk/propertybox.c:694

 msgid "French"
 msgstr "Французский"
 
 msgid "French"
 msgstr "Французский"
 

-#: ../gtk/propertybox.c:652
+#: ../gtk/propertybox.c:695

 msgid "Swedish"
 msgstr "Шведский"
 
 msgid "Swedish"
 msgstr "Шведский"
 

-#: ../gtk/propertybox.c:653
+#: ../gtk/propertybox.c:696

 msgid "Italian"
 msgstr "Итальянский"
 
 msgid "Italian"
 msgstr "Итальянский"
 

-#: ../gtk/propertybox.c:654
+#: ../gtk/propertybox.c:697

 msgid "Spanish"
 msgstr "Испанский"
 
 msgid "Spanish"
 msgstr "Испанский"
 

-#: ../gtk/propertybox.c:655
+#: ../gtk/propertybox.c:698

 #, fuzzy
 msgid "Brazilian Portugese"
 msgstr "Португальский"
 
 #, fuzzy
 msgid "Brazilian Portugese"
 msgstr "Португальский"
 

-#: ../gtk/propertybox.c:656
+#: ../gtk/propertybox.c:699

 msgid "Polish"
 msgstr "Польский"
 
 msgid "Polish"
 msgstr "Польский"
 

-#: ../gtk/propertybox.c:657
+#: ../gtk/propertybox.c:700

 msgid "German"
 msgstr "Немецкий"
 
 msgid "German"
 msgstr "Немецкий"
 

-#: ../gtk/propertybox.c:658
+#: ../gtk/propertybox.c:701

 msgid "Russian"
 msgstr "Русский"
 
 msgid "Russian"
 msgstr "Русский"
 

-#: ../gtk/propertybox.c:659
+#: ../gtk/propertybox.c:702

 msgid "Japanese"
 msgstr "Японский"
 
 msgid "Japanese"
 msgstr "Японский"
 

-#: ../gtk/propertybox.c:660
+#: ../gtk/propertybox.c:703

 msgid "Dutch"
 msgstr "Датский"
 
 msgid "Dutch"
 msgstr "Датский"
 

-#: ../gtk/propertybox.c:661
+#: ../gtk/propertybox.c:704

 msgid "Hungarian"
 msgstr "Венгерский"
 
 msgid "Hungarian"
 msgstr "Венгерский"
 

-#: ../gtk/propertybox.c:662
+#: ../gtk/propertybox.c:705

 msgid "Czech"
 msgstr "Чешский"
 
 msgid "Czech"
 msgstr "Чешский"
 

-#: ../gtk/propertybox.c:663
+#: ../gtk/propertybox.c:706

 msgid "Chinese"
 msgstr "Китайский"
 
 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 для того чтобы языковые настройки вступили "
 "в силу."
 
 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 ""
 #: ../gtk/update.c:80
 #, c-format
 msgid ""


@@ -356,76 +430,102 @@ msgstr "Создание аккаунта"
 msgid "Now ready !"
 msgstr "Готово !"
 
 msgid "Now ready !"
 msgstr "Готово !"
 

-#: ../gtk/incall_view.c:61
+#: ../gtk/incall_view.c:69

 #, fuzzy, c-format
 msgid "Call #%i"
 msgstr "Звонк %s"
 
 #, 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 ""
 
 #, c-format
 msgid "Transfer to call #%i with %s"
 msgstr ""
 

-#: ../gtk/incall_view.c:113
+#: ../gtk/incall_view.c:155

 msgid "Transfer"
 msgstr ""
 
 msgid "Transfer"
 msgstr ""
 

-#: ../gtk/incall_view.c:187
+#: ../gtk/incall_view.c:271

 msgid "<b>Calling...</b>"
 msgstr "<b>Вызов...</b>"
 
 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"
 
 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 "Входящий вызов"
 
 #, 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 ""
 
 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 ""
 
 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>"
 
 #, 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>"
 
 #, 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"
 
 #, 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>"
 
 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 ""
 
 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 ""
 
 msgid "Pause"
 msgstr ""
 


@@ -488,8 +588,9 @@ msgid "<b>Add contacts from directory</b>"
 msgstr "Добавить новый контакт из директории '%s'"
 
 #: ../gtk/main.ui.h:14
 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>"
 
 #: ../gtk/main.ui.h:15
 msgid "<b>Welcome !</b>"


@@ -513,26 +614,26 @@ msgid "All users"
 msgstr ""
 
 #: ../gtk/main.ui.h:21
 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 "Входить автоматически"
 
 msgid "Automatically log me in"
 msgstr "Входить автоматически"
 

-#: ../gtk/main.ui.h:24
+#: ../gtk/main.ui.h:22

 msgid "B"
 msgstr "B"
 
 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"
 
 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 ""
 #: ../gtk/main.ui.h:26
 msgid "Check _Updates"
 msgstr ""


@@ -546,10 +647,6 @@ msgstr "Соединение"
 msgid "D"
 msgstr "D"
 
 msgid "D"
 msgstr "D"
 

-#: ../gtk/main.ui.h:29
-msgid "Decline"
-msgstr "Отклонить"
-

 #: ../gtk/main.ui.h:30
 msgid "Default"
 msgstr "По умолчанию"
 #: ../gtk/main.ui.h:30
 msgid "Default"
 msgstr "По умолчанию"


@@ -559,13 +656,14 @@ msgid "Duration"
 msgstr "Продолжительность"
 
 #: ../gtk/main.ui.h:32
 msgstr "Продолжительность"
 
 #: ../gtk/main.ui.h:32

-msgid "Duration:"
-msgstr "Продолжительность:"
-
-#: ../gtk/main.ui.h:33

 msgid "Enable self-view"
 msgstr "Включить видео "
 
 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 "Введите имя пользователя, "
 #: ../gtk/main.ui.h:34
 msgid "Enter username, phone number, or full sip address"
 msgstr "Введите имя пользователя, "


@@ -601,21 +699,26 @@ msgstr "Информация "
 msgid "Lookup:"
 msgstr "Поиск:"
 
 msgid "Lookup:"
 msgstr "Поиск:"
 

-#: ../gtk/main.ui.h:43
+#: ../gtk/main.ui.h:42

 msgid "My current identity:"
 msgstr "Текущий идентификатор:"
 
 msgid "My current identity:"
 msgstr "Текущий идентификатор:"
 

-#: ../gtk/main.ui.h:44
+#: ../gtk/main.ui.h:43

 #, fuzzy
 msgid "Online users"
 msgstr ""
 "Все пользователи\n"
 "Пользователи в сети"
 
 #, fuzzy
 msgid "Online users"
 msgstr ""
 "Все пользователи\n"
 "Пользователи в сети"
 

-#: ../gtk/main.ui.h:45
+#: ../gtk/main.ui.h:44

 msgid "Password"
 msgstr "Пароль"
 
 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-адрес или номер телефона."
 #: ../gtk/main.ui.h:47
 msgid "SIP address or phone number:"
 msgstr "SIP-адрес или номер телефона."


@@ -625,20 +728,15 @@ msgstr "SIP-адрес или номер телефона."
 msgid "Search"
 msgstr "Поиск:"
 
 msgid "Search"
 msgstr "Поиск:"
 

-#: ../gtk/main.ui.h:49
+#: ../gtk/main.ui.h:50

 #, fuzzy
 msgid "Show debug window"
 msgstr "Linphone окно отладки"
 
 #, fuzzy
 msgid "Show debug window"
 msgstr "Linphone окно отладки"
 

-#: ../gtk/main.ui.h:50
+#: ../gtk/main.ui.h:51

 msgid "Username"
 msgstr "Имя пользователя"
 
 msgid "Username"
 msgstr "Имя пользователя"
 

-#: ../gtk/main.ui.h:51
-#, fuzzy
-msgid "_Call history"
-msgstr "История звонков"
-

 #: ../gtk/main.ui.h:52
 #, fuzzy
 msgid "_Help"
 #: ../gtk/main.ui.h:52
 #, fuzzy
 msgid "_Help"


@@ -649,18 +747,14 @@ msgid "_Homepage"
 msgstr ""
 
 #: ../gtk/main.ui.h:54
 msgstr ""
 
 #: ../gtk/main.ui.h:54

-msgid "_Linphone"
-msgstr "_Linphone"
-
-#: ../gtk/main.ui.h:55

 msgid "_Options"
 msgstr ""
 
 msgid "_Options"
 msgstr ""
 

-#: ../gtk/main.ui.h:56
+#: ../gtk/main.ui.h:55

 msgid "in"
 msgstr "в"
 
 msgid "in"
 msgstr "в"
 

-#: ../gtk/main.ui.h:57
+#: ../gtk/main.ui.h:56

 msgid "label"
 msgstr "метка"
 
 msgid "label"
 msgstr "метка"
 


@@ -720,14 +814,6 @@ msgstr "SIP Адрес"
 msgid "Show this contact presence status"
 msgstr "Показывать этому контакту статус присутствия"
 
 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 окно отладки"
 #: ../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
 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):"
 
 #: ../gtk/sip_account.ui.h:7
 msgid "Registration duration (sec):"


@@ -809,10 +895,6 @@ msgstr "sip:"
 msgid "Send"
 msgstr "Отправить"
 
 msgid "Send"
 msgstr "Отправить"
 

-#: ../gtk/chatroom.ui.h:2
-msgid "gtk-close"
-msgstr "Закрыть"
-

 #: ../gtk/parameters.ui.h:1
 msgid "0 stands for \"unlimited\""
 msgstr "0 означает \"безлимитный\""
 #: ../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
 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>"
 
 #: ../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
 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 (необязательно)"
 
 msgid "ALSA special device (optional):"
 msgstr "Специальное устройство ALSA (необязательно)"
 

-#: ../gtk/parameters.ui.h:15
+#: ../gtk/parameters.ui.h:16

 msgid "Add"
 msgstr "Добавить"
 
 msgid "Add"
 msgstr "Добавить"
 

-#: ../gtk/parameters.ui.h:16
+#: ../gtk/parameters.ui.h:17

 msgid "Audio RTP/UDP:"
 msgstr "Аудио RTP/UDP"
 
 msgid "Audio RTP/UDP:"
 msgstr "Аудио RTP/UDP"
 

-#: ../gtk/parameters.ui.h:17
+#: ../gtk/parameters.ui.h:18

 #, fuzzy
 msgid "Audio codecs"
 msgstr ""
 "Аудио кодеки\n"
 "Видео кодеки"
 
 #, 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-адрес шлюза ниже)"
 
 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)"
 
 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"
 
 msgid "CIF"
 msgstr "CIF"
 

-#: ../gtk/parameters.ui.h:22
+#: ../gtk/parameters.ui.h:23

 msgid "Capture device:"
 msgstr "Устройство захвата:"
 
 msgid "Capture device:"
 msgstr "Устройство захвата:"
 

-#: ../gtk/parameters.ui.h:23
+#: ../gtk/parameters.ui.h:24

 msgid "Codecs"
 msgstr "Кодеки"
 
 msgid "Codecs"
 msgstr "Кодеки"
 

-#: ../gtk/parameters.ui.h:24
+#: ../gtk/parameters.ui.h:25

 msgid "Direct connection to the Internet"
 msgstr "Прямое подключение к Интернет"
 
 msgid "Direct connection to the Internet"
 msgstr "Прямое подключение к Интернет"
 

-#: ../gtk/parameters.ui.h:25
+#: ../gtk/parameters.ui.h:26

 msgid "Disable"
 msgstr "Выключить"
 
 msgid "Disable"
 msgstr "Выключить"
 

-#: ../gtk/parameters.ui.h:26
+#: ../gtk/parameters.ui.h:27

 msgid "Done"
 msgstr "Готово"
 
 msgid "Done"
 msgstr "Готово"
 

-#: ../gtk/parameters.ui.h:27
+#: ../gtk/parameters.ui.h:28

 msgid "Download speed limit in Kbit/sec:"
 msgstr "Ограничение скорости входящего потока kbit/sec"
 
 msgid "Download speed limit in Kbit/sec:"
 msgstr "Ограничение скорости входящего потока kbit/sec"
 

-#: ../gtk/parameters.ui.h:28
+#: ../gtk/parameters.ui.h:29

 msgid "Edit"
 msgstr "Редактировать"
 
 msgid "Edit"
 msgstr "Редактировать"
 

-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:30

 msgid "Enable"
 msgstr "Включить"
 
 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 "Включить подавление эхо"
 
 msgid "Enable echo cancellation"
 msgstr "Включить подавление эхо"
 

-#: ../gtk/parameters.ui.h:31
+#: ../gtk/parameters.ui.h:33

 msgid "Erase all passwords"
 msgstr "Стереть все пароли"
 
 msgid "Erase all passwords"
 msgstr "Стереть все пароли"
 

-#: ../gtk/parameters.ui.h:32
+#: ../gtk/parameters.ui.h:34

 msgid "Manage SIP Accounts"
 msgstr "Управление учетными записями SIP"
 
 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 "Настройка мультимедиа"
 
 msgid "Multimedia settings"
 msgstr "Настройка мультимедиа"
 

-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:37

 msgid "Network settings"
 msgstr "Настройки сети"
 
 msgid "Network settings"
 msgstr "Настройки сети"
 

-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:38

 msgid "Playback device:"
 msgstr "Устройство воспроизведения"
 
 msgid "Playback device:"
 msgstr "Устройство воспроизведения"
 

-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:39

 msgid "Prefered video resolution:"
 msgstr "Предпочтительное разрешение видео:"
 
 msgid "Prefered video resolution:"
 msgstr "Предпочтительное разрешение видео:"
 

-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:40

 msgid "Public IP address:"
 msgstr "Выделенный IP-адрес"
 
 msgid "Public IP address:"
 msgstr "Выделенный IP-адрес"
 

-#: ../gtk/parameters.ui.h:38
+#: ../gtk/parameters.ui.h:41

 msgid ""
 "Register to FONICS\n"
 "virtual network !"
 msgid ""
 "Register to FONICS\n"
 "virtual network !"


@@ -969,100 +1065,106 @@ msgstr ""
 "Регистрация в \n"
 "виртуальной сети FONICS!"
 
 "Регистрация в \n"
 "виртуальной сети FONICS!"
 

-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:43

 msgid "Remove"
 msgstr "Удалить"
 
 msgid "Remove"
 msgstr "Удалить"
 

-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:44

 msgid "Ring device:"
 msgstr "Устройство звонка:"
 
 msgid "Ring device:"
 msgstr "Устройство звонка:"
 

-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:45

 msgid "Ring sound:"
 msgstr "Звук звонка:"
 
 msgid "Ring sound:"
 msgstr "Звук звонка:"
 

-#: ../gtk/parameters.ui.h:43
+#: ../gtk/parameters.ui.h:46

 #, fuzzy
 #, fuzzy

-msgid "SIP (TCP):"
+msgid "SIP (TCP)"

 msgstr "SIP (UDP):"
 
 msgstr "SIP (UDP):"
 

-#: ../gtk/parameters.ui.h:44
-msgid "SIP (UDP):"
+#: ../gtk/parameters.ui.h:47
+#, fuzzy
+msgid "SIP (TLS)"

 msgstr "SIP (UDP):"
 
 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-инфо"
 
 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 (Максимально Передаваемый Блок)"
 
 msgid "Set Maximum Transmission Unit:"
 msgstr "Установка MTU (Максимально Передаваемый Блок)"
 

-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:51

 msgid "Settings"
 msgstr "Настройки:"
 
 msgid "Settings"
 msgstr "Настройки:"
 

-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:52

 msgid "Show advanced settings"
 msgstr ""
 
 msgid "Show advanced settings"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:53

 msgid "Stun server:"
 msgstr "Stun сервер:"
 
 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 аккаунт"
 
 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:"
 
 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"
 
 msgid "Use IPv6 instead of IPv4"
 msgstr "Использовать IPv6 вместо IPv4"
 

-#: ../gtk/parameters.ui.h:53
+#: ../gtk/parameters.ui.h:57

 msgid "User interface"
 msgstr "Интерфейс:"
 
 msgid "User interface"
 msgstr "Интерфейс:"
 

-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:58

 msgid "Video RTP/UDP:"
 msgstr "Видео RTP/UDP:"
 
 msgid "Video RTP/UDP:"
 msgstr "Видео RTP/UDP:"
 

-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:59

 #, fuzzy
 msgid "Video codecs"
 msgstr ""
 "Аудио кодеки\n"
 "Видео кодеки"
 
 #, fuzzy
 msgid "Video codecs"
 msgstr ""
 "Аудио кодеки\n"
 "Видео кодеки"
 

-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:60

 msgid "Video input device:"
 msgstr "Видео устройство вывода:"
 
 msgid "Video input device:"
 msgstr "Видео устройство вывода:"
 

-#: ../gtk/parameters.ui.h:57
+#: ../gtk/parameters.ui.h:61

 msgid "Your display name (eg: John Doe):"
 msgstr "Отображаемое имя (Иван Сидоров):"
 
 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 адрес:"
 
 msgid "Your resulting SIP address:"
 msgstr "Результирующий sip адрес:"
 

-#: ../gtk/parameters.ui.h:59
+#: ../gtk/parameters.ui.h:63

 msgid "Your username:"
 msgstr "Имя пользователя:"
 
 msgid "Your username:"
 msgstr "Имя пользователя:"
 

-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:64

 #, fuzzy
 msgid "a sound card"
 msgstr "звуковая карта\n"
 
 #, fuzzy
 msgid "a sound card"
 msgstr "звуковая карта\n"
 

-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:65

 msgid "default camera"
 msgstr "камера по умолчаию"
 
 msgid "default camera"
 msgstr "камера по умолчаию"
 

-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:66

 msgid "default soundcard"
 msgstr "звуковая карта по умолчанию"
 
 msgid "default soundcard"
 msgstr "звуковая карта по умолчанию"
 


@@ -1086,26 +1188,19 @@ msgstr "Linphone"
 msgid "Please wait"
 msgstr "Подождите"
 
 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 "отмененный"
 
 msgid "aborted"
 msgstr "отмененный"
 

-#: ../coreapi/linphonecore.c:209
+#: ../coreapi/linphonecore.c:190

 msgid "completed"
 msgstr "заверщённый"
 
 msgid "completed"
 msgstr "заверщённый"
 

-#: ../coreapi/linphonecore.c:212
+#: ../coreapi/linphonecore.c:193

 msgid "missed"
 msgstr "пропущенный"
 
 msgid "missed"
 msgstr "пропущенный"
 

-#: ../coreapi/linphonecore.c:217
+#: ../coreapi/linphonecore.c:198

 #, c-format
 msgid ""
 "%s at %s\n"
 #, c-format
 msgid ""
 "%s at %s\n"


@@ -1120,27 +1215,23 @@ msgstr ""
 "Статус: %s\n"
 "Длительность: %i мн %i сек\n"
 
 "Статус: %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 "Исходящий звонок"
 
 msgid "Outgoing call"
 msgstr "Исходящий звонок"
 

-#: ../coreapi/linphonecore.c:998
+#: ../coreapi/linphonecore.c:1088

 msgid "Ready"
 msgstr "Готов"
 
 msgid "Ready"
 msgstr "Готов"
 

-#: ../coreapi/linphonecore.c:1773
+#: ../coreapi/linphonecore.c:1831

 msgid "Looking for telephone number destination..."
 msgstr "Поиск назначения для телефонного номера.."
 
 msgid "Looking for telephone number destination..."
 msgstr "Поиск назначения для телефонного номера.."
 

-#: ../coreapi/linphonecore.c:1776
+#: ../coreapi/linphonecore.c:1834

 msgid "Could not resolve this number."
 msgstr "Не может принять решение по этому номеру."
 
 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"
 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>"
 
 "Не могу опознать sip адрес. SIP url обычно выглядит как: <sip:"
 "username@domainname>"
 

-#: ../coreapi/linphonecore.c:1967
+#: ../coreapi/linphonecore.c:2025

 msgid "Contacting"
 msgstr "Соединение"
 
 msgid "Contacting"
 msgstr "Соединение"
 

-#: ../coreapi/linphonecore.c:1974
+#: ../coreapi/linphonecore.c:2032

 #, fuzzy
 msgid "Could not call"
 msgstr "невозможно позвонить"
 
 #, 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 ""
 
 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 ""
 
 msgid "Modifying call parameters..."
 msgstr ""
 

-#: ../coreapi/linphonecore.c:2311
+#: ../coreapi/linphonecore.c:2366

 msgid "Connected."
 msgstr "Соединён."
 
 msgid "Connected."
 msgstr "Соединён."
 

-#: ../coreapi/linphonecore.c:2334
+#: ../coreapi/linphonecore.c:2389

 #, fuzzy
 msgid "Call aborted"
 msgstr "отмененный"
 
 #, 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 "невозможно позвонить"
 
 #, fuzzy
 msgid "Could not pause the call"
 msgstr "невозможно позвонить"
 

-#: ../coreapi/linphonecore.c:2460
+#: ../coreapi/linphonecore.c:2535

 #, fuzzy
 msgid "Pausing the current call..."
 msgstr "Показать текущий звонок"
 
 #, 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"
 #: ../coreapi/misc.c:147
 msgid ""
 "Your computer appears to be using ALSA sound drivers.\n"


@@ -1274,7 +1353,7 @@ msgstr "В ожидании"
 msgid "Unknown-bug"
 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."
 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:имя_хоста\""
 
 "Введеный 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"
 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"
 
 "Неверные параметры идентификации\n"
 "Должно выглядеть как sip:username@proxydomain"
 

-#: ../coreapi/proxy.c:671
+#: ../coreapi/proxy.c:690

 #, c-format
 msgid "Could not login as %s"
 msgstr "Невозможно зайти как: %s"
 
 #, c-format
 msgid "Could not login as %s"
 msgstr "Невозможно зайти как: %s"
 

-#: ../coreapi/callbacks.c:170
+#: ../coreapi/callbacks.c:206

 #, fuzzy
 msgid "is contacting you"
 msgstr "контактирует с вами."
 
 #, fuzzy
 msgid "is contacting you"
 msgstr "контактирует с вами."
 

-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207

 msgid " and asked autoanswer."
 msgstr ""
 
 msgid " and asked autoanswer."
 msgstr ""
 

-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207

 msgid "."
 msgstr ""
 
 msgid "."
 msgstr ""
 

-#: ../coreapi/callbacks.c:226
+#: ../coreapi/callbacks.c:266

 #, fuzzy
 msgid "Remote ringing."
 msgstr "Registrierung"
 
 #, fuzzy
 msgid "Remote ringing."
 msgstr "Registrierung"
 

-#: ../coreapi/callbacks.c:242
+#: ../coreapi/callbacks.c:282

 #, fuzzy
 msgid "Remote ringing..."
 msgstr "Registrierung"
 
 #, fuzzy
 msgid "Remote ringing..."
 msgstr "Registrierung"
 

-#: ../coreapi/callbacks.c:253
+#: ../coreapi/callbacks.c:293

 msgid "Early media."
 msgstr "Early media"
 
 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"
 
 #, 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 ""
 
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr ""
 

-#: ../coreapi/callbacks.c:317
+#: ../coreapi/callbacks.c:357

 #, fuzzy
 msgid "Call resumed."
 msgstr "Разговор окончен"
 
 #, fuzzy
 msgid "Call resumed."
 msgstr "Разговор окончен"
 

-#: ../coreapi/callbacks.c:322
+#: ../coreapi/callbacks.c:362

 #, fuzzy, c-format
 msgid "Call answered by %s."
 msgstr ""
 "Позвонить\n"
 "или ответить"
 
 #, fuzzy, c-format
 msgid "Call answered by %s."
 msgstr ""
 "Позвонить\n"
 "или ответить"
 

-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:432

 msgid "We are being paused..."
 msgstr ""
 
 msgid "We are being paused..."
 msgstr ""
 

-#: ../coreapi/callbacks.c:387
+#: ../coreapi/callbacks.c:436

 msgid "We have been resumed..."
 msgstr ""
 
 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 "Звонок прерван."
 
 msgid "Call terminated."
 msgstr "Звонок прерван."
 

-#: ../coreapi/callbacks.c:431
+#: ../coreapi/callbacks.c:480

 msgid "User is busy."
 msgstr "Пользователь занят."
 
 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).");
 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 "Пользователь не хочет чтоб его беспокоили."
 
 msgid "User does not want to be disturbed."
 msgstr "Пользователь не хочет чтоб его беспокоили."
 

-#: ../coreapi/callbacks.c:435
+#: ../coreapi/callbacks.c:484

 msgid "Call declined."
 msgstr "Звонок отклонён."
 
 msgid "Call declined."
 msgstr "Звонок отклонён."
 

-#: ../coreapi/callbacks.c:447
+#: ../coreapi/callbacks.c:496

 #, fuzzy
 msgid "No response."
 msgstr "время ожидания истекло"
 
 #, fuzzy
 msgid "No response."
 msgstr "время ожидания истекло"
 

-#: ../coreapi/callbacks.c:451
+#: ../coreapi/callbacks.c:500

 msgid "Protocol error."
 msgstr ""
 
 msgid "Protocol error."
 msgstr ""
 

-#: ../coreapi/callbacks.c:467
+#: ../coreapi/callbacks.c:516

 #, fuzzy
 msgid "Redirected"
 msgstr "Переадресован на %s..."
 
 #, fuzzy
 msgid "Redirected"
 msgstr "Переадресован на %s..."
 

-#: ../coreapi/callbacks.c:477
+#: ../coreapi/callbacks.c:526

 msgid "Not found"
 msgstr ""
 
 msgid "Not found"
 msgstr ""
 

-#: ../coreapi/callbacks.c:487
+#: ../coreapi/callbacks.c:551

 msgid "No common codecs"
 msgstr ""
 
 msgid "No common codecs"
 msgstr ""
 

-#: ../coreapi/callbacks.c:493
+#: ../coreapi/callbacks.c:557

 #, fuzzy
 msgid "Call failed."
 msgstr "Anruf annulliert"
 
 #, fuzzy
 msgid "Call failed."
 msgstr "Anruf annulliert"
 

-#: ../coreapi/callbacks.c:557
+#: ../coreapi/callbacks.c:631

 #, c-format
 msgid "Registration on %s successful."
 msgstr "Регистрация на %s прошла успешно."
 
 #, 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 завершена."
 
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Отмена регистрации на %s завершена."
 

-#: ../coreapi/callbacks.c:574
+#: ../coreapi/callbacks.c:648

 msgid "no response timeout"
 msgstr "время ожидания истекло"
 
 msgid "no response timeout"
 msgstr "время ожидания истекло"
 

-#: ../coreapi/callbacks.c:577
+#: ../coreapi/callbacks.c:651

 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Регистрация на %s не удалась: %s"
 
 #, 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 "Информация аунтефикации"
 
 #, 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 кодировщик"
 
 #~ 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 "Authentication required for realm %s"
 #~ msgstr "Регистрация для %s"
 

-#~ msgid "None"
-#~ msgstr "Нет"
-

 #~ msgid "Wait"
 #~ msgstr "Подождать"
 
 #~ msgid "Wait"
 #~ msgstr "Подождать"
 


@@ -2115,12 +2241,6 @@ msgstr "Информация аунтефикации"
 #~ msgid "Timeout..."
 #~ msgstr "Zeitberschreitung..."
 
 #~ 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."
 #~ 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 (file)
--- 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"
 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"
 "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"
 
 "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"
 #: ../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"
 
 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"
 
 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"
 
 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"
 
 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"
 
 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)"
 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"
 
 "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"
 
 #, 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"
 #, 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."
 
 "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"
 #, 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>:"
 
 "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"
 
 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"
 
 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)"
 
 #, 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 ""
 
 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 ""
 
 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"
 
 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"
 
 msgid "Name"
 msgstr "Namn"
 

-#: ../gtk/friendlist.c:205
+#: ../gtk/friendlist.c:271

 msgid "Presence status"
 msgstr "Närvarostatus"
 
 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"
 
 #, 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!"
 
 msgid "Invalid sip contact !"
 msgstr "ogiltig SIP kontakt!"
 

-#: ../gtk/friendlist.c:495
+#: ../gtk/friendlist.c:613

 #, c-format
 msgid "Call %s"
 msgstr "Ringer %s"
 
 #, 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"
 
 #, 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'"
 
 #, 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'"
 
 #, 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"
 
 #, 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)"
 
 msgid "Rate (Hz)"
 msgstr "Frekvens (Hz)"
 

-#: ../gtk/propertybox.c:283
+#: ../gtk/propertybox.c:308

 msgid "Status"
 msgstr "Status"
 
 msgid "Status"
 msgstr "Status"
 

-#: ../gtk/propertybox.c:289
+#: ../gtk/propertybox.c:314

 msgid "Min bitrate (kbit/s)"
 msgstr "Min. datahastighet (kbit/s)"
 
 msgid "Min bitrate (kbit/s)"
 msgstr "Min. datahastighet (kbit/s)"
 

-#: ../gtk/propertybox.c:296
+#: ../gtk/propertybox.c:321

 msgid "Parameters"
 msgstr "Parametrar"
 
 msgid "Parameters"
 msgstr "Parametrar"
 

-#: ../gtk/propertybox.c:326 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507

 msgid "Enabled"
 msgstr "På"
 
 msgid "Enabled"
 msgstr "På"
 

-#: ../gtk/propertybox.c:327 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507

 msgid "Disabled"
 msgstr "Av"
 
 msgid "Disabled"
 msgstr "Av"
 

-#: ../gtk/propertybox.c:510
+#: ../gtk/propertybox.c:553

 msgid "Account"
 msgstr "Konto"
 
 msgid "Account"
 msgstr "Konto"
 

-#: ../gtk/propertybox.c:650
+#: ../gtk/propertybox.c:693

 msgid "English"
 msgstr "Engelska"
 
 msgid "English"
 msgstr "Engelska"
 

-#: ../gtk/propertybox.c:651
+#: ../gtk/propertybox.c:694

 msgid "French"
 msgstr "Fransk"
 
 msgid "French"
 msgstr "Fransk"
 

-#: ../gtk/propertybox.c:652
+#: ../gtk/propertybox.c:695

 msgid "Swedish"
 msgstr "Svenska"
 
 msgid "Swedish"
 msgstr "Svenska"
 

-#: ../gtk/propertybox.c:653
+#: ../gtk/propertybox.c:696

 msgid "Italian"
 msgstr "Italiensk"
 
 msgid "Italian"
 msgstr "Italiensk"
 

-#: ../gtk/propertybox.c:654
+#: ../gtk/propertybox.c:697

 msgid "Spanish"
 msgstr "Spanska"
 
 msgid "Spanish"
 msgstr "Spanska"
 

-#: ../gtk/propertybox.c:655
+#: ../gtk/propertybox.c:698

 msgid "Brazilian Portugese"
 msgstr "Portugisiska"
 
 msgid "Brazilian Portugese"
 msgstr "Portugisiska"
 

-#: ../gtk/propertybox.c:656
+#: ../gtk/propertybox.c:699

 msgid "Polish"
 msgstr "Polska"
 
 msgid "Polish"
 msgstr "Polska"
 

-#: ../gtk/propertybox.c:657
+#: ../gtk/propertybox.c:700

 msgid "German"
 msgstr "Tyska"
 
 msgid "German"
 msgstr "Tyska"
 

-#: ../gtk/propertybox.c:658
+#: ../gtk/propertybox.c:701

 msgid "Russian"
 msgstr "Ryska"
 
 msgid "Russian"
 msgstr "Ryska"
 

-#: ../gtk/propertybox.c:659
+#: ../gtk/propertybox.c:702

 msgid "Japanese"
 msgstr "Japanska"
 
 msgid "Japanese"
 msgstr "Japanska"
 

-#: ../gtk/propertybox.c:660
+#: ../gtk/propertybox.c:703

 msgid "Dutch"
 msgstr "Nederländksa"
 
 msgid "Dutch"
 msgstr "Nederländksa"
 

-#: ../gtk/propertybox.c:661
+#: ../gtk/propertybox.c:704

 msgid "Hungarian"
 msgstr "Hungerska"
 
 msgid "Hungarian"
 msgstr "Hungerska"
 

-#: ../gtk/propertybox.c:662
+#: ../gtk/propertybox.c:705

 msgid "Czech"
 msgstr "Tjekiska"
 
 msgid "Czech"
 msgstr "Tjekiska"
 

-#: ../gtk/propertybox.c:663
+#: ../gtk/propertybox.c:706

 msgid "Chinese"
 msgstr "Kinesiska"
 
 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."
 
 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 ""
 #: ../gtk/update.c:80
 #, c-format
 msgid ""


@@ -352,75 +425,102 @@ msgstr "Skapar ditt konto"
 msgid "Now ready !"
 msgstr "Klar nu!"
 
 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"
 
 #, 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 ""
 
 #, c-format
 msgid "Transfer to call #%i with %s"
 msgstr ""
 

-#: ../gtk/incall_view.c:113
+#: ../gtk/incall_view.c:155

 msgid "Transfer"
 msgstr ""
 
 msgid "Transfer"
 msgstr ""
 

-#: ../gtk/incall_view.c:187
+#: ../gtk/incall_view.c:271

 msgid "<b>Calling...</b>"
 msgstr "<b>Ringer...</b>"
 
 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"
 
 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"
 
 #, 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 ""
 
 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 ""
 
 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>"
 
 #, 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>"
 
 #, 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"
 
 #, 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>"
 
 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 ""
 
 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 ""
 
 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
 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>"
 
 #: ../gtk/main.ui.h:15
 msgid "<b>Welcome !</b>"


@@ -507,26 +608,26 @@ msgid "All users"
 msgstr ""
 
 #: ../gtk/main.ui.h:21
 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"
 
 msgid "Automatically log me in"
 msgstr "Logga mig automatiskt"
 

-#: ../gtk/main.ui.h:24
+#: ../gtk/main.ui.h:22

 msgid "B"
 msgstr ""
 
 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 ""
 
 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"
 #: ../gtk/main.ui.h:26
 #, fuzzy
 msgid "Check _Updates"


@@ -541,10 +642,6 @@ msgstr "Kontaktar"
 msgid "D"
 msgstr ""
 
 msgid "D"
 msgstr ""
 

-#: ../gtk/main.ui.h:29
-msgid "Decline"
-msgstr "Avböj"
-

 #: ../gtk/main.ui.h:30
 #, fuzzy
 msgid "Default"
 #: ../gtk/main.ui.h:30
 #, fuzzy
 msgid "Default"


@@ -555,13 +652,14 @@ msgid "Duration"
 msgstr "Förlopp"
 
 #: ../gtk/main.ui.h:32
 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"
 
 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"
 #: ../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:"
 
 msgid "Lookup:"
 msgstr "Sök:"
 

-#: ../gtk/main.ui.h:43
+#: ../gtk/main.ui.h:42

 msgid "My current identity:"
 msgstr "Min nuvarande identitet"
 
 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"
 
 #, 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"
 
 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"
 #: ../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"
 
 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"
 
 #, 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"
 
 msgid "Username"
 msgstr "Användarnamn"
 

-#: ../gtk/main.ui.h:51
-#, fuzzy
-msgid "_Call history"
-msgstr "Samtalshistorik"
-

 #: ../gtk/main.ui.h:52
 msgid "_Help"
 msgstr ""
 #: ../gtk/main.ui.h:52
 msgid "_Help"
 msgstr ""


@@ -644,18 +742,14 @@ msgid "_Homepage"
 msgstr "Hemsidan"
 
 #: ../gtk/main.ui.h:54
 msgstr "Hemsidan"
 
 #: ../gtk/main.ui.h:54

-msgid "_Linphone"
-msgstr "_inphone"
-
-#: ../gtk/main.ui.h:55

 msgid "_Options"
 msgstr ""
 
 msgid "_Options"
 msgstr ""
 

-#: ../gtk/main.ui.h:56
+#: ../gtk/main.ui.h:55

 msgid "in"
 msgstr "i"
 
 msgid "in"
 msgstr "i"
 

-#: ../gtk/main.ui.h:57
+#: ../gtk/main.ui.h:56

 msgid "label"
 msgstr "etikett"
 
 msgid "label"
 msgstr "etikett"
 


@@ -702,15 +796,6 @@ msgstr "SIP Adress"
 msgid "Show this contact presence status"
 msgstr "Visa kontaktens närvarostatus"
 
 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"
 #: ../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
 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):"
 
 #: ../gtk/sip_account.ui.h:7
 msgid "Registration duration (sec):"


@@ -793,11 +878,6 @@ msgstr "sip:"
 msgid "Send"
 msgstr "Skicka"
 
 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\""
 #: ../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
 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>"
 
 #: ../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
 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):"
 
 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"
 
 msgid "Add"
 msgstr "Lägg till"
 

-#: ../gtk/parameters.ui.h:16
+#: ../gtk/parameters.ui.h:17

 msgid "Audio RTP/UDP:"
 msgstr ""
 
 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"
 
 #, 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)"
 
 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)"
 
 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 ""
 
 msgid "CIF"
 msgstr ""
 

-#: ../gtk/parameters.ui.h:22
+#: ../gtk/parameters.ui.h:23

 msgid "Capture device:"
 msgstr "Mikrofon enhet:"
 
 msgid "Capture device:"
 msgstr "Mikrofon enhet:"
 

-#: ../gtk/parameters.ui.h:23
+#: ../gtk/parameters.ui.h:24

 msgid "Codecs"
 msgstr "Codecs"
 
 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"
 
 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"
 
 msgid "Disable"
 msgstr "Inaktivera"
 

-#: ../gtk/parameters.ui.h:26
+#: ../gtk/parameters.ui.h:27

 msgid "Done"
 msgstr "Klar"
 
 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:"
 
 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"
 
 msgid "Edit"
 msgstr "Editera"
 

-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:30

 msgid "Enable"
 msgstr "Möjliggör"
 
 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"
 
 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"
 
 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"
 
 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"
 
 msgid "Multimedia settings"
 msgstr "Multimedia inställningar"
 

-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:37

 msgid "Network settings"
 msgstr "Nätverksinställningar"
 
 msgid "Network settings"
 msgstr "Nätverksinställningar"
 

-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:38

 msgid "Playback device:"
 msgstr "Uppspelningsenhet:"
 
 msgid "Playback device:"
 msgstr "Uppspelningsenhet:"
 

-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:39

 msgid "Prefered video resolution:"
 msgstr "Video upplösning:"
 
 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:"
 
 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 !"
 msgid ""
 "Register to FONICS\n"
 "virtual network !"


@@ -953,100 +1047,104 @@ msgstr ""
 "Registrera hos FONICS\n"
 "virtuella nätverk!"
 
 "Registrera hos FONICS\n"
 "virtuella nätverk!"
 

-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:43

 msgid "Remove"
 msgstr "Ta bort"
 
 msgid "Remove"
 msgstr "Ta bort"
 

-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:44

 msgid "Ring device:"
 msgstr "Ringning enhet:"
 
 msgid "Ring device:"
 msgstr "Ringning enhet:"
 

-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:45

 msgid "Ring sound:"
 msgstr "Ring signal:"
 
 msgid "Ring sound:"
 msgstr "Ring signal:"
 

-#: ../gtk/parameters.ui.h:43
-msgid "SIP (TCP):"
+#: ../gtk/parameters.ui.h:46
+msgid "SIP (TCP)"

 msgstr ""
 
 msgstr ""
 

-#: ../gtk/parameters.ui.h:44
-msgid "SIP (UDP):"
+#: ../gtk/parameters.ui.h:47
+msgid "SIP (TLS)"

 msgstr ""
 
 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"
 
 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):"
 
 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"
 
 msgid "Settings"
 msgstr "Inställningar"
 

-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:52

 msgid "Show advanced settings"
 msgstr "Visa avancerade inställningar"
 
 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:"
 
 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"
 
 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:"
 
 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"
 
 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"
 
 msgid "User interface"
 msgstr "Användarinterface"
 

-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:58

 msgid "Video RTP/UDP:"
 msgstr ""
 
 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"
 
 #, 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:"
 
 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:"
 
 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:"
 
 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:"
 
 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"
 
 #, 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"
 
 msgid "default camera"
 msgstr "default kamera"
 

-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:66

 msgid "default soundcard"
 msgstr "default ljudkort"
 
 msgid "default soundcard"
 msgstr "default ljudkort"
 


@@ -1070,26 +1168,19 @@ msgstr "Linphone"
 msgid "Please wait"
 msgstr "Vänta"
 
 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"
 
 msgid "aborted"
 msgstr "avbrytade"
 

-#: ../coreapi/linphonecore.c:209
+#: ../coreapi/linphonecore.c:190

 msgid "completed"
 msgstr "avslutade"
 
 msgid "completed"
 msgstr "avslutade"
 

-#: ../coreapi/linphonecore.c:212
+#: ../coreapi/linphonecore.c:193

 msgid "missed"
 msgstr "missade"
 
 msgid "missed"
 msgstr "missade"
 

-#: ../coreapi/linphonecore.c:217
+#: ../coreapi/linphonecore.c:198

 #, c-format
 msgid ""
 "%s at %s\n"
 #, c-format
 msgid ""
 "%s at %s\n"


@@ -1104,27 +1195,23 @@ msgstr ""
 "Status: %s\n"
 "Längd: %i min %i sek\n"
 
 "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"
 
 msgid "Outgoing call"
 msgstr "Utgående samtal"
 

-#: ../coreapi/linphonecore.c:998
+#: ../coreapi/linphonecore.c:1088

 msgid "Ready"
 msgstr "Redo"
 
 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..."
 
 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."
 
 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"
 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"
 
 "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"
 
 msgid "Contacting"
 msgstr "Kontaktar"
 

-#: ../coreapi/linphonecore.c:1974
+#: ../coreapi/linphonecore.c:2032

 #, fuzzy
 msgid "Could not call"
 msgstr "Kunde inte ringa"
 
 #, 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 ""
 
 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 ""
 
 msgid "Modifying call parameters..."
 msgstr ""
 

-#: ../coreapi/linphonecore.c:2311
+#: ../coreapi/linphonecore.c:2366

 msgid "Connected."
 msgstr "Kopplad"
 
 msgid "Connected."
 msgstr "Kopplad"
 

-#: ../coreapi/linphonecore.c:2334
+#: ../coreapi/linphonecore.c:2389

 #, fuzzy
 msgid "Call aborted"
 msgstr "avbrytade"
 
 #, 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"
 
 #, 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"
 
 #, 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"
 #: ../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"
 
 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."
 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"
 
 "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"
 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"
 
 "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"
 
 #, 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."
 
 #, fuzzy
 msgid "is contacting you"
 msgstr "kontaktar dig."
 

-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207

 msgid " and asked autoanswer."
 msgstr ""
 
 msgid " and asked autoanswer."
 msgstr ""
 

-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207

 msgid "."
 msgstr ""
 
 msgid "."
 msgstr ""
 

-#: ../coreapi/callbacks.c:226
+#: ../coreapi/callbacks.c:266

 msgid "Remote ringing."
 msgstr "Ringer hos motparten."
 
 msgid "Remote ringing."
 msgstr "Ringer hos motparten."
 

-#: ../coreapi/callbacks.c:242
+#: ../coreapi/callbacks.c:282

 #, fuzzy
 msgid "Remote ringing..."
 msgstr "Ringer hos motparten."
 
 #, fuzzy
 msgid "Remote ringing..."
 msgstr "Ringer hos motparten."
 

-#: ../coreapi/callbacks.c:253
+#: ../coreapi/callbacks.c:293

 msgid "Early media."
 msgstr "Tidig media"
 
 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"
 
 #, 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 ""
 
 #, 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"
 
 #, fuzzy
 msgid "Call resumed."
 msgstr "Samtalet slut"
 

-#: ../coreapi/callbacks.c:322
+#: ../coreapi/callbacks.c:362

 #, c-format
 msgid "Call answered by %s."
 msgstr ""
 
 #, c-format
 msgid "Call answered by %s."
 msgstr ""
 

-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:432

 msgid "We are being paused..."
 msgstr ""
 
 msgid "We are being paused..."
 msgstr ""
 

-#: ../coreapi/callbacks.c:387
+#: ../coreapi/callbacks.c:436

 msgid "We have been resumed..."
 msgstr ""
 
 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."
 
 msgid "Call terminated."
 msgstr "Samtalet slut."
 

-#: ../coreapi/callbacks.c:431
+#: ../coreapi/callbacks.c:480

 msgid "User is busy."
 msgstr "Användare upptagen."
 
 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).");
 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."
 
 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."
 
 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"
 
 #, fuzzy
 msgid "No response."
 msgstr "Inget svar inom angiven tid"
 

-#: ../coreapi/callbacks.c:451
+#: ../coreapi/callbacks.c:500

 msgid "Protocol error."
 msgstr ""
 
 msgid "Protocol error."
 msgstr ""
 

-#: ../coreapi/callbacks.c:467
+#: ../coreapi/callbacks.c:516

 #, fuzzy
 msgid "Redirected"
 msgstr "Omdirigerat till %s..."
 
 #, fuzzy
 msgid "Redirected"
 msgstr "Omdirigerat till %s..."
 

-#: ../coreapi/callbacks.c:477
+#: ../coreapi/callbacks.c:526

 msgid "Not found"
 msgstr ""
 
 msgid "Not found"
 msgstr ""
 

-#: ../coreapi/callbacks.c:487
+#: ../coreapi/callbacks.c:551

 msgid "No common codecs"
 msgstr ""
 
 msgid "No common codecs"
 msgstr ""
 

-#: ../coreapi/callbacks.c:493
+#: ../coreapi/callbacks.c:557

 #, fuzzy
 msgid "Call failed."
 msgstr "Samtalet avböjdes."
 
 #, 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."
 
 #, 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."
 
 #, 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"
 
 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"
 
 #, 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"
 
 #, 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"
 
 #~ 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 (file)
--- 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"
 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"
 "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"
 
 "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"
 #: ../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 通话"
 
 msgid "Chat with %s"
 msgstr "与 %s 通话"
 

-#: ../gtk/main.c:74
+#: ../gtk/main.c:83

 msgid "log to stdout some debug information while running."
 msgstr "运行时向标准输出记录调试信息。"
 
 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 "启动到系统托盘，不显示主界面。"
 
 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 "现在呼叫的地址"
 
 msgid "address to call right now"
 msgstr "现在呼叫的地址"
 

-#: ../gtk/main.c:95
+#: ../gtk/main.c:111

 msgid "if set automatically answer incoming calls"
 msgstr "是否设置呼叫自动应答"
 
 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)"
 
 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 通话"
 
 #, 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"
 #, c-format
 msgid ""
 "%s would like to add you to his contact list.\n"


@@ -67,31 +84,63 @@ msgstr ""
 "您是否允许他看到您的在线状态或者将它加为您的联系人允许?\n"
 "如果您回答否，则会将该人临时性的放入黑名单"
 
 "您是否允许他看到您的在线状态或者将它加为您的联系人允许?\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 的密码："
 
 #, 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 "网站"
 
 msgid "Website link"
 msgstr "网站"
 

-#: ../gtk/main.c:1076
+#: ../gtk/main.c:1205

 msgid "Linphone - a video internet phone"
 msgstr "Linphone - 互联网视频电话"
 
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - 互联网视频电话"
 

-#: ../gtk/main.c:1095
+#: ../gtk/main.c:1295

 #, c-format
 msgid "%s (Default)"
 msgstr "%s (默认)"
 
 #, 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 ""
 
 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."
 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"
 "您无法发送或接收音频呼叫。"
 
 "未在此计算机上检测到声卡。\n"
 "您无法发送或接收音频呼叫。"
 

-#: ../gtk/main.c:1423
+#: ../gtk/main.c:1663

 msgid "A free SIP video-phone"
 msgstr "免费的 SIP 视频电话"
 
 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 "名称"
 
 msgid "Name"
 msgstr "名称"
 

-#: ../gtk/friendlist.c:205
+#: ../gtk/friendlist.c:271

 msgid "Presence status"
 msgstr "在线状态"
 
 msgid "Presence status"
 msgstr "在线状态"
 

-#: ../gtk/friendlist.c:242
+#: ../gtk/friendlist.c:308

 #, c-format
 msgid "Search in %s directory"
 msgstr "在 %s 目录中查找 "
 
 #, c-format
 msgid "Search in %s directory"
 msgstr "在 %s 目录中查找 "
 

-#: ../gtk/friendlist.c:450
+#: ../gtk/friendlist.c:568

 msgid "Invalid sip contact !"
 msgstr "无效的 SIP 联系人！"
 
 msgid "Invalid sip contact !"
 msgstr "无效的 SIP 联系人！"
 

-#: ../gtk/friendlist.c:495
+#: ../gtk/friendlist.c:613

 #, c-format
 msgid "Call %s"
 msgstr "呼叫 %s"
 
 #, c-format
 msgid "Call %s"
 msgstr "呼叫 %s"
 

-#: ../gtk/friendlist.c:496
+#: ../gtk/friendlist.c:614

 #, c-format
 msgid "Send text to %s"
 msgstr "发送消息给 %s"
 
 #, 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"
 
 #, c-format
 msgid "Edit contact '%s'"
 msgstr "编辑联系人 %s"
 

-#: ../gtk/friendlist.c:498
+#: ../gtk/friendlist.c:616

 #, c-format
 msgid "Delete contact '%s'"
 msgstr "删除联系人 %s"
 
 #, 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 目录增加联系人 "
 
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr "从 %s 目录增加联系人 "
 

-#: ../gtk/propertybox.c:277
+#: ../gtk/propertybox.c:302

 msgid "Rate (Hz)"
 msgstr "采样率(Hz)"
 
 msgid "Rate (Hz)"
 msgstr "采样率(Hz)"
 

-#: ../gtk/propertybox.c:283
+#: ../gtk/propertybox.c:308

 msgid "Status"
 msgstr "状态"
 
 msgid "Status"
 msgstr "状态"
 

-#: ../gtk/propertybox.c:289
+#: ../gtk/propertybox.c:314

 msgid "Min bitrate (kbit/s)"
 msgstr "最小比特率(kbit/s)"
 
 msgid "Min bitrate (kbit/s)"
 msgstr "最小比特率(kbit/s)"
 

-#: ../gtk/propertybox.c:296
+#: ../gtk/propertybox.c:321

 msgid "Parameters"
 msgstr "参数"
 
 msgid "Parameters"
 msgstr "参数"
 

-#: ../gtk/propertybox.c:326 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507

 msgid "Enabled"
 msgstr "启用"
 
 msgid "Enabled"
 msgstr "启用"
 

-#: ../gtk/propertybox.c:327 ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507

 msgid "Disabled"
 msgstr "禁用"
 
 msgid "Disabled"
 msgstr "禁用"
 

-#: ../gtk/propertybox.c:510
+#: ../gtk/propertybox.c:553

 msgid "Account"
 msgstr "帐户"
 
 msgid "Account"
 msgstr "帐户"
 

-#: ../gtk/propertybox.c:650
+#: ../gtk/propertybox.c:693

 msgid "English"
 msgstr "英语"
 
 msgid "English"
 msgstr "英语"
 

-#: ../gtk/propertybox.c:651
+#: ../gtk/propertybox.c:694

 msgid "French"
 msgstr "法语"
 
 msgid "French"
 msgstr "法语"
 

-#: ../gtk/propertybox.c:652
+#: ../gtk/propertybox.c:695

 msgid "Swedish"
 msgstr "瑞典语"
 
 msgid "Swedish"
 msgstr "瑞典语"
 

-#: ../gtk/propertybox.c:653
+#: ../gtk/propertybox.c:696

 msgid "Italian"
 msgstr "意大利语"
 
 msgid "Italian"
 msgstr "意大利语"
 

-#: ../gtk/propertybox.c:654
+#: ../gtk/propertybox.c:697

 msgid "Spanish"
 msgstr "西班牙语"
 
 msgid "Spanish"
 msgstr "西班牙语"
 

-#: ../gtk/propertybox.c:655
+#: ../gtk/propertybox.c:698

 msgid "Brazilian Portugese"
 msgstr "巴西葡萄牙语"
 
 msgid "Brazilian Portugese"
 msgstr "巴西葡萄牙语"
 

-#: ../gtk/propertybox.c:656
+#: ../gtk/propertybox.c:699

 msgid "Polish"
 msgstr "波兰语"
 
 msgid "Polish"
 msgstr "波兰语"
 

-#: ../gtk/propertybox.c:657
+#: ../gtk/propertybox.c:700

 msgid "German"
 msgstr "德语"
 
 msgid "German"
 msgstr "德语"
 

-#: ../gtk/propertybox.c:658
+#: ../gtk/propertybox.c:701

 msgid "Russian"
 msgstr "俄语"
 
 msgid "Russian"
 msgstr "俄语"
 

-#: ../gtk/propertybox.c:659
+#: ../gtk/propertybox.c:702

 msgid "Japanese"
 msgstr "日语"
 
 msgid "Japanese"
 msgstr "日语"
 

-#: ../gtk/propertybox.c:660
+#: ../gtk/propertybox.c:703

 msgid "Dutch"
 msgstr "荷兰语"
 
 msgid "Dutch"
 msgstr "荷兰语"
 

-#: ../gtk/propertybox.c:661
+#: ../gtk/propertybox.c:704

 msgid "Hungarian"
 msgstr "匈牙利语"
 
 msgid "Hungarian"
 msgstr "匈牙利语"
 

-#: ../gtk/propertybox.c:662
+#: ../gtk/propertybox.c:705

 msgid "Czech"
 msgstr "捷克语"
 
 msgid "Czech"
 msgstr "捷克语"
 

-#: ../gtk/propertybox.c:663
+#: ../gtk/propertybox.c:706

 msgid "Chinese"
 msgstr "中文"
 
 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 以使语言选择生效。"
 
 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 ""
 #: ../gtk/update.c:80
 #, c-format
 msgid ""


@@ -350,75 +423,102 @@ msgstr "正在创建您的帐户"
 msgid "Now ready !"
 msgstr "就绪！"
 
 msgid "Now ready !"
 msgstr "就绪！"
 

-#: ../gtk/incall_view.c:61
+#: ../gtk/incall_view.c:69

 #, fuzzy, c-format
 msgid "Call #%i"
 msgstr "呼叫 %s"
 
 #, 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 ""
 
 #, c-format
 msgid "Transfer to call #%i with %s"
 msgstr ""
 

-#: ../gtk/incall_view.c:113
+#: ../gtk/incall_view.c:155

 msgid "Transfer"
 msgstr ""
 
 msgid "Transfer"
 msgstr ""
 

-#: ../gtk/incall_view.c:187
+#: ../gtk/incall_view.c:271

 msgid "<b>Calling...</b>"
 msgstr "<b>正在呼叫...</b>"
 
 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"
 
 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 "呼入"
 
 #, 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 ""
 
 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 ""
 
 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>"
 
 #, 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>"
 
 #, 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"
 
 #, 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>"
 
 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 ""
 
 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 ""
 
 msgid "Pause"
 msgstr ""
 


@@ -480,8 +580,9 @@ msgid "<b>Add contacts from directory</b>"
 msgstr "<b>从目录增加联系人</b>"
 
 #: ../gtk/main.ui.h:14
 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>"
 
 #: ../gtk/main.ui.h:15
 msgid "<b>Welcome !</b>"


@@ -505,26 +606,26 @@ msgid "All users"
 msgstr ""
 
 #: ../gtk/main.ui.h:21
 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 "自动登录"
 
 msgid "Automatically log me in"
 msgstr "自动登录"
 

-#: ../gtk/main.ui.h:24
+#: ../gtk/main.ui.h:22

 msgid "B"
 msgstr "B"
 
 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"
 
 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"
 #: ../gtk/main.ui.h:26
 #, fuzzy
 msgid "Check _Updates"


@@ -538,10 +639,6 @@ msgstr "联系人"
 msgid "D"
 msgstr "D"
 
 msgid "D"
 msgstr "D"
 

-#: ../gtk/main.ui.h:29
-msgid "Decline"
-msgstr "拒绝"
-

 #: ../gtk/main.ui.h:30
 msgid "Default"
 msgstr "默认"
 #: ../gtk/main.ui.h:30
 msgid "Default"
 msgstr "默认"


@@ -551,13 +648,14 @@ msgid "Duration"
 msgstr "通话时间"
 
 #: ../gtk/main.ui.h:32
 msgstr "通话时间"
 
 #: ../gtk/main.ui.h:32

-msgid "Duration:"
-msgstr "通话计时："
-
-#: ../gtk/main.ui.h:33

 msgid "Enable self-view"
 msgstr "启用自视"
 
 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 地址"
 #: ../gtk/main.ui.h:34
 msgid "Enter username, phone number, or full sip address"
 msgstr "请输入用户名、电话号码或完整的 SIP 地址"


@@ -593,21 +691,26 @@ msgstr "登录信息"
 msgid "Lookup:"
 msgstr "查找："
 
 msgid "Lookup:"
 msgstr "查找："
 

-#: ../gtk/main.ui.h:43
+#: ../gtk/main.ui.h:42

 msgid "My current identity:"
 msgstr "当前地址："
 
 msgid "My current identity:"
 msgstr "当前地址："
 

-#: ../gtk/main.ui.h:44
+#: ../gtk/main.ui.h:43

 #, fuzzy
 msgid "Online users"
 msgstr ""
 "全部用户\n"
 "在线用户"
 
 #, fuzzy
 msgid "Online users"
 msgstr ""
 "全部用户\n"
 "在线用户"
 

-#: ../gtk/main.ui.h:45
+#: ../gtk/main.ui.h:44

 msgid "Password"
 msgstr "密码"
 
 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 地址或电话号码："
 #: ../gtk/main.ui.h:47
 msgid "SIP address or phone number:"
 msgstr "SIP 地址或电话号码："


@@ -616,20 +719,15 @@ msgstr "SIP 地址或电话号码："
 msgid "Search"
 msgstr "搜索"
 
 msgid "Search"
 msgstr "搜索"
 

-#: ../gtk/main.ui.h:49
+#: ../gtk/main.ui.h:50

 #, fuzzy
 msgid "Show debug window"
 msgstr "Linphone 调试窗口"
 
 #, fuzzy
 msgid "Show debug window"
 msgstr "Linphone 调试窗口"
 

-#: ../gtk/main.ui.h:50
+#: ../gtk/main.ui.h:51

 msgid "Username"
 msgstr "用户名"
 
 msgid "Username"
 msgstr "用户名"
 

-#: ../gtk/main.ui.h:51
-#, fuzzy
-msgid "_Call history"
-msgstr "呼叫历史"
-

 #: ../gtk/main.ui.h:52
 msgid "_Help"
 msgstr ""
 #: ../gtk/main.ui.h:52
 msgid "_Help"
 msgstr ""


@@ -640,18 +738,14 @@ msgid "_Homepage"
 msgstr "主页"
 
 #: ../gtk/main.ui.h:54
 msgstr "主页"
 
 #: ../gtk/main.ui.h:54

-msgid "_Linphone"
-msgstr "_Linphone"
-
-#: ../gtk/main.ui.h:55

 msgid "_Options"
 msgstr ""
 
 msgid "_Options"
 msgstr ""
 

-#: ../gtk/main.ui.h:56
+#: ../gtk/main.ui.h:55

 msgid "in"
 msgstr "于"
 
 msgid "in"
 msgstr "于"
 

-#: ../gtk/main.ui.h:57
+#: ../gtk/main.ui.h:56

 msgid "label"
 msgstr "标签"
 
 msgid "label"
 msgstr "标签"
 


@@ -710,14 +804,6 @@ msgstr "SIP 地址"
 msgid "Show this contact presence status"
 msgstr "显示该联系人的在线状态"
 
 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 调试窗口"
 #: ../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
 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):"
 
 #: ../gtk/sip_account.ui.h:7
 msgid "Registration duration (sec):"


@@ -800,10 +886,6 @@ msgstr "sip:"
 msgid "Send"
 msgstr "发送"
 
 msgid "Send"
 msgstr "发送"
 

-#: ../gtk/chatroom.ui.h:2
-msgid "gtk-close"
-msgstr ""
-

 #: ../gtk/parameters.ui.h:1
 msgid "0 stands for \"unlimited\""
 msgstr "0 表示 “没有限制”"
 #: ../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
 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>"
 
 #: ../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
 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 特殊设备(可选)："
 
 msgid "ALSA special device (optional):"
 msgstr "ALSA 特殊设备(可选)："
 

-#: ../gtk/parameters.ui.h:15
+#: ../gtk/parameters.ui.h:16

 msgid "Add"
 msgstr "添加"
 
 msgid "Add"
 msgstr "添加"
 

-#: ../gtk/parameters.ui.h:16
+#: ../gtk/parameters.ui.h:17

 msgid "Audio RTP/UDP:"
 msgstr "音频 RTP/UDP："
 
 msgid "Audio RTP/UDP:"
 msgstr "音频 RTP/UDP："
 

-#: ../gtk/parameters.ui.h:17
+#: ../gtk/parameters.ui.h:18

 #, fuzzy
 msgid "Audio codecs"
 msgstr ""
 "音频编解码器\n"
 "视频编解码器"
 
 #, 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)"
 
 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 解决)"
 
 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"
 
 msgid "CIF"
 msgstr "CIF"
 

-#: ../gtk/parameters.ui.h:22
+#: ../gtk/parameters.ui.h:23

 msgid "Capture device:"
 msgstr "录音设备："
 
 msgid "Capture device:"
 msgstr "录音设备："
 

-#: ../gtk/parameters.ui.h:23
+#: ../gtk/parameters.ui.h:24

 msgid "Codecs"
 msgstr "编解码器"
 
 msgid "Codecs"
 msgstr "编解码器"
 

-#: ../gtk/parameters.ui.h:24
+#: ../gtk/parameters.ui.h:25

 msgid "Direct connection to the Internet"
 msgstr "直接连接到互联网"
 
 msgid "Direct connection to the Internet"
 msgstr "直接连接到互联网"
 

-#: ../gtk/parameters.ui.h:25
+#: ../gtk/parameters.ui.h:26

 msgid "Disable"
 msgstr "禁用"
 
 msgid "Disable"
 msgstr "禁用"
 

-#: ../gtk/parameters.ui.h:26
+#: ../gtk/parameters.ui.h:27

 msgid "Done"
 msgstr "完成"
 
 msgid "Done"
 msgstr "完成"
 

-#: ../gtk/parameters.ui.h:27
+#: ../gtk/parameters.ui.h:28

 msgid "Download speed limit in Kbit/sec:"
 msgstr "下载速率限制 kbit/s："
 
 msgid "Download speed limit in Kbit/sec:"
 msgstr "下载速率限制 kbit/s："
 

-#: ../gtk/parameters.ui.h:28
+#: ../gtk/parameters.ui.h:29

 msgid "Edit"
 msgstr "编辑"
 
 msgid "Edit"
 msgstr "编辑"
 

-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:30

 msgid "Enable"
 msgstr "启用"
 
 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 "启用回声抑制"
 
 msgid "Enable echo cancellation"
 msgstr "启用回声抑制"
 

-#: ../gtk/parameters.ui.h:31
+#: ../gtk/parameters.ui.h:33

 msgid "Erase all passwords"
 msgstr "清除所有密码"
 
 msgid "Erase all passwords"
 msgstr "清除所有密码"
 

-#: ../gtk/parameters.ui.h:32
+#: ../gtk/parameters.ui.h:34

 msgid "Manage SIP Accounts"
 msgstr "SIP 帐户管理"
 
 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 "音视频设置"
 
 msgid "Multimedia settings"
 msgstr "音视频设置"
 

-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:37

 msgid "Network settings"
 msgstr "网络设置"
 
 msgid "Network settings"
 msgstr "网络设置"
 

-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:38

 msgid "Playback device:"
 msgstr "回放设备："
 
 msgid "Playback device:"
 msgstr "回放设备："
 

-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:39

 msgid "Prefered video resolution:"
 msgstr "视频分辨率："
 
 msgid "Prefered video resolution:"
 msgstr "视频分辨率："
 

-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:40

 msgid "Public IP address:"
 msgstr "公网 IP 地址："
 
 msgid "Public IP address:"
 msgstr "公网 IP 地址："
 

-#: ../gtk/parameters.ui.h:38
+#: ../gtk/parameters.ui.h:41

 msgid ""
 "Register to FONICS\n"
 "virtual network !"
 msgid ""
 "Register to FONICS\n"
 "virtual network !"


@@ -959,100 +1055,106 @@ msgstr ""
 "注册到 FONICS\n"
 "虚拟网络!"
 
 "注册到 FONICS\n"
 "虚拟网络!"
 

-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:43

 msgid "Remove"
 msgstr "移除"
 
 msgid "Remove"
 msgstr "移除"
 

-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:44

 msgid "Ring device:"
 msgstr "响铃设备："
 
 msgid "Ring device:"
 msgstr "响铃设备："
 

-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:45

 msgid "Ring sound:"
 msgstr "铃声文件："
 
 msgid "Ring sound:"
 msgstr "铃声文件："
 

-#: ../gtk/parameters.ui.h:43
+#: ../gtk/parameters.ui.h:46

 #, fuzzy
 #, fuzzy

-msgid "SIP (TCP):"
+msgid "SIP (TCP)"

 msgstr "SIP (UDP)："
 
 msgstr "SIP (UDP)："
 

-#: ../gtk/parameters.ui.h:44
-msgid "SIP (UDP):"
+#: ../gtk/parameters.ui.h:47
+#, fuzzy
+msgid "SIP (TLS)"

 msgstr "SIP (UDP)："
 
 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"
 
 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)："
 
 msgid "Set Maximum Transmission Unit:"
 msgstr "设置最大传输单元(MTU)："
 

-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:51

 msgid "Settings"
 msgstr "设置"
 
 msgid "Settings"
 msgstr "设置"
 

-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:52

 msgid "Show advanced settings"
 msgstr "显示高级设置"
 
 msgid "Show advanced settings"
 msgstr "显示高级设置"
 

-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:53

 msgid "Stun server:"
 msgstr "Stun 服务器："
 
 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地址"
 
 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："
 
 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"
 
 msgid "Use IPv6 instead of IPv4"
 msgstr "使用 IPv6 而非 IPv4"
 

-#: ../gtk/parameters.ui.h:53
+#: ../gtk/parameters.ui.h:57

 msgid "User interface"
 msgstr "用户界面"
 
 msgid "User interface"
 msgstr "用户界面"
 

-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:58

 msgid "Video RTP/UDP:"
 msgstr "视频 RTP/UDP："
 
 msgid "Video RTP/UDP:"
 msgstr "视频 RTP/UDP："
 

-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:59

 #, fuzzy
 msgid "Video codecs"
 msgstr ""
 "音频编解码器\n"
 "视频编解码器"
 
 #, fuzzy
 msgid "Video codecs"
 msgstr ""
 "音频编解码器\n"
 "视频编解码器"
 

-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:60

 msgid "Video input device:"
 msgstr "视频输入设备："
 
 msgid "Video input device:"
 msgstr "视频输入设备："
 

-#: ../gtk/parameters.ui.h:57
+#: ../gtk/parameters.ui.h:61

 msgid "Your display name (eg: John Doe):"
 msgstr "您的显示名："
 
 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 地址结果："
 
 msgid "Your resulting SIP address:"
 msgstr "您的 SIP 地址结果："
 

-#: ../gtk/parameters.ui.h:59
+#: ../gtk/parameters.ui.h:63

 msgid "Your username:"
 msgstr "您的用户名："
 
 msgid "Your username:"
 msgstr "您的用户名："
 

-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:64

 #, fuzzy
 msgid "a sound card"
 msgstr "声卡\n"
 
 #, fuzzy
 msgid "a sound card"
 msgstr "声卡\n"
 

-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:65

 msgid "default camera"
 msgstr "默认摄像头"
 
 msgid "default camera"
 msgstr "默认摄像头"
 

-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:66

 msgid "default soundcard"
 msgstr "默认声卡"
 
 msgid "default soundcard"
 msgstr "默认声卡"
 


@@ -1076,25 +1178,19 @@ msgstr "Linphone"
 msgid "Please wait"
 msgstr "请稍候"
 
 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 "中断"
 
 msgid "aborted"
 msgstr "中断"
 

-#: ../coreapi/linphonecore.c:209
+#: ../coreapi/linphonecore.c:190

 msgid "completed"
 msgstr "完成"
 
 msgid "completed"
 msgstr "完成"
 

-#: ../coreapi/linphonecore.c:212
+#: ../coreapi/linphonecore.c:193

 msgid "missed"
 msgstr "丢失"
 
 msgid "missed"
 msgstr "丢失"
 

-#: ../coreapi/linphonecore.c:217
+#: ../coreapi/linphonecore.c:198

 #, c-format
 msgid ""
 "%s at %s\n"
 #, c-format
 msgid ""
 "%s at %s\n"


@@ -1109,27 +1205,23 @@ msgstr ""
 "状态：%s\n"
 "状态：%i 分 %i 秒\n"
 
 "状态：%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 "呼出"
 
 msgid "Outgoing call"
 msgstr "呼出"
 

-#: ../coreapi/linphonecore.c:998
+#: ../coreapi/linphonecore.c:1088

 msgid "Ready"
 msgstr "就绪"
 
 msgid "Ready"
 msgstr "就绪"
 

-#: ../coreapi/linphonecore.c:1773
+#: ../coreapi/linphonecore.c:1831

 msgid "Looking for telephone number destination..."
 msgstr "查询电话号码目的地..."
 
 msgid "Looking for telephone number destination..."
 msgstr "查询电话号码目的地..."
 

-#: ../coreapi/linphonecore.c:1776
+#: ../coreapi/linphonecore.c:1834

 msgid "Could not resolve this number."
 msgstr "该号码无法解析。"
 
 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"
 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:用户名@域名"
 
 "无法解析给定的 SIP 地址，SIP 地址应有如下格式：\n"
 "sip:用户名@域名"
 

-#: ../coreapi/linphonecore.c:1967
+#: ../coreapi/linphonecore.c:2025

 msgid "Contacting"
 msgstr "联系中"
 
 msgid "Contacting"
 msgstr "联系中"
 

-#: ../coreapi/linphonecore.c:1974
+#: ../coreapi/linphonecore.c:2032

 #, fuzzy
 msgid "Could not call"
 msgstr "无法呼叫"
 
 #, 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 ""
 
 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 ""
 
 msgid "Modifying call parameters..."
 msgstr ""
 

-#: ../coreapi/linphonecore.c:2311
+#: ../coreapi/linphonecore.c:2366

 msgid "Connected."
 msgstr "已连接。"
 
 msgid "Connected."
 msgstr "已连接。"
 

-#: ../coreapi/linphonecore.c:2334
+#: ../coreapi/linphonecore.c:2389

 #, fuzzy
 msgid "Call aborted"
 msgstr "中断"
 
 #, 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 "无法呼叫"
 
 #, fuzzy
 msgid "Could not pause the call"
 msgstr "无法呼叫"
 

-#: ../coreapi/linphonecore.c:2460
+#: ../coreapi/linphonecore.c:2535

 msgid "Pausing the current call..."
 msgstr ""
 
 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"
 #: ../coreapi/misc.c:147
 msgid ""
 "Your computer appears to be using ALSA sound drivers.\n"


@@ -1258,13 +1338,13 @@ msgstr "挂起"
 msgid "Unknown-bug"
 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:”开头，并紧随一个主机名。"
 
 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"
 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"
 
 "您输入的地址无效。\n"
 "它应具有“sip:用户名@代理域”的形式，例如 sip:alice@example.net"
 

-#: ../coreapi/proxy.c:671
+#: ../coreapi/proxy.c:690

 #, c-format
 msgid "Could not login as %s"
 msgstr "无法登录为 %s"
 
 #, c-format
 msgid "Could not login as %s"
 msgstr "无法登录为 %s"
 

-#: ../coreapi/callbacks.c:170
+#: ../coreapi/callbacks.c:206

 msgid "is contacting you"
 msgstr "正在联系您"
 
 msgid "is contacting you"
 msgstr "正在联系您"
 

-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207

 msgid " and asked autoanswer."
 msgstr " 并询问了自动回答。"
 
 msgid " and asked autoanswer."
 msgstr " 并询问了自动回答。"
 

-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207

 msgid "."
 msgstr "."
 
 msgid "."
 msgstr "."
 

-#: ../coreapi/callbacks.c:226
+#: ../coreapi/callbacks.c:266

 msgid "Remote ringing."
 msgstr "响铃。"
 
 msgid "Remote ringing."
 msgstr "响铃。"
 

-#: ../coreapi/callbacks.c:242
+#: ../coreapi/callbacks.c:282

 #, fuzzy
 msgid "Remote ringing..."
 msgstr "响铃。"
 
 #, fuzzy
 msgid "Remote ringing..."
 msgstr "响铃。"
 

-#: ../coreapi/callbacks.c:253
+#: ../coreapi/callbacks.c:293

 msgid "Early media."
 msgstr ""
 
 msgid "Early media."
 msgstr ""
 

-#: ../coreapi/callbacks.c:291
+#: ../coreapi/callbacks.c:331

 #, fuzzy, c-format
 msgid "Call with %s is paused."
 msgstr "与 %s 通话"
 
 #, 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 ""
 
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr ""
 

-#: ../coreapi/callbacks.c:317
+#: ../coreapi/callbacks.c:357

 #, fuzzy
 msgid "Call resumed."
 msgstr "呼叫结束"
 
 #, fuzzy
 msgid "Call resumed."
 msgstr "呼叫结束"
 

-#: ../coreapi/callbacks.c:322
+#: ../coreapi/callbacks.c:362

 #, c-format
 msgid "Call answered by %s."
 msgstr ""
 
 #, c-format
 msgid "Call answered by %s."
 msgstr ""
 

-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:432

 msgid "We are being paused..."
 msgstr ""
 
 msgid "We are being paused..."
 msgstr ""
 

-#: ../coreapi/callbacks.c:387
+#: ../coreapi/callbacks.c:436

 msgid "We have been resumed..."
 msgstr ""
 
 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 "通话结束。"
 
 msgid "Call terminated."
 msgstr "通话结束。"
 

-#: ../coreapi/callbacks.c:431
+#: ../coreapi/callbacks.c:480

 msgid "User is busy."
 msgstr "被叫正忙。"
 
 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).");
 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 "用户已开启免打扰功能。"
 
 msgid "User does not want to be disturbed."
 msgstr "用户已开启免打扰功能。"
 

-#: ../coreapi/callbacks.c:435
+#: ../coreapi/callbacks.c:484

 msgid "Call declined."
 msgstr "呼叫被拒绝。"
 
 msgid "Call declined."
 msgstr "呼叫被拒绝。"
 

-#: ../coreapi/callbacks.c:447
+#: ../coreapi/callbacks.c:496

 msgid "No response."
 msgstr "没有响应。"
 
 msgid "No response."
 msgstr "没有响应。"
 

-#: ../coreapi/callbacks.c:451
+#: ../coreapi/callbacks.c:500

 msgid "Protocol error."
 msgstr "协议错误。"
 
 msgid "Protocol error."
 msgstr "协议错误。"
 

-#: ../coreapi/callbacks.c:467
+#: ../coreapi/callbacks.c:516

 msgid "Redirected"
 msgstr "已重定向"
 
 msgid "Redirected"
 msgstr "已重定向"
 

-#: ../coreapi/callbacks.c:477
+#: ../coreapi/callbacks.c:526

 msgid "Not found"
 msgstr "未找到"
 
 msgid "Not found"
 msgstr "未找到"
 

-#: ../coreapi/callbacks.c:487
+#: ../coreapi/callbacks.c:551

 msgid "No common codecs"
 msgstr "未找到常用编解码器"
 
 msgid "No common codecs"
 msgstr "未找到常用编解码器"
 

-#: ../coreapi/callbacks.c:493
+#: ../coreapi/callbacks.c:557

 msgid "Call failed."
 msgstr "呼叫失败。"
 
 msgid "Call failed."
 msgstr "呼叫失败。"
 

-#: ../coreapi/callbacks.c:557
+#: ../coreapi/callbacks.c:631

 #, c-format
 msgid "Registration on %s successful."
 msgstr "成功注册到 %s"
 
 #, 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 解除注册。"
 
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "已在 %s 解除注册。"
 

-#: ../coreapi/callbacks.c:574
+#: ../coreapi/callbacks.c:648

 msgid "no response timeout"
 msgstr "没有响应，超时"
 
 msgid "no response timeout"
 msgstr "没有响应，超时"
 

-#: ../coreapi/callbacks.c:577
+#: ../coreapi/callbacks.c:651

 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "注册到 %s 失败: %s"
 
 #, 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 - 需要认证"
 
 #, 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 编码器"
 
 #~ 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 (file)
--- 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"
 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"
 "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"
 
 "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"
 #, 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 聊天"
 
 msgid "Chat with %s"
 msgstr "和 %s 聊天"
 

-#: ../gtk/main.c:74
+#: ../gtk/main.c:83

 msgid "log to stdout some debug information while running."
 msgstr "執行時將一些除錯資訊記錄到標準輸出。"
 
 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 "只在系統匣啟動，不要顯示主要介面。"
 
 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 "現在要打電話的位址"
 
 msgid "address to call right now"
 msgstr "現在要打電話的位址"
 

-#: ../gtk/main.c:95
+#: ../gtk/main.c:111

 msgid "if set automatically answer incoming calls"
 msgstr "如啟用此項，將會自動接聽來電"
 
 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 通話"
 
 #, 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"
 #, 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"
 "如果您回答否，這個人會被暫時列入黑名單。"
 
 "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"
 #, 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> 的密碼："
 
 "請輸入您使用者名稱 <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 "網站連結"
 
 msgid "Website link"
 msgstr "網站連結"
 

-#: ../gtk/main.c:1075
+#: ../gtk/main.c:1205

 msgid "Linphone - a video internet phone"
 msgstr "Linphone - 網路視訊電話"
 
 msgid "Linphone - a video internet phone"
 msgstr "Linphone - 網路視訊電話"
 

-#: ../gtk/main.c:1094
+#: ../gtk/main.c:1295

 #, c-format
 msgid "%s (Default)"
 msgstr "%s （預設值）"
 
 #, 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."
 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"
 "您將無法傳送或接收語音電話。"
 
 "在這臺電腦中偵測不到音效卡。\n"
 "您將無法傳送或接收語音電話。"
 

-#: ../gtk/main.c:1422
+#: ../gtk/main.c:1663

 msgid "A free SIP video-phone"
 msgstr "自由的 SIP 視訊電話"
 
 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 "名稱"
 
 msgid "Name"
 msgstr "名稱"
 

-#: ../gtk/friendlist.c:205
+#: ../gtk/friendlist.c:271

 msgid "Presence status"
 msgstr "上線狀態"
 
 msgid "Presence status"
 msgstr "上線狀態"
 

-#: ../gtk/friendlist.c:242
+#: ../gtk/friendlist.c:308

 #, c-format
 msgid "Search in %s directory"
 msgstr "在 %s 目錄中搜尋"
 
 #, c-format
 msgid "Search in %s directory"
 msgstr "在 %s 目錄中搜尋"
 

-#: ../gtk/friendlist.c:450
+#: ../gtk/friendlist.c:568

 msgid "Invalid sip contact !"
 msgstr "無效的 sip 連絡人！"
 
 msgid "Invalid sip contact !"
 msgstr "無效的 sip 連絡人！"
 

-#: ../gtk/friendlist.c:495
+#: ../gtk/friendlist.c:613

 #, c-format
 msgid "Call %s"
 msgstr "播打給 %s"
 
 #, c-format
 msgid "Call %s"
 msgstr "播打給 %s"
 

-#: ../gtk/friendlist.c:496
+#: ../gtk/friendlist.c:614

 #, c-format
 msgid "Send text to %s"
 msgstr "傳送文字給 %s"
 
 #, 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」"
 
 #, c-format
 msgid "Edit contact '%s'"
 msgstr "編輯連絡人「%s」"
 

-#: ../gtk/friendlist.c:498
+#: ../gtk/friendlist.c:616

 #, c-format
 msgid "Delete contact '%s'"
 msgstr "刪除連絡人「%s」"
 
 #, 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 目錄加入新的連絡人"
 
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr "從 %s 目錄加入新的連絡人"
 

-#: ../gtk/propertybox.c:277
+#: ../gtk/propertybox.c:302

 msgid "Rate (Hz)"
 msgstr "頻率 (Hz)"
 
 msgid "Rate (Hz)"
 msgstr "頻率 (Hz)"
 

-#: ../gtk/propertybox.c:283
+#: ../gtk/propertybox.c:308

 msgid "Status"
 msgstr "狀態"
 
 msgid "Status"
 msgstr "狀態"
 

-#: ../gtk/propertybox.c:289
+#: ../gtk/propertybox.c:314

 msgid "Min bitrate (kbit/s)"
 msgstr "最小頻寬 (kbit/s)"
 
 msgid "Min bitrate (kbit/s)"
 msgstr "最小頻寬 (kbit/s)"
 

-#: ../gtk/propertybox.c:296
+#: ../gtk/propertybox.c:321

 msgid "Parameters"
 msgstr "參數"
 
 msgid "Parameters"
 msgstr "參數"
 

-#: ../gtk/propertybox.c:326
-#: ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:364 ../gtk/propertybox.c:507

 msgid "Enabled"
 msgstr "已啟用"
 
 msgid "Enabled"
 msgstr "已啟用"
 

-#: ../gtk/propertybox.c:327
-#: ../gtk/propertybox.c:465
+#: ../gtk/propertybox.c:366 ../gtk/propertybox.c:507

 msgid "Disabled"
 msgstr "已停用"
 
 msgid "Disabled"
 msgstr "已停用"
 

-#: ../gtk/propertybox.c:510
+#: ../gtk/propertybox.c:553

 msgid "Account"
 msgstr "帳號"
 
 msgid "Account"
 msgstr "帳號"
 

-#: ../gtk/propertybox.c:650
+#: ../gtk/propertybox.c:693

 msgid "English"
 msgstr "英語"
 
 msgid "English"
 msgstr "英語"
 

-#: ../gtk/propertybox.c:651
+#: ../gtk/propertybox.c:694

 msgid "French"
 msgstr "法語"
 
 msgid "French"
 msgstr "法語"
 

-#: ../gtk/propertybox.c:652
+#: ../gtk/propertybox.c:695

 msgid "Swedish"
 msgstr "瑞典語"
 
 msgid "Swedish"
 msgstr "瑞典語"
 

-#: ../gtk/propertybox.c:653
+#: ../gtk/propertybox.c:696

 msgid "Italian"
 msgstr "義大利語"
 
 msgid "Italian"
 msgstr "義大利語"
 

-#: ../gtk/propertybox.c:654
+#: ../gtk/propertybox.c:697

 msgid "Spanish"
 msgstr "西班牙語"
 
 msgid "Spanish"
 msgstr "西班牙語"
 

-#: ../gtk/propertybox.c:655
+#: ../gtk/propertybox.c:698

 msgid "Brazilian Portugese"
 msgstr "巴西葡萄牙語"
 
 msgid "Brazilian Portugese"
 msgstr "巴西葡萄牙語"
 

-#: ../gtk/propertybox.c:656
+#: ../gtk/propertybox.c:699

 msgid "Polish"
 msgstr "波蘭語"
 
 msgid "Polish"
 msgstr "波蘭語"
 

-#: ../gtk/propertybox.c:657
+#: ../gtk/propertybox.c:700

 msgid "German"
 msgstr "德語"
 
 msgid "German"
 msgstr "德語"
 

-#: ../gtk/propertybox.c:658
+#: ../gtk/propertybox.c:701

 msgid "Russian"
 msgstr "俄語"
 
 msgid "Russian"
 msgstr "俄語"
 

-#: ../gtk/propertybox.c:659
+#: ../gtk/propertybox.c:702

 msgid "Japanese"
 msgstr "日語"
 
 msgid "Japanese"
 msgstr "日語"
 

-#: ../gtk/propertybox.c:660
+#: ../gtk/propertybox.c:703

 msgid "Dutch"
 msgstr "荷蘭語"
 
 msgid "Dutch"
 msgstr "荷蘭語"
 

-#: ../gtk/propertybox.c:661
+#: ../gtk/propertybox.c:704

 msgid "Hungarian"
 msgstr "匈牙利語"
 
 msgid "Hungarian"
 msgstr "匈牙利語"
 

-#: ../gtk/propertybox.c:662
+#: ../gtk/propertybox.c:705

 msgid "Czech"
 msgstr "捷克語"
 
 msgid "Czech"
 msgstr "捷克語"
 

-#: ../gtk/propertybox.c:663
+#: ../gtk/propertybox.c:706

 msgid "Chinese"
 msgstr "中文"
 
 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 才能讓新選擇的語言生效。"
 
 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 ""
 #: ../gtk/update.c:80
 #, c-format
 msgid ""


@@ -305,8 +377,7 @@ msgstr "使用者名稱："
 msgid "Checking if '%s' is available..."
 msgstr "檢查「%s」是否可用…"
 
 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 "請稍候..."
 
 msgid "Please wait..."
 msgstr "請稍候..."
 


@@ -314,13 +385,11 @@ msgstr "請稍候..."
 msgid "Sorry this username already exists. Please try a new one."
 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 "確定！"
 
 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 "連線問題，請稍後再試一次。"
 
 msgid "Communication problem, please try again later."
 msgstr "連線問題，請稍後再試一次。"
 


@@ -356,68 +425,99 @@ msgstr "正在建立您的帳號"
 msgid "Now ready !"
 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 "轉接"
 
 msgid "Transfer"
 msgstr "轉接"
 

-#: ../gtk/incall_view.c:187
+#: ../gtk/incall_view.c:271

 msgid "<b>Calling...</b>"
 msgstr "<b>播打...</b>"
 
 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"
 
 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>"
 
 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 ""
 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>"
 
 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>"
 
 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"
 
 #, 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>"
 
 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 "繼續"
 
 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 "暫停"
 
 msgid "Pause"
 msgstr "暫停"
 


@@ -479,8 +579,9 @@ msgid "<b>Add contacts from directory</b>"
 msgstr "<b>從目錄加入連絡人</b>"
 
 #: ../gtk/main.ui.h:14
 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>"
 
 #: ../gtk/main.ui.h:15
 msgid "<b>Welcome !</b>"


@@ -503,26 +604,26 @@ msgid "All users"
 msgstr "所有使用者"
 
 #: ../gtk/main.ui.h:21
 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 "將我自動登入"
 
 msgid "Automatically log me in"
 msgstr "將我自動登入"
 

-#: ../gtk/main.ui.h:24
+#: ../gtk/main.ui.h:22

 msgid "B"
 msgstr "B"
 
 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"
 
 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)"
 #: ../gtk/main.ui.h:26
 msgid "Check _Updates"
 msgstr "檢查更新(_U)"


@@ -535,10 +636,6 @@ msgstr "連絡人"
 msgid "D"
 msgstr "D"
 
 msgid "D"
 msgstr "D"
 

-#: ../gtk/main.ui.h:29
-msgid "Decline"
-msgstr "拒接"
-

 #: ../gtk/main.ui.h:30
 msgid "Default"
 msgstr "預設值"
 #: ../gtk/main.ui.h:30
 msgid "Default"
 msgstr "預設值"


@@ -548,13 +645,14 @@ msgid "Duration"
 msgstr "時間長度"
 
 #: ../gtk/main.ui.h:32
 msgstr "時間長度"
 
 #: ../gtk/main.ui.h:32

-msgid "Duration:"
-msgstr "時間長度："
-
-#: ../gtk/main.ui.h:33

 msgid "Enable self-view"
 msgstr "啟用自拍檢視"
 
 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 位址"
 #: ../gtk/main.ui.h:34
 msgid "Enter username, phone number, or full sip address"
 msgstr "輸入使用者名稱、電話號碼或完整的 sip 位址"


@@ -587,18 +685,23 @@ msgstr "登入資訊"
 msgid "Lookup:"
 msgstr "查詢："
 
 msgid "Lookup:"
 msgstr "查詢："
 

-#: ../gtk/main.ui.h:43
+#: ../gtk/main.ui.h:42

 msgid "My current identity:"
 msgstr "我目前的使用者識別："
 
 msgid "My current identity:"
 msgstr "我目前的使用者識別："
 

-#: ../gtk/main.ui.h:44
+#: ../gtk/main.ui.h:43

 msgid "Online users"
 msgstr "線上使用者"
 
 msgid "Online users"
 msgstr "線上使用者"
 

-#: ../gtk/main.ui.h:45
+#: ../gtk/main.ui.h:44

 msgid "Password"
 msgstr "密碼"
 
 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 位址或電話號碼："
 #: ../gtk/main.ui.h:47
 msgid "SIP address or phone number:"
 msgstr "SIP 位址或電話號碼："


@@ -607,18 +710,14 @@ msgstr "SIP 位址或電話號碼："
 msgid "Search"
 msgstr "搜尋"
 
 msgid "Search"
 msgstr "搜尋"
 

-#: ../gtk/main.ui.h:49
+#: ../gtk/main.ui.h:50

 msgid "Show debug window"
 msgstr "顯示除錯視窗"
 
 msgid "Show debug window"
 msgstr "顯示除錯視窗"
 

-#: ../gtk/main.ui.h:50
+#: ../gtk/main.ui.h:51

 msgid "Username"
 msgstr "使用者名稱"
 
 msgid "Username"
 msgstr "使用者名稱"
 

-#: ../gtk/main.ui.h:51
-msgid "_Call history"
-msgstr "通話紀錄(_C)"
-

 #: ../gtk/main.ui.h:52
 msgid "_Help"
 msgstr "求助(_H)"
 #: ../gtk/main.ui.h:52
 msgid "_Help"
 msgstr "求助(_H)"


@@ -628,18 +727,14 @@ msgid "_Homepage"
 msgstr "官方網頁(_H)"
 
 #: ../gtk/main.ui.h:54
 msgstr "官方網頁(_H)"
 
 #: ../gtk/main.ui.h:54

-msgid "_Linphone"
-msgstr "_Linphone"
-
-#: ../gtk/main.ui.h:55

 msgid "_Options"
 msgstr "選項(_O)"
 
 msgid "_Options"
 msgstr "選項(_O)"
 

-#: ../gtk/main.ui.h:56
+#: ../gtk/main.ui.h:55

 msgid "in"
 msgstr "於"
 
 msgid "in"
 msgstr "於"
 

-#: ../gtk/main.ui.h:57
+#: ../gtk/main.ui.h:56

 msgid "label"
 msgstr "標籤"
 
 msgid "label"
 msgstr "標籤"
 


@@ -697,16 +792,6 @@ msgstr "SIP 位址"
 msgid "Show this contact presence status"
 msgstr "顯示這個連絡人的上線狀態"
 
 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 除錯視窗"
 #: ../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
 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):"
 
 #: ../gtk/sip_account.ui.h:7
 msgid "Registration duration (sec):"


@@ -787,10 +872,6 @@ msgstr "sip:"
 msgid "Send"
 msgstr "傳送"
 
 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 表示「不限制」"
 #: ../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
 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>"
 
 #: ../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
 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 特殊裝置 (選擇性)："
 
 msgid "ALSA special device (optional):"
 msgstr "ALSA 特殊裝置 (選擇性)："
 

-#: ../gtk/parameters.ui.h:15
+#: ../gtk/parameters.ui.h:16

 msgid "Add"
 msgstr "加入"
 
 msgid "Add"
 msgstr "加入"
 

-#: ../gtk/parameters.ui.h:16
+#: ../gtk/parameters.ui.h:17

 msgid "Audio RTP/UDP:"
 msgstr "音效 RTP/UDP:"
 
 msgid "Audio RTP/UDP:"
 msgstr "音效 RTP/UDP:"
 

-#: ../gtk/parameters.ui.h:17
+#: ../gtk/parameters.ui.h:18

 msgid "Audio codecs"
 msgstr "音訊編碼解碼器"
 
 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)"
 
 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 解析)"
 
 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"
 
 msgid "CIF"
 msgstr "CIF"
 

-#: ../gtk/parameters.ui.h:22
+#: ../gtk/parameters.ui.h:23

 msgid "Capture device:"
 msgstr "捕捉裝置:"
 
 msgid "Capture device:"
 msgstr "捕捉裝置:"
 

-#: ../gtk/parameters.ui.h:23
+#: ../gtk/parameters.ui.h:24

 msgid "Codecs"
 msgstr "編碼解碼器"
 
 msgid "Codecs"
 msgstr "編碼解碼器"
 

-#: ../gtk/parameters.ui.h:24
+#: ../gtk/parameters.ui.h:25

 msgid "Direct connection to the Internet"
 msgstr "直接連線到網際網路"
 
 msgid "Direct connection to the Internet"
 msgstr "直接連線到網際網路"
 

-#: ../gtk/parameters.ui.h:25
+#: ../gtk/parameters.ui.h:26

 msgid "Disable"
 msgstr "停用"
 
 msgid "Disable"
 msgstr "停用"
 

-#: ../gtk/parameters.ui.h:26
+#: ../gtk/parameters.ui.h:27

 msgid "Done"
 msgstr "完成"
 
 msgid "Done"
 msgstr "完成"
 

-#: ../gtk/parameters.ui.h:27
+#: ../gtk/parameters.ui.h:28

 msgid "Download speed limit in Kbit/sec:"
 msgstr "下載速度限制於 Kbit/sec:"
 
 msgid "Download speed limit in Kbit/sec:"
 msgstr "下載速度限制於 Kbit/sec:"
 

-#: ../gtk/parameters.ui.h:28
+#: ../gtk/parameters.ui.h:29

 msgid "Edit"
 msgstr "編輯"
 
 msgid "Edit"
 msgstr "編輯"
 

-#: ../gtk/parameters.ui.h:29
+#: ../gtk/parameters.ui.h:30

 msgid "Enable"
 msgstr "啟用"
 
 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 "啟用回音消除"
 
 msgid "Enable echo cancellation"
 msgstr "啟用回音消除"
 

-#: ../gtk/parameters.ui.h:31
+#: ../gtk/parameters.ui.h:33

 msgid "Erase all passwords"
 msgstr "消除所有的密碼"
 
 msgid "Erase all passwords"
 msgstr "消除所有的密碼"
 

-#: ../gtk/parameters.ui.h:32
+#: ../gtk/parameters.ui.h:34

 msgid "Manage SIP Accounts"
 msgstr "管理 SIP 帳號"
 
 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 "多媒體設定值"
 
 msgid "Multimedia settings"
 msgstr "多媒體設定值"
 

-#: ../gtk/parameters.ui.h:34
+#: ../gtk/parameters.ui.h:37

 msgid "Network settings"
 msgstr "網路設定值"
 
 msgid "Network settings"
 msgstr "網路設定值"
 

-#: ../gtk/parameters.ui.h:35
+#: ../gtk/parameters.ui.h:38

 msgid "Playback device:"
 msgstr "播放裝置"
 
 msgid "Playback device:"
 msgstr "播放裝置"
 

-#: ../gtk/parameters.ui.h:36
+#: ../gtk/parameters.ui.h:39

 msgid "Prefered video resolution:"
 msgstr "偏好的視訊解析度:"
 
 msgid "Prefered video resolution:"
 msgstr "偏好的視訊解析度:"
 

-#: ../gtk/parameters.ui.h:37
+#: ../gtk/parameters.ui.h:40

 msgid "Public IP address:"
 msgstr "公共 IP 地址:"
 
 msgid "Public IP address:"
 msgstr "公共 IP 地址:"
 

-#: ../gtk/parameters.ui.h:38
+#: ../gtk/parameters.ui.h:41

 msgid ""
 "Register to FONICS\n"
 "virtual network !"
 msgid ""
 "Register to FONICS\n"
 "virtual network !"


@@ -943,95 +1038,102 @@ msgstr ""
 "註冊到 FONICS\n"
 "虛擬網路！"
 
 "註冊到 FONICS\n"
 "虛擬網路！"
 

-#: ../gtk/parameters.ui.h:40
+#: ../gtk/parameters.ui.h:43

 msgid "Remove"
 msgstr "移除"
 
 msgid "Remove"
 msgstr "移除"
 

-#: ../gtk/parameters.ui.h:41
+#: ../gtk/parameters.ui.h:44

 msgid "Ring device:"
 msgstr "響鈴裝置:"
 
 msgid "Ring device:"
 msgstr "響鈴裝置:"
 

-#: ../gtk/parameters.ui.h:42
+#: ../gtk/parameters.ui.h:45

 msgid "Ring sound:"
 msgstr "鈴聲音效:"
 
 msgid "Ring sound:"
 msgstr "鈴聲音效:"
 

-#: ../gtk/parameters.ui.h:43
-msgid "SIP (TCP):"
+#: ../gtk/parameters.ui.h:46
+#, fuzzy
+msgid "SIP (TCP)"

 msgstr "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):"
 
 msgstr "SIP (UDP):"
 

-#: ../gtk/parameters.ui.h:45
+#: ../gtk/parameters.ui.h:49

 msgid "Send DTMFs as SIP info"
 msgstr "傳送 DTMFs 為 SIP 資訊"
 
 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 "設定最大傳輸單位:"
 
 msgid "Set Maximum Transmission Unit:"
 msgstr "設定最大傳輸單位:"
 

-#: ../gtk/parameters.ui.h:47
+#: ../gtk/parameters.ui.h:51

 msgid "Settings"
 msgstr "設定值"
 
 msgid "Settings"
 msgstr "設定值"
 

-#: ../gtk/parameters.ui.h:48
+#: ../gtk/parameters.ui.h:52

 msgid "Show advanced settings"
 msgstr "顯示進階設定值"
 
 msgid "Show advanced settings"
 msgstr "顯示進階設定值"
 

-#: ../gtk/parameters.ui.h:49
+#: ../gtk/parameters.ui.h:53

 msgid "Stun server:"
 msgstr "Stun 伺服器:"
 
 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 位址"
 
 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:"
 
 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"
 
 msgid "Use IPv6 instead of IPv4"
 msgstr "使用 IPv6 代替 IPv4"
 

-#: ../gtk/parameters.ui.h:53
+#: ../gtk/parameters.ui.h:57

 msgid "User interface"
 msgstr "使用者介面"
 
 msgid "User interface"
 msgstr "使用者介面"
 

-#: ../gtk/parameters.ui.h:54
+#: ../gtk/parameters.ui.h:58

 msgid "Video RTP/UDP:"
 msgstr "視訊 RTP/UDP:"
 
 msgid "Video RTP/UDP:"
 msgstr "視訊 RTP/UDP:"
 

-#: ../gtk/parameters.ui.h:55
+#: ../gtk/parameters.ui.h:59

 msgid "Video codecs"
 msgstr "視訊編碼解碼器"
 
 msgid "Video codecs"
 msgstr "視訊編碼解碼器"
 

-#: ../gtk/parameters.ui.h:56
+#: ../gtk/parameters.ui.h:60

 msgid "Video input device:"
 msgstr "視訊輸入裝置:"
 
 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):"
 
 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 位址:"
 
 msgid "Your resulting SIP address:"
 msgstr "您組成的 SIP 位址:"
 

-#: ../gtk/parameters.ui.h:59
+#: ../gtk/parameters.ui.h:63

 msgid "Your username:"
 msgstr "您的使用者名稱:"
 
 msgid "Your username:"
 msgstr "您的使用者名稱:"
 

-#: ../gtk/parameters.ui.h:60
+#: ../gtk/parameters.ui.h:64

 msgid "a sound card"
 msgstr "音效卡"
 
 msgid "a sound card"
 msgstr "音效卡"
 

-#: ../gtk/parameters.ui.h:61
+#: ../gtk/parameters.ui.h:65

 msgid "default camera"
 msgstr "預設的攝影機"
 
 msgid "default camera"
 msgstr "預設的攝影機"
 

-#: ../gtk/parameters.ui.h:62
+#: ../gtk/parameters.ui.h:66

 msgid "default soundcard"
 msgstr "預設的音效卡"
 
 msgid "default soundcard"
 msgstr "預設的音效卡"
 


@@ -1055,25 +1157,19 @@ msgstr "Linphone"
 msgid "Please wait"
 msgstr "請稍候"
 
 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 "已放棄"
 
 msgid "aborted"
 msgstr "已放棄"
 

-#: ../coreapi/linphonecore.c:209
+#: ../coreapi/linphonecore.c:190

 msgid "completed"
 msgstr "已完成"
 
 msgid "completed"
 msgstr "已完成"
 

-#: ../coreapi/linphonecore.c:212
+#: ../coreapi/linphonecore.c:193

 msgid "missed"
 msgstr "未接"
 
 msgid "missed"
 msgstr "未接"
 

-#: ../coreapi/linphonecore.c:217
+#: ../coreapi/linphonecore.c:198

 #, c-format
 msgid ""
 "%s at %s\n"
 #, c-format
 msgid ""
 "%s at %s\n"


@@ -1088,74 +1184,60 @@ msgstr ""
 "狀態：%s\n"
 "持續時間：%i 分 %i 秒\n"
 
 "狀態：%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 "去電"
 
 msgid "Outgoing call"
 msgstr "去電"
 

-#: ../coreapi/linphonecore.c:998
+#: ../coreapi/linphonecore.c:1088

 msgid "Ready"
 msgstr "準備就緒"
 
 msgid "Ready"
 msgstr "準備就緒"
 

-#: ../coreapi/linphonecore.c:1773
+#: ../coreapi/linphonecore.c:1831

 msgid "Looking for telephone number destination..."
 msgstr "尋找電話號碼目的端..."
 
 msgid "Looking for telephone number destination..."
 msgstr "尋找電話號碼目的端..."
 

-#: ../coreapi/linphonecore.c:1776
+#: ../coreapi/linphonecore.c:1834

 msgid "Could not resolve this number."
 msgstr "無法解析這個號碼。"
 
 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"
 
 msgstr "無法解析指定的 sip 位址。sip 網址通常看起來像 sip:user@domain"
 

-#: ../coreapi/linphonecore.c:1967
+#: ../coreapi/linphonecore.c:2025

 msgid "Contacting"
 msgstr "正在連絡"
 
 msgid "Contacting"
 msgstr "正在連絡"
 

-#: ../coreapi/linphonecore.c:1974
+#: ../coreapi/linphonecore.c:2032

 msgid "Could not call"
 msgstr "無法通話"
 
 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 "抱歉，我們已達瀏同步通話的最大數目"
 
 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 "修改通話參數..."
 
 msgid "Modifying call parameters..."
 msgstr "修改通話參數..."
 

-#: ../coreapi/linphonecore.c:2311
+#: ../coreapi/linphonecore.c:2366

 msgid "Connected."
 msgstr "已連線。"
 
 msgid "Connected."
 msgstr "已連線。"
 

-#: ../coreapi/linphonecore.c:2334
+#: ../coreapi/linphonecore.c:2389

 msgid "Call aborted"
 msgstr "通話已放棄"
 
 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 "無法暫停通話"
 
 msgid "Could not pause the call"
 msgstr "無法暫停通話"
 

-#: ../coreapi/linphonecore.c:2460
+#: ../coreapi/linphonecore.c:2535

 msgid "Pausing the current call..."
 msgstr "暫停目前的通話..."
 
 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"
 #: ../coreapi/misc.c:147
 msgid ""
 "Your computer appears to be using ALSA sound drivers.\n"


@@ -1232,11 +1314,14 @@ msgstr "等待中"
 msgid "Unknown-bug"
 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"
 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"
 
 "您輸入的 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 登入"
 
 #, c-format
 msgid "Could not login as %s"
 msgstr "無法以 %s 登入"
 

-#: ../coreapi/callbacks.c:170
+#: ../coreapi/callbacks.c:206

 msgid "is contacting you"
 msgstr "正在連絡您"
 
 msgid "is contacting you"
 msgstr "正在連絡您"
 

-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207

 msgid " and asked autoanswer."
 msgstr "並要求自動接聽。"
 
 msgid " and asked autoanswer."
 msgstr "並要求自動接聽。"
 

-#: ../coreapi/callbacks.c:171
+#: ../coreapi/callbacks.c:207

 msgid "."
 msgstr "."
 
 msgid "."
 msgstr "."
 

-#: ../coreapi/callbacks.c:226
+#: ../coreapi/callbacks.c:266

 msgid "Remote ringing."
 msgstr "遠端響鈴。"
 
 msgid "Remote ringing."
 msgstr "遠端響鈴。"
 

-#: ../coreapi/callbacks.c:242
+#: ../coreapi/callbacks.c:282

 msgid "Remote ringing..."
 msgstr "遠端響鈴..."
 
 msgid "Remote ringing..."
 msgstr "遠端響鈴..."
 

-#: ../coreapi/callbacks.c:253
+#: ../coreapi/callbacks.c:293

 msgid "Early media."
 msgstr "早期媒體。"
 
 msgid "Early media."
 msgstr "早期媒體。"
 

-#: ../coreapi/callbacks.c:291
+#: ../coreapi/callbacks.c:331

 #, c-format
 msgid "Call with %s is paused."
 msgstr "和 %s 的通話已暫停。"
 
 #, 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 接聽 - 保留中。"
 
 #, c-format
 msgid "Call answered by %s - on hold."
 msgstr "通話由 %s 接聽 - 保留中。"
 

-#: ../coreapi/callbacks.c:317
+#: ../coreapi/callbacks.c:357

 msgid "Call resumed."
 msgstr "通話已繼續。"
 
 msgid "Call resumed."
 msgstr "通話已繼續。"
 

-#: ../coreapi/callbacks.c:322
+#: ../coreapi/callbacks.c:362

 #, c-format
 msgid "Call answered by %s."
 msgstr "通話由 %s 接聽。"
 
 #, c-format
 msgid "Call answered by %s."
 msgstr "通話由 %s 接聽。"
 

-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:432

 msgid "We are being paused..."
 msgstr "我們被暫停了..."
 
 msgid "We are being paused..."
 msgstr "我們被暫停了..."
 

-#: ../coreapi/callbacks.c:387
+#: ../coreapi/callbacks.c:436

 msgid "We have been resumed..."
 msgstr "我們要繼續了..."
 
 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 "通話已終止。"
 
 msgid "Call terminated."
 msgstr "通話已終止。"
 

-#: ../coreapi/callbacks.c:431
+#: ../coreapi/callbacks.c:480

 msgid "User is busy."
 msgstr "使用者現正忙碌。"
 
 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).");
 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 "使用者不想要被打擾。"
 
 msgid "User does not want to be disturbed."
 msgstr "使用者不想要被打擾。"
 

-#: ../coreapi/callbacks.c:435
+#: ../coreapi/callbacks.c:484

 msgid "Call declined."
 msgstr "通話被拒接。"
 
 msgid "Call declined."
 msgstr "通話被拒接。"
 

-#: ../coreapi/callbacks.c:447
+#: ../coreapi/callbacks.c:496

 msgid "No response."
 msgstr "沒有回應。"
 
 msgid "No response."
 msgstr "沒有回應。"
 

-#: ../coreapi/callbacks.c:451
+#: ../coreapi/callbacks.c:500

 msgid "Protocol error."
 msgstr "通訊協定錯誤。"
 
 msgid "Protocol error."
 msgstr "通訊協定錯誤。"
 

-#: ../coreapi/callbacks.c:467
+#: ../coreapi/callbacks.c:516

 msgid "Redirected"
 msgstr "已重新導向"
 
 msgid "Redirected"
 msgstr "已重新導向"
 

-#: ../coreapi/callbacks.c:477
+#: ../coreapi/callbacks.c:526

 msgid "Not found"
 msgstr "找不到"
 
 msgid "Not found"
 msgstr "找不到"
 

-#: ../coreapi/callbacks.c:487
+#: ../coreapi/callbacks.c:551

 msgid "No common codecs"
 msgstr "沒有通用的編碼解碼器"
 
 msgid "No common codecs"
 msgstr "沒有通用的編碼解碼器"
 

-#: ../coreapi/callbacks.c:493
+#: ../coreapi/callbacks.c:557

 msgid "Call failed."
 msgstr "通話失敗。"
 
 msgid "Call failed."
 msgstr "通話失敗。"
 

-#: ../coreapi/callbacks.c:557
+#: ../coreapi/callbacks.c:631

 #, c-format
 msgid "Registration on %s successful."
 msgstr "在 %s 註冊成功。"
 
 #, 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 取消註冊完成。"
 
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "在 %s 取消註冊完成。"
 

-#: ../coreapi/callbacks.c:574
+#: ../coreapi/callbacks.c:648

 msgid "no response timeout"
 msgstr "沒有回應逾時"
 
 msgid "no response timeout"
 msgstr "沒有回應逾時"
 

-#: ../coreapi/callbacks.c:577
+#: ../coreapi/callbacks.c:651

 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "在 %s 註冊失敗：%s"
 
 #, 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 "驗證失敗"
 
 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 "
 #~ msgid ""
 #~ "Your machine appears to be connected to an IPv6 network. By default "
 #~ "linphone always uses IPv4. Please update your configuration if you want "